From 2094bc3d804877bca0b7baf7eed22781dcecfc35 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 26 Oct 2018 00:00:25 -0400
Subject: [PATCH] Renamed phase matter to reduce conflicts / Item balancing

---
 .../sprites/items/item-phase-fabric.png       | Bin 0 -> 253 bytes
 .../sprites/items/item-phase-matter.png       | Bin 132 -> 0 bytes
 core/assets/bundles/bundle.properties         |   4 +++-
 .../src/io/anuke/mindustry/content/Items.java |   8 +++++---
 .../io/anuke/mindustry/content/Recipes.java   |  18 +++++++++---------
 .../content/blocks/CraftingBlocks.java        |   2 +-
 .../content/blocks/DefenseBlocks.java         |   6 +++---
 tests/src/test/java/ApplicationTests.java     |   2 +-
 8 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 core/assets-raw/sprites/items/item-phase-fabric.png
 delete mode 100644 core/assets-raw/sprites/items/item-phase-matter.png

diff --git a/core/assets-raw/sprites/items/item-phase-fabric.png b/core/assets-raw/sprites/items/item-phase-fabric.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdbb20375d8eb5204aaaa9b742b8ac697d213236
GIT binary patch
literal 253
zcmeAS@N?(olHy`uVBq!ia0y~yVBi2@4mJh`h9ms@x)~T4*pj^6T^Rm@;DWu&Co?cG
za29w(7Bet#3xhBt!>l<H3=9nHC7!;n?2ovln5{%t)LHLfU|{I-ba4!kxLn(}k@K*D
zfb0FvE3cZj8!X|eXlba*pLlGqQ6u|B4lPp`t;T@KhcXzK3T&FI7XJ5qb&cPet$%iN
zA28Z;&_>%Zz|QkahL+)nqDT>j?bXe87ZX2nGOz~JWEGgbd6dJKcz4Q+%pa|WGKW6x
zxVEoE?7MpP#mfpum)|nhGf%ubh2eow!MP8t8-KZ|yt^E}mw|zS!PC{xWt~$(699-~
BT_6Ae

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/items/item-phase-matter.png b/core/assets-raw/sprites/items/item-phase-matter.png
deleted file mode 100644
index 8cd0e3551472cee53751f4246512fa987e0e8e29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 132
zcmeAS@N?(olHy`uVBq!ia0y~yVBi2@4mJh`h9ms@x)~T4yggkULn>}1XXNIl9%w&!
z<UeaC&wu;)-~a!=+VfwY-|X;B4ps-gh@#rh^*fvtq}MSVah%R_i9@?!X473R4e6sS
kJ46E<1$q-%^>`R^^JlZX%<r^kU|?YIboFyt=akR{0C;{Y!vFvP

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index a7c2c57c8f..625eaf7202 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -431,8 +431,10 @@ item.silicon.name = Silicon
 item.silcion.description = An extremely useful semiconductor, with applications in solar panels and many complex electronics.
 item.plastanium.name = Plastanium
 item.plastanium.description = A light, ductile material used in advanced aircraft and fragmentation ammunition.
-item.phase-matter.name = Phase Matter
+item.phase-fabric.name = Phase Fabric
+item.phase-fabric.description = A near-weightless substance used in advanced electronics and self-repairing technology.
 item.surge-alloy.name = Surge Alloy
+item.surge-alloy.description = An advanced alloy with unique electrical properties.
 item.biomatter.name = Biomatter
 item.biomatter.description = A clump of organic mush; used for conversion into oil or as a basic fuel.
 item.sand.name = Sand
diff --git a/core/src/io/anuke/mindustry/content/Items.java b/core/src/io/anuke/mindustry/content/Items.java
index 688cbcc9a6..a19a2a4048 100644
--- a/core/src/io/anuke/mindustry/content/Items.java
+++ b/core/src/io/anuke/mindustry/content/Items.java
@@ -7,7 +7,7 @@ import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.ItemType;
 
 public class Items implements ContentList{
-    public static Item stone, copper, lead, densealloy, coal, titanium, thorium, silicon, plastanium, phasematter, surgealloy,
+    public static Item stone, copper, lead, densealloy, coal, titanium, thorium, silicon, plastanium, phasefabric, surgealloy,
             biomatter, sand, blastCompound, pyratite;
 
     @Override
@@ -71,9 +71,11 @@ public class Items implements ContentList{
             cost = 1.6f;
         }};
 
-        phasematter = new Item("phase-matter", Color.valueOf("f4ba6e")){{
+        phasefabric = new Item("phase-fabric", Color.valueOf("f4ba6e")){{
             type = ItemType.material;
             cost = 1.5f;
+            fluxiness = 0.9f;
+            radioactivity = 0.3f;
         }};
 
         surgealloy = new Item("surge-alloy", Color.valueOf("f3e979")){{
@@ -82,7 +84,7 @@ public class Items implements ContentList{
 
         biomatter = new Item("biomatter", Color.valueOf("648b55")){{
             flammability = 0.4f;
-            fluxiness = 0.2f;
+            fluxiness = 0.3f;
         }};
 
         sand = new Item("sand", Color.valueOf("e3d39e")){{
diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java
index 30b4eb6a3b..bdc35d2cbd 100644
--- a/core/src/io/anuke/mindustry/content/Recipes.java
+++ b/core/src/io/anuke/mindustry/content/Recipes.java
@@ -36,8 +36,8 @@ public class Recipes implements ContentList{
         new Recipe(defense, DefenseBlocks.thoriumWall, new ItemStack(Items.thorium, 12));
         new Recipe(defense, DefenseBlocks.thoriumWallLarge, new ItemStack(Items.thorium, 12 * 4));
 
-        new Recipe(defense, DefenseBlocks.phaseWall, new ItemStack(Items.phasematter, 12));
-        new Recipe(defense, DefenseBlocks.phaseWallLarge, new ItemStack(Items.phasematter, 12 * 4));
+        new Recipe(defense, DefenseBlocks.phaseWall, new ItemStack(Items.phasefabric, 12));
+        new Recipe(defense, DefenseBlocks.phaseWallLarge, new ItemStack(Items.phasefabric, 12 * 4));
 
         new Recipe(defense, DefenseBlocks.surgeWall, new ItemStack(Items.surgealloy, 12));
         new Recipe(defense, DefenseBlocks.surgeWallLarge, new ItemStack(Items.surgealloy, 12 * 4));
@@ -68,7 +68,7 @@ public class Recipes implements ContentList{
         //DISTRIBUTION
         new Recipe(distribution, DistributionBlocks.conveyor, new ItemStack(Items.copper, 1)).setAlwaysUnlocked(true);
         new Recipe(distribution, DistributionBlocks.titaniumconveyor, new ItemStack(Items.copper, 2), new ItemStack(Items.titanium, 1));
-        new Recipe(distribution, DistributionBlocks.phaseConveyor, new ItemStack(Items.phasematter, 10), new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 20), new ItemStack(Items.densealloy, 20));
+        new Recipe(distribution, DistributionBlocks.phaseConveyor, new ItemStack(Items.phasefabric, 10), new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 20), new ItemStack(Items.densealloy, 20));
 
         //starter lead transportation
         new Recipe(distribution, DistributionBlocks.junction, new ItemStack(Items.copper, 2)).setAlwaysUnlocked(true);
@@ -125,11 +125,11 @@ public class Recipes implements ContentList{
 
         //generators - solar
         new Recipe(power, PowerBlocks.solarPanel, new ItemStack(Items.lead, 20), new ItemStack(Items.silicon, 30));
-        new Recipe(power, PowerBlocks.largeSolarPanel, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 290), new ItemStack(Items.phasematter, 30));
+        new Recipe(power, PowerBlocks.largeSolarPanel, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 290), new ItemStack(Items.phasefabric, 30));
 
         //generators - nuclear
         new Recipe(power, PowerBlocks.thoriumReactor, new ItemStack(Items.lead, 600), new ItemStack(Items.silicon, 400), new ItemStack(Items.densealloy, 300), new ItemStack(Items.thorium, 300));
-        new Recipe(power, PowerBlocks.rtgGenerator, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 150), new ItemStack(Items.phasematter, 50), new ItemStack(Items.plastanium, 150), new ItemStack(Items.thorium, 100));
+        new Recipe(power, PowerBlocks.rtgGenerator, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 150), new ItemStack(Items.phasefabric, 50), new ItemStack(Items.plastanium, 150), new ItemStack(Items.thorium, 100));
 
         new Recipe(distribution, StorageBlocks.unloader, new ItemStack(Items.densealloy, 40), new ItemStack(Items.silicon, 50));
         new Recipe(distribution, StorageBlocks.container, new ItemStack(Items.densealloy, 200));
@@ -138,7 +138,7 @@ public class Recipes implements ContentList{
         /*new Recipe(distribution, StorageBlocks.core,
             new ItemStack(Items.copper, 2000), new ItemStack(Items.densealloy, 1500),
             new ItemStack(Items.silicon, 1500), new ItemStack(Items.thorium, 500),
-            new ItemStack(Items.surgealloy, 500), new ItemStack(Items.phasematter, 750)
+            new ItemStack(Items.surgealloy, 500), new ItemStack(Items.phasefabric, 750)
         );*/
 
         //DRILLS, PRODUCERS
@@ -156,7 +156,7 @@ public class Recipes implements ContentList{
         //bodies
         new Recipe(units, UpgradeBlocks.dartPad, new ItemStack(Items.lead, 150), new ItemStack(Items.copper, 150), new ItemStack(Items.silicon, 200), new ItemStack(Items.titanium, 240)).setVisible(RecipeVisibility.desktopOnly);
         new Recipe(units, UpgradeBlocks.tridentPad, new ItemStack(Items.lead, 250), new ItemStack(Items.copper, 250), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200));
-        new Recipe(units, UpgradeBlocks.javelinPad, new ItemStack(Items.lead, 350), new ItemStack(Items.silicon, 450), new ItemStack(Items.titanium, 500), new ItemStack(Items.plastanium, 400), new ItemStack(Items.phasematter, 200));
+        new Recipe(units, UpgradeBlocks.javelinPad, new ItemStack(Items.lead, 350), new ItemStack(Items.silicon, 450), new ItemStack(Items.titanium, 500), new ItemStack(Items.plastanium, 400), new ItemStack(Items.phasefabric, 200));
         new Recipe(units, UpgradeBlocks.glaivePad, new ItemStack(Items.lead, 450), new ItemStack(Items.silicon, 650), new ItemStack(Items.titanium, 700), new ItemStack(Items.plastanium, 600), new ItemStack(Items.surgealloy, 200));
 
         new Recipe(units, UpgradeBlocks.alphaPad, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 100), new ItemStack(Items.copper, 150)).setVisible(RecipeVisibility.mobileOnly);
@@ -170,7 +170,7 @@ public class Recipes implements ContentList{
 
         new Recipe(units, UnitBlocks.daggerFactory, new ItemStack(Items.lead, 90), new ItemStack(Items.silicon, 70));
         new Recipe(units, UnitBlocks.titanFactory, new ItemStack(Items.thorium, 90), new ItemStack(Items.lead, 140), new ItemStack(Items.silicon, 90));
-        new Recipe(units, UnitBlocks.fortressFactory, new ItemStack(Items.thorium, 200), new ItemStack(Items.lead, 220), new ItemStack(Items.silicon, 150), new ItemStack(Items.surgealloy, 100), new ItemStack(Items.phasematter, 50));
+        new Recipe(units, UnitBlocks.fortressFactory, new ItemStack(Items.thorium, 200), new ItemStack(Items.lead, 220), new ItemStack(Items.silicon, 150), new ItemStack(Items.surgealloy, 100), new ItemStack(Items.phasefabric, 50));
 
         new Recipe(units, UnitBlocks.wraithFactory, new ItemStack(Items.titanium, 60), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 90));
         new Recipe(units, UnitBlocks.ghoulFactory, new ItemStack(Items.plastanium, 80), new ItemStack(Items.titanium, 100), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 220));
@@ -182,7 +182,7 @@ public class Recipes implements ContentList{
         //LIQUIDS
         new Recipe(liquid, LiquidBlocks.conduit, new ItemStack(Items.lead, 1)).setDependencies(CraftingBlocks.smelter);
         new Recipe(liquid, LiquidBlocks.pulseConduit, new ItemStack(Items.titanium, 1), new ItemStack(Items.lead, 1));
-        new Recipe(liquid, LiquidBlocks.phaseConduit, new ItemStack(Items.phasematter, 10), new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 20), new ItemStack(Items.titanium, 20));
+        new Recipe(liquid, LiquidBlocks.phaseConduit, new ItemStack(Items.phasefabric, 10), new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 20), new ItemStack(Items.titanium, 20));
 
         new Recipe(liquid, LiquidBlocks.liquidRouter, new ItemStack(Items.titanium, 4), new ItemStack(Items.lead, 4));
         new Recipe(liquid, LiquidBlocks.liquidtank, new ItemStack(Items.titanium, 50), new ItemStack(Items.lead, 50));
diff --git a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
index f5ab2fa73c..aed1ecf0a0 100644
--- a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
@@ -75,7 +75,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
 
         phaseWeaver = new PhaseWeaver("phase-weaver"){{
             craftEffect = BlockFx.smeltsmoke;
-            result = Items.phasematter;
+            result = Items.phasefabric;
             craftTime = 120f;
             powerCapacity = 50f;
             size = 2;
diff --git a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java
index 687b2c1aea..6a8b586c7b 100644
--- a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java
@@ -73,19 +73,19 @@ public class DefenseBlocks extends BlockList implements ContentList{
         mendProjector = new MendProjector("mend-projector"){{
             consumes.power(0.2f);
             size = 2;
-            consumes.item(Items.phasematter).optional(true);
+            consumes.item(Items.phasefabric).optional(true);
         }};
 
         overdriveProjector = new OverdriveProjector("overdrive-projector"){{
             consumes.power(0.35f);
             size = 2;
-            consumes.item(Items.phasematter).optional(true);
+            consumes.item(Items.phasefabric).optional(true);
         }};
 
         forceProjector = new ForceProjector("force-projector"){{
             consumes.power(0.2f);
             size = 3;
-            consumes.item(Items.phasematter).optional(true);
+            consumes.item(Items.phasefabric).optional(true);
         }};
 
         shockMine = new ShockMine("shock-mine"){{
diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java
index 435541b852..8c47aabbb4 100644
--- a/tests/src/test/java/ApplicationTests.java
+++ b/tests/src/test/java/ApplicationTests.java
@@ -164,7 +164,7 @@ public class ApplicationTests{
         tile.entity.items.add(Items.coal, 5);
         tile.entity.items.add(Items.titanium, 50);
         assertEquals(tile.entity.items.total(), 55);
-        tile.entity.items.remove(Items.phasematter, 10);
+        tile.entity.items.remove(Items.phasefabric, 10);
         tile.entity.items.remove(Items.titanium, 10);
         assertEquals(tile.entity.items.total(), 45);
     }