Merge pull request #47754 from aerrant/fix-feral-humans-ammo

Limit feral humans ammo
CleverRaven · Feb 27, 2021 · 661c627 · 661c627
2 parents f77f179 + 128d91b
commit 661c627
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/data/json/items/gun/monster_gun.json b/data/json/items/gun/monster_gun.json
@@ -65,7 +65,9 @@
     "material": [ "stone" ],
     "flags": [ "PRIMITIVE_RANGED_WEAPON", "NEVER_JAMS", "NONCONDUCTIVE", "NO_REPAIR", "WATERPROOF_GUN", "NO_SALVAGE", "NO_UNLOAD" ],
     "skill": "throw",
+    "ammo": [ "rock" ],
     "ammo_effects": [ "NO_PENETRATE_OBSTACLES" ],
+    "clip_size": 1,
     "ranged_damage": { "damage_type": "bash", "amount": 4 },
     "weight": "540 g",
     "volume": "210 ml",

diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json
@@ -32,6 +32,8 @@
         "cooldown": 5,
         "move_cost": 150,
         "gun_type": "feral_human_thrown_rock",
+        "ammo_type": "rock",
+        "no_ammo_sound": "",
         "fake_skills": [ [ "gun", 2 ], [ "throw", 2 ] ],
         "fake_dex": 6,
         "fake_per": 6,