From 6cc30e6ebd47aa33c3251dcaabf6df25be46f43a Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 9 May 2022 16:55:08 -0400 Subject: [PATCH] Fixed tank tread rects --- .../sprites/units/conquer-treads.png | Bin 706 -> 682 bytes core/assets-raw/sprites/units/conquer.png | Bin 7228 -> 7272 bytes core/assets-raw/sprites/units/sei.png | Bin 3487 -> 3459 bytes core/src/mindustry/content/UnitTypes.java | 13 +++++++------ .../src/mindustry/entities/comp/TankComp.java | 4 ++-- core/src/mindustry/type/UnitType.java | 6 +++--- tools/src/mindustry/tools/Generators.java | 2 +- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/core/assets-raw/sprites/units/conquer-treads.png b/core/assets-raw/sprites/units/conquer-treads.png index 120fec69e905f48954c83080c5bd917a6aa3aa98..3bc6677188e4d0be5f3771b8f67bd589623cf521 100644 GIT binary patch literal 682 zcmeAS@N?(olHy`uVBq!ia0vp^SAqBi2OE&AShDZ~kYX$ja(7}_cTVOd0|Qfvr;B4q z#hkZy4|*~?N;Cv2e-qR>uz7;q8Z%ptdAbg^GxfeaIO&|QNZxw)!@W#xiR$wI6KB3T z%L_CI2z2tztC|0Qt*H1lYj1mT+`RtPRr}^$HOfoRXIR&}LP1TdqmwJCe6#t7c=`PG zo40R}1WNjV1s65VfXRcI+kQ^p|ND3Q&1j3)Uw+zEbMLPRJ8iHMYQiEWh;?8xVy%6B zM)ooGBkNusPUyM$=>3^mOcQU+|Nrgg_vFY!V)f~2qDNd<4Fes0LIi~2Oe6y-XU6o$ zZane$;mg$#>1%<3aI*N8QM%2$ZBZOQ6d@sSR0-(+qeg3H7|W#xp*jTOrj1XYzW?`c zVMN+izxnSsZ#S5WOQE58z2u{w<1>-{0{7OLv-cVE{#iZto`FL;zRlusA=dB^DE?gD zFnj;GA40gKrz@VTnB$2NkRZ$N{E>a|Y`yWm78GenxE8SPW31;6dsW16%?>2u>FVdQ I&MBb@0DgYtga7~l literal 706 zcmeAS@N?(olHy`uVBq!ia0vp^&q0`j4M;xy;-~k44ofy`glX=O&z*OVu;uumf z=k48%zRZRa4Hua=vL`XT@_2J#%bNz5xr|O)H<-AzRDu*NzqwcBGe$qJ`8B&c|2EJR zFkssewYM>{jK5!g_4k5Pr#}b3lCfFc_WG(cL!Fvmhmg8Ur|_b@u>6E+j}!M-ao4w{ zUri`-nqr~oHAg@dCVzx8@KMW(`p-g#-roKDN_Wnef8Tahao?{9<5dIe2g$R*ECkUz zB+~y2yzJuN_-{G?nom!K>eK(72brN!h+_2Izr{Sq5C6O4eZckKIUf|;U@DPKr55}4 zw%l-I@!PgGb!TGow@rV(eC7GgCnWoeZL<|0ltcVFduF#R|L>WnH#Qi{9e;xEZeWlB zl?BH;?by3}{?0ok@AKEM-o9ZDZl!rn2^#4(eJ8Pm0nn^FEd~>23(WcGfe1|$8;gXQ zoGl+0VhXA4N2lI%~$9;+JWiabx$Ski4Kp*Ri_)atcN XnybQIxzCtn3KH;i^>bP0l+XkK`tR}$ diff --git a/core/assets-raw/sprites/units/conquer.png b/core/assets-raw/sprites/units/conquer.png index d7f4c333eb106f937fce20c3a0d8a407f59ee9b0..6d2d669ec1fbfcf3023281f5ade1df1022f362a2 100644 GIT binary patch literal 7272 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 diff --git a/core/assets-raw/sprites/units/sei.png b/core/assets-raw/sprites/units/sei.png index 01737b2654033e5d06e14cb9babbd6dfd131adfc..122cd107ab1562c70395924b356127a45e1fece8 100644 GIT binary patch delta 3426 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 Eg1+`-Jpcdz delta 3454 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 diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 0e7e7f5b31..e8f1d4d792 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2460,7 +2460,7 @@ public class UnitTypes{ health = 800; armor = 5f; itemCapacity = 0; - treadRects = new Rect[]{new Rect(12, 7, 14, 51)}; + treadRects = new Rect[]{new Rect(12 - 32f, 7 - 32f, 14, 51)}; researchCostMultiplier = 0f; weapons.add(new Weapon("stell-weapon"){{ @@ -2501,7 +2501,7 @@ public class UnitTypes{ health = 2100; armor = 8f; itemCapacity = 0; - treadRects = new Rect[]{new Rect(17, 10, 19, 76)}; + treadRects = new Rect[]{new Rect(17 - 96f/2f, 10 - 96f/2f, 19, 76)}; researchCostMultiplier = 0f; weapons.add(new Weapon("locus-weapon"){{ @@ -2588,7 +2588,7 @@ public class UnitTypes{ health = 4500; armor = 10f; itemCapacity = 0; - treadRects = new Rect[]{new Rect(16, 38, 30, 75), new Rect(44, 7, 17, 60)}; + treadRects = new Rect[]{new Rect(16 - 60f, 38 - 60f, 30, 75), new Rect(44 - 60f, 7 - 60f, 17, 60)}; researchCostMultiplier = 0f; weapons.add(new Weapon("precept-weapon"){{ @@ -2654,8 +2654,7 @@ public class UnitTypes{ armor = 20f; itemCapacity = 0; crushDamage = 13f / 5f; - treadRects = new Rect[]{new Rect(22, 16, 28, 130)}; - + treadRects = new Rect[]{new Rect(22 - 154f/2f, 16 - 154f/2f, 28, 130)}; weapons.add(new Weapon("vanquish-weapon"){{ layerOffset = 0.0001f; @@ -2749,7 +2748,9 @@ public class UnitTypes{ armor = 25f; crushDamage = 25f / 5f; rotateSpeed = 0.8f; - treadRects = new Rect[]{new Rect(27, 152, 56, 73), new Rect(24, 51 - 9, 29, 17), new Rect(59, 18 - 9, 39, 19)}; + + float xo = 231f/2f, yo = 231f/2f; + treadRects = new Rect[]{new Rect(27 - xo, 152 - yo, 56, 73), new Rect(24 - xo, 51 - 9 - yo, 29, 17), new Rect(59 - xo, 18 - 9 - yo, 39, 19)}; weapons.add(new Weapon("conquer-weapon"){{ layerOffset = 0.1f; diff --git a/core/src/mindustry/entities/comp/TankComp.java b/core/src/mindustry/entities/comp/TankComp.java index 8982205da1..c1f1a90fd4 100644 --- a/core/src/mindustry/entities/comp/TankComp.java +++ b/core/src/mindustry/entities/comp/TankComp.java @@ -37,8 +37,8 @@ abstract class TankComp implements Posc, Flyingc, Hitboxc, Unitc, ElevationMovec //first rect should always be at the back var treadRect = type.treadRects[0]; - float xOffset = (treadRegion.width/2f - (treadRect.x + treadRect.width/2f)) / 4f; - float yOffset = (treadRegion.height/2f - (treadRect.y + treadRect.height/2f)) / 4f; + float xOffset = (-(treadRect.x + treadRect.width/2f)) / 4f; + float yOffset = (-(treadRect.y + treadRect.height/2f)) / 4f; for(int i : Mathf.signs){ Tmp.v1.set(xOffset * i, yOffset - treadRect.height / 2f / 4f).rotate(rotation - 90); diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index ee015ad2b6..f975ea0b96 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -362,7 +362,7 @@ public class UnitType extends UnlockableContent{ //TANK UNITS - /** list of treads as rectangles in IMAGE COORDINATES. these are mirrored, and should match the coordinates you see in an image editor. */ + /** list of treads as rectangles in IMAGE COORDINATES, relative to the center. these are mirrored. */ public Rect[] treadRects = {}; /** number of frames of movement in a tread */ public int treadFrames = 18; @@ -1303,8 +1303,8 @@ public class UnitType extends UnlockableContent{ for(int i = 0; i < treadRects.length; i ++){ var region = treadRegions[i][frame]; var treadRect = treadRects[i]; - float xOffset = treadRegion.width/2f - (treadRect.x + treadRect.width/2f); - float yOffset = treadRegion.height/2f - (treadRect.y + treadRect.height/2f); + float xOffset = -(treadRect.x + treadRect.width/2f); + float yOffset = -(treadRect.y + treadRect.height/2f); for(int side : Mathf.signs){ Tmp.v1.set(xOffset * side, yOffset).rotate(unit.rotation - 90); diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java index d55f4227fe..2ffe36e4a6 100644 --- a/tools/src/mindustry/tools/Generators.java +++ b/tools/src/mindustry/tools/Generators.java @@ -530,7 +530,7 @@ public class Generators{ for(int r = 0; r < type.treadRects.length; r++){ Rect treadRect = type.treadRects[r]; //slice is always 1 pixel wide - Pixmap slice = pix.crop((int)treadRect.x, (int)treadRect.y, 1, (int)treadRect.height); + Pixmap slice = pix.crop((int)(treadRect.x + pix.width/2f), (int)(treadRect.y + pix.height/2f), 1, (int)treadRect.height); int frames = type.treadFrames; for(int i = 0; i < frames; i++){ int pullOffset = type.treadPullOffset;