From b8a989bbcb96c35445adc8e43ebf5f63d9586240 Mon Sep 17 00:00:00 2001 From: tenmillimaster <> Date: Sun, 2 Feb 2020 23:23:07 -0600 Subject: [PATCH 1/2] more hotfixes --- data/mods/Generic_Guns/ammo/grenade.json | 2 +- data/mods/Generic_Guns/ammo/rocket.json | 9 +- .../Generic_Guns/bandoliers/bandolier.json | 83 +++++++++++++++++++ data/mods/Generic_Guns/firearms/shot.json | 11 ++- .../Generic_Guns/gg_ammunition_types.json | 2 +- .../mods/Generic_Guns/robots/active_bots.json | 12 +-- .../mods/Generic_Guns/robots/broken_bots.json | 2 +- .../temp_magazine_json_load_hack.json | 2 +- 8 files changed, 106 insertions(+), 17 deletions(-) create mode 100644 data/mods/Generic_Guns/bandoliers/bandolier.json diff --git a/data/mods/Generic_Guns/ammo/grenade.json b/data/mods/Generic_Guns/ammo/grenade.json index 4f052c8482568..eb29cf1ce3455 100644 --- a/data/mods/Generic_Guns/ammo/grenade.json +++ b/data/mods/Generic_Guns/ammo/grenade.json @@ -12,7 +12,7 @@ "copy-from": "grenade_ammo", "type": "AMMO", "name": "HEDP grenade cartridge", - "description": "A grenade cartridge with a 'High Explosive Dual Purpose' load and a high number of damaging fragments. Good for armored or soft targets.", + "description": "A grenade cartridge with a high explosive dual purpose load, capable of producing good penetration and a high number of damaging fragments. Good for armored or soft targets.", "extend": { "effects": [ "FRAG", "EXPLOSIVE" ] } }, { diff --git a/data/mods/Generic_Guns/ammo/rocket.json b/data/mods/Generic_Guns/ammo/rocket.json index bbdabed34abe8..c44f7538a2ec2 100644 --- a/data/mods/Generic_Guns/ammo/rocket.json +++ b/data/mods/Generic_Guns/ammo/rocket.json @@ -5,9 +5,6 @@ "copy-from": "84x246mm_he", "name": { "str": "rocket, antipersonnel", "str_pl": "rocket, antipersonnel" }, "description": "A large anti-personnel rocket for a military rocket launcher. Designed to be highly effective against personnel.", - "material": [ "steel", "powder" ], - "volume": "1250 ml", - "weight": "3200 g", "ammo_type": "ammo_rocket" }, { @@ -15,13 +12,15 @@ "type": "AMMO", "copy-from": "84x246mm_hedp", "name": { "str": "rocket, multipurpose", "str_pl": "rocket, multipurpose" }, - "description": "An anti-tank rocket with a high explosive dual purpose warhead for a military rocket launcher. Designed to be highly effective against vehicles and structures, and retains some effectiveness against personnel." + "description": "An anti-tank rocket with a high explosive dual purpose warhead for a military rocket launcher. Designed to be highly effective against vehicles and structures, and retains some effectiveness against personnel.", + "ammo_type": "ammo_rocket" }, { "id": "rocket_smoke", "type": "AMMO", "copy-from": "84x246mm_smoke", "name": { "str": "rocket, smoke", "str_pl": "rocket, smoke" }, - "description": "A rocket loaded with a smoke warhead for a military rocket launcher. Commonly used for signaling, target designation, and for screening troop movements." + "description": "A rocket loaded with a smoke warhead for a military rocket launcher. Commonly used for signaling, target designation, and for screening troop movements.", + "ammo_type": "ammo_rocket" } ] diff --git a/data/mods/Generic_Guns/bandoliers/bandolier.json b/data/mods/Generic_Guns/bandoliers/bandolier.json new file mode 100644 index 0000000000000..eb0fe22f56cbc --- /dev/null +++ b/data/mods/Generic_Guns/bandoliers/bandolier.json @@ -0,0 +1,83 @@ +[ + { + "id": "bandolier_pistol", + "copy-from": "bandolier_pistol", + "type": "ARMOR", + "name": { "str": "pistol bandolier" }, + "use_action": { + "type": "bandolier", + "capacity": 18, + "ammo": [ "ammo_pistol_tiny", "ammo_pistol", "ammo_pistol_magnum" ], + "draw_cost": 20 + } + }, + { + "id": "bandolier_rifle", + "copy-from": "bandolier_rifle", + "type": "ARMOR", + "name": { "str": "rifle bandolier" }, + "use_action": { "type": "bandolier", "capacity": 16, "ammo": [ "ammo_rifle", "ammo_rifle_huge" ], "draw_cost": 20 } + }, + { + "id": "bandolier_shotgun", + "copy-from": "bandolier_shotgun", + "type": "ARMOR", + "name": { "str": "waist shotgun bandolier" }, + "use_action": { "type": "bandolier", "capacity": 25, "ammo": [ "ammo_shot", "signal_flare" ], "draw_cost": 25 } + }, + { + "id": "torso_bandolier_shotgun", + "copy-from": "torso_bandolier_shotgun", + "type": "ARMOR", + "name": { "str": "torso shotgun bandolier" }, + "use_action": { "type": "bandolier", "capacity": 50, "ammo": [ "ammo_shot", "signal_flare" ], "draw_cost": 35 } + }, + { + "id": "flintlock_pouch", + "copy-from": "flintlock_pouch", + "type": "ARMOR", + "name": { "str": "paper cartridge pouch", "str_pl": "paper cartridge pouches" }, + "use_action": { "type": "bandolier", "capacity": 14, "ammo": [ "ammo_black_powder", "blunderbuss", "shotcanister" ], "draw_cost": 20 } + }, + { + "id": "bandolier_wrist", + "copy-from": "bandolier_wrist", + "type": "ARMOR", + "name": { "str": "wrist bandolier" }, + "use_action": { "type": "bandolier", "capacity": 4, "ammo": [ "ammo_pistol_magnum", "ammo_rifle" ], "draw_cost": 20 } + }, + { + "id": "grenade_pouch", + "copy-from": "grenade_pouch", + "type": "ARMOR", + "name": { "str": "grenade pouch", "str_pl": "grenade pouches" }, + "use_action": { "type": "bandolier", "capacity": 4, "ammo": [ "ammo_grenade" ], "draw_cost": 20 } + }, + { + "id": "ammo_pouch", + "copy-from": "ammo_pouch", + "type": "ARMOR", + "name": { "str": "ammo pouch", "str_pl": "ammo pouches" }, + "use_action": { + "type": "bandolier", + "capacity": 60, + "ammo": [ + "pebble", + "ammo_black_powder", + "ammo_pistol_tiny", + "ammo_pistol", + "ammo_pistol_magnum", + "ammo_rifle", + "ammo_rifle_huge", + "ammo_shot", + "signal_flare", + "stimpack_ammo", + "ampoule", + "blunderbuss", + "shotcanister", + "paintball" + ], + "draw_cost": 35 + } + } +] diff --git a/data/mods/Generic_Guns/firearms/shot.json b/data/mods/Generic_Guns/firearms/shot.json index 81cbb2c0d11e1..9c0c11402d60a 100644 --- a/data/mods/Generic_Guns/firearms/shot.json +++ b/data/mods/Generic_Guns/firearms/shot.json @@ -21,7 +21,7 @@ "type": "GUN", "name": "sporting shotgun", "ammo": "ammo_shot", - "description": "A tube magazine fed shotgun, a simple and long-popular design among law enforcement, civilians and in some military applications. Though reloading is slow and the recoil can be stout, shotgun ammo comes in many varieties and are suitable for anything from large game to small birds.", + "description": "A simple, popular design, sporting shotguns are used by law enforcement, civilians and occasionally militaries. Its internal magazine is small by modern standards, and reloading can be quite slow. Shotshells come in many varieties, and shotguns are suitable for anything from some large game to small birds.", "clip_size": 6 }, { @@ -30,7 +30,14 @@ "type": "GUN", "name": "tactical shotgun", "ammo": "ammo_shot", - "description": "A detachable magazine fed shotgun, mostly oriented towards overly enthusiastic civilians. Featuring rails and a menancing black finish and furniture, this sort of shotgun doesn't really look like it has a sporting use. Though such systems tend to not work well overall, the box magazine feed reduces the lengthy reloading times associated with shotguns. These can be tuned to run somewhat reliably for competition use.", + "description": "A detachable magazine fed shotgun, mostly oriented towards overly enthusiastic civilians. Featuring rails and a menacing black appearance, this sort of shotgun doesn't really look like it has a sporting use. The magazines reduce lengthy reloading times associated with shotguns. Though known for being somewhat finicky, these can be tuned to run with some reliability.", "magazines": [ [ "ammo_shot", [ "shot_mag" ] ] ] + }, + { + "id": "bio_shotgun_gun", + "copy-from": "bio_shotgun_gun", + "type": "GUN", + "name": "bionic shotgun", + "ammo": "ammo_shot" } ] diff --git a/data/mods/Generic_Guns/gg_ammunition_types.json b/data/mods/Generic_Guns/gg_ammunition_types.json index 4e3eacb0c72f8..934e92ec1987a 100644 --- a/data/mods/Generic_Guns/gg_ammunition_types.json +++ b/data/mods/Generic_Guns/gg_ammunition_types.json @@ -3,7 +3,7 @@ "type": "ammunition_type", "id": "ammo_black_powder", "//": "a combination flintlock and cap and ball type ammo. Just roll with it.", - "name": "standard pistol ammo", + "name": "black powder ammo", "default": "black_powder_ball" }, { diff --git a/data/mods/Generic_Guns/robots/active_bots.json b/data/mods/Generic_Guns/robots/active_bots.json index 761c13eb7db3e..0af2798be1e87 100644 --- a/data/mods/Generic_Guns/robots/active_bots.json +++ b/data/mods/Generic_Guns/robots/active_bots.json @@ -56,12 +56,6 @@ } ] }, - { - "id": "mon_crows_m240", - "copy-from": "mon_turret_rifle", - "type": "MONSTER", - "default_faction": "military" - }, { "id": "mon_turret_rifle", "copy-from": "mon_turret_rifle", @@ -91,6 +85,12 @@ } ] }, + { + "id": "mon_crows_m240", + "copy-from": "mon_turret_rifle", + "type": "MONSTER", + "default_faction": "military" + }, { "id": "mon_secubot", "copy-from": "mon_secubot", diff --git a/data/mods/Generic_Guns/robots/broken_bots.json b/data/mods/Generic_Guns/robots/broken_bots.json index 7bedf8db00ba8..4fa5a1b38b718 100644 --- a/data/mods/Generic_Guns/robots/broken_bots.json +++ b/data/mods/Generic_Guns/robots/broken_bots.json @@ -21,7 +21,7 @@ "type": "GENERIC", "id": "broken_talon_m202a1", "copy-from": "broken_talon_m202a1", - "name": "broken rocket TALON UGV", + "name": "broken launcher TALON UGV", "description": "A broken TALON UGV, with its casing broken and fluid drained. Could be gutted for parts." }, { diff --git a/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_magazine_json_load_hack.json b/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_magazine_json_load_hack.json index 53de7658cedbe..80e2b37bf6f35 100644 --- a/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_magazine_json_load_hack.json +++ b/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_magazine_json_load_hack.json @@ -214,6 +214,6 @@ "copy-from": "belt40mm", "type": "MAGAZINE", "name": "grenade belt", - "ammo_type": [ "40x53mm", "ammo_grenade" ] + "ammo_type": [ "ammo_grenade", "40x53mm" ] } ] From b0a51619e5caacf9727b8ef4cdf1b0104b2b6788 Mon Sep 17 00:00:00 2001 From: tenmillimaster <> Date: Mon, 3 Feb 2020 00:41:30 -0600 Subject: [PATCH 2/2] Update active_bots.json --- data/mods/Generic_Guns/robots/active_bots.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Generic_Guns/robots/active_bots.json b/data/mods/Generic_Guns/robots/active_bots.json index 0af2798be1e87..3ff155159eaa3 100644 --- a/data/mods/Generic_Guns/robots/active_bots.json +++ b/data/mods/Generic_Guns/robots/active_bots.json @@ -104,7 +104,7 @@ "cooldown": 1, "move_cost": 150, "gun_type": "rifle_assault", - "ammo_type": "556", + "ammo_type": "rifle_ball", "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ], "fake_dex": 12, "ranges": [ [ 0, 30, "DEFAULT" ] ],