From 62f420655e0f111cfec37ca50fd059d195832151 Mon Sep 17 00:00:00 2001 From: scarf Date: Thu, 11 May 2023 15:06:43 +0900 Subject: [PATCH] fix: rename id of `sai` to `sai_weapon` weapon `sai` was colliding with overmap terrain `sai`. --- data/json/items/melee/unarmed_weapons.json | 2 +- data/json/recipes/weapon/piercing.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/melee/unarmed_weapons.json b/data/json/items/melee/unarmed_weapons.json index dc7844e59757..019d6c33e5dc 100644 --- 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 index 1c00161bc3ee..02422b49eb16 100644 --- 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",