From 00293d022ca1c35a4f7f02043983658ea977a664 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 2 Nov 2021 10:39:05 -0400 Subject: [PATCH] progress --- .../sprites/blocks/defense/build-tower-base.png | Bin 0 -> 484 bytes .../sprites/blocks/defense/build-tower.png | Bin 0 -> 907 bytes core/src/mindustry/content/Blocks.java | 12 ++++++------ core/src/mindustry/content/UnitTypes.java | 1 + .../maps/planet/ErekirPlanetGenerator.java | 2 +- core/src/mindustry/type/UnitType.java | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/defense/build-tower-base.png create mode 100644 core/assets-raw/sprites/blocks/defense/build-tower.png diff --git a/core/assets-raw/sprites/blocks/defense/build-tower-base.png b/core/assets-raw/sprites/blocks/defense/build-tower-base.png new file mode 100644 index 0000000000000000000000000000000000000000..c404b9c886ac7f71b9190ec5c1731773aee932d1 GIT binary patch literal 484 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FV4Uaa z;uw*ZIowM@7@UWS4dowb(jM(Yj@oUbMB`Q%hw_Q(^<-;rG|L?|tWy z>tA};;KcdA-_Jj?v3sAtes<%e}5-&Q|_UZ@B>_SUnL*>ejRpq zawpTZ4;vrreo)}pa_ITFhj%XW@NbB2@UlGbUZR@y{ZDb*7pJvLgHCNoTemdCE6}`H zm3Kzz$|;MY8ijsbspytAo3_S5vnD4_zv4vB!l)kwb^W=*Y5A>FE=kL2-9KTHAEo?Y z;i8_bdt2NNIxlQ^w$fHej*G?QgY9Zxt+c%tL_Z{4@rq&PXJZOK~ zxXv)~i!vD>bY6HM=R<&kfwGMTYg#LN>wz;LCJ4@um1AiXeW0kgfy>5)C9J7kz47V; oMS%!GxrYApx4+bzPWZ&1p}OeF?2wzR3=9kmp00i_>zopr03M0XQvd(} literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/defense/build-tower.png b/core/assets-raw/sprites/blocks/defense/build-tower.png new file mode 100644 index 0000000000000000000000000000000000000000..cc06efaf34486ba002e9be4b26114daa03559087 GIT binary patch literal 907 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&!0hVj z;uumf=j|N(qRS2<$Lx(|7^0-O=5(E8U79w!>JFlVX8BP6$JMkUc?g2q;j}CVse7l0pAuTBWK2$ z3meYN5D!=zzIglGcW>422uq&fW;o`lp;)s(fYD(_OVA;9E+K{=o*J4p3k(={ckF6- z%XG@uJ+y&)zRt+>u3y4lI zs_`uH5)dx<`S*;^fsHm+^=f50i_#BF?rxuScJ+t1|M)L{J9@lflB!2LzsA`nuPF-z z?H26d)9`Ex`_b^pYlo)dvP)BEJ^K=7T;mXMV0XWL^#1K?2i5;9cmICmm$)tS8t)Ub zb_)tPUroB8;^K6lN$*Kv$^6i*B|jQ2NeCz}eEZvsGxuS6YmRD-L!rR8i5F6KZU1k+ zLXorfVfgFN52=3IH4c?xPqY`lmA|EW@caDt+K$FG3eLV29!~e4Dt=qpvGDEI!|W`q zHL-i%>ijA5?AUu(W^--)kI(Guk96Hwl ztF{_O{J;M1<<@ZdSdiy>8Ix5^nqN-3aQw>`s}=pZCWqKX*dGdT<{oVE$Y_(l)b0#+ zi-}5N#<_RO3w8gb$*-HQXL6X`$jAA&%8v``3-xQ{w;X0SvYn%?xbVma#s_76e!&k^ zeEJ_Xo#&PJKksA4c>Dd|lb+|wxl?VKYgF$1{FGht`|8sV51-a;4F2XlVM>e8A$A@P zhD+WWsx=2X7!>BVOghBQ!^zOF+W-Axl^-qjAFDFeY7Wd`NZ8XNbeNrI|F%ot?>g=) lW$1n=jGnMLZsz`Dc;1n}<(%7ABL)Tr22WQ%mvv4FO#lz&k>mgX literal 0 HcmV?d00001 diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 9ff4968c88..3040ddc0ce 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1159,7 +1159,7 @@ public class Blocks implements ContentList{ }}; buildTower = new BuildTurret("build-tower"){{ - requirements(Category.effect, with(Items.lead, 40, Items.beryllium, 50)); + requirements(Category.effect, with(Items.graphite, 40, Items.beryllium, 50)); consumes.power(0.2f); range = 200f; size = 3; @@ -1412,7 +1412,7 @@ public class Blocks implements ContentList{ }}; beamNode = new BeamNode("beam-node"){{ - requirements(Category.power, with(Items.graphite, 1, Items.lead, 3)); + requirements(Category.power, with(Items.graphite, 1, Items.beryllium, 3)); consumesPower = outputsPower = true; consumes.powerBuffered(1000f); range = 10; @@ -1420,7 +1420,7 @@ public class Blocks implements ContentList{ //TODO requirements beamTower = new BeamNode("beam-tower"){{ - requirements(Category.power, with(Items.graphite, 10, Items.lead, 30, Items.beryllium, 30)); + requirements(Category.power, with(Items.graphite, 10, Items.beryllium, 30)); size = 3; consumesPower = outputsPower = true; consumes.powerBuffered(40000f); @@ -1520,7 +1520,7 @@ public class Blocks implements ContentList{ //TODO work on sprite, green bits? turbineCondenser = new ThermalGenerator("turbine-condenser"){{ - requirements(Category.power, with(Items.graphite, 35, Items.lead, 50, Items.beryllium, 25)); + requirements(Category.power, with(Items.graphite, 35, Items.beryllium, 25)); attribute = Attribute.vent; displayEfficiencyScale = 1f / 9f; minEfficiency = 9f - 0.0001f; @@ -2375,12 +2375,12 @@ public class Blocks implements ContentList{ //region payloads payloadConveyor = new PayloadConveyor("payload-conveyor"){{ - requirements(Category.units, with(Items.graphite, 10, Items.lead, 10)); + requirements(Category.units, with(Items.graphite, 10)); canOverdrive = false; }}; payloadRouter = new PayloadRouter("payload-router"){{ - requirements(Category.units, with(Items.graphite, 15, Items.lead, 15)); + requirements(Category.units, with(Items.graphite, 15)); canOverdrive = false; }}; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index e0856d3ff9..d92283cae5 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2415,6 +2415,7 @@ public class UnitTypes implements ContentList{ spark = new UnitType("spark"){{ defaultController = BuilderAI::new; isCounted = false; + envDisabled = 0; lowAltitude = false; flying = true; diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index 789447da55..d55c8c63a0 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -197,7 +197,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ } //not allowed - state.rules.hiddenBuildItems.addAll(Items.copper, Items.titanium, Items.coal); + state.rules.hiddenBuildItems.addAll(Items.copper, Items.titanium, Items.coal, Items.lead); //it is very hot state.rules.attributes.set(Attribute.heat, 0.8f); diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 2969a80997..c7d1ec306b 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -54,8 +54,8 @@ public class UnitType extends UnlockableContent{ public int envRequired = 0; /** The environment flags that this unit can function in. If the env matches any of these, it will be enabled. */ public int envEnabled = Env.terrestrial; - /** The environment flags that this unit *cannot* function in. If the env matches any of these, it will be *disabled*. */ - public int envDisabled = 0; + /** The environment flags that this unit *cannot* function in. If the env matches any of these, it will explode or be disabled. */ + public int envDisabled = Env.scorching; public float speed = 1.1f, boostMultiplier = 1f, rotateSpeed = 5f, baseRotateSpeed = 5f; public float drag = 0.3f, accel = 0.5f, landShake = 0f, rippleScale = 1f, riseSpeed = 0.08f, fallSpeed = 0.018f;