Merge pull request #3608 from Argenttip/Extractable-tiles-description

More Extractable Tiles With Descriptions

items/materials/bloodstonewall.matitem

@@ -10,6 +10,6 @@
         2.0
     ],
     "shortdescription": "Blood Crystal",
-    "description": "Contains valuable quietus essence.\n^green;Extractable^reset;.",
+    "description": "Contains valuable quietus essence.\n^green;Extractable^reset;, ^orange;Crushable^reset;.",
     "materialId": 6506
 }

items/materials/brick.matitem.patch

@@ -0,0 +1,7 @@
+[
+{
+    "op": "replace",
+    "path": "/description",
+    "value": "Small but perfectly formed bricks made from clay. \n^orange;Crushable^reset;."
+}
+]

items/materials/candyblock.matitem.patch

@@ -1,7 +1,7 @@
-[
-    {
-        "op": "replace",
-        "path": "/description",
-        "value": "Sweet-smelling rock candy!\n^green;Extractable^reset;."
-    }
-]
+[
+    {
+        "op": "replace",
+        "path": "/description",
+        "value": "Sweet-smelling rock candy!\n^green;Extractable^reset;, \n^orange;Crushable^reset;."
+    }
+]

items/materials/ferron.matitem.patch

@@ -0,0 +1,7 @@
+[
+    {
+        "op": "replace",
+        "path": "/description",
+        "value": "A rock containing trace amounts of the finnicky ore rumoured to be used in the manufacture of vivatin.\n^orange;Crushable^reset;."
+    }
+]

items/materials/glowsandmaterial.matitem

@@ -9,7 +9,7 @@
         2.5,
         2.0
     ],
-    "description": "An interesting and unusual irradiated sand.\n^blue;+^white;1 ^blue;Fuel^reset;\n^green;Extractable^reset;.",
+    "description": "An interesting and unusual irradiated sand.\n^blue;+^white;1 ^blue;Fuel^reset;\n^green;Extractable^reset;, ^orange;Siftable^reset;.",
     "shortdescription": "Glowing Sand",
     "fuelAmount": 1,
     "materialId": 6565

items/materials/ironfilings.matitem.patch

@@ -0,0 +1,7 @@
+[
+    {
+        "op": "replace",
+        "path": "/description",
+        "value": "Iron grains, fine as sand.\n^red;Smeltable^reset;, ^orange;Siftable^reset;."
+    }
+]

items/materials/jellystone.matitem

@@ -4,7 +4,7 @@
     "rarity": "Common",
     "price": 0,
     "inventoryIcon": "jellystone.png",
-    "description": "Unsure how this is possible, but okay.\n^green;Extractable^reset;.",
+    "description": "Unsure how this is possible, but okay.\n^green;Extractable^reset;, ^orange;Crushable^reset;.",
     "shortdescription": "Gelatinous Stone",
     "materialId": 6630
 }

items/materials/jungledirt1.matitem

@@ -10,6 +10,6 @@
         2.0
     ],
     "shortdescription": "Jungle Soil",
-    "description": "This is some nice soil.\n^green;Extractable^reset;.",
+    "description": "This is some nice soil.\n^green;Extractable^reset;, ^orange;Siftable^reset;.",
     "materialId": 6569
 }

items/materials/jungledirt2.matitem

@@ -10,6 +10,6 @@
         2.0
     ],
     "shortdescription": "Jungle Dirt",
-    "description": "This is some nice dirt.\n^green;Extractable^reset;.",
+    "description": "This is some nice dirt.\n^green;Extractable^reset;, ^orange;Siftable^reset;.",
     "materialId": 6570
 }

items/materials/supermatter.matitem.patch

@@ -2,7 +2,7 @@
     {
         "op": "replace",
         "path": "/description",
-        "value": "A crystal used to power FTL technology. It's still not fully understood.\n^green;Extractable^reset;."
+        "value": "A crystal used to power FTL technology. It's still not fully understood.\n^green;Extractable^reset;, ^orange;Crushable^reset;."
     },
     {
         "op": "add",

objects/generic/centrifuge_recipes.config

@@ -650,16 +650,28 @@
 	  "dirtmaterial" : ["common", 3],
 	  "drydirt" : ["common", 3],
 	  "drysand" : ["common", 3]
+	},
+	"glowsandmaterial" : {
+	  "irradiumore": ["rarest", 6],
+	  "uraniumore": ["rarest", 6],
+	  "neptuniumore": ["rarest", 6],	 
+          "thoriumore": ["rarest", 6],	 
+          "liquidirradium": ["rarest", 6],
+	  "volatilepowder": ["rarest", 6],
+
+	  "glowfibre": ["rare", 3],
+          "prisiliteore": ["rare", 3],
+	  "lead": ["rare", 3],
+
+	  "crystal": ["uncommon", 3],
+	  "biospore": ["uncommon", 3],
+	  "ff_silicon": ["uncommon", 3],
+
+	  "crystalsandmaterial": ["common", 2], 
+	  "sand2": ["common", 2]
 	}
  },
 
-
-
-
-
-
-
-
  "itemMapRocks": {
     "coral2material": {
       "calciumnitrate": ["rarest", 2],
@@ -1740,7 +1752,7 @@
 		"gravelmaterial":  ["rarest", 2],
 		"sand": ["rare", 1]
 	},
-	"jellystone" : {
+    "jellystone" : {
 		"ironore" : ["rarest", 2],
 		"goldore" : ["rarest", 2],
 
@@ -1753,8 +1765,8 @@
 
 		"cobblestonematerial" : ["common", 2],
 		"fu_salt" : ["common", 2]
-	 },
-	 "bloodstonewall" : {
+        },
+    "bloodstonewall" : {
 		"quietusore" : ["rarest", 2],
 		"blooddiamond" : ["rarest", 2],
 
@@ -1765,14 +1777,33 @@
 
 		"crystal" : ["common", 2],
 		"bloodsandmaterial" : ["common", 2]
-	 },
-	 "ferron" : {
-	    "magnetinpowder" : ["uncommon", 2],
+        },
+    "ferron" : {
+	        "magnetinpowder" : ["uncommon", 2],
 		"ironfilings" :["uncommon", 2],
 
 		"gravelmaterial" : ["common", 2],
 		"drysand" : ["common", 2]
-	 }
+        },
+    "candyblock" :{
+	   "sugar" : ["rarest", 1]
+	},
+    "brickmaterial": {
+            "clay": ["rarest",2],
+            "gravelmaterial": ["rarest",2],
+            "sand": ["rare",1]
+        },
+    "supermatter": {
+	    "solidfuel": ["rare", 2],
+	    "liquidfuel": ["rare", 2],
+
+	    "crystal": ["uncommon", 2],
+	    "glowsandmaterial" : ["uncommon", 2],
+
+	    "crystalsandmaterial": ["common", 3], 
+	    "sand2": ["common", 3],
+	    "glasssandmaterial": ["common", 3]
+	}
  },
 
   "itemMapFarm": {

objects/power/electricfurnace/electricfurnace.object

@@ -132,7 +132,8 @@
     //"treasurehoard" : "money",
 
     //Other/Non-FU
-    "luckycoin":"luckycoin_khe"
+    "luckycoin":"luckycoin_khe",
+    "ironfilings" : "liquidironfu"
 
   },
 
@@ -205,7 +206,7 @@
     "mud": { "mudstonematerial": 90 },
     "sand": { "fu_carbon": 8 },
     "sand2": { "fu_carbon": 8 },
-    "retexsand2": { "fu_carbon": 8 }//,
+    "retexsand2": { "fu_carbon": 8 },
 
     //Tiles (Blast furnace+Arc)
     //"alienrock": {"fu_nitrogen": 21,"vialproto": 18,"liquidnitrogenitem": 16,"fu_carbondioxide": 30},
@@ -226,6 +227,7 @@
     //"treasurehoard": { "silverbar": 48, "goldbar": 48 }
 
     //Other/Non-FU
+    "ironfilings" : { "ironbar" : 15 }
 
   }
 }

objects/power/fu_blastfurnace/fu_blastfurnace.object

@@ -133,7 +133,8 @@
     "treasurehoard" : "money",
 
     //Other/Non-FU
-    "luckycoin":"luckycoin_khe"
+    "luckycoin":"luckycoin_khe",
+    "ironfilings" : "liquidironfu"
 
   },
 
@@ -224,9 +225,10 @@
     "protorockmaterial": {"fu_nitrogen": 11,"aliencompound": 18,"liquidbioooze": 24,"fu_carbondioxide": 30},
     "rustyblock": { "fu_carbon": 26 },
     "rustymetal": { "fu_carbon": 26 },
-    "treasurehoard": { "goldbar": 5 }
+    "treasurehoard": { "goldbar": 5 },
 
     //Other/Non-FU
+    "ironfilings" : { "ironbar" : 15 }
 
   }
 }

objects/power/isn_arcsmelter/isn_arcsmelter.object

@@ -131,7 +131,8 @@
     "treasurehoard" : "money",
 
     //Other/Non-FU
-    "luckycoin" :"luckycoin_khe"
+    "luckycoin" :"luckycoin_khe",
+    "ironfilings" : "liquidironfu"
 
   },
 
@@ -223,9 +224,9 @@
     "protorockmaterial" : {"fu_nitrogen" : 11,"aliencompound" : 18,"liquidbioooze" : 24,"fu_carbondioxide" : 30},
     "rustyblock" : { "fu_carbon" : 26 },
     "rustymetal" : { "fu_carbon" : 26 },
-    "treasurehoard" : { "goldbar" : 15 }
+    "treasurehoard" : { "goldbar" : 15 },
 
     //Other/Non-FU
-
+    "ironfilings" : { "ironbar" : 15 }
   }
 }