From 30abfc0619c41dc6e10d13bc1200214ae4a834ef Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 20 Oct 2020 14:02:10 -0400 Subject: [PATCH] Fixed #3045 --- core/assets/baseparts/1603214918168.msch | 2 ++ core/assets/baseparts/1603214945791.msch | 2 ++ core/assets/baseparts/1603214967392.msch | 1 + core/assets/baseparts/1603214996033.msch | 3 +++ core/assets/baseparts/1603215024189.msch | Bin 0 -> 162 bytes core/assets/baseparts/1603215113546.msch | 2 ++ core/assets/baseparts/1603215171294.msch | 2 ++ core/assets/baseparts/1603215272794.msch | 1 + core/assets/baseparts/1603215345320.msch | 4 ++++ core/assets/baseparts/1603215415778.msch | 2 ++ core/assets/baseparts/1603215454977.msch | Bin 0 -> 216 bytes core/assets/baseparts/1603215491407.msch | 2 ++ core/assets/baseparts/1603215563717.msch | Bin 0 -> 160 bytes core/assets/baseparts/1603215697527.msch | Bin 0 -> 262 bytes core/assets/baseparts/1603215771822.msch | Bin 0 -> 239 bytes core/assets/baseparts/1603215801163.msch | 1 + core/assets/baseparts/1603216038407.msch | Bin 0 -> 304 bytes core/assets/baseparts/1603216102310.msch | 1 + core/assets/baseparts/1603216240041.msch | 3 +++ core/assets/baseparts/1603216539888.msch | Bin 0 -> 449 bytes core/src/mindustry/content/Blocks.java | 2 +- .../mindustry/entities/comp/BuildingComp.java | 2 +- core/src/mindustry/logic/LExecutor.java | 17 ++++++++++------- core/src/mindustry/logic/LStatements.java | 6 ++++-- core/src/mindustry/logic/LUnitControl.java | 2 +- .../blocks/defense/turrets/LiquidTurret.java | 6 ++++++ .../world/blocks/defense/turrets/Turret.java | 6 ------ .../world/blocks/logic/LogicBlock.java | 5 ++++- 28 files changed, 53 insertions(+), 19 deletions(-) create mode 100644 core/assets/baseparts/1603214918168.msch create mode 100644 core/assets/baseparts/1603214945791.msch create mode 100644 core/assets/baseparts/1603214967392.msch create mode 100644 core/assets/baseparts/1603214996033.msch create mode 100644 core/assets/baseparts/1603215024189.msch create mode 100644 core/assets/baseparts/1603215113546.msch create mode 100644 core/assets/baseparts/1603215171294.msch create mode 100644 core/assets/baseparts/1603215272794.msch create mode 100644 core/assets/baseparts/1603215345320.msch create mode 100644 core/assets/baseparts/1603215415778.msch create mode 100644 core/assets/baseparts/1603215454977.msch create mode 100644 core/assets/baseparts/1603215491407.msch create mode 100644 core/assets/baseparts/1603215563717.msch create mode 100644 core/assets/baseparts/1603215697527.msch create mode 100644 core/assets/baseparts/1603215771822.msch create mode 100644 core/assets/baseparts/1603215801163.msch create mode 100644 core/assets/baseparts/1603216038407.msch create mode 100644 core/assets/baseparts/1603216102310.msch create mode 100644 core/assets/baseparts/1603216240041.msch create mode 100644 core/assets/baseparts/1603216539888.msch diff --git a/core/assets/baseparts/1603214918168.msch b/core/assets/baseparts/1603214918168.msch new file mode 100644 index 0000000000..6d69a2c362 --- /dev/null +++ b/core/assets/baseparts/1603214918168.msch @@ -0,0 +1,2 @@ +mschx5 +! Ey-J(qG&'.}SmtWKuXGq Yz\P?E:Y ΤԢh)(%UDK(.%#V0FN# \ No newline at end of file diff --git a/core/assets/baseparts/1603214967392.msch b/core/assets/baseparts/1603214967392.msch new file mode 100644 index 0000000000..0e30b20a82 --- /dev/null +++ b/core/assets/baseparts/1603214967392.msch @@ -0,0 +1 @@ +mschx%A ᧀZc\.z$dФ/t?3o`Ɲ.L<$NV!b>=e%80r"^!GKug9耦{S_@+$jW\oJSM ܅0?CThqW \ No newline at end of file diff --git a/core/assets/baseparts/1603214996033.msch b/core/assets/baseparts/1603214996033.msch new file mode 100644 index 0000000000..83690987ae --- /dev/null +++ b/core/assets/baseparts/1603214996033.msch @@ -0,0 +1,3 @@ +mschx% + Ӫmic׽C/{bU~A>:n^Xvw?ŧ5~sH>5q(h5q@LMQaXAe@A=aQQbV9(3s`)UYjEad8QG9=g(0gZixGkCH!%L!NIO Q>T+wCQMjV{0d=1o&KC$yQ~&?~ literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/1603215113546.msch b/core/assets/baseparts/1603215113546.msch new file mode 100644 index 0000000000..bf1020f89f --- /dev/null +++ b/core/assets/baseparts/1603215113546.msch @@ -0,0 +1,2 @@ +mschx%[n  A}" t'C$؎]  c.9gFcK8XƸ}>O }c|tt#-)䃑dqPҒr$b@*b2rtҳRZґ@Wr# \ No newline at end of file diff --git a/core/assets/baseparts/1603215171294.msch b/core/assets/baseparts/1603215171294.msch new file mode 100644 index 0000000000..eaef917ff3 --- /dev/null +++ b/core/assets/baseparts/1603215171294.msch @@ -0,0 +1,2 @@ +mschx%ᎃ Ai߃pB`M +!0;060/oK8J\k a|T k~Sq)O-h_|M%35V⾸Ӌ\[}ٱ#ⶼ@0-'hh0@W @JCi4bjp2gㄽ_]䡎Eӱ-K+. \ No newline at end of file diff --git a/core/assets/baseparts/1603215272794.msch b/core/assets/baseparts/1603215272794.msch new file mode 100644 index 0000000000..b2351a3857 --- /dev/null +++ b/core/assets/baseparts/1603215272794.msch @@ -0,0 +1 @@ +mschxMKn D 1P&#$ 9yvtCY_%Jno>1-~K؎i?#BI%q;R8W;r˖#v)!F\7ٔoIy{4ïvg=!;^`4E ` ah:I:!꬐u0hRFC7: TW0t=z*] %wX#H7G4}mWW03Įb6 e> \ No newline at end of file diff --git a/core/assets/baseparts/1603215345320.msch b/core/assets/baseparts/1603215345320.msch new file mode 100644 index 0000000000..8c97534bdf --- /dev/null +++ b/core/assets/baseparts/1603215345320.msch @@ -0,0 +1,4 @@ +mschxEn@\E!dͲ:iҐqvfاȇP^]|g7Bw +Vp]ln5'?|`npr};МC0O[vM߆4vpߑ'*HY~2dJNV(BLr +bHw-cKM52e*W R!KL{X# SAJR5dCV6r]m`t~H覵RvX +2HNk{8'L^+y# +pU%%%JAJ$?M \ No newline at end of file diff --git a/core/assets/baseparts/1603215415778.msch b/core/assets/baseparts/1603215415778.msch new file mode 100644 index 0000000000..6f7f75ab97 --- /dev/null +++ b/core/assets/baseparts/1603215415778.msch @@ -0,0 +1,2 @@ +mschx-k +1 MуP PҮEdM?o2c1e_BϚ/guI08bI~e.pRwGO`madh{Nނ:'"IZ}äz}o)" \ No newline at end of file diff --git a/core/assets/baseparts/1603215454977.msch b/core/assets/baseparts/1603215454977.msch new file mode 100644 index 0000000000000000000000000000000000000000..c0a53057ed741f285cd16fe930a9f2bd0cc2ec2b GIT binary patch literal 216 zcmV;}04M)#b7N=$c$_tk+lquR5JYQYyhfdw?-=|jaq%MI}w6=oK|n&D1b8nyma`OBqi@t6o2Cbexvuj@ }cNOv2a=oc\D[=qt0&?S (Р(p=R$тJT&geJIMʴ* ~#d|EE4I#tFxpzpzʤ3% h'/4 ol```›SfffG?J (, \ No newline at end of file diff --git a/core/assets/baseparts/1603215563717.msch b/core/assets/baseparts/1603215563717.msch new file mode 100644 index 0000000000000000000000000000000000000000..460c1d9f8b55a2cf31f26543d84be9bf0ca3824c GIT binary patch literal 160 zcmV;R0AK%Yb7N=$c$_^>(GJ2O3_Lav7c_p!K8kES5I4XAG5)>nT+D?YcfCR}VH%*5 z-ve%~cD}^7Z-L;}P#21&#hd^ON4a_W%%$%IuIA0tTzm=}?2^;kW5a!muO8RA=1xn1 zJ7x3f341>N4^i&&4e;Ot11N?C2F9TVT%d#wa};xAT#aVUJBuMvCe2X`Wu!n|SRFkp O148;o2ICh}4JxA8CguO`j(pueRW4M9OEblkNBg{mVoP>fd43ACUW41!T$1Q)@F z;8SpA2Q7Y@{rFUmS`%oUaS_l$PlqeKZD?emu5E$7V#D{&AUlJ2jV!YLiFYa^sf?sD MGHE!~KQo#|Ku0BfqyPW_ literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/1603215771822.msch b/core/assets/baseparts/1603215771822.msch new file mode 100644 index 0000000000000000000000000000000000000000..68ee586ea5ec58d88238857e0b4a0e2ab592b927 GIT binary patch literal 239 zcmVu!V~5QUE@>dLy?P2ZsZc_^Z!Awe*JHhuZFgHtBqo18N@ zJn<0dg4rzIm$>gXW#i9i*3*Q=u28GZOLBX0F#sdvWus5=C^q3$Trt5Nn_gl#?RQL2 zuGmfIc%;Qbd6R9@YjWO0t{#MNqVNXIKjO7w1m_5Tv^f$NF-wGa)O znhOq5C5VV%OejMUXubPUPp83SWv+!zzujy}mCuOVlu-VKT_ pBi!r0iGrXiBuRB;U#+qE{Xs7V%rt}+&%EHy^)us9@dvUVIaNDicJlxL literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/1603215801163.msch b/core/assets/baseparts/1603215801163.msch new file mode 100644 index 0000000000..09b9033d84 --- /dev/null +++ b/core/assets/baseparts/1603215801163.msch @@ -0,0 +1 @@ +mschx-[ DJJ aQMӵ~g&31dSo=-q[[LޭFqav.0[ SA/ciF(dPD~+ \ No newline at end of file diff --git a/core/assets/baseparts/1603216038407.msch b/core/assets/baseparts/1603216038407.msch new file mode 100644 index 0000000000000000000000000000000000000000..85865ba1232ba235265ae8c3db94c0dd19873a1e GIT binary patch literal 304 zcmV-00nh$zb7N=$c$_tlU2cRh41{O-S;7L#ZZFX%4i!OEMS=u{(5gr8!-|ecD?z?^ zY>ypuc*{^Yy%@CH81%Z0Iz|)FOop*tqxBBx@Z9{Y!?0>+=7F~lgT_X)44dD>$Y9&4 z4bgwG`MQ`{OrFt3?d-k`qj#U?+Xvj&Sw}O8Fzq(tu}a6_{AB)Y>&>h>=*Z&6y3sn5 zf_`;oUv#wNFaO}\_~Hy !K) %Q5KzFNR2L/9uۋX|iX9u+8pz&։mOh!>t^m1%(M6Ae) \ No newline at end of file diff --git a/core/assets/baseparts/1603216240041.msch b/core/assets/baseparts/1603216240041.msch new file mode 100644 index 0000000000..c0960c09d5 --- /dev/null +++ b/core/assets/baseparts/1603216240041.msch @@ -0,0 +1,3 @@ +mschxMIR0EJk.cp +*b z@XOt$(AqABzNdOx`q}e9w}eE^n@c`g|0_k;CJ0PO{%+@SiLIx44E=w-%RKfj+Q|*R zw^%)UGV=o1G`{&r=ZRs5vGX78KD;iWvxxPB_8gp=c67aM{g7gKS}=2Zj&6Fvv381n zo{8u?{*=@9D=1?e1*O0UDnTtc2^z+Z1 zmJnJ(XbGW3r{#o$=yE~9P(aCt7SO@Jpjv~Of~gkMoOZk`Szp3P<=CAIu9iH*KmrC5 zWOx}a8tEDA6`P+6wXW+s9oBa!E9q9;%>cvhHM=Wd>($&l;@);_e&Qlu<^g*EsW?o* zJ-*rvdx7SUZ7`{b&J0BtUK4QOG#AQ|<_}`4^)HUO@TDob%FtDmR}__@8`iM9aj^n& r*&R8?4cZNc1)p&Kj-drx(g(Th&w?+4uZ)r&CFvt3H^BNIY&>DDgQedV literal 0 HcmV?d00001 diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 60908d8337..056b94d27b 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1652,7 +1652,7 @@ public class Blocks implements ContentList{ }}, Items.titanium, new ShrapnelBulletType(){{ length = brange; - damage = 65f; + damage = 66f; ammoMultiplier = 4f; width = 17f; reloadMultiplier = 1.3f; diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 45b1042660..87518c35ef 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -911,7 +911,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, /** Called when arbitrary configuration is applied to a tile. */ public void configured(@Nullable Unit builder, @Nullable Object value){ //null is of type void.class; anonymous classes use their superclass. - Class type = value == null ? void.class : value.getClass().isAnonymousClass() ? value.getClass().getSuperclass() : value.getClass(); + Class type = value == null ? void.class : value.getClass().isAnonymousClass() || value.getClass().getSimpleName().startsWith("adapter") ? value.getClass().getSuperclass() : value.getClass(); if(builder != null && builder.isPlayer()){ lastAccessed = builder.getPlayer().name; diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index e2cbd581fd..6b4f9ced0a 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -47,6 +47,7 @@ public class LExecutor{ public LongSeq graphicsBuffer = new LongSeq(); public StringBuilder textBuffer = new StringBuilder(); public Building[] links = {}; + public IntSet linkIds = new IntSet(); public Team team = Team.derelict; public boolean initialized(){ @@ -212,9 +213,9 @@ public class LExecutor{ public LLocate locate = LLocate.building; public BlockFlag flag = BlockFlag.core; public int enemy, ore; - public int outX, outY, outFound; + public int outX, outY, outFound, outBuild; - public UnitLocateI(LLocate locate, BlockFlag flag, int enemy, int ore, int outX, int outY, int outFound){ + public UnitLocateI(LLocate locate, BlockFlag flag, int enemy, int ore, int outX, int outY, int outFound, int outBuild){ this.locate = locate; this.flag = flag; this.enemy = enemy; @@ -271,6 +272,7 @@ public class LExecutor{ cache.found = false; exec.setnum(outFound, 0); } + exec.setobj(outFound, res != null && res.build != null && res.build.team == exec.team ? res.build : null); }else{ exec.setbool(outFound, cache.found); exec.setnum(outX, cache.x); @@ -446,13 +448,13 @@ public class LExecutor{ float range = Math.max(unit.range(), buildingRange); if(!unit.within(x1, y1, range)){ exec.setobj(p3, null); - exec.setnum(p4, 0); + exec.setobj(p4, null); }else{ Tile tile = world.tileWorld(x1, y1); //any environmental solid block is returned as StoneWall, aka "@solid" Block block = tile == null ? null : !tile.synthetic() ? (tile.solid() ? Blocks.stoneWall : Blocks.air) : tile.block(); exec.setobj(p3, block); - exec.setnum(p4, tile != null && tile.build != null ? tile.build.rotation : 0); + exec.setobj(p4, tile != null && tile.build != null ? tile.build : null); } } case itemDrop -> { @@ -510,11 +512,11 @@ public class LExecutor{ @Override public void run(LExecutor exec){ Object obj = exec.obj(target); - if(obj instanceof Controllable cont && cont.team() == exec.team){ + if(obj instanceof Building b && b.team == exec.team && exec.linkIds.contains(b.id)){ if(type.isObj){ - cont.control(type, exec.obj(p1), exec.num(p2), exec.num(p3), exec.num(p4)); + b.control(type, exec.obj(p1), exec.num(p2), exec.num(p3), exec.num(p4)); }else{ - cont.control(type, exec.num(p1), exec.num(p2), exec.num(p3), exec.num(p4)); + b.control(type, exec.num(p1), exec.num(p2), exec.num(p3), exec.num(p4)); } } } @@ -607,6 +609,7 @@ public class LExecutor{ Object target = exec.obj(from); Object sense = exec.obj(type); + //TODO should remote enemy buildings be senseable? if(target instanceof Senseable se){ if(sense instanceof Content){ exec.setnum(to, se.sense(((Content)sense))); diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java index ba4d31e9a1..57adbdb7fe 100644 --- a/core/src/mindustry/logic/LStatements.java +++ b/core/src/mindustry/logic/LStatements.java @@ -819,7 +819,7 @@ public class LStatements{ public LLocate locate = LLocate.building; public BlockFlag flag = BlockFlag.core; public String enemy = "true", ore = "@copper"; - public String outX = "outx", outY = "outy", outFound = "found"; + public String outX = "outx", outY = "outy", outFound = "found", outBuild = "building"; @Override public void build(Table table){ @@ -905,6 +905,8 @@ public class LStatements{ table.add(" found ").left(); fields(table, outFound, str -> outFound = str); + table.add(" building ").left(); + fields(table, outBuild, str -> outBuild = str); } @@ -915,7 +917,7 @@ public class LStatements{ @Override public LInstruction build(LAssembler builder){ - return new UnitLocateI(locate, flag, builder.var(enemy), builder.var(ore), builder.var(outX), builder.var(outY), builder.var(outFound)); + return new UnitLocateI(locate, flag, builder.var(enemy), builder.var(ore), builder.var(outX), builder.var(outY), builder.var(outFound), builder.var(outBuild)); } } } diff --git a/core/src/mindustry/logic/LUnitControl.java b/core/src/mindustry/logic/LUnitControl.java index 2166b00690..b4c7f8254c 100644 --- a/core/src/mindustry/logic/LUnitControl.java +++ b/core/src/mindustry/logic/LUnitControl.java @@ -15,7 +15,7 @@ public enum LUnitControl{ mine("x", "y"), flag("value"), build("x", "y", "block", "rotation"), - getBlock("x", "y", "result", "resRot"), + getBlock("x", "y", "type", "building"), within("x", "y", "radius", "result"); public final String[] params; diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java index 15716b4a94..25725cd0a9 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java @@ -37,6 +37,10 @@ public class LiquidTurret extends Turret{ super.setStats(); stats.add(Stat.ammo, new AmmoListValue<>(ammoTypes)); + } + + @Override + public void init(){ consumes.add(new ConsumeLiquidFilter(i -> ammoTypes.containsKey(i), 1f){ @Override public boolean valid(Building entity){ @@ -53,6 +57,8 @@ public class LiquidTurret extends Turret{ } }); + + super.init(); } public class LiquidTurretBuild extends TurretBuild{ diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 2361c429af..58abb26b12 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -24,7 +24,6 @@ import mindustry.type.*; import mindustry.world.blocks.*; import mindustry.world.consumers.*; import mindustry.world.meta.*; -import mindustry.world.meta.values.*; import static mindustry.Vars.*; @@ -60,7 +59,6 @@ public abstract class Turret extends ReloadTurret{ public boolean alternate = false; public boolean targetAir = true; public boolean targetGround = true; - public boolean acceptCoolant = true; public Sortf unitSort = Unit::dst2; @@ -105,10 +103,6 @@ public abstract class Turret extends ReloadTurret{ stats.add(Stat.reload, 60f / reloadTime * shots, StatUnit.none); stats.add(Stat.targetsAir, targetAir); stats.add(Stat.targetsGround, targetGround); - - if(acceptCoolant){ - stats.add(Stat.booster, new BoosterListValue(reloadTime, consumes.get(ConsumeType.liquid).amount, coolantMultiplier, true, l -> consumes.liquidfilters.get(l.id))); - } } @Override diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java index e1b5c857e4..488c44604d 100644 --- a/core/src/mindustry/world/blocks/logic/LogicBlock.java +++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java @@ -279,10 +279,13 @@ public class LogicBlock extends Block{ //store link objects executor.links = new Building[links.count(l -> l.valid && l.active)]; + executor.linkIds.clear(); int index = 0; for(LogicLink link : links){ if(link.active && link.valid){ - executor.links[index ++] = world.build(link.x, link.y); + Building build = world.build(link.x, link.y); + executor.links[index ++] = build; + if(build != null) executor.linkIds.add(build.id); } }