Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'$' symbol removal

Browse Source
This commit is contained in:
Anuken
2020-08-04 10:45:55 -04:00
parent f60afc39f1
commit 3038862af5
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java
View File

@@ -103,11 +103,11 @@ public class LoadRegionProcessor extends BaseProcessor{
private String parse(String value){ private String parse(String value){
value = '"' + value + '"'; value = '"' + value + '"';
value = value.replace("@size", "\" + ((mindustry.world.Block)content).size + \"");
value = value.replace("@", "\" + content.name + \""); value = value.replace("@", "\" + content.name + \"");
value = value.replace("#1", "\" + INDEX0 + \""); value = value.replace("#1", "\" + INDEX0 + \"");
value = value.replace("#2", "\" + INDEX1 + \""); value = value.replace("#2", "\" + INDEX1 + \"");
value = value.replace("#", "\" + INDEX0 + \""); value = value.replace("#", "\" + INDEX0 + \"");
value = value.replace("$size", "\" + ((mindustry.world.Block)content).size + \"");
return value; return value;
} }

BIN
core/assets/sprites/fallback/sprites4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 180 KiB

After

Width:  |  Height:  |  Size: 184 KiB

BIN
core/assets/sprites/sprites2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 181 KiB

After

Width:  |  Height:  |  Size: 184 KiB

2
core/src/mindustry/world/blocks/defense/PointDefenseTurret.java
View File

@@ -21,7 +21,7 @@ public class PointDefenseTurret extends Block{
public final int timerTarget = timers++; public final int timerTarget = timers++;
public float retargetTime = 5f; public float retargetTime = 5f;
public @Load("block-$size") TextureRegion baseRegion; public @Load("block-@size") TextureRegion baseRegion;
public Color color = Color.white; public Color color = Color.white;
public Effect beamEffect = Fx.pointBeam; public Effect beamEffect = Fx.pointBeam;

2
core/src/mindustry/world/blocks/defense/TractorBeamTurret.java
View File

@@ -19,7 +19,7 @@ public class TractorBeamTurret extends Block{
public final int timerTarget = timers++; public final int timerTarget = timers++;
public float retargetTime = 5f; public float retargetTime = 5f;
public @Load("block-$size") TextureRegion baseRegion; public @Load("block-@size") TextureRegion baseRegion;
public @Load("@-laser") TextureRegion laser; public @Load("@-laser") TextureRegion laser;
public @Load("@-laser-end") TextureRegion laserEnd; public @Load("@-laser-end") TextureRegion laserEnd;

2
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -67,7 +67,7 @@ public abstract class Turret extends Block{
protected Vec2 tr = new Vec2(); protected Vec2 tr = new Vec2();
protected Vec2 tr2 = new Vec2(); protected Vec2 tr2 = new Vec2();
public @Load("block-$size") TextureRegion baseRegion; public @Load("block-@size") TextureRegion baseRegion;
public @Load("@-heat") TextureRegion heatRegion; public @Load("@-heat") TextureRegion heatRegion;
public Cons<TurretEntity> drawer = tile -> Draw.rect(region, tile.x + tr2.x, tile.y + tr2.y, tile.rotation - 90); public Cons<TurretEntity> drawer = tile -> Draw.rect(region, tile.x + tr2.x, tile.y + tr2.y, tile.rotation - 90);

6
core/src/mindustry/world/blocks/production/PayloadAcceptor.java
View File

@@ -16,9 +16,9 @@ import static mindustry.Vars.tilesize;
public class PayloadAcceptor extends Block{ public class PayloadAcceptor extends Block{
public float payloadSpeed = 0.5f; public float payloadSpeed = 0.5f;
public @Load(value = "@-top", fallback = "factory-top-$size") TextureRegion topRegion; public @Load(value = "@-top", fallback = "factory-top-@size") TextureRegion topRegion;
public @Load(value = "@-out", fallback = "factory-out-$size") TextureRegion outRegion; public @Load(value = "@-out", fallback = "factory-out-@size") TextureRegion outRegion;
public @Load(value = "@-in", fallback = "factory-in-$size") TextureRegion inRegion; public @Load(value = "@-in", fallback = "factory-in-@size") TextureRegion inRegion;
public PayloadAcceptor(String name){ public PayloadAcceptor(String name){
super(name); super(name);

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=d7733125246ba0ecee206fa6baa7513c8c0bfbf4 archash=67c4b5cb3c52f5267bbcb4ecfe7134676664c3c2