Backport #77029 Fix sling staff (#77427)

* Fix sling staff (#77029) * Change `ammo_restriction` of sling staff Remove "sling-ready_grenade": 1 from `ammo_restriction` of sling staff * Add `pocket_mods` to grenade cradle Add `"pocket_mods": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "sling-ready_grenade": 1 }, "open_container": true } ]` to `staff_sling_grenade_cradle`. * Remove not yet supported open_container
CleverRaven · Oct 30, 2024 · 9cdd625 · 9cdd625
1 parent 30ea495
commit 9cdd625
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/data/json/items/gunmod/conversions.json b/data/json/items/gunmod/conversions.json
@@ -916,6 +916,7 @@
     "location": "bore",
     "mod_targets": [ "staff_sling" ],
     "install_time": "1 m",
-    "ammo_modifier": [ "sling-ready_grenade" ]
+    "ammo_modifier": [ "sling-ready_grenade" ],
+    "pocket_mods": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "sling-ready_grenade": 1 } } ]
   }
 ]
diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json
@@ -91,7 +91,7 @@
     "clip_size": 1,
     "valid_mod_locations": [ [ "bore", 1 ] ],
     "reload": 50,
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "rock": 1, "sling-ready_grenade": 1 } } ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "rock": 1 } } ],
     "melee_damage": { "bash": 16 }
   },
   {