Skip to content

Commit

Permalink
Merge pull request #36147 from anothersimulacrum/40mm
Browse files Browse the repository at this point in the history
Fix 40mm mod errors
  • Loading branch information
ZhilkinSerg authored Dec 16, 2019
2 parents 03e7d8d + ddd733e commit a81ee3c
Show file tree
Hide file tree
Showing 12 changed files with 36 additions and 39 deletions.
2 changes: 1 addition & 1 deletion data/mods/Aftershock/items/afs_weapons.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"looks_like": "bionic_general",
"color": "magenta",
"skill": "launcher",
"ammo": "40mm",
"ammo": "40x46mm",
"dispersion": 290,
"durability": 6,
"clip_size": 1,
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Aftershock/recipes/afs__recipes.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ],
"components": [
[ [ "canister_empty", 1 ] ],
[ [ "grenade", 1 ], [ "40mm_frag", 2 ], [ "40mm_concussive", 2 ] ],
[ [ "grenade", 1 ], [ "40x46mm_m433", 2 ] ],
[ [ "plut_cell", 6 ] ],
[ [ "amplifier", 3 ] ],
[ [ "power_supply", 1 ] ],
Expand Down
10 changes: 1 addition & 9 deletions data/mods/Aftershock/vehicles/afs_vehicle_overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,7 @@
{
"y": 1,
"x": 3,
"parts": [
"turret_mount",
{
"ammo_type": [ "40mm_frag", "40mm_concussive" ],
"part": "mounted_mk19",
"ammo": 60,
"ammo_qty": [ 1, 25 ]
}
]
"parts": [ "turret_mount", { "ammo_type": [ "40x46mm_m433" ], "part": "mounted_mk19", "ammo": 60, "ammo_qty": [ 1, 25 ] } ]
},
{ "y": 1, "x": 3, "parts": [ "seat", "seatbelt_heavyduty" ] },
{ "y": 0, "x": 3, "parts": [ "hdframe_vertical_2", "stowboard_vertical", "hdroof" ] },
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Fuji_Mil_Prof/prof/army.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
{ "item": "m4a1", "ammo-item": "556", "charges": 30, "contents-item": [ "shoulder_strap", "holo_sight", "m203" ] },
{ "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
{ "item": "modularvestceramic", "contents-group": "army_mags_m4" },
{ "item": "40mm_frag", "charges": 4, "container-item": "grenade_pouch" },
{ "item": "40x46mm_m433", "charges": 4, "container-item": "grenade_pouch" },
{ "item": "knife_combat", "container-item": "sheath" },
{ "item": "m17", "ammo-item": "9mm", "charges": 17, "container-item": "holster" }
]
Expand Down
25 changes: 15 additions & 10 deletions data/mods/Generic_Guns/gg_ammo_blacklist.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,22 @@
"38_fmj",
"38_special",
"38_super",
"40x46mm_m1006",
"40x46mm_m433",
"40x46mm_m576",
"40x46mm_m651",
"40x46mm_buckshot_m118",
"40x46mm_buckshot_m199",
"40x46mm_slug_m118",
"40x46mm_slug_m199",
"40x46mm_flechette_m118",
"40x46mm_flechette_m199",
"40x53mm_m1001",
"40x53mm_m430a1",
"40x53mm_buckshot_m169",
"40x53mm_slug_m169",
"40x53mm_flechette_m169",
"40fmj",
"40mm_beanbag",
"40mm_concussive",
"40mm_flare",
"40mm_flashbang",
"40mm_flechette",
"40mm_frag",
"40mm_incendiary",
"40mm_shot",
"40mm_smoke",
"40mm_teargas",
"40sw",
"44army",
"44fmj",
Expand Down
12 changes: 6 additions & 6 deletions data/mods/Modular_Turrets/monster.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@
"color": "blue",
"luminance": 300,
"revert_to_itype": "bot_turret_teargas",
"starting_ammo": { "40mm_teargas": 50 },
"starting_ammo": { "40x46mm_m651": 50 },
"special_attacks": [
{
"type": "gun",
"cooldown": 2,
"gun_type": "robogun_teargas",
"ammo_type": "40mm_teargas",
"ammo_type": "40x46mm_m651",
"fake_skills": [ [ "gun", 2 ], [ "launcher", 2 ] ],
"fake_dex": 9,
"no_ammo_sound": "click click!",
Expand All @@ -148,13 +148,13 @@
"color": "blue",
"luminance": 300,
"revert_to_itype": "bot_turret_beanbag",
"starting_ammo": { "40mm_beanbag": 50 },
"starting_ammo": { "40x46mm_m1006": 50 },
"special_attacks": [
{
"type": "gun",
"cooldown": 1,
"gun_type": "robogun_beanbag",
"ammo_type": "40mm_beanbag",
"ammo_type": "40x46mm_m1006",
"fake_skills": [ [ "gun", 2 ], [ "launcher", 2 ] ],
"fake_dex": 9,
"no_ammo_sound": "click click!",
Expand Down Expand Up @@ -346,13 +346,13 @@
"color": "red",
"luminance": 200,
"revert_to_itype": "bot_milturret_40mm",
"starting_ammo": { "40mm_frag": 50 },
"starting_ammo": { "40x46mm_m433": 50 },
"special_attacks": [
{
"type": "gun",
"cooldown": 3,
"gun_type": "robogun_40mm",
"ammo_type": "40mm",
"ammo_type": "40x46mm_m433",
"fake_skills": [ [ "gun", 4 ], [ "launcher", 5 ] ],
"fake_dex": 10,
"no_ammo_sound": "click!",
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Modular_Turrets/monster_override.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,14 @@
"description": "An automated defense robot still active due to its internal power source. This one is equipped with an electric prod, tear gas sprayer, and integrated 40mm beanbag launcher.",
"emit_fields": [ "emit_tear_gas_pulse" ],
"melee_damage": [ { "damage_type": "electric", "amount": 6 } ],
"starting_ammo": { "40mm_beanbag": 100 },
"starting_ammo": { "40x46mm_m1006": 100 },
"special_attacks": [
{
"type": "gun",
"move_cost": 150,
"cooldown": 2,
"gun_type": "robogun_beanbag",
"ammo_type": "40mm_beanbag",
"ammo_type": "40x46mm",
"fake_skills": [ [ "gun", 2 ], [ "launcher", 2 ] ],
"fake_dex": 9,
"no_ammo_sound": "click click!",
Expand Down
6 changes: 3 additions & 3 deletions data/mods/Modular_Turrets/roboguns.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"copy-from": "robogun_base",
"name": "integral teargas launcher",
"skill": "launcher",
"ammo": "40mm",
"ammo": "40x46mm",
"ammo_effects": "NO_BOOM",
"clip_size": 50,
"dispersion": 270,
Expand All @@ -56,7 +56,7 @@
"copy-from": "robogun_base",
"name": "integral beanbag launcher",
"skill": "launcher",
"ammo": "40mm",
"ammo": "40x46mm",
"ammo_effects": "NO_BOOM",
"clip_size": 50,
"dispersion": 270,
Expand Down Expand Up @@ -105,7 +105,7 @@
"copy-from": "robogun_base",
"name": "integral grenade launcher",
"skill": "launcher",
"ammo": "40mm",
"ammo": "40x46mm",
"dispersion": 270,
"modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
"clip_size": 50
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Salvaged_Robots/monsters.json
Original file line number Diff line number Diff line change
Expand Up @@ -947,14 +947,14 @@
"melee_damage": [ { "damage_type": "electric", "amount": 6 } ],
"color": "dark_gray_red",
"luminance": 50,
"starting_ammo": { "40mm_frag": 100 },
"starting_ammo": { "40x46mm_m433": 100 },
"special_attacks": [
{
"type": "gun",
"move_cost": 250,
"cooldown": 3,
"gun_type": "robogun_40mm",
"ammo_type": "40mm_frag",
"ammo_type": "40x46mm_m433",
"fake_skills": [ [ "gun", 4 ], [ "launcher", 5 ] ],
"fake_dex": 10,
"no_ammo_sound": "click!",
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Salvaged_Robots/robot_additions/40mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"color": "yellow",
"count": 4,
"stack_size": 4,
"ammo_type": "40mm",
"casing": "40mm_casing",
"ammo_type": "40x46mm",
"casing": "40x46mm_m118_casing",
"range": 40,
"damage": 5,
"dispersion": 30,
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Salvaged_Robots/robot_additions/vehicles.json
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@
"y": 1,
"part": "mounted_mk19",
"ammo": 60,
"ammo_types": [ "40mm_frag", "40mm_concussive", "40mm_emp" ],
"ammo_types": [ "40x46mm_m433", "40mm_emp" ],
"ammo_qty": [ 1, 25 ]
},
{ "x": -1, "y": 2, "part": "hdframe_horizontal_2" },
Expand Down
2 changes: 1 addition & 1 deletion data/mods/blazemod/blaze_ammo_recipes.json
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
[ [ "hbolt_wood", 1 ], [ "hbolt_metal", 1 ] ],
[ [ "canbombfrag", 1 ], [ "grenade", 1 ], [ "landmine", 1 ], [ "40mm_frag", 1 ], [ "pipebomb", 1 ] ],
[ [ "canbombfrag", 1 ], [ "grenade", 1 ], [ "landmine", 1 ], [ "40x46mm_m433", 1 ], [ "pipebomb", 1 ] ],
[ [ "cordage", 1, "LIST" ], [ "adhesive", 1, "LIST" ] ]
]
},
Expand Down

0 comments on commit a81ee3c

Please sign in to comment.