From 27e9b5aeb9ec2c355c85289ce5e3f77154767391 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 13 Sep 2020 12:13:42 -0400
Subject: [PATCH] Removed cliffs / Nerfed explosion bombing

---
 .../sprites/blocks/environment/cliffs1.png        | Bin 298 -> 0 bytes
 core/src/mindustry/ai/BaseRegistry.java           |   3 ++-
 core/src/mindustry/content/Blocks.java            |   7 +------
 core/src/mindustry/entities/comp/UnitComp.java    |   4 ++--
 core/src/mindustry/io/SaveFileReader.java         |   3 ++-
 .../mindustry/world/blocks/logic/LogicBlock.java  |   2 +-
 6 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 core/assets-raw/sprites/blocks/environment/cliffs1.png

diff --git a/core/assets-raw/sprites/blocks/environment/cliffs1.png b/core/assets-raw/sprites/blocks/environment/cliffs1.png
deleted file mode 100644
index eb60a159df239c08a73617e38f57fc2452042768..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 298
zcmV+_0oDGAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002-Nkl<Zc-qC*
zK@!6t2nA5in04>aEP4#D;W^VuXY5$2^1ooRV3){?2uAkj>qsfx7P4)RV}!^#e_|=1
zhbYNcBEA5P(8))D*0U)32T&u>#YV}I_x}I|aYkhF-a11-iKyf-poOr`M`#Ip09}@)
zfJg+@1<?Sy4N(LFp$Ac&5CQZsu1Q!2i<r6CmI9FSKmZ1U&I%J?9nKzz?GE!0vIsYT
z4R3o&MDnsQ0-*<y_0>87+m_<patmM~B(ml+!^ymk+53S-Kz~FLyF_0`9su)ew-nG?
wlP-ZbxrLCZ1hXZ%6wum<%K;j33!p~40Y{CJIyqt>9RL6T07*qoM6N<$f-L=c(f|Me

diff --git a/core/src/mindustry/ai/BaseRegistry.java b/core/src/mindustry/ai/BaseRegistry.java
index bc470b9096..cb34095a3c 100644
--- a/core/src/mindustry/ai/BaseRegistry.java
+++ b/core/src/mindustry/ai/BaseRegistry.java
@@ -1,6 +1,7 @@
 package mindustry.ai;
 
 import arc.*;
+import arc.math.*;
 import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
@@ -68,7 +69,7 @@ public class BaseRegistry{
                 }
                 schem.tiles.removeAll(s -> s.block.buildVisibility == BuildVisibility.sandboxOnly);
 
-                part.tier = schem.tiles.sumf(s -> s.block.buildCost / s.block.buildCostMultiplier);
+                part.tier = schem.tiles.sumf(s -> Mathf.pow(s.block.buildCost / s.block.buildCostMultiplier, 1.2f));
 
                 if(part.core != null){
                     cores.add(part);
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index a8a2d3e19f..950e6cc458 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -292,11 +292,6 @@ public class Blocks implements ContentList{
             attributes.set(Attribute.water, 0.3f);
         }};
 
-        cliffs = new StaticWall("cliffs"){{
-            variants = 1;
-            fillsTile = false;
-        }};
-
         stoneWall = new StaticWall("stone-wall"){{
             variants = 2;
         }};
@@ -1493,7 +1488,7 @@ public class Blocks implements ContentList{
             reloadTime = 35f;
             shootCone = 40f;
             rotatespeed = 8f;
-            powerUse = 4f;
+            powerUse = 4.5f;
             targetAir = false;
             range = 90f;
             shootEffect = Fx.lightningShoot;
diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java
index 8e8f575f98..7670332136 100644
--- a/core/src/mindustry/entities/comp/UnitComp.java
+++ b/core/src/mindustry/entities/comp/UnitComp.java
@@ -327,8 +327,8 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
 
     /** Actually destroys the unit, removing it and creating explosions. **/
     public void destroy(){
-        float explosiveness = 2f + item().explosiveness * stack().amount;
-        float flammability = item().flammability * stack().amount;
+        float explosiveness = 2f + item().explosiveness * stack().amount / 2f;
+        float flammability = item().flammability * stack().amount / 2f;
         Damage.dynamicExplosion(x, y, flammability, explosiveness, 0f, bounds() / 2f, Pal.darkFlame, state.rules.damageExplosions);
 
         float shake = hitSize / 3f;
diff --git a/core/src/mindustry/io/SaveFileReader.java b/core/src/mindustry/io/SaveFileReader.java
index 42ff593a20..c925dc48a4 100644
--- a/core/src/mindustry/io/SaveFileReader.java
+++ b/core/src/mindustry/io/SaveFileReader.java
@@ -48,7 +48,8 @@ public abstract class SaveFileReader{
     "holostone", "dacite",
     "holostone-wall", "dacite-wall",
     "rock", "boulder",
-    "snowrock", "snow-boulder"
+    "snowrock", "snow-boulder",
+    "cliffs", "stone-wall"
     );
 
     protected final ReusableByteOutStream byteOutput = new ReusableByteOutStream();
diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java
index 8710fd43b2..e79a0ad6ce 100644
--- a/core/src/mindustry/world/blocks/logic/LogicBlock.java
+++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java
@@ -69,7 +69,7 @@ public class LogicBlock extends Block{
         if(name.contains("-")){
             String[] split = name.split("-");
             //filter out 'large' at the end of block names
-            if(split.length >= 2 && split[split.length - 1].equals("large")){
+            if(split.length >= 2 && (split[split.length - 1].equals("large") || Strings.canParseFloat(split[split.length - 1]))){
                 name = split[split.length - 2];
             }else{
                 name = split[split.length - 1];