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 delta 3363 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 delta 143 zcmV;A0C4}M8ma-1BYyyKNklLXXh1O>#0O!jSrQ(85N;UAAY_Y>Euq)~WW&)d85$PQEQmk`p<9A%5hwvr xB_$zSf^0a5rb=FbS%Qo~VxvXSC>SOH0H?wB{X*0uxBvhE00>D%PDHLkV1i4IH;@1T 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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 diff --git a/core/assets-raw/sprites/blocks/liquid/mechanical-pump.png b/core/assets-raw/sprites/blocks/liquid/mechanical-pump.png index 3e98ba508182427edd46326b86d39e067cb74865..b92420f1c3f9b7ee6cae7f517514c8f826853392 100644 GIT binary patch delta 1539 zcmV+e2K@Py0hA1oBYyaB^>EX>4U6ba`-PAZ2)IW&i+q+O1b>lJq7F z{Ld+J1Pc&?{a!jznl6Cm!`uj%i>*d?!aY( z4LV}sk9p0R4m<9Tvi|%eSNjJIk-=={qpM3lLeAF)u}hww<$p@@vg4N_+J?tvy63)L zdVU!)ddg`%tFZP(`v86Y>AcJ?Z%2^)>)e&^G0;gd5~iJpr!@%6lFX($zaVutTz@Ke#7vW$-{FYXljBn8a&>HdMEtN z*oIo`sY@uo9V_6{J*NSqGuQ9X0wL5^OnJn24E2yV$A1H{1`P5Dv&RABk*0~nbmf*A zJR9ioVbw89gQP422oZcUz>on0hatm*`X&FYY>Z^CaAX)?wo-!Z3&D^X8;MUJAY?~Cu?mOhaP}&PVNI zeJ`o2B`d%|eN;K75tPTbM!G}|QLYn2LJt1|%{KI3(R7LW85(1!q~Q(7$Gh08cVxVf zQ?9&9A3&)ehv*wn>KiaW2Bnth1XT}HWPd9bnrT^^$$m@U>MBDEvGq-VtkK3i5oLTY z?4r@7%pwV)Ds-t;6s)fpT(LUNPTn8K|=VRF5^L z)l9Ug=)P2qC6xIU6XU1UUq;Lj#TJMh)FxnDxHS4?DD5-ii!^`*}WzN`dy@3t33 zaZzkT4gPc6Q|}u2uyCAb$`5{od8{6&%hQt@w8u|?UI5B;>YU!OHEtpr@OEs=tSNu> z+mpbUcXu)|PSL|FOf9N<-SDS2_J7jWQeI7;_6b!;7ri?au8wnC+Jx@{aJ=^xo}zJb z^)?i*hF&yin(Jdo)DMh&i{__>zD4tTw0CI2bdB$x4QI866dru3cTOe5Z*yxDg#Bp9 zt*+rO*iM&Q8+r%mEo;94bdS+1AZhqY!~gW^U#@4_$X%Ny;Q#;t24YJ`M1KJP0Mh_} zd{Ub?00009a7bBm001r{001r{0eGc9b^rhX2XskIMF-;p0s|#4@W~=D00027Nkl)PejO?(SwYQWo|0w3#_EWD?Ed$!sD@c_16FXBZTbgA-0N}$YX zb^{R3zZQykYxX$x^qGT)`>`Spm8o&!pM+(9q}Od;pYD!eyV?*dM~B|zP7#No`IAQY p*{5ti*TVPn6fFCr!_D-X{Q~&ZH>5)?UI_pI002ovPDHLkV1nR>=70bI delta 120 zcmV-;0EhpS43q(oBXIy*NklhlQnqG0YkeO;`cU3XlRAMzMmRBeS!!!HPf_W&(^4 a3IYKA6STq&OR!r20000 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 IM6N<$f~izvj{pDw diff --git a/core/assets-raw/sprites/blocks/production/oilrefinery.png b/core/assets-raw/sprites/blocks/production/oilrefinery.png deleted file mode 100644 index b6fdea3228c100295c47008fbe6e665096538fb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqfu1goAr-fhXBcLm{Lj0aui@iy z^{ELwkDCpg;~WpyPf#l931##Vn0db7xrg8k=Aai(WqFPnxGKEn(016ybi{4@B*s{Q ly9*0g6?iuBwM;Z+WRSJmlsM&-#&@9M44$rjF6*2UngH_6EWiK& 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 zcmV+$2juwr0jUmaB^>EX>4U6ba`-PAZ2)IW&i+q+O1bx((EV* zes>kK1Of4~9IsWggIWIIB_^Gu&-u^P#OkO70r>!JRsZ?BslVhwa9$a9-Ue&6JSLcc zQ3hVmXZE1Yc&~{*1|M{_KcJ9EdYV&P7k?Bwp9`E>^z=zrE`KjMehGptcs$fK_wnNM zOAz6t!0 zNspM32F;VhfO&vodV_{e;3-P5K+1v|2^qI7F!Y9@FM}7&1%wkpgu%e^*3=vEzqBo= zwH~?v+HYTpUD#t<%;?DVw{Qs{(3Vem_;)mQi5qX{qJc9B zA8VuZObu{l2@n^FZWd#J1OaV<7%XUq=m5lzUhs)xIg-I72mmt{P))EQvI36Bu3OeP z7`(_h$x>Pb2qsHTppgU;u#91eA7{M8P-J4GnAx&p&w-;QYb;x9o$WO$I&#Lbv(7p1 zf{UKK@qg^Cci#KpW57UC!Z_IARPZ5$7)5Cm(NR`M;fOI|qGS>$n_TiKq?jdqvdNrn zcG>5UW5Gg2(!bc^RPiO0SfNTNRa3dz>Z-4y#wM}WsF}viHrIR$EpF5ns-LLA4Y^;V z1`D;0m>GQTL`}%f9U`EY6YiJ^VrW1RcO3xdb3TnU|oB|y& zLC{n{Zm_XCk^3cXip?M4hTo7=9lHMmIn|+C$USj;L9N7bqR;@SXJPlLrY420q=-IZ zGH6N}Lyx9r+Xu0QL{3ktCSNCO?e%5QqF%iS%D7hh(#4c0NITZH{-3o%djxnz(}?%X;DtI zHrFJu%7rp5@YP`~OIG9_Yhxmb%RJVKwttkSWOFwNdKsCE$=bR%0cGtKiP|>qySIMrok>xz;rbb!PdOZSj`)>`N{T=_(tk)N zij$?M9M7~(`a*mbnj=>g`rlQv*FtdbQGB!l+q`=-yagmYJ*!T)y~fh32kSwV3<^uV zoV1thv|%kv;fw}wYn1`Ji93&X8M(;$&h^ZCxF@@MW;;|jMRG9T;`+s+-xY~RdVMKL z>cVod!{Oza0_+h<)MC6}UkKElAGk>6JbQkypb000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jc?*127o~#!kPA{M4OWE-OdStUmx7HVZ67U!IIXGFoNW@qRBXZHU$ad>n*npv=^lsy2Ntt=9~ zt_EOc!47KiK0~Pvx%>t9Pl~gX_W&e~;k?(?oSnRL|D?#}F90x0ReufSXg7+HNdP;$ zsmNLG+YMOXx}{R~F#JLhr8>d%_*25U5Vadce*?E}<2e3>Qk_WCZ+bLaS*}#Kiem=-INyL{J0#ZyBEuc4VA8>sz;9KXG+$^jRoIwh((w`!ezj0XJJ&k{g@b zHTOCJnMaItmz%300N!01%gO)*wSIrV?3#=B{KEO^6cZ_v4-|4GxWXKnW}5&2002ov JPDHLkV1hLoY777X delta 223 zcmV<503iRV4*CI*BYyzFNkluwxS=0Kb~cv`D(jN&+~}2a>VM*<*r0|B%X<9#gEC>CQSM Z{s#AL-s{;-yC(nu002ovPDHLkV1iz$Wyt^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 zcmV<20VDqY1O5Y$EPv6zZxR6j#c}=+W8!4c!9@mF(7}l)Nu^OqHMW3JP<}QQQlQ=e zNAG|;a@9fN@+v0PISM4fuWW-c#L z3eRAQ8J-yuVt+b{I(rwpT}9Cy^pzL1`&;O}5r(zRww&Rmk|A08JkBSInYBMT{5atI zUXOzhNeMu_VfS#4Zi^jZZ|48 Sc3wyT0000yPq;#|tEq1%#?jG?pPdEzr*2 zA`l30J9G*8&SgYtfr{9qG}k~=nk@Gg>8K*Bl1!_;K~Hb7gLVwK0(WdX>wCkvbi?Q;8c6STI9%A;k*;aDARCA;&pGSV8oLl?j;m1DT z_iPS6q&aw>8fCX=Ev{2@EL=^a+p+MTImcx5A(2UeY<`Y(w#25bGZjsdcu*vjDG`ll zSX*7ewmOK)kmqUxRWo_4Y*1G$YV*TUw*l6YOHF&tdR4E%k}=D!E3@P147*JR9Ratc ze>t#ScLHK{5tPeyw*RUJX@veP$@{ro@w2EPGb+BZpq S{CY !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); } }