diff --git a/core/assets-raw/sprites/blocks/units/tank-assembler-in.png b/core/assets-raw/sprites/blocks/units/tank-assembler-in.png new file mode 100644 index 0000000000..080596e1d6 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/tank-assembler-in.png differ diff --git a/core/assets-raw/sprites/blocks/units/tank-assembler-side1.png b/core/assets-raw/sprites/blocks/units/tank-assembler-side1.png new file mode 100644 index 0000000000..6ea08597e9 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/tank-assembler-side1.png differ diff --git a/core/assets-raw/sprites/blocks/units/tank-assembler-side2.png b/core/assets-raw/sprites/blocks/units/tank-assembler-side2.png new file mode 100644 index 0000000000..c549831fd5 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/tank-assembler-side2.png differ diff --git a/core/assets-raw/sprites/blocks/units/tank-assembler-top.png b/core/assets-raw/sprites/blocks/units/tank-assembler-top.png index 93baebe80a..006c35f38a 100644 Binary files a/core/assets-raw/sprites/blocks/units/tank-assembler-top.png and b/core/assets-raw/sprites/blocks/units/tank-assembler-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/tank-assembler.png b/core/assets-raw/sprites/blocks/units/tank-assembler.png index 9db25c43e7..bf54cf6950 100644 Binary files a/core/assets-raw/sprites/blocks/units/tank-assembler.png and b/core/assets-raw/sprites/blocks/units/tank-assembler.png differ diff --git a/core/src/mindustry/world/blocks/units/UnitAssembler.java b/core/src/mindustry/world/blocks/units/UnitAssembler.java index 07d6362ae6..41ea60d383 100644 --- a/core/src/mindustry/world/blocks/units/UnitAssembler.java +++ b/core/src/mindustry/world/blocks/units/UnitAssembler.java @@ -10,6 +10,7 @@ import arc.struct.*; import arc.util.*; import arc.util.io.*; import mindustry.ai.types.*; +import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.entities.*; import mindustry.entities.units.*; @@ -33,6 +34,9 @@ import static mindustry.Vars.*; * 3. * */ public class UnitAssembler extends PayloadBlock{ + public @Load("@-side1") TextureRegion sideRegion1; + public @Load("@-side2") TextureRegion sideRegion2; + public int areaSize = 11; public UnitType droneType = UnitTypes.assemblyDrone; public int dronesCreated = 4; @@ -87,7 +91,7 @@ public class UnitAssembler extends PayloadBlock{ @Override public void drawRequestRegion(BuildPlan plan, Eachable list){ Draw.rect(region, plan.drawx(), plan.drawy()); - //Draw.rect(outRegion, plan.drawx(), plan.drawy(), plan.rotation * 90); + Draw.rect(plan.rotation >= 2 ? sideRegion2 : sideRegion1, plan.drawx(), plan.drawy(), plan.rotation * 90); Draw.rect(topRegion, plan.drawx(), plan.drawy()); } @@ -359,6 +363,8 @@ public class UnitAssembler extends PayloadBlock{ } } + Draw.rect(rotation >= 2 ? sideRegion2 : sideRegion1, x, y, rotdeg()); + Draw.z(Layer.blockOver); payRotation = rotdeg(); diff --git a/gradle.properties b/gradle.properties index f6658de073..58a8d51b9f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=224e6c07e0 +archash=15f2f63a9f