Skip to content

Commit

Permalink
Unblacklist generic guns mod from tests
Browse files Browse the repository at this point in the history
This was previously blacklisted in #37206 due to a conflict with ew_pack
(Icecoon's Arsenal) but that's no longer a core mod, so we can re-enable
generic guns for testing.

Fix the few minor JSON errors that tests caught in this mod.
  • Loading branch information
jbytheway authored and kevingranade committed Aug 20, 2020
1 parent 89e5147 commit 688696e
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 6 deletions.
1 change: 0 additions & 1 deletion build-scripts/mod_test_blacklist
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ Graphical_Overmap
more_locations
sees_player_hitbutton
sees_player_retro
generic_guns
national_guard_camp
Graphical_Overmap_Fujistruct
Graphical_Overmap_More_Locations
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Generic_Guns/ammo/shot.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"name": { "str_sp": "shotshell, slug" },
"description": "A shotshell with a single projectile, shaped somewhat like a shuttlecock. Slugs are used with shotguns to give them extra range, allowing them to stand in for a rifle. Extremely damaging but rather inaccurate.",
"dispersion": 100,
"relative": { "range": 12, "damage": { "damage_type": "bullet", "armor_penetratoin": 6 } },
"relative": { "range": 12, "damage": { "damage_type": "bullet", "armor_penetration": 6 } },
"proportional": { "price": 1.4, "price_postapoc": 1.4, "recoil": 1.4 },
"delete": { "effects": [ "SHOT" ] }
},
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Generic_Guns/firearms/black_powder.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"type": "GUN",
"name": { "str": "antique revolver" },
"ammo": [ "ammo_black_powder" ],
"description": "This is an old revolver designed during the period of westward expansion. Black powder paper cartridges must be loaded for each shot, which is a fairly lengthy process. Despite its age, this type of weapon would perform adequately against most two-legged threats.",
"description": "This is an old revolver designed during the period of westward expansion. Black powder paper cartridges must be loaded for each shot, which is a fairly lengthy process. Despite its age, this type of weapon would perform adequately against most two-legged threats.",
"clip_size": 6,
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "ammo_black_powder": 6 } } ]
},
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Generic_Guns/firearms/pistol.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"type": "GUN",
"name": "survivor subgun",
"ammo": [ "ammo_pistol" ],
"description": "A crudely constructed fully automatic submachinegun, accepting standard pistol and submachine gun magazines. The heavy bolt makes accurate fire difficult, and its questionable construction makes for poor reliability and longevity. Similar designs of desperation from the Second World War served their nations well enough, so this should be good for zombies... right? Accepts standard pistol ammunition.",
"description": "A crudely constructed fully automatic submachinegun, accepting standard pistol and submachine gun magazines. The heavy bolt makes accurate fire difficult, and its questionable construction makes for poor reliability and longevity. Similar designs of desperation from the Second World War served their nations well enough, so this should be good for zombies right? Accepts standard pistol ammunition.",
"pocket_data": [
{
"pocket_type": "MAGAZINE_WELL",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Generic_Guns/firearms/pistol_magnum.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"name": { "str": "hand cannon" },
"ammo": [ "ammo_pistol_magnum", "ammo_pistol" ],
"//": "We're just going to prtend that .357 and .44 magnum deagles will run .38's and .44 special just fine",
"description": "This large pistol is almost as heavy as a small carbine, and just about as powerful too. Chambered in hard hitting magnum calibers, it is suitable for hunting medium game, humans, or offsetting any of one's perceived deficiencies. Though tradtionally such magnums are revolvers, this one is a magazine fed semi-automatic.",
"description": "This large pistol is almost as heavy as a small carbine, and just about as powerful too. Chambered in hard hitting magnum calibers, it is suitable for hunting medium game, humans, or offsetting any of one's perceived deficiencies. Though tradtionally such magnums are revolvers, this one is a magazine fed semi-automatic.",
"pocket_data": [
{
"pocket_type": "MAGAZINE_WELL",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Generic_Guns/gunmods/gunmods.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"copy-from": "m320_mod_mod",
"type": "GUNMOD",
"name": { "str_sp": "underbarrel launcher (modified)" },
"description": "A stubby single shot launcher for launching grenades or flares. This launcher can be attached to a rifle or other suitable platform, and includes its own set of sights. In more recent years, variants were sold commercially to ostensibly launch flares. With the right cartridges, this would be devastating against hard or soft targets. A crude homemade bracket has been attached, allowing a wider variety of hosts.",
"description": "A stubby single shot launcher for launching grenades or flares. This launcher can be attached to a rifle or other suitable platform, and includes its own set of sights. In more recent years, variants were sold commercially to ostensibly launch flares. With the right cartridges, this would be devastating against hard or soft targets. A crude homemade bracket has been attached, allowing a wider variety of hosts.",
"gun_data": { "ammo": "ammo_grenade", "skill": "launcher", "dispersion": 270, "durability": 10, "clip_size": 1 },
"mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "ammo_grenade": 1 } } ]
Expand Down

0 comments on commit 688696e

Please sign in to comment.