From 180e527a187f091ce47af75712772e9a0f0f472f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 24 Dec 2021 13:23:47 -0500
Subject: [PATCH] Beryllium wall

---
 .../blocks/walls/beryllium-wall-large.png     | Bin 0 -> 776 bytes
 .../sprites/blocks/walls/beryllium-wall.png   | Bin 0 -> 285 bytes
 core/assets/icons/icons.properties            |   2 ++
 core/assets/logicids.dat                      | Bin 3865 -> 3903 bytes
 core/src/mindustry/content/Blocks.java        |  19 +++++++++++++++---
 5 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/walls/beryllium-wall-large.png
 create mode 100644 core/assets-raw/sprites/blocks/walls/beryllium-wall.png

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 0000000000000000000000000000000000000000..0278823e03b99cbb7838bb39bf26f093898817ff
GIT binary patch
literal 776
zcmV+j1NZ!iP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%!bwCyRCt{2n!9nsFbswvUpn`mAPczk0?7>NQe>3u=28o20{5z&N<Kv)!5=SD
z;rYKy6O#n+iQ)so@b>+6r;N^*Q|_m3bl`p*ueVx$G!qMesDB7W07QL5fB+En3jqc|
z)F*@&X$J`euU!PSsj+t$rdiwxmB);cjG?i2AR^i;1WjLQpT`=oHwd-B{aOU25YCs=
z<ImG6q;1JIYHxV|{P=SezP}zJ2ed}5lGrXioa8oGnhCi<Yup{Awo4C1bPnJQ?Lis{
zA^@e}YrFy_8`1{^AA~HyYiCVv%<+0-$2?z7@WT+l0y&2`XSCw_dd)U7fT-Y+F+3oc
zZiCUmBV$SZ+Dd&JtQ9;mChAv8p|?SAaf_SQFPBAd(J;+4OmiqC@7X1u0XeNtkHa+6
zNa?N0V;`4nb0uYGfaGG7YMYt~h|>|t53Viy3Lp@;HfsnGi4AnNa4N0=r2vusk@<kq
ziLfMS5ws*rkgIi0miHWeMc`dP1HlsfA`Jw|`rx_^uH_N@qR4GE48VWU6F_SRTI&g*
zwF9m71kl=n)(QjQ`Kc{36%PZ@9Be!wXo7c7iCIo{76_In@0J$lf=9t<AfUHMt_{+k
z1%Lz?0byxdg5Z&0$pVl}drt`4HaQ4h2^P1U;QjSz&LDAp);UJc+o2l(A{>H73j}Ye
zK96&&vu7SaBD7LvEA{8`+7P%gQNL1x0i*`51py77`(IAxqi{3?Y4B3H+y$Z_L<dhK
z*aa+A8QyDxXQ_^Bv2@ESu|?`i(XDd(`JOAr)wRMoNg=eX5-Zux{hq88-75DEucspt
zJbFr$R;pS`_#ptOQ=Ftn<j51{8bau|K}+9S)$5{NpmrcNAczk_*2<Acds2<po9;Rs
z>6F!;bnWQwyMXlJbO(S)2BAv;L^y<Q0T5vjx&}a0hVTOmew3G)^>9`I0000<MNUMn
GLSTYU*-}#g

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..d4ffa38ddad97bf073c4992da0112a711a422125
GIT binary patch
literal 285
zcmV+&0pk9NP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#*GWV{R9J=Wm$4CpFbqW%U;!$Ipry<N86~S^ElOI3pke|p>2e9!@|S)7Zmg2C
z<R|%`ByNw_^DRF%-3MV>bN;Z*TUh`$gcE=X(H-k9?bv65K=jmzh#c#lbdk@H1invD
z3gS-#B_O;aWI=S+Kp|mi*)H>T@i$cfQMI*`!T^@Qma`B*%zQw7Xd<it6`%qn0mSSD
zs1IBL3xwsY=?Rd))@og*p|+yMTo5v61#&GWFhEX-a|KlmFd%{=%nbppWT_C^e+Q)#
jY6;L<u@8be3tSK%t3qHysMLB700000NkvXXu0mjfmb`1C

literal 0
HcmV?d00001

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 98985445b9fbf64b0f87efe13fe271d0774e00c7..478711e7fc7e764faa2fb52a63a00aa2cd17046c 100644
GIT binary patch
delta 53
wcmbO!w_lEl;p#@FP97D$q|~CyoSe+kT;1}-oE!!bRK9LbVp00$PM!%&0QJHX3jhEB

delta 16
XcmdllH&c#@;qpeNPM*yhdHR?DG0_FG

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;
         }};