From f644abbf619f1e951b88ec950ef92d56bef03150 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 14 Feb 2022 20:31:28 -0500
Subject: [PATCH] Tech tree tweaks & wall thorium

---
 .../blocks/environment/ore-wall-thorium1.png      | Bin 0 -> 271 bytes
 .../blocks/environment/ore-wall-thorium2.png      | Bin 0 -> 300 bytes
 .../blocks/environment/ore-wall-thorium3.png      | Bin 0 -> 324 bytes
 core/src/mindustry/content/Blocks.java            |   7 +++++--
 core/src/mindustry/content/ErekirTechTree.java    |   4 ++--
 5 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/environment/ore-wall-thorium1.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/ore-wall-thorium2.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/ore-wall-thorium3.png

diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-thorium1.png b/core/assets-raw/sprites/blocks/environment/ore-wall-thorium1.png
new file mode 100644
index 0000000000000000000000000000000000000000..474c51942caec9a08d1112d248a4d2496cec2bbf
GIT binary patch
literal 271
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Cp}#pLn2y}
z6C_xbWep}R`tkhH<Np(XzS%fU<)!*<#usA2mj!*MMELPGTxV>L-gfy)(H_19?N2LY
z9rPQnGM?CH|Mdg2uj~P*o<+g@_69Rfawl{=KFxR}EpkoMk4N&)1Y+1G%}Vw3V_q&-
zr*OI`=95LUK(xk<YZXGWPj)cudaSAEB`KlMcXXOtM<K)2O^Q2rwkEMp2ucW46?_EJ
zb3jsPhmfAHms1Vj!fxgZvQ6s`EUJuc(0^@Y5MU@hDe0w#1nc4i5gsiD2A>TPCl`8i
RZUK6V!PC{xWt~$(69B~#X2Spg

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-thorium2.png b/core/assets-raw/sprites/blocks/environment/ore-wall-thorium2.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ea1ec30652a2dcf8cd993cdf9231bba8486ebcd
GIT binary patch
literal 300
zcmV+{0n`48P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#=1D|BR9J;$U>F4h3>XP1___G_e{?bSSWANXsNw)@mQ&jiOyp|B=Qz4JfLZ{j
z1E}RgvK&A!%dtA(aLab0ET?HAJoWGcHOwXop!fpa_h#|}ST&L2d*tZErVlQFE9lW3
zL9XSv^b^d6ryhQwX_OFM4xD=Ufnwid6Nfv%w#E~$;e_PL1t=ka%@W%hPexi<&cHxK
zZAcCvRFEM@CDk23iscLpgSj#y2OMtM{vTJC#g(0D5(4NJ!T8t`GYhpWMK4K-ExhQK
y25@EN;gtw+0el4+Rm%bNbU@1zbQFvNssRA7v0-miGp(io0000<MNUMnLSTXdCwJih

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-thorium3.png b/core/assets-raw/sprites/blocks/environment/ore-wall-thorium3.png
new file mode 100644
index 0000000000000000000000000000000000000000..266b53f8143834562864821d84b52307058ae9f7
GIT binary patch
literal 324
zcmV-K0lWT*P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#{z*hZR9J=Wmc0#wFc5{0C{o&NkS&l>FaSej6G}E=2nL|A#1?EoOXXCS(B*y+
zj+Dr+0tx)Sdp^zp6czomwjsoA2vK^b%4xp8zrCKM*CiJK7MDbp1f<w;5?@Pz)9C<H
zKZ;G46(E_<%W8h-YI%s-Q?9F%=4FNYaaZ3_0l0?Rh7c_fn#2XPAp-DO71skz*XEf6
z7?LvL%mIW1EY&AzTOsN9=K!wWasa6SQ$I$}x4bu}uH67h8pOVO%FqI#ZUF~jZ9EOa
z)C2RfifMS~zZ(F9P}Lvl88?6?Eh$RmS<rNC<sGRQ#42$y3?Z2x1wQqc%mZ9hl=KE*
W3yZgM$0@-80000<MNUMnLSTYdDuP1*

literal 0
HcmV?d00001

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index bef9ebc7cb..a99ce0931f 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -46,7 +46,6 @@ public class Blocks{
     redmat, bluemat,
     stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
     redweed, purbush, yellowCoral,
-    //TODO rename steamvent to rhyolite vent, maybe add red vent or crystal vent
     rhyoliteVent, carbonVent, arkyicVent, yellowStoneVent, redStoneVent,
     regolithWall, yellowStoneWall, rhyoliteWall, carbonWall, redIceWall, ferricStoneWall, beryllicStoneWall, arkyicWall, crystallineStoneWall, redStoneWall, redDiamondWall,
     ferricStone, ferricCraters, carbonStone, beryllicStone, crystallineStone, crystalFloor, yellowStonePlates,
@@ -60,7 +59,7 @@ public class Blocks{
 
     //ores
     oreCopper, oreLead, oreScrap, oreCoal, oreTitanium, oreThorium,
-    oreTungsten, oreCrystalThorium,
+    oreTungsten, oreCrystalThorium, wallOreThorium,
 
     //wall ores
     wallOreBeryl, graphiticWall, wallOreTungsten,
@@ -828,6 +827,10 @@ public class Blocks{
 
         oreCrystalThorium = new OreBlock("ore-crystal-thorium", Items.thorium);
 
+        wallOreThorium = new OreBlock("ore-wall-thorium", Items.thorium){{
+            wallOre = true;
+        }};
+
         wallOreBeryl = new OreBlock("ore-wall-beryllium", Items.beryllium){{
             wallOre = true;
         }};
diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java
index ecf770ee3e..b9115dbf5a 100644
--- a/core/src/mindustry/content/ErekirTechTree.java
+++ b/core/src/mindustry/content/ErekirTechTree.java
@@ -93,7 +93,7 @@ public class ErekirTechTree{
             //TODO move into turbine condenser?
             node(plasmaBore, () -> {
                 node(impactDrill, Seq.with(new OnSector(aware)), () -> {
-                    node(largePlasmaBore, Seq.with(new OnSector(four)), () -> {
+                    node(largePlasmaBore, Seq.with(new OnSector(five)), () -> {
                         node(eruptionDrill, () -> {
 
                         });
@@ -203,7 +203,7 @@ public class ErekirTechTree{
 
                 node(sublimate, () -> {
                     //TODO implement
-                    node(titan, () -> {
+                    node(titan, Seq.with(new OnSector(five)), () -> {
 
                     });