fix: rename id of sai to sai_weapon (#2810)

weapon `sai` was colliding with overmap terrain `sai`.
cataclysmbnteam · May 11, 2023 · cb8660e · cb8660e
1 parent 64f1172
commit cb8660e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/data/json/items/melee/unarmed_weapons.json b/data/json/items/melee/unarmed_weapons.json
@@ -153,7 +153,7 @@
     "flags": [ "DURABLE_MELEE", "UNARMED_WEAPON", "BELT_CLIP", "NONCONDUCTIVE", "STAB" ]
   },
   {
-    "id": "sai",
+    "id": "sai_weapon",
     "type": "GENERIC",
     "name": "sai",
     "description": "A pointed metal baton with two curved prongs projecting from the handle.  It's primarily used for disarming opponents, but can also make your punches puncture your foes.",

diff --git a/data/json/recipes/weapon/piercing.json b/data/json/recipes/weapon/piercing.json
@@ -794,7 +794,7 @@
     ]
   },
   {
-    "result": "sai",
+    "result": "sai_weapon",
     "type": "recipe",
     "category": "CC_WEAPON",
     "subcategory": "CSC_WEAPON_PIERCING",