Main push

CleverRaven · Jun 6, 2024 · d22c772 · d22c772
1 parent daea5c2
commit d22c772
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 39 deletions.
diff --git a/data/json/items/melee/spears_and_polearms.json b/data/json/items/melee/spears_and_polearms.json
@@ -607,28 +607,6 @@
     "price": "80 USD",
     "price_postapoc": "5 USD"
   },
-  {
-    "type": "GENERIC",
-    "id": "spear_survivor",
-    "name": { "str_sp": "survivor naginata" },
-    "description": "This sturdy steel shaft with a sword blade at the end is good for both slashing and stabbing.",
-    "weight": "1700 g",
-    "color": "light_gray",
-    "symbol": "/",
-    "material": [ "steel" ],
-    "techniques": [ "IMPALE", "WIDE", "WBLOCK_1" ],
-    "volume": "2250 ml",
-    "longest_side": "180 cm",
-    "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "neutral" },
-    "flags": [ "POLEARM", "REACH_ATTACK", "SHEATH_SPEAR" ],
-    "weapon_category": [ "HOOKING_WEAPONRY", "POLEARMS" ],
-    "//": "Description says it can slash. STAB currently doesn't slash, but at least it doesn't give the spear bonus",
-    "price": "80 USD",
-    "price_postapoc": "45 USD",
-    "qualities": [ [ "COOK", 1 ], [ "CUT", 1 ], [ "BUTCHER", -24 ] ],
-    "use_action": [ "HEAT_SOLID_ITEMS" ],
-    "melee_damage": { "bash": 4, "cut": 36 }
-  },
   {
     "type": "GENERIC",
     "id": "javelin",

diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json
@@ -1418,5 +1418,10 @@
     "id": "stowed_glass_fridge",
     "type": "MIGRATION",
     "replace": "glass_fridge"
+  },
+  {
+    "id": "spear_survivor",
+    "type": "MIGRATION",
+    "replace": "naginata"
   }
 ]
diff --git a/data/json/recipes/weapon/piercing.json b/data/json/recipes/weapon/piercing.json
@@ -542,23 +542,6 @@
     "tools": [ [ [ "hotcut_any", 1, "LIST" ] ] ],
     "components": [ [ [ "filament", 100, "LIST" ] ], [ [ "long_pole", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
   },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "spear_survivor",
-    "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_CUTTING",
-    "skill_used": "fabrication",
-    "difficulty": 6,
-    "skills_required": [ "melee", 5 ],
-    "time": "20 m",
-    "autolearn": true,
-    "using": [ [ "blacksmithing_standard", 5 ] ],
-    "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "GRIND", "level": 2 } ],
-    "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
-    "tools": [ [ [ "hotcut_any", 1, "LIST" ] ] ],
-    "components": [ [ [ "blade", 1 ] ], [ [ "spike", 1 ] ], [ [ "pipe", 2 ] ], [ [ "duct_tape", 100 ] ] ]
-  },
   {
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",