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

yay more hardcoded regions (#8021)

Browse Source 
* change fuckall

* more of this

* typo
This commit is contained in:
null
2023-01-07 17:38:12 +01:00
committed by GitHub
parent 9af9e1459d
commit 9dcb8b7bd5
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/mindustry/world/blocks/production/BeamDrill.java
View File

@@ -24,13 +24,13 @@ import static mindustry.Vars.*;
public class BeamDrill extends Block{ public class BeamDrill extends Block{
protected Rand rand = new Rand(); protected Rand rand = new Rand();
public @Load("drill-laser") TextureRegion laser; public @Load(value = "@-beam", fallback = "drill-laser") TextureRegion laser;
public @Load("drill-laser-end") TextureRegion laserEnd; public @Load(value = "@-beam-end", fallback = "drill-laser-end") TextureRegion laserEnd;
public @Load("drill-laser-center") TextureRegion laserCenter; public @Load(value = "@-beam-center", fallback = "drill-laser-center") TextureRegion laserCenter;
public @Load("drill-laser-boost") TextureRegion laserBoost; public @Load(value = "@-beam-boost", fallback = "drill-laser-boost") TextureRegion laserBoost;
public @Load("drill-laser-boost-end") TextureRegion laserEndBoost; public @Load(value = "@-beam-boost-end", fallback = "drill-laser-boost-end") TextureRegion laserEndBoost;
public @Load("drill-laser-boost-center") TextureRegion laserCenterBoost; public @Load(value = "@-beam-boost-center", fallback = "drill-laser-boost-center") TextureRegion laserCenterBoost;
public @Load("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
public @Load("@-glow") TextureRegion glowRegion; public @Load("@-glow") TextureRegion glowRegion;

7
core/src/mindustry/world/draw/DrawPistons.java
View File

@@ -11,6 +11,7 @@ import mindustry.world.*;
public class DrawPistons extends DrawBlock{ public class DrawPistons extends DrawBlock{
public float sinMag = 4f, sinScl = 6f, sinOffset = 50f, sideOffset = 0f, lenOffset = -1f; public float sinMag = 4f, sinScl = 6f, sinOffset = 50f, sideOffset = 0f, lenOffset = -1f;
public int sides = 4; public int sides = 4;
public String suffix = "-piston";
public TextureRegion region1, region2, regiont; public TextureRegion region1, region2, regiont;
@Override @Override
@@ -41,8 +42,8 @@ public class DrawPistons extends DrawBlock{
public void load(Block block){ public void load(Block block){
super.load(block); super.load(block);
region1 = Core.atlas.find(block.name + "-piston0", block.name + "-piston"); region1 = Core.atlas.find(block.name + suffix + "0", block.name + suffix);
region2 = Core.atlas.find(block.name + "-piston1", block.name + "-piston"); region2 = Core.atlas.find(block.name + suffix + "1", block.name + suffix);
regiont = Core.atlas.find(block.name + "-piston-t"); regiont = Core.atlas.find(block.name + suffix + "-t");
} }
} }