Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Spawn Zombie Cops with small firearms more often and lower pick rate of mx_military 'map extra' #55908

Merged
merged 13 commits into from
Mar 9, 2022
Merged

Spawn Zombie Cops with small firearms more often and lower pick rate of mx_military 'map extra' #55908

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8f7ce74
Reduce ammo generation on military weapon drops
KurzedMetal Mar 6, 2022
38c76be
Reduce generation of grenades
KurzedMetal Mar 6, 2022
5bbf299
Make cops drop more pistols but less rifles/shotguns
KurzedMetal Mar 6, 2022
0159f53
Reduce generation of rifles on a few map extras
KurzedMetal Mar 6, 2022
5f0161f
Make soldiers drop damaged firearms instead of always intact
KurzedMetal Mar 6, 2022
5fcb501
Fix unintended values
KurzedMetal Mar 6, 2022
3bc1d1c
Lint JSON
KurzedMetal Mar 6, 2022
4ed8088
Add fouling to rifles drop by soldiers
KurzedMetal Mar 6, 2022
b6d1803
Revert "Reduce ammo generation on military weapon drops"
KurzedMetal Mar 7, 2022
c827c91
Revert "Reduce generation of grenades"
KurzedMetal Mar 7, 2022
5cfbe1e
Revert "Reduce generation of rifles on a few map extras"
KurzedMetal Mar 7, 2022
9e6ec87
Reduce mx_military spawn rate by a factor of 5
KurzedMetal Mar 7, 2022
7877468
Keep mx_helicopter lower pick rate than mx_military
KurzedMetal Mar 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/json/itemgroups/Weapons_Mods_Ammo/guns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@
"type": "item_group",
"id": "guns_cop",
"//": "Police issue weapons of all types",
"items": [ { "group": "longguns_cop", "prob": 50 }, { "group": "sidearms_cop", "prob": 50 } ]
"items": [ { "group": "longguns_cop", "prob": 20 }, { "group": "sidearms_cop", "prob": 80 } ]
},
{
"type": "item_group",
Expand Down
8 changes: 4 additions & 4 deletions data/json/itemgroups/military.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
"id": "military_standard_assault_rifles",
"subtype": "distribution",
"entries": [
{ "item": "m4_carbine", "variant": "m4a1", "prob": 88, "charges": [ 0, 30 ] },
{ "item": "m27_assault_rifle", "variant": "m27iar", "prob": 10, "charges": [ 0, 30 ] },
{ "item": "m4_carbine", "variant": "m4a1", "prob": 88, "charges": [ 0, 20 ] },
{ "item": "m27_assault_rifle", "variant": "m27iar", "prob": 10, "charges": [ 0, 20 ] },
{
"item": "m27_assault_rifle",
"variant": "m38dmr",
"contents-group": "m38dmr_mods",
"prob": 1,
"charges": [ 0, 30 ]
"charges": [ 0, 20 ]
},
{ "item": "m16a4", "prob": 2, "charges": [ 0, 30 ] }
{ "item": "m16a4", "prob": 2, "charges": [ 0, 20 ] }
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/monsterdrops/feral_humans.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@
"ammo": 0,
"entries": [
{ "distribution": [ { "group": "clothing_soldier_broken_armor_set", "prob": 100, "damage": [ 2, 4 ] } ] },
{ "group": "military_standard_grenades", "count": [ 1, 3 ], "prob": 20 },
{ "group": "military_standard_grenades", "count": [ 1, 2 ], "prob": 20 },
{ "group": "military_patrol_food" },
{ "distribution": [ { "group": "infantry_officer_gear" }, { "group": "infantry_medical_gear" } ], "prob": 25 },
{ "group": "wallets", "prob": 10 },
Expand Down
4 changes: 2 additions & 2 deletions data/json/monsterdrops/zombie_cop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@
"items": [
{ "group": "cop_melee", "prob": 60 },
{
"distribution": [ { "group": "longguns_cop", "prob": 50, "contents-item": "shoulder_strap" }, { "group": "sidearms_cop", "prob": 50 } ],
"prob": 40
"distribution": [ { "group": "longguns_cop", "prob": 20, "contents-item": "shoulder_strap" }, { "group": "sidearms_cop", "prob": 80 } ],
"prob": 60
}
]
},
Expand Down
24 changes: 12 additions & 12 deletions data/json/monsterdrops/zombie_soldier.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
},
{
"distribution": [
{ "group": "military_standard_assault_rifles", "contents-item": "shoulder_strap", "prob": 75 },
{ "group": "military_standard_lmgs", "contents-item": "shoulder_strap", "prob": 10 },
{ "group": "military_standard_shotguns", "contents-item": "shoulder_strap", "prob": 5 }
{ "group": "military_standard_assault_rifles", "contents-item": "shoulder_strap", "prob": 75, "damage": [0, 4] },
{ "group": "military_standard_lmgs", "contents-item": "shoulder_strap", "prob": 10, "damage": [0, 4] },
{ "group": "military_standard_shotguns", "contents-item": "shoulder_strap", "prob": 5, "damage": [0, 4] }
KurzedMetal marked this conversation as resolved.
Show resolved Hide resolved
],
"prob": 10
},
{ "group": "infantry_common_gear" },
{ "group": "military_standard_grenades", "count": [ 1, 3 ], "prob": 20 },
{ "group": "military_standard_grenades", "count": [ 1, 2 ], "prob": 20 },
{ "group": "military_patrol_food" },
{ "distribution": [ { "group": "infantry_officer_gear" }, { "group": "infantry_medical_gear" } ], "prob": 25 },
{ "group": "wallets", "prob": 10 },
Expand All @@ -38,15 +38,15 @@
"entries": [
{
"distribution": [
{ "group": "military_standard_assault_rifles", "contents-item": "shoulder_strap", "prob": 75 },
{ "group": "military_standard_lmgs", "contents-item": "shoulder_strap", "prob": 10 },
{ "group": "military_standard_shotguns", "contents-item": "shoulder_strap", "prob": 5 }
{ "group": "military_standard_assault_rifles", "contents-item": "shoulder_strap", "prob": 75, "damage": [0, 4] },
{ "group": "military_standard_lmgs", "contents-item": "shoulder_strap", "prob": 10, "damage": [0, 4] },
{ "group": "military_standard_shotguns", "contents-item": "shoulder_strap", "prob": 5, "damage": [0, 4] }
],
"prob": 10
},
{ "group": "clothing_soldier_heavy_set", "damage": [ 0, 2 ] },
{ "group": "infantry_common_gear" },
{ "group": "military_standard_grenades", "count": [ 1, 3 ], "prob": 20 },
{ "group": "military_standard_grenades", "count": [ 1, 2 ], "prob": 20 },
{ "group": "military_patrol_food" },
{ "distribution": [ { "group": "infantry_officer_gear" }, { "group": "infantry_medical_gear" } ], "prob": 25 },
{ "group": "wallets", "prob": 10 },
Expand Down Expand Up @@ -79,14 +79,14 @@
},
{
"distribution": [
{ "group": "military_standard_assault_rifles", "contents-group": "sopmod", "prob": 75 },
{ "group": "military_standard_lmgs", "contents-item": "shoulder_strap", "prob": 10 },
{ "group": "military_standard_shotguns", "contents-item": "shoulder_strap", "prob": 5 }
{ "group": "military_standard_assault_rifles", "contents-group": "sopmod", "prob": 75, "damage": [0, 4] },
{ "group": "military_standard_lmgs", "contents-item": "shoulder_strap", "prob": 10, "damage": [0, 4] },
{ "group": "military_standard_shotguns", "contents-item": "shoulder_strap", "prob": 5, "damage": [0, 4] }
],
"prob": 10
},
{ "group": "infantry_common_gear" },
{ "group": "military_standard_grenades", "count": [ 1, 3 ], "prob": 20 },
{ "group": "military_standard_grenades", "count": [ 1, 2 ], "prob": 20 },
{ "group": "military_patrol_food" },
{
"collection": [ { "group": "infantry_officer_gear", "prob": 90 }, { "group": "infantry_medical_gear", "prob": 80 } ]
Expand Down
4 changes: 2 additions & 2 deletions data/json/npcs/island_prison/prisoners.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@
[ "switchblade", 5 ],
[ "throwing_knife", 5 ],
{
"distribution": [ { "group": "longguns_cop", "prob": 50, "contents-item": "shoulder_strap" }, { "group": "sidearms_cop", "prob": 50 } ],
"prob": 40
"distribution": [ { "group": "longguns_cop", "prob": 20, "contents-item": "shoulder_strap" }, { "group": "sidearms_cop", "prob": 80 } ],
"prob": 60
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion data/mods/No_Hope/monster_drops.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"prob": 10
},
{ "group": "infantry_common_gear", "damage": [ 1, 4 ] },
{ "group": "military_standard_grenades", "count": [ 1, 3 ], "prob": 20 },
{ "group": "military_standard_grenades", "count": [ 1, 2 ], "prob": 20 },
{ "group": "military_patrol_food" },
{ "distribution": [ { "group": "infantry_officer_gear" }, { "group": "infantry_medical_gear" } ], "prob": 25 },
{ "item": "cash_card", "prob": 10, "charges": [ 0, 50000 ] },
Expand Down
16 changes: 8 additions & 8 deletions src/map_extras.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,10 +582,10 @@ static bool mx_military( map &m, const tripoint & )
}
} else {
m.add_spawn( mon_zombie_soldier, 1, *p );
// 10% chance of zombie carrying weapon so 90% chance of it being on the ground
if( !one_in( 10 ) ) {
// 25% chance per corpse to to generate an extra weapon on the ground
if( one_in( 4 ) ) {
item_group_id group;
// 80% assault rifles, 10% LMGs, 5% shotguns, 5% sniper rifles
// ~80% assault rifles, ~10% LMGs, ~5% shotguns, ~5% sniper rifles
if( one_in( 20 ) ) {
group = Item_spawn_data_military_standard_sniper_rifles;
} else if( one_in( 19 ) ) {
Expand Down Expand Up @@ -725,15 +725,15 @@ static bool mx_roadblock( map &m, const tripoint &abs_sub )
return m.passable( n );
} ) ) {
m.add_spawn( mon_zombie_soldier, 1, *p );
// 10% chance of zombie carrying weapon so 90% chance of it being on the ground
if( !one_in( 10 ) ) {
// 25% chance per corpse to to generate an extra weapon on the ground
if( one_in( 4 ) ) {
item_group_id group;
// 75% assault rifles, 10% LMGs, 5% shotguns, 5% sniper rifles
// ~80% assault rifles, ~10% LMGs, ~5% shotguns, ~5% sniper rifles
if( one_in( 20 ) ) {
group = Item_spawn_data_military_standard_sniper_rifles;
} else if( one_in( 20 ) ) {
} else if( one_in( 19 ) ) {
group = Item_spawn_data_military_standard_shotguns;
} else if( one_in( 10 ) ) {
} else if( one_in( 9 ) ) {
group = Item_spawn_data_military_standard_lmgs;
} else {
group = Item_spawn_data_military_standard_assault_rifles;
Expand Down