diff --git a/core/assets-raw/sprites/blocks/walls/beryllium-wall-large.png b/core/assets-raw/sprites/blocks/walls/beryllium-wall-large.png new file mode 100644 index 0000000000..0278823e03 Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/beryllium-wall-large.png differ diff --git a/core/assets-raw/sprites/blocks/walls/beryllium-wall.png b/core/assets-raw/sprites/blocks/walls/beryllium-wall.png new file mode 100644 index 0000000000..d4ffa38dda Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/beryllium-wall.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index f79639951b..51936e1650 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -489,3 +489,5 @@ 63217=tank-assembler|block-tank-assembler-ui 63216=assembly-drone|unit-assembly-drone-ui 63215=basic-assembler-module|block-basic-assembler-module-ui +63214=beryllium-wall|block-beryllium-wall-ui +63213=beryllium-wall-large|block-beryllium-wall-large-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index 98985445b9..478711e7fc 100644 Binary files a/core/assets/logicids.dat and b/core/assets/logicids.dat differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 5fae9c8e86..cf24e670d4 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -74,7 +74,7 @@ public class Blocks{ powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, payloadSource, payloadVoid, illuminator, //defense - copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, plastaniumWall, plastaniumWallLarge, tungstenWall, tungstenWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, + copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, plastaniumWall, plastaniumWallLarge, berylliumWall, berylliumWallLarge, tungstenWall, tungstenWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, 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 @@ -1362,16 +1362,29 @@ public class Blocks{ schematicPriority = 10; }}; + berylliumWall = new Wall("beryllium-wall"){{ + requirements(Category.defense, with(Items.beryllium, 6)); + health = 130 * wallHealthMultiplier; + armor = 2f; + }}; + + berylliumWallLarge = new Wall("beryllium-wall-large"){{ + requirements(Category.defense, ItemStack.mult(berylliumWall.requirements, 4)); + health = 130 * wallHealthMultiplier * 4; + armor = 2f; + size = 2; + }}; + tungstenWall = new Wall("tungsten-wall"){{ requirements(Category.defense, with(Items.tungsten, 6)); health = 180 * wallHealthMultiplier; - armor = 7f; + armor = 10f; }}; tungstenWallLarge = new Wall("tungsten-wall-large"){{ requirements(Category.defense, ItemStack.mult(tungstenWall.requirements, 4)); health = 180 * wallHealthMultiplier * 4; - armor = 7f; + armor = 10f; size = 2; }};