From 14ccb2b7bcb69d8999c5c03c2c75ea20fbfa8320 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 14 Feb 2022 12:55:52 -0500 Subject: [PATCH] Carbide walls --- .../blocks/walls/carbide-wall-large.png | Bin 0 -> 859 bytes .../sprites/blocks/walls/carbide-wall.png | Bin 0 -> 319 bytes core/assets/icons/icons.properties | 2 + core/assets/logicids.dat | Bin 4141 -> 4175 bytes core/src/mindustry/content/Blocks.java | 193 ++++++++++-------- 5 files changed, 115 insertions(+), 80 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/walls/carbide-wall-large.png create mode 100644 core/assets-raw/sprites/blocks/walls/carbide-wall.png diff --git a/core/assets-raw/sprites/blocks/walls/carbide-wall-large.png b/core/assets-raw/sprites/blocks/walls/carbide-wall-large.png new file mode 100644 index 0000000000000000000000000000000000000000..35c0d1fd414d938350dfbb1b54450e62315cab34 GIT binary patch literal 859 zcmV-h1ElPx&6-h)vRCt{2TA^|qF%;Z5fdOGP$+)1PD8?q8u+n}_Nl9pbpItfq%Of@=fc5LM$uaFzT&xJxB-j$j&}bbF z)e5-uCPo9I#ohs0om*1l1azNnSDs09=_fm7sbVQY8;KhCr(bs@Gv< z@<72AE+IPMMaF7$eAkli<1D(uC3r_z6fl@4I3-9uLGP2{H8(vYyGbrjF#1@0&24Y52r^3ysEemM_@K7LC;?Qikm}Hd zQUucvP+MXuZ&2k6zFT6g1XH)fOaWAGkQypugxVKS_<~-MYFv}E#3B{KY{QixKOvG3 z5us&xl(>}Ja4t^}@QI+98%kWYUFj0~hR*fpPhXz8A0Cb;+%NBnMEA=(9FC`IXV&)~ zl(-JZ6Vg%t=uw%lCwM7ui_Dxbm?wA%BD9`kqL#w7PMAkzx4qS$ic7XTtf~a2or;TH zCCXlht$;kkMagABaz-ej6j&tSDA#tkcOBt#zYKXrX!*6gTzPD)2=r-jD>yH@LaO<4 z-tc2E(qZ&oHDCUn+Z9%H9Jxo$m$#u^;UNO>v{m!vZTm!^`~YPjWAJr(^EqL5dxPCd ln4JK?{~}0+z!Z^&!wb+-F90wZc*+0(002ovPDHLkV1gGKiar1U literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/walls/carbide-wall.png b/core/assets-raw/sprites/blocks/walls/carbide-wall.png new file mode 100644 index 0000000000000000000000000000000000000000..4e2f36b4c544aeb025d41ac5dd8210db2d57aa4a GIT binary patch literal 319 zcmV-F0l@x=P)Px#`AI}UR9J=Wm$4DUAPhx?FMDKzxOSJ$t*1%j39>?_apxLu;7LfAa~vTg0iuaY zA42cMM|`{I;}zf#_x=W!(VagmerpS04S@n!Lbz$1!_Z%=Y|hbB2LQ18y$S%Qi=QKC z1@WbU77!Q7M%)>J6UY3=Vhy7jJpwCtL~6hSA}PY!5N;ahkXV}?)PIM`TR?Tu>@kW#n7)P>#2ZVHX5es5 Rzl;C?002ovPDHLkV1m3Teh>fv literal 0 HcmV?d00001 diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 5b38197e9c..b8925b99ae 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -537,3 +537,5 @@ 63166=large-shield-projector|block-large-shield-projector-ui 63165=payload-mass-driver|block-payload-mass-driver-ui 63164=world-cell|block-world-cell-ui +63163=carbide-wall|block-carbide-wall-ui +63162=carbide-wall-large|block-carbide-wall-large-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index 6972dddfdc239ab893fec8a86b3e4ae917b829e2..8adb35898d2fd8f3205b315a4bf8752af978adc8 100644 GIT binary patch delta 50 vcmZ3ha9)9l;lW0x6kbK18!^2D4R1|ejgZcbuRdg|s>-V;m!v0f2( delta 16 XcmX@FuvUSI;oe536yD7pyvLaUGh+qP diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 228edacd74..6744606605 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -77,8 +77,9 @@ public class Blocks{ powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, payloadSource, payloadVoid, illuminator, //defense - copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, plastaniumWall, plastaniumWallLarge, berylliumWall, berylliumWallLarge, tungstenWall, tungstenWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, + copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, plastaniumWall, plastaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, + berylliumWall, berylliumWallLarge, tungstenWall, tungstenWallLarge, carbideWall, carbideWallLarge, mender, mendProjector, overdriveProjector, overdriveDome, forceProjector, shockMine, scrapWall, scrapWallLarge, scrapWallHuge, scrapWallGigantic, thruster, //ok, these names are getting ridiculous, but at least I don't have humongous walls yet @@ -1438,23 +1439,27 @@ public class Blocks{ copperWall = new Wall("copper-wall"){{ requirements(Category.defense, with(Items.copper, 6)); health = 80 * wallHealthMultiplier; + envDisabled |= Env.scorching; }}; copperWallLarge = new Wall("copper-wall-large"){{ requirements(Category.defense, ItemStack.mult(copperWall.requirements, 4)); health = 80 * 4 * wallHealthMultiplier; size = 2; + envDisabled |= Env.scorching; }}; titaniumWall = new Wall("titanium-wall"){{ requirements(Category.defense, with(Items.titanium, 6)); health = 110 * wallHealthMultiplier; + envDisabled |= Env.scorching; }}; titaniumWallLarge = new Wall("titanium-wall-large"){{ requirements(Category.defense, ItemStack.mult(titaniumWall.requirements, 4)); health = 110 * wallHealthMultiplier * 4; size = 2; + envDisabled |= Env.scorching; }}; plastaniumWall = new Wall("plastanium-wall"){{ @@ -1463,6 +1468,7 @@ public class Blocks{ insulated = true; absorbLasers = true; schematicPriority = 10; + envDisabled |= Env.scorching; }}; plastaniumWallLarge = new Wall("plastanium-wall-large"){{ @@ -1472,6 +1478,104 @@ public class Blocks{ insulated = true; absorbLasers = true; schematicPriority = 10; + envDisabled |= Env.scorching; + }}; + + thoriumWall = new Wall("thorium-wall"){{ + requirements(Category.defense, with(Items.thorium, 6)); + health = 200 * wallHealthMultiplier; + envDisabled |= Env.scorching; + }}; + + thoriumWallLarge = new Wall("thorium-wall-large"){{ + requirements(Category.defense, ItemStack.mult(thoriumWall.requirements, 4)); + health = 200 * wallHealthMultiplier * 4; + size = 2; + envDisabled |= Env.scorching; + }}; + + phaseWall = new Wall("phase-wall"){{ + requirements(Category.defense, with(Items.phaseFabric, 6)); + health = 150 * wallHealthMultiplier; + chanceDeflect = 10f; + flashHit = true; + envDisabled |= Env.scorching; + }}; + + phaseWallLarge = new Wall("phase-wall-large"){{ + requirements(Category.defense, ItemStack.mult(phaseWall.requirements, 4)); + health = 150 * 4 * wallHealthMultiplier; + size = 2; + chanceDeflect = 10f; + flashHit = true; + envDisabled |= Env.scorching; + }}; + + surgeWall = new Wall("surge-wall"){{ + requirements(Category.defense, with(Items.surgeAlloy, 6)); + health = 230 * wallHealthMultiplier; + lightningChance = 0.05f; + envDisabled |= Env.scorching; + }}; + + surgeWallLarge = new Wall("surge-wall-large"){{ + requirements(Category.defense, ItemStack.mult(surgeWall.requirements, 4)); + health = 230 * 4 * wallHealthMultiplier; + size = 2; + lightningChance = 0.05f; + envDisabled |= Env.scorching; + }}; + + door = new Door("door"){{ + requirements(Category.defense, with(Items.titanium, 6, Items.silicon, 4)); + health = 100 * wallHealthMultiplier; + envDisabled |= Env.scorching; + }}; + + doorLarge = new Door("door-large"){{ + requirements(Category.defense, ItemStack.mult(door.requirements, 4)); + openfx = Fx.dooropenlarge; + closefx = Fx.doorcloselarge; + health = 100 * 4 * wallHealthMultiplier; + size = 2; + envDisabled |= Env.scorching; + }}; + + scrapWall = new Wall("scrap-wall"){{ + requirements(Category.defense, BuildVisibility.sandboxOnly, with(Items.scrap, 6)); + health = 60 * wallHealthMultiplier; + variants = 5; + envDisabled |= Env.scorching; + }}; + + scrapWallLarge = new Wall("scrap-wall-large"){{ + requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.mult(scrapWall.requirements, 4)); + health = 60 * 4 * wallHealthMultiplier; + size = 2; + variants = 4; + envDisabled |= Env.scorching; + }}; + + scrapWallHuge = new Wall("scrap-wall-huge"){{ + requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.mult(scrapWall.requirements, 9)); + health = 60 * 9 * wallHealthMultiplier; + size = 3; + variants = 3; + envDisabled |= Env.scorching; + }}; + + scrapWallGigantic = new Wall("scrap-wall-gigantic"){{ + requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.mult(scrapWall.requirements, 16)); + health = 60 * 16 * wallHealthMultiplier; + size = 4; + envDisabled |= Env.scorching; + }}; + + thruster = new Thruster("thruster"){{ + requirements(Category.defense, BuildVisibility.sandboxOnly, with(Items.scrap, 96)); + health = 55 * 16 * wallHealthMultiplier; + size = 4; + envDisabled |= Env.scorching; }}; berylliumWall = new Wall("beryllium-wall"){{ @@ -1500,90 +1604,19 @@ public class Blocks{ size = 2; }}; - thoriumWall = new Wall("thorium-wall"){{ - requirements(Category.defense, with(Items.thorium, 6)); - health = 200 * wallHealthMultiplier; + carbideWall = new Wall("carbide-wall"){{ + requirements(Category.defense, with(Items.thorium, 6, Items.carbide, 6)); + health = 240 * wallHealthMultiplier; + armor = 16f; }}; - thoriumWallLarge = new Wall("thorium-wall-large"){{ + carbideWallLarge = new Wall("carbide-wall-large"){{ requirements(Category.defense, ItemStack.mult(thoriumWall.requirements, 4)); - health = 200 * wallHealthMultiplier * 4; + health = 240 * wallHealthMultiplier * 4; + armor = 16f; size = 2; }}; - phaseWall = new Wall("phase-wall"){{ - requirements(Category.defense, with(Items.phaseFabric, 6)); - health = 150 * wallHealthMultiplier; - chanceDeflect = 10f; - flashHit = true; - }}; - - phaseWallLarge = new Wall("phase-wall-large"){{ - requirements(Category.defense, ItemStack.mult(phaseWall.requirements, 4)); - health = 150 * 4 * wallHealthMultiplier; - size = 2; - chanceDeflect = 10f; - flashHit = true; - }}; - - surgeWall = new Wall("surge-wall"){{ - requirements(Category.defense, with(Items.surgeAlloy, 6)); - health = 230 * wallHealthMultiplier; - lightningChance = 0.05f; - }}; - - surgeWallLarge = new Wall("surge-wall-large"){{ - requirements(Category.defense, ItemStack.mult(surgeWall.requirements, 4)); - health = 230 * 4 * wallHealthMultiplier; - size = 2; - lightningChance = 0.05f; - }}; - - door = new Door("door"){{ - requirements(Category.defense, with(Items.titanium, 6, Items.silicon, 4)); - health = 100 * wallHealthMultiplier; - }}; - - doorLarge = new Door("door-large"){{ - requirements(Category.defense, ItemStack.mult(door.requirements, 4)); - openfx = Fx.dooropenlarge; - closefx = Fx.doorcloselarge; - health = 100 * 4 * wallHealthMultiplier; - size = 2; - }}; - - scrapWall = new Wall("scrap-wall"){{ - requirements(Category.defense, BuildVisibility.sandboxOnly, with(Items.scrap, 6)); - health = 60 * wallHealthMultiplier; - variants = 5; - }}; - - scrapWallLarge = new Wall("scrap-wall-large"){{ - requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.mult(scrapWall.requirements, 4)); - health = 60 * 4 * wallHealthMultiplier; - size = 2; - variants = 4; - }}; - - scrapWallHuge = new Wall("scrap-wall-huge"){{ - requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.mult(scrapWall.requirements, 9)); - health = 60 * 9 * wallHealthMultiplier; - size = 3; - variants = 3; - }}; - - scrapWallGigantic = new Wall("scrap-wall-gigantic"){{ - requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.mult(scrapWall.requirements, 16)); - health = 60 * 16 * wallHealthMultiplier; - size = 4; - }}; - - thruster = new Thruster("thruster"){{ - requirements(Category.defense, BuildVisibility.sandboxOnly, with(Items.scrap, 96)); - health = 55 * 16 * wallHealthMultiplier; - size = 4; - }}; - mender = new MendProjector("mender"){{ requirements(Category.effect, with(Items.lead, 30, Items.copper, 25)); consumes.power(0.3f); @@ -3666,7 +3699,7 @@ public class Blocks{ consumes.power(2f); size = 3; //TODO expand this list - filter = Seq.with(Blocks.tungstenWallLarge, Blocks.berylliumWallLarge, Blocks.cliffCrusher, Blocks.plasmaBore, Blocks.reinforcedLiquidTank, Blocks.duct); + filter = Seq.with(Blocks.tungstenWallLarge, Blocks.berylliumWallLarge, Blocks.reinforcedLiquidTank); }}; //yes this block is pretty much useless