Merge pull request #36713 from anothersimulacrum/mv-bronze

Move bronze to materials.json
CleverRaven · Jan 5, 2020 · 9fe2e72 · 9fe2e72
2 parents 745411a + 6d96601
commit 9fe2e72
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json
@@ -290,24 +290,6 @@
     "color": "light_cyan",
     "ammo_type": "components"
   },
-  {
-    "type": "material",
-    "ident": "bronze",
-    "name": "Bronze",
-    "density": 58,
-    "bash_resist": 4,
-    "cut_resist": 5,
-    "acid_resist": 1,
-    "fire_resist": 2,
-    "elec_resist": 0,
-    "chip_resist": 15,
-    "repaired_with": "scrap_bronze",
-    "dmg_adj": [ "marked", "dented", "smashed", "shattered" ],
-    "bash_dmg_verb": "dented",
-    "cut_dmg_verb": "scratched",
-    "burn_products": [ [ "scrap_bronze", 1 ] ],
-    "compacts_into": [ "scrap_bronze" ]
-  },
   {
     "type": "GENERIC",
     "id": "scrap_copper",

diff --git a/data/json/materials.json b/data/json/materials.json
@@ -1663,5 +1663,23 @@
     "bash_dmg_verb": "dented",
     "cut_dmg_verb": "scratched",
     "compacts_into": [ "zinc_metal" ]
+  },
+  {
+    "type": "material",
+    "ident": "bronze",
+    "name": "Bronze",
+    "density": 58,
+    "bash_resist": 4,
+    "cut_resist": 5,
+    "acid_resist": 1,
+    "fire_resist": 2,
+    "elec_resist": 0,
+    "chip_resist": 15,
+    "repaired_with": "scrap_bronze",
+    "dmg_adj": [ "marked", "dented", "smashed", "shattered" ],
+    "bash_dmg_verb": "dented",
+    "cut_dmg_verb": "scratched",
+    "burn_products": [ [ "scrap_bronze", 1 ] ],
+    "compacts_into": [ "scrap_bronze" ]
   }
 ]