From 9cdd625002e4a4d5bbc90e8b356490565d599ea1 Mon Sep 17 00:00:00 2001
From: osuphobia <78858975+osuphobia@users.noreply.github.com>
Date: Wed, 30 Oct 2024 23:54:20 +0800
Subject: [PATCH] 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
---
 data/json/items/gunmod/conversions.json | 3 ++-
 data/json/items/ranged/slings.json      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/json/items/gunmod/conversions.json b/data/json/items/gunmod/conversions.json
index b8964135c8a0d..4da60b09166b8 100644
--- 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
index 8708e473e154f..26143da0c4aea 100644
--- 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 }
   },
   {