From 688696e7b6944c8f93ad22981483983fe254174a Mon Sep 17 00:00:00 2001 From: John Bytheway Date: Wed, 19 Aug 2020 16:55:54 -0400 Subject: [PATCH] Unblacklist generic guns mod from tests 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. --- build-scripts/mod_test_blacklist | 1 - data/mods/Generic_Guns/ammo/shot.json | 2 +- data/mods/Generic_Guns/firearms/black_powder.json | 2 +- data/mods/Generic_Guns/firearms/pistol.json | 2 +- data/mods/Generic_Guns/firearms/pistol_magnum.json | 2 +- data/mods/Generic_Guns/gunmods/gunmods.json | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build-scripts/mod_test_blacklist b/build-scripts/mod_test_blacklist index fff9efc420532..02f8522c57a8a 100644 --- a/build-scripts/mod_test_blacklist +++ b/build-scripts/mod_test_blacklist @@ -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 diff --git a/data/mods/Generic_Guns/ammo/shot.json b/data/mods/Generic_Guns/ammo/shot.json index eb107446ef5e1..ba5d13f0d002a 100644 --- a/data/mods/Generic_Guns/ammo/shot.json +++ b/data/mods/Generic_Guns/ammo/shot.json @@ -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" ] } }, diff --git a/data/mods/Generic_Guns/firearms/black_powder.json b/data/mods/Generic_Guns/firearms/black_powder.json index d0fd75a67a9c6..e581c9496c135 100644 --- a/data/mods/Generic_Guns/firearms/black_powder.json +++ b/data/mods/Generic_Guns/firearms/black_powder.json @@ -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 } } ] }, diff --git a/data/mods/Generic_Guns/firearms/pistol.json b/data/mods/Generic_Guns/firearms/pistol.json index 015f5f11ffd36..7e7b93b4a7cab 100644 --- a/data/mods/Generic_Guns/firearms/pistol.json +++ b/data/mods/Generic_Guns/firearms/pistol.json @@ -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", diff --git a/data/mods/Generic_Guns/firearms/pistol_magnum.json b/data/mods/Generic_Guns/firearms/pistol_magnum.json index 1b935c3138296..e25b9f1507491 100644 --- a/data/mods/Generic_Guns/firearms/pistol_magnum.json +++ b/data/mods/Generic_Guns/firearms/pistol_magnum.json @@ -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", diff --git a/data/mods/Generic_Guns/gunmods/gunmods.json b/data/mods/Generic_Guns/gunmods/gunmods.json index 4e82e99205813..cdf567e013d6b 100644 --- a/data/mods/Generic_Guns/gunmods/gunmods.json +++ b/data/mods/Generic_Guns/gunmods/gunmods.json @@ -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 } } ]