Skip to content

Commit ed73855

Browse files
committed
🚑️ build error
1 parent a917fce commit ed73855

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

patches/client/0059-FR-ARC-drawPlace-and-drawSelect.patch

+11-15
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ Subject: [PATCH] FR: ARC drawPlace and drawSelect
1010
.../world/blocks/defense/MendProjector.java | 5 ++-
1111
.../blocks/defense/OverdriveProjector.java | 6 ++-
1212
.../blocks/defense/turrets/BaseTurret.java | 5 ++-
13-
.../world/blocks/defense/turrets/Turret.java | 12 ++++++
13+
.../world/blocks/defense/turrets/Turret.java | 8 ++++
1414
.../world/blocks/production/Drill.java | 22 ++++++----
1515
.../world/blocks/storage/CoreBlock.java | 9 ++++
16-
9 files changed, 92 insertions(+), 13 deletions(-)
16+
9 files changed, 88 insertions(+), 13 deletions(-)
1717

1818
diff --git a/core/src/mindustry/game/Universe.java b/core/src/mindustry/game/Universe.java
1919
index 33fcc893c17585aef5f24f0282db5788410a5237..4012377fec3fb9161645e7d76616b2f7f78d48c8 100644
@@ -221,28 +221,24 @@ index eced3dc7581a4916970634e600d0f5cd86f6ee7e..58e315a6d9ec8c4c32df8a8220a9ccbb
221221

222222
public float estimateDps(){
223223
diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
224-
index 5db6510b6453d024d1f973bbf6d5f227fe176530..725439d42ac8444c15552d938b110f0d4f9052fc 100644
224+
index 5db6510b6453d024d1f973bbf6d5f227fe176530..b458a8b73455e57a8552b3b6f51e1ca8a83159af 100644
225225
--- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java
226226
+++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
227-
@@ -398,6 +398,18 @@ public class Turret extends ReloadTurret{
228-
drawer.draw(this);
229-
}
230-
231-
+ //show shoot target line
232-
+ @Override
233-
+ public void drawSelect(){
234-
+ super.drawSelect();
227+
@@ -405,6 +405,14 @@ public class Turret extends ReloadTurret{
228+
if(drawMinRange){
229+
Drawf.dashCircle(x, y, minRange(), team.color);
230+
}
231+
+
232+
+ //ARC: show shoot target line
235233
+ if(!targetPos.isZero() && dst(targetPos) < range * 5){
236234
+ Lines.stroke(1f);
237235
+ Lines.dashLine(x, y, targetPos.x, targetPos.y, (int)(Mathf.len(targetPos.x - x, targetPos.y - y) / 8));
238236
+ Lines.dashCircle(targetPos.x, targetPos.y, 8);
239237
+ Draw.reset();
240238
+ }
241-
+ }
242-
+
239+
}
240+
243241
@Override
244-
public void drawSelect(){
245-
super.drawSelect();
246242
diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java
247243
index 377641cd32a85e37cd99b09622c7ed1b8022a0d1..9188bfda2f06342825afba3231e5861bca09b6d1 100644
248244
--- a/core/src/mindustry/world/blocks/production/Drill.java

src/mindustryX/features/ui/toolTable/HudSettingsTable.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ protected void rebuild(){
7878
if(i % settings.getInt("arcQuickMsgKey", 8) == 0) t.row();
7979
int finalI = i;
8080
t.button(settings.getString(getArcQuickMsgShortName(i)), Styles.flatBordert, () -> {
81-
if(settings.getBool(getArcQuickMsgJs(finalI))) mods.getScripts().runConsole(mods.getScripts().injectConsoleVariables() + settings.getString(getArcQuickMsgName(finalI)));
81+
if(settings.getBool(getArcQuickMsgJs(finalI))) mods.getScripts().runConsole(ui.consolefrag.injectConsoleVariables() + settings.getString(getArcQuickMsgName(finalI)));
8282
else Call.sendChatMessage(settings.getString(getArcQuickMsgName(finalI)));
8383
});
8484
}

0 commit comments

Comments
 (0)