Skip to content

Commit

Permalink
Fix for incompatible magazine spawning in national guard camp (#35794)
Browse files Browse the repository at this point in the history
* scarhmag -> stanag30

Correct magazine inside gun.

* Fix for using gasoline as flamethrower ammo
  • Loading branch information
hfox authored and ZhilkinSerg committed Dec 1, 2019
1 parent 214a896 commit 54572ca
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion data/mods/National_Guard_Camp/item_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
{ "group": "robots", "prob": 100 },
{ "item": "storage_battery", "prob": 40, "charges-min": 200, "charges-max": 1000 },
{ "item": "223", "prob": 20, "charges-min": 10, "charges-max": 30 },
{ "item": "scar_l", "prob": 20, "damage": [ 1, 2 ], "contents-item": [ "scarhmag" ] }
{ "item": "scar_l", "prob": 20, "damage": [ 1, 2 ], "contents-item": [ "stanag30" ] }
]
}
]
4 changes: 2 additions & 2 deletions data/mods/National_Guard_Camp/military.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@
"type": "MONSTER",
"name": "W12B10",
"description": "Wraitheon (12B) Combat Engineer 10 Level. Part of Wraitheon's series of one-to-one auxiliaries designed to seamlessly integrate with more traditional forces.",
"starting_ammo": { "gasoline": 120 },
"starting_ammo": { "napalm": 120 },
"special_attacks": [
{
"type": "gun",
"cooldown": 1,
"gun_type": "flamethrower",
"ammo_type": "gasoline",
"ammo_type": "napalm",
"fake_skills": [ [ "gun", 1 ] ],
"fake_dex": 8,
"range": 5,
Expand Down

0 comments on commit 54572ca

Please sign in to comment.