From a3871cca9085d10689d7e413c37ceca1ac684ba8 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 15 Oct 2019 18:32:47 -0400 Subject: [PATCH] Added correctly named mech pads for alpha/dart --- .../sprites/blocks/mechs/alpha-mech-pad.png | Bin 0 -> 5083 bytes .../{dart-mech-pad.png => dart-ship-pad.png} | Bin core/assets/bundles/bundle.properties | 3 ++- core/assets/sprites/block_colors.png | Bin 727 -> 732 bytes core/src/io/anuke/mindustry/content/Blocks.java | 11 +++++++++-- core/src/io/anuke/mindustry/content/Mechs.java | 5 ++--- .../io/anuke/mindustry/io/SaveFileReader.java | 4 +++- 7 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/mechs/alpha-mech-pad.png rename core/assets-raw/sprites/blocks/mechs/{dart-mech-pad.png => dart-ship-pad.png} (100%) diff --git a/core/assets-raw/sprites/blocks/mechs/alpha-mech-pad.png b/core/assets-raw/sprites/blocks/mechs/alpha-mech-pad.png new file mode 100644 index 0000000000000000000000000000000000000000..e5a90abb4bf1d775336e05994fcf0ba9a33f3876 GIT binary patch literal 5083 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 literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/mechs/dart-mech-pad.png b/core/assets-raw/sprites/blocks/mechs/dart-ship-pad.png similarity index 100% rename from core/assets-raw/sprites/blocks/mechs/dart-mech-pad.png rename to core/assets-raw/sprites/blocks/mechs/dart-ship-pad.png diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 91a5ecfc89..258828f879 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -873,7 +873,8 @@ block.pneumatic-drill.name = Pneumatic Drill block.laser-drill.name = Laser Drill block.water-extractor.name = Water Extractor block.cultivator.name = Cultivator -block.dart-mech-pad.name = Alpha Mech Pad +block.dart-ship-pad.name = Dart Ship Pad +block.alpha-mech-pad.name = Alpha Mech Pad block.delta-mech-pad.name = Delta Mech Pad block.javelin-ship-pad.name = Javelin Ship Pad block.trident-ship-pad.name = Trident Ship Pad diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index c8615955a6c270209b3bf10a0267330d4d2791f7..a518537775fe67f6ec640f069f2e7e628c1c6b43 100644 GIT binary patch literal 732 zcmeAS@N?(olHy`uVBq!ia0y~yV3c8CU|{56V_;z5IV~v2z`(TF)5S5Q;?~;&wMnmmOVQS-*bOH8I%|5FPDb8YyK;M_is0=;#B0SeJgf$985_1b5Z1)pLx_H4tEThTe}05MIwcol z*Lr#Td4q@-u8S`QEVgt%dhzj=ZFiD0Tpku3H;`OE@7-ndm+M|Ge*G)fYW>|sk6-cT z-Pvn$-WvY*A|8uy+JzhJiY^1Ul<=Mt8$S=00B@bP~)T2G4~+$V7)>AT>> z6uIYNo+p|7_u4&q$`rj(B6_97?Ktzyc!o;N{+n78Z}x38xZr=q)>l#S;T7JAqG}Q0 zwljFrm`+Qt@b7Xl)(^P6`^cu>Z+`dg;gPs-d;ipD+T3lWZ;qAznAFan$!GV{;>QYS zPZ5q4(j7Z3lI+g8Y4}*lJwMW^#m1)o;;s0Ly~e$T$4<7K3)&^WtUjUX;={sY$Ikk^ z%H`pE*||!~v0wh+e(!^io%mb}e{^^JlUNj^GPU;DsjNQN%Ko!k+FerSZND8C_f+)T zwI-Wx{Y{%iQa-Od73X)*Vr7ExA&E2>o?Suga-69LdydPyeoFQHmBR8~swunGL+MbR z-l^GN1>S#h+-B@)cF8kLS!?H1f#^ck_KPRx-0Xbt<-yilA9gZTOnu%F)b;bCU`n84 zK3DSWnTM_NkD1w?zO!VWWp_tt#F0ed6Kaorrr&t-T|sw;L8SAJoV+yMrSrXhPPu&W z@dqKvtxvqIcg$O}L9M-@%3N^LX_X}k`x$-De>j!Y{YsaCfq}u()z4*}Q$iB}Ge>K@ literal 727 zcmeAS@N?(olHy`uVBq!ia0y~yV3cNHU|{56V_;x-C(f0@z`!)m)5S5Q;?~;<@!r9V z3`c)+34IBBlD$uZ?Pk{*2jAtLsT0)#LlOdisH=M2y|d-yooCys@7^ujZvEcux!Lxo zS9bc&{bg|Wm7+)0nic#3wyw56v*Q&ws@@)GWPX0Ya*lKRzsK`0)_&orpS(KTbm7}6 z8J53iY*vr1{1tFs)0h3})2COin_s?g!6!G@_G)OTN!F^$D^*=nYA3up<>e#R_&Qkk z&6{@{_ro}N@^y8+)wQRjDx4bQ4xZZz%_}l-*t2Zs@XaD&TdTHw2j<~6_ zte3yk|FYm>hQ(q__n#Yux0u~ePw;qJbX?)IoNcV>_7_&4C!CZ1zN74~nQVA|(dTQ- zzjoiYh+qEHDOUJ-*6fU&T}|JTtlx^?z99K#%G9ZaUp{=auT!i#d?TGH;!WJ4O^3SQ zFlo9boP6v$Q+tD4_r`f$8y^-<{Prs_t$4;-qtnuc%YIjN?mDKak}_u(qtPLb)q>_~ z&659P=AB5I_~Mhd(o5N-nYQ0*+~R)nzIc1z>(8kziK4p;MfW{<;5@6@--^%fRe&(- zpNTd>W_?q-C-b*?9Df`V5_0jny_5fXhx2y}dxZVmN~Q(Xcih`2IFE<#bIFY}EAF}d zZ%;&kAx^M|(q1>G74HTdEMPl`JSbuBT9KBJ#9Gq5bud$(uH@`~*bAC~&1ma85J zt7$uXlOfw%uxzu|u|Uz;0*4F~6E94)D>%L4a@w7J8k@|WFRfOn2opF`d8pH%`ld#H zc=Ma*OgTF0CznswX;Dsj-n`~`sEnKPdF0MIeBrFnyye-B3rw!!sH&~xJzpDr7NS3r0^=;im}-~#cb*y!{yE53nN`B rg$oPkiK=#7-rP1}jA58mGGZ!a&H!+4p2fq}u()z4*}Q$iB})a+m< diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 130d56d369..8bfcbbec0f 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -79,7 +79,7 @@ public class Blocks implements ContentList{ fortressFactory, repairPoint, //upgrades - dartPad, deltaPad, tauPad, omegaPad, javelinPad, tridentPad, glaivePad; + dartPad, alphaPad, deltaPad, tauPad, omegaPad, javelinPad, tridentPad, glaivePad; @Override public void load(){ @@ -1742,7 +1742,14 @@ public class Blocks implements ContentList{ //endregion //region upgrades - dartPad = new MechPad("dart-mech-pad"){{ + dartPad = new MechPad("dart-ship-pad"){{ + requirements(Category.upgrade, ItemStack.with(Items.lead, 100, Items.graphite, 50, Items.copper, 75)); + mech = Mechs.dart; + size = 2; + consumes.power(0.5f); + }}; + + alphaPad = new MechPad("alpha-mech-pad"){{ requirements(Category.upgrade, ItemStack.with(Items.lead, 100, Items.graphite, 50, Items.copper, 75)); mech = Mechs.alpha; size = 2; diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index dca4b16c2e..b13f10a91b 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -43,10 +43,9 @@ public class Mechs implements ContentList{ homingPower = 20f; damage = 3f; speed = 3f; - bulletWidth = 4f; - bulletHeight = 4f; + bulletWidth = 6f; + bulletHeight = 6f; lifetime = 60f; - }}; }}; } diff --git a/core/src/io/anuke/mindustry/io/SaveFileReader.java b/core/src/io/anuke/mindustry/io/SaveFileReader.java index 8384aca50e..b5e0fe8a8c 100644 --- a/core/src/io/anuke/mindustry/io/SaveFileReader.java +++ b/core/src/io/anuke/mindustry/io/SaveFileReader.java @@ -14,7 +14,9 @@ public abstract class SaveFileReader{ protected final DataOutputStream dataBytes = new DataOutputStream(byteOutput); protected final ReusableByteOutStream byteOutputSmall = new ReusableByteOutStream(); protected final DataOutputStream dataBytesSmall = new DataOutputStream(byteOutputSmall); - protected final ObjectMap fallback = ObjectMap.of(); + protected final ObjectMap fallback = ObjectMap.of( + "dart-mech-pad", "dart-ship-pad" + ); protected void region(String name, DataInput stream, CounterInputStream counter, IORunner cons) throws IOException{ counter.resetCount();