Merge pull request #3498 from RockCat89/master

Slopped variants of Copper and Silver

items/materials/coppersloppedpanel.matitem

@@ -0,0 +1,11 @@
+{
+  "itemName" : "coppersloppedpanel",
+  "category" : "block",
+  "rarity" : "Common",
+  "inventoryIcon" : "coppersloppedpanel.png",
+  "dropCollision" : [-2.5, -2.0, 2.5, 2.0],
+  "description" : "Panels made out of pure copper. Now you just need a clockwork angel!",
+  "shortdescription" : "Sloped Copper Panel",
+
+  "materialId" : 6482
+}

items/materials/silversloppedpanel.matitem

@@ -0,0 +1,11 @@
+{
+  "itemName" : "silversloppedpanel",
+  "category" : "block",
+  "rarity" : "Common",
+  "inventoryIcon" : "silversloppedpanel.png",
+  "dropCollision" : [-2.5, -2.0, 2.5, 2.0],
+  "description" : "Panels made out of pure silver. Space vampires beware!",
+  "shortdescription" : "Sloped Silver Panel",
+
+  "materialId" : 6481
+}

recipes/materials/coppersloppedpanel.recipe

@@ -0,0 +1,8 @@
+{
+  "input" : [
+    { "item" : "copperbar", "count" : 1 }
+  ],
+  "output" : { "item" : "coppersloppedpanel", "count" : 20 },
+  "duration" : 0.25,
+  "groups"  : [ "craftingfurniture", "materials", "all" ]
+}

recipes/materials/silversloppedpanel.recipe

@@ -0,0 +1,8 @@
+{
+  "input" : [
+    { "item" : "silverbar", "count" : 1 }
+  ],
+  "output" : { "item" : "silversloppedpanel", "count" : 20 },
+  "duration" : 0.25,
+  "groups"  : [ "craftingfurniture", "materials", "all" ]
+}

tiles/materials/coppersloppedpanel.material

@@ -0,0 +1,22 @@
+{
+  "materialId" : 6482,
+  "materialName" : "coppersloppedpanel",
+  "particleColor" : [205, 173, 0, 255],
+  "itemDrop" : "coppersloppedpanel",
+
+  "description" : "Panels made out of pure copper. Now you just need a clockwork angel!",
+  "shortdescription" : "Sloped Copper Panel",
+  "footstepSound" : "/sfx/blocks/footstep_lightmetal.ogg",
+  "health" : 50,
+  "category" : "materials",
+
+  "renderTemplate" : "/tiles/slopedmaterialtemplate.config",
+  "renderParameters" : {
+    "texture" : "coppersloppedpanel.png",
+    "variants" : 1,
+    "lightTransparent" : false,
+    "occludesBelow" : true,
+    "multiColored" : false,
+    "zLevel" : 5000
+  }
+}

tiles/materials/silversloppedpanel.material

@@ -0,0 +1,22 @@
+{
+  "materialId" : 6481,
+  "materialName" : "silversloppedpanel",
+  "particleColor" : [205, 173, 0, 255],
+  "itemDrop" : "silversloppedpanel",
+
+  "description" : "Panels made out of pure silver. Space vampires beware!",
+  "shortdescription" : "Sloped Silver Panel",
+  "footstepSound" : "/sfx/blocks/footstep_lightmetal.ogg",
+  "health" : 50,
+  "category" : "materials",
+
+  "renderTemplate" : "/tiles/slopedmaterialtemplate.config",
+  "renderParameters" : {
+    "texture" : "silversloppedpanel.png",
+    "variants" : 1,
+    "lightTransparent" : false,
+    "occludesBelow" : true,
+    "multiColored" : false,
+    "zLevel" : 5000
+  }
+}

zb/researchTree/fu_craftsmanship.config

@@ -188,7 +188,7 @@
         "position" : [-120, -20],
         "children" : [ "workbenchtungsten", "lamps" ],
         "price" : [ ["fuscienceresource", 150],["copperbar", 3]],
-        "unlocks" : [ "coppershelf", "coppersupport", "copperceilinglight", "copperlantern", "copperbox1", "fu_copperCeilingLamp", "fu_copperCog", "fu_copperWallLamp", "fu_copperWallLamp2", "fu_copperladder", "copperfence", "copperplatform", "fu_copperplatform", "copperroofing", "copperwindow", "copperblock", "hazard", "sewerpipe", "fusewerpipe", "heavypipe", "fuheavypipe", "fupipewidget", "scb-pipelamp", "scb-sewerpipe-end", "scb-watertrap", "scb-poisontrap", "scb-flametrap", "apexshopcounter", "apexcampshopcounter", "tribalshopcounter", "plantshopcounter", "medievalshopcounter", "shopcounter", "hylotlshopcounter", "frontiershopcounter", "shroomshopcounter", "scorchedcityshopcounter", "swampshopcounter" ]
+        "unlocks" : [ "coppershelf", "coppersupport", "copperceilinglight", "copperlantern", "copperbox1", "fu_copperCeilingLamp", "fu_copperCog", "fu_copperWallLamp", "fu_copperWallLamp2", "fu_copperladder", "copperfence", "copperplatform", "fu_copperplatform", "copperroofing", "copperwindow", "copperblock", "coppersloppedpanel", "hazard", "sewerpipe", "fusewerpipe", "heavypipe", "fuheavypipe", "fupipewidget", "scb-pipelamp", "scb-sewerpipe-end", "scb-watertrap", "scb-poisontrap", "scb-flametrap", "apexshopcounter", "apexcampshopcounter", "tribalshopcounter", "plantshopcounter", "medievalshopcounter", "shopcounter", "hylotlshopcounter", "frontiershopcounter", "shroomshopcounter", "scorchedcityshopcounter", "swampshopcounter" ]
       },
       "lamps" : {
         "icon" : "/objects/crafting/lavalampstation/lavalampstationicon.png",
@@ -209,7 +209,7 @@
         "position" : [-160, -40],
         "children" : [ "workbenchveluu" ],
         "price" : [ ["fuscienceresource", 150],["goldbar", 1],["silverbar", 1]],
-        "unlocks" : [ "slopedshinygold", "silverblock", "goldblock", "goldenplatform", "platinumblock", "treasurehoard", "silverscrew", "silverplatform", "diamondblockmaterial", "fu_harpsichord", "fugoldchest", "fugoldmedievalarmor", "fugoldmedievalarmorarmed", "fugoldmedievalchandelier", "fugoldmedievalglobe", "fugoldmedievalstreetlamp", "fuornatechandelier", "fusilvercandle", "fusilverchalice", "fusilverhourglass", "fusilverornatechandelier", "fusilverroyalcandlestick", "fusilverroyalthrone", "nightarsilverchain", "nightarsilverroof", "nightarsilvertech", "nightarsilverwindow", "nightarcrosshatch", "nightargirder1", "funightarsilverstairs" ]
+        "unlocks" : [ "slopedshinygold", "silverblock", "silversloppedpanel", "goldblock", "goldenplatform", "platinumblock", "treasurehoard", "silverscrew", "silverplatform", "diamondblockmaterial", "fu_harpsichord", "fugoldchest", "fugoldmedievalarmor", "fugoldmedievalarmorarmed", "fugoldmedievalchandelier", "fugoldmedievalglobe", "fugoldmedievalstreetlamp", "fuornatechandelier", "fusilvercandle", "fusilverchalice", "fusilverhourglass", "fusilverornatechandelier", "fusilverroyalcandlestick", "fusilverroyalthrone", "nightarsilverchain", "nightarsilverroof", "nightarsilvertech", "nightarsilverwindow", "nightarcrosshatch", "nightargirder1", "funightarsilverstairs" ]
       },
       "workbenchtitanium" : {
         "icon" : "/objects/tiered/tier3chair/tier3chairIcon.png",
@@ -703,7 +703,7 @@
   },
 
   "versions":{
-    "fu_craftsmanship" : "0.246"
+    "fu_craftsmanship" : "0.247"
   },
   "initiallyResearched" : {
     "fu_craftsmanship" : [ "BASICTRAINING" ]