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
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$7>k44ofy`glX=O&z;wvd
z#WAE}&f8hL3lAIcv?<10eV?bmz2ghhNuHNMDO27&3*ydT`o3zemz}HPL3#b4hd=jw
z3r}YG(D{h@(1&k-OPBYYn;!gbd0xqbI+^v`qv}kAxf@p0bGS0N)H*jX2z=#cWOKNp
z-XfmK&dIVqmSyY8jpY){BJXfcJ>E01XW_<j1*KcsEWYuX^N&kyFz48M;BOSmQh{^R
zFF!tiS#wG5Nwci{ivNFp6pQTJFQ>@9#cl1R8+x{Lo|r|<;@s(&eMff5HgA5{621pK
zZylvLlo*yi$lk-GDt(EaMZQJnV0OB1-kFb8$;WNt{XQHP*w19yZjrv_(XXnrX2uOG
z9!xZ}QJ9g}eDR=ivghAhUbWI|L~V@JUWI!t-0qlP*ggB2{&d%Ziw0*+e2O(x-rrQ6
z$7s3MzyGkwWsjF@PbJGw&nZ?-O>cOTG$m{HEY6P0f+zXc>Hg+Y5ZGas%^}#yTe7V{
zYaQcKhKc_s{%p9^xj`jEaEprfgw>^f)4t2px;}_?U_L1HM~Ro^<gW+2c-K7@{Ilpp
zt|`xf`isI2+3ZoTITvhYUi+2h!mY+@T+9!CuGBRW<!8PilVhWh(Nyl=8R=Il#xYI(
z{WP)XP3{LX6c%jvSjT&5K5GMu1Y=@mbkl>02`8B*_*DCI+%~i1h~pI7KIg&TuNmhQ
z3Tv-fx}CqhP?|wWrpb+)C4Z$|fAQ+g>2eNATY^%xzdrwXOJIj#;QpW{#wBd)SQ&Ze
z{f_s0wz$BACG$hj&O5A&6kOQ-Rc^5Agi7AaZc1O-m%Xv%wAMz~S6&y_7XAJ?Py5)_
zt%oc<6}PMr(!P1_@4Pi4ceTFrtzWJzWK-oeC2Uoc*AGR86~S|sxIZ}|{8Y;6#db&U
z`%zb4FN$4IreLbj!S8hK)I^W!px*1V-&x7LoN{$u$=et2b~k)^Si;`m!M4zw!NsB_
lk5M2|U>BQ1NZSWy?z$<{XMQaRV_;xl@O1TaS?83{1OQIiQd0l`

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
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V7Tt-
z;usRq`gZz8!Da&<SJ4DUt+oYA&#*|Uu1?YQifUVs#H9DKi1Ws$>9zmz)=b*`ME&P{
zmAwAzpLOlc?y@IF7603CCOVSAtVOti^P=o)y|*{g8y&t}>FAJoJ+EZq`3Wrh`~$ci
z`7^63>`_W_EV<^On3#D}?{nEl^H7Gsty?D_VwiSd+GYWVGc^vi8A@vyL>DlrFdlis
zx`IE3k-O#TnwOjt4qVHMUAA!BqN6baM(M0Yx@ravejUZEp}YnPO-g5Y8P}$)6u4E-
ozEn7i^Fq`{{w6E#7y<d!P6^H{u2k_eFfcH9y85}Sb4q9e0G7OKq5uE@

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