From d82d0ae923176681b1a24e8ffa9febbb55968e0e Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 1 Mar 2019 23:01:12 -0500 Subject: [PATCH] Waveskip / Stat fixes / 3x3 thermalpump / Removed liquid tiers --- .../blocks/drills/oil-extractor-top.png | Bin 170 -> 3365 bytes .../sprites/blocks/drills/oil-extractor.png | Bin 268 -> 5728 bytes .../sprites/blocks/liquid/mechanical-pump.png | Bin 148 -> 1556 bytes .../sprites/blocks/liquid/thermal-pump.png | Bin 258 -> 6468 bytes .../sprites/blocks/production/oilrefinery.png | Bin 138 -> 0 bytes .../production/plastanium-compressor.png | Bin 250 -> 1833 bytes core/assets/sprites/block_colors.png | Bin 510 -> 510 bytes .../src/io/anuke/mindustry/content/Blocks.java | 11 ++++------- .../io/anuke/mindustry/content/Liquids.java | 4 ---- .../src/io/anuke/mindustry/entities/Units.java | 9 +++++++-- .../anuke/mindustry/entities/type/Player.java | 5 +---- core/src/io/anuke/mindustry/type/Liquid.java | 2 -- .../mindustry/ui/fragments/HudFragment.java | 11 +++-------- .../world/blocks/distribution/Conveyor.java | 1 - .../world/blocks/production/Drill.java | 2 +- .../world/blocks/production/Pump.java | 6 ++---- .../world/blocks/production/SolidPump.java | 2 +- .../mindustry/world/blocks/units/MechPad.java | 2 +- 18 files changed, 20 insertions(+), 35 deletions(-) delete mode 100644 core/assets-raw/sprites/blocks/production/oilrefinery.png diff --git a/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png b/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png index 37bebd60c18a1b00df09fb614009b38dcd8d7d23..ba07cbb1844ab262e809ac0cb0d5bdc7a9c7d234 100644 GIT binary patch literal 3365 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 diff --git a/core/assets-raw/sprites/blocks/drills/oil-extractor.png b/core/assets-raw/sprites/blocks/drills/oil-extractor.png index e137d2e7739a5b4d5c7372133ed29a323839cd2a..8d363c44cb8d817d3b956c9ac5bd3c9b362a01ac 100644 GIT binary patch literal 5728 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 Mr>mdKI;Vst0Frq!4*&oF delta 241 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 BXe0mt literal 258 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7PI|gHhE&{II>nKT$&kmj z*zKbjYvIdf2D6*o1r}QK8$9rfsgUDORAt`(XIZDT`22G!fAcSy^h^m#sof*>Wv71Z z{-jk=t4}=KvE}sFYf2s|ZDtJ4C0D}1&oInB`JZ<; zU&F`a>QfVV9yc2}$2lIZpP*FI6Uyi#F!OxDa}U88%t0@n%JLjDa8-ECq3y7Z>4@9* qNsO@qcNZ40D)4OLYnf=u$RKOADRIgvjqeN$3=E#GelF{r5}E+=%`CtG diff --git a/core/assets-raw/sprites/blocks/production/plastanium-compressor.png b/core/assets-raw/sprites/blocks/production/plastanium-compressor.png index 4bd9a0098fbdcd7cda7b50e0dda7d098f28a8a4e..8bcbc2c9110ab3bb251dbdfa1604d43e1887b57a 100644 GIT binary patch delta 1819 zcmeyxxRP&zay_ejRY*ihP-3}4K~a8MW=^U?No7H*LTW{38UsVct+nCNm)>Y_)Rl{F zW?}reNoIZM=H|$M4^-9WE;;}6{FNiGRrsjIo z$F)~??#@_Kacb4pmC4%4Dn0d{F`mgYr#^df+^B3ZYi8WG8LS(XGSo679T`OO%?$z+ zoSLnE@kIKVL|pXjpD~f`?Bv4@l?_Q%&24@UG`%)BoNAKdl-#as@TF~`ezW*l))ryM zmV*aAUb`awasL+G6D=v#nlsI=|QKK=ZeD>lmKD-5~oC4yVd1A>8ER4C05;_^}FBp#W$9?EbvYd2K zg@eIZEWmez;wGlPJ}HI?>s4-5S`JCnZrtW!rKGwfkTYm5NgX9AaL5D1EJP7%q*dpPYDRMC| z%>7}9VdA0`A@$iYpEQ@uP_5Z?a!zj9&F2%64?4MC+JECw$Vb&F5evOELW6hSdbMi( z!eeS1udSGQ?5x@K8gAXZD`KnWuQsjQTe-GWm}sxUWlI#_Sbjz?F4Cb`F!Qq2q-RhrA6Nttb9g&FeZV|FG@;gkafS z|CueXE{r~5TUhP5_DJEP3k)mL6Th!qrq;T4NrzpMQHGbKbN{lm+w2=#UHtr4sl}^j zzx|qeVNu*(j#E3rem}mf`F?Wb>-V3oIy){lJTOC9RQkGAz0K7QX0^aQyG%vD?vp%q z+-JhEwYviD*!#M7i8E*Cpnm=B<@AL+Pn+H6$>0}1_Z8p2Evf)&#k?x19 zi8|h4Pvo+bl{!z`TO|^Rutaefj5w)4W$Y^>?p!yVl>jU%p_T zj=1-NBcj3)XC*cEd=T{h+j-0E-R|vmZ|8aju7CJTa<0FnOnKjrsU2Qj4px`yJ=D7< zFI_Hkev9ufry8+Y%Hg8F?uTx^?o{wTux1O>?LF1TdstO$Y*+hj-+S!RYWCNTQ+c?& z_s-ce{mqs{UGIlIYz5g<8FzPD_m@lVJn{3~*E3Z+)OS~2 zb^EU_-ri91@kHc7v$%ftNvltJ_`G3Hxt$)XpgMg~rNisvmhpYfoBprgS$oH4$GLpf z^5uViNIgHPBRTuarBiB?Why)8yp*7@qnmUhk}$Frs9E*(8)o?p9S(xGo>t)sv5Ukq5!rFU;ybaKFd zrsj%YO^vT7YB4Y{uqAoByDmV$>i5U!wJHQMxnG&%Vv_0C)6u$& zBkC!yP7RCnN5M}LNxB_B*fw66pd_};GDUhZOQfp1f>>6ng4pvp<>@X5SEi*u|DXQt zzjWKFKien&`=3y?f<}$alASBku278uZQJkCWh1tAk&D1RvTduvOZ% zo_TxTV~c;SL32GW=U16TN1m}T;QOK3a)Lo4)O4TN{p}q7Q}zUXV@l*bu4!=PHpj%4 zj7zUyZ8YmjX8YgsB@Rl{$Tj ufn{r5{ed^Ly1)N9^z)^Nu;yfbks{R{hh%1^&1PU=VDNPHb6Mw<&;$TA8fpvx delta 223 zcmZ3<_lt3Yay`RAPZ!6Kid$BYU{>^!veM$x`eo1P9AM}$L3!_s zq?-W_iGMA=&8_{{_m+Qo+0MJSKbO9HmVPGr$i^Azug|X2?awu5tq`(fsQF}l@Z&D2 z2Wx_^&P@KZPxwb`Ig_WFw%7t=<`?nj3@vA~r!%j3kiYE6+yki*J3?b!;+IM~s$QHK zQmpvR`k*@J)FqyW;@f6~20zN$kSwgsuz%L+Egrj0c`;d>W1qC~)Xn53hyN2!&5#RT hGvnnsE9HM|-*fN1zUjMLoq>UY!PC{xWt~$(698VRWyt^l diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 7a9bed0f1a8cce21ef2a1161ad5686e012bf423b..6642bd33d3d97a6516bee729083d3cbf7af71518 100644 GIT binary patch delta 476 zcmeyz{EvBpPW{FG`9h2gM+^T6BtJ^IaL|=4{KCOb4bP>4o~GLx0t4#IM1vOGV|0Jt zU|n=4FjI49(ekZJE=9>o&GjiQc)6%g&$q`nM#}v2REg{VSburm`?lZ4TlhmSZ~N@dPHC2A^N+vR7n;sE{`%`9p7@V>?>qAC`)=H?|LG6r}xhA%qW_d;C94*s>&jfo&Pkv3yj=#<~eI*w(b%fd$;-vvy`rdj-BuTO!N{puCby*{qGm6bZEjTA7!xeu zGPmk*nx1|j*ZG7l$$64ON%dA;R@LIWV_h%Gewix1<#+Upy@G99&u*LZaOot)$X_<+ z)VpSGwYU6Z@!)q{e>1-)-#ztXcXelZzYfU}b`O17?sF&ooS|%;M@E#w+*pN~dK+$D zp24Z!VS8e-hbV`8@S3&jE=+pe@u}l^sGzH9g-(9JR9~&Hf~T(uY+|NrCN&&ZW$u4Pdc=fS|hz~JfX=d#Wzp$P!x+~ITp delta 476 zcmeyz{EvBpPW{CF`9h2gtv{W6Iww1_i%Z5hva2srnd+u`^#+rhD`VNHIoxQNQEDE{ZnWE?t$q0Z+$<$J?{8h|2O_f@^?=)<2|*X zC+o-abGAB(=!bpyS@Yvu{DUheH{bD&a5%gY|N?aE7^8r z*;->!--#6gDpNHDd($JLV-Ie#>Nqvwc@}f1apjtvfN-6x&xZrIGhUnI?OT1eDs=t9 zNrtD_X>We~f@ilcn=Iq@rH^m0&ECuUX{DH|qx$6alYCF#_{z4nh|$w@rIwz*TeV53 ntmC^)m(BbC{;~hhwx2QXmbqv1pDK3-1_lOCS3j3^P6 !u.isDead() && u.isAdded()); + return getClosestTarget(team, x, y, range, Unit::isValid); } /**Returns the closest target enemy. First, units are checked, then tile entities.*/ public static TargetTrait getClosestTarget(Team team, float x, float y, float range, Predicate unitPred){ + return getClosestTarget(team, x, y, range, unitPred, t -> true); + } + + /**Returns the closest target enemy. First, units are checked, then tile entities.*/ + public static TargetTrait getClosestTarget(Team team, float x, float y, float range, Predicate unitPred, Predicate tilePred){ Unit unit = getClosestEnemy(team, x, y, range, unitPred); if(unit != null){ return unit; }else{ - return findEnemyTile(team, x, y, range, tile -> true); + return findEnemyTile(team, x, y, range, tilePred); } } diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java index 8938aaf7ad..dfd5e02029 100644 --- a/core/src/io/anuke/mindustry/entities/type/Player.java +++ b/core/src/io/anuke/mindustry/entities/type/Player.java @@ -462,11 +462,8 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ //region update methods - Vector2 last = new Vector2(); - @Override public void update(){ - last.set(this); hitTime -= Time.delta(); @@ -685,7 +682,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ if(target == null){ isShooting = false; if(Core.settings.getBool("autotarget")){ - target = Units.getClosestTarget(team, x, y, getWeapon().bullet.range(), u -> u.getTeam() != Team.none); + target = Units.getClosestTarget(team, x, y, getWeapon().bullet.range(), u -> u.getTeam() != Team.none, u -> u.getTeam() != Team.none); if(mech.canHeal && target == null){ target = Geometry.findClosest(x, y, world.indexer.getDamaged(Team.blue)); diff --git a/core/src/io/anuke/mindustry/type/Liquid.java b/core/src/io/anuke/mindustry/type/Liquid.java index 72b67edea6..2f04dfa787 100644 --- a/core/src/io/anuke/mindustry/type/Liquid.java +++ b/core/src/io/anuke/mindustry/type/Liquid.java @@ -25,8 +25,6 @@ public class Liquid extends UnlockableContent{ public Color flameColor = Color.valueOf("ffb763"); /**The associated status effect.*/ public StatusEffect effect = StatusEffects.none; - /**Pump tier. Controls which pumps can use this liquid.*/ - public int tier; /**Displayed icon. TODO fix it by removing autogen, draw icons manually*/ public TextureRegion iconRegion; diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index 8937fcaceb..37af6a825e 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -23,7 +23,6 @@ import io.anuke.arc.util.Time; import io.anuke.arc.util.Tmp; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.EventType.StateChangeEvent; -import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.graphics.Pal; @@ -466,12 +465,8 @@ public class HudFragment extends Fragment{ }else{ state.wavetime = 0f; } - }).growY().fillX().right().width(40f).update(l -> { - boolean vis = !state.rules.waveTimer && ((Net.server() || players[0].isAdmin) || !Net.active()); - boolean paused = state.is(State.paused) || !vis; - - l.getStyle().imageUp = Core.scene.skin.getDrawable(vis ? "icon-play" : "clear"); - l.touchable(!paused ? Touchable.enabled : Touchable.disabled); - }).visible(() -> !state.rules.waveTimer && ((Net.server() || players[0].isAdmin) || !Net.active()) && unitGroups[Team.red.ordinal()].size() == 0); + }).growY().fillX().right().width(40f) + .visible(() -> state.rules.waves && ((Net.server() || players[0].isAdmin) || !Net.active()) && state.enemies() == 0 + && state.wavetime < state.rules.waveSpacing - 60); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java index e421be3bd9..ff8f0b0662 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java @@ -28,7 +28,6 @@ import static io.anuke.mindustry.Vars.*; public class Conveyor extends Block{ private static final float itemSpace = 0.135f * 3f; - private static final float offsetScl = 128f * 3f; private static final float minmove = 1f / (Short.MAX_VALUE - 2); private static ItemPos drawpos = new ItemPos(); private static ItemPos pos1 = new ItemPos(); diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java index a91b74e466..3bd9bb259e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java @@ -160,7 +160,7 @@ public class Drill extends Block{ } }); - stats.add(BlockStat.drillSpeed, 60f / drillTime, StatUnit.itemsSecond); + stats.add(BlockStat.drillSpeed, 60f / drillTime * size * size, StatUnit.itemsSecond); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Pump.java b/core/src/io/anuke/mindustry/world/blocks/production/Pump.java index 75c168cc74..8201f434be 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Pump.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Pump.java @@ -21,8 +21,6 @@ public class Pump extends LiquidBlock{ /**Pump amount per tile this block is on.*/ protected float pumpAmount = 1f; - /**Maximum liquid tier this pump can use.*/ - protected int tier = 0; public Pump(String name){ super(name); @@ -42,7 +40,7 @@ public class Pump extends LiquidBlock{ @Override public void setStats(){ super.setStats(); - stats.add(BlockStat.liquidOutputSpeed, 60f * pumpAmount, StatUnit.liquidSecond); + stats.add(BlockStat.liquidOutputSpeed, 60f * pumpAmount * size * size, StatUnit.liquidSecond); } @Override @@ -115,7 +113,7 @@ public class Pump extends LiquidBlock{ } protected boolean isValid(Tile tile){ - return tile != null && tile.floor().liquidDrop != null && tier >= tile.floor().liquidDrop.tier; + return tile != null && tile.floor().liquidDrop != null; } } diff --git a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java index 7af581fa66..226933c355 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java @@ -69,7 +69,7 @@ public class SolidPump extends Pump{ if(isMultiblock()){ for(Tile other : tile.getLinkedTiles(tempTiles)){ if(isValid(other)){ - fraction += 1f / size; + fraction += 1f / (size * size); } } }else{ diff --git a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java index be2cc85caa..92a8e9212c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java @@ -222,7 +222,7 @@ public class MechPad extends Block{ player.rotation = 90f; player.baseRotation = 90f; - player.set(x, y); + player.setNet(x, y); player.beginRespawning(this); } }