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

Tweaked zombie soldier, cop and survivor drop lists #36645

Merged
merged 18 commits into from
May 11, 2020
Merged

Tweaked zombie soldier, cop and survivor drop lists #36645

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
bacffd9
Tweaked zombie soldier drop list
Night-Pryanik Jan 2, 2020
b30fa17
Split guns_cop into long- and short-barreled groups
Night-Pryanik Jan 2, 2020
d2b433e
Survivor zed longguns will be dropped with shoulder straps
Night-Pryanik Jan 2, 2020
8aa0f87
Added shoulder strap to long-barreled firearms drop of ordinary zombies
Night-Pryanik Jan 2, 2020
14d6f33
Moved veteran survivor zombie monster drop list from monster_drops.js…
Night-Pryanik Jan 2, 2020
3470c75
Added shoulder straps to long-barreled firearms of veteran survivor z…
Night-Pryanik Jan 2, 2020
6223dc4
Changes per reviews
Night-Pryanik Jan 2, 2020
e0bc0f8
Returned guaranteed spawn of t-shirts and socks
Night-Pryanik Jan 3, 2020
80f653c
Reverted changes to clothing spawn chances
Night-Pryanik Jan 3, 2020
a55bedf
Reverted changes to common infantry gear and MREs spawn chances
Night-Pryanik Jan 3, 2020
5119957
One more revert
Night-Pryanik Jan 3, 2020
1a9128a
Merge branch 'master' into zombie-soldiers-inv-tweak
Night-Pryanik Mar 18, 2020
4a33934
Added shoulder strap to default zombie long guns
Night-Pryanik Mar 18, 2020
5d767d5
Merge branch 'master' into zombie-soldiers-inv-tweak
Night-Pryanik Apr 13, 2020
f7e9328
Merge branch 'master' into zombie-soldiers-inv-tweak
Night-Pryanik May 4, 2020
44035b4
Removed non-existing weapon from an itemgroup
Night-Pryanik May 10, 2020
f9bbf97
Increased chance to spawn guns from 40% to 70%
Night-Pryanik May 10, 2020
280621f
Added 10% chance to spawn sniper rifles on corpses of soldiers on mil…
Night-Pryanik May 10, 2020
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
40 changes: 20 additions & 20 deletions data/json/itemgroups/clothing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,18 @@
"subtype": "collection",
"//": "Standard (non-winter) set of clothes worn by soldiers and paramilitary forces.",
"items": [
{ "group": "clothing_soldier_shirt" },
{ "item": "jacket_army" },
{ "group": "clothing_soldier_shirt", "prob": 80 },
Night-Pryanik marked this conversation as resolved.
Show resolved Hide resolved
{ "item": "jacket_army", "prob": 70 },
{ "item": "elbow_pads", "prob": 10 },
{ "item": "pants_army" },
{ "item": "webbing_belt" },
{ "item": "knee_pads", "prob": 85 },
{ "distribution": [ { "item": "socks", "prob": 95 }, { "item": "socks_wool", "prob": 5 } ] },
{ "item": "boots_combat" },
{ "item": "helmet_army", "prob": 80 },
{ "item": "pants_army", "prob": 80 },
{ "item": "webbing_belt", "prob": 50 },
{ "item": "knee_pads", "prob": 60 },
{ "distribution": [ { "item": "socks", "prob": 95 }, { "item": "socks_wool", "prob": 5 } ], "prob": 90 },
{ "item": "boots_combat", "prob": 70 },
{ "item": "helmet_army", "prob": 60 },
{ "item": "gloves_tactical", "prob": 60 },
{ "item": "ballistic_vest", "prob": 90 },
{ "item": "molle_pack", "prob": 85 },
{ "item": "ballistic_vest", "prob": 60 },
{ "item": "molle_pack", "prob": 60 },
{ "group": "clothing_tactical_leg", "prob": 15 },
{
"distribution": [
Expand All @@ -129,18 +129,18 @@
"subtype": "collection",
"//": "Winter set of clothes worn by soldiers and paramilitary forces.",
"items": [
{ "group": "clothing_soldier_shirt" },
{ "item": "winter_jacket_army" },
{ "group": "clothing_soldier_shirt", "prob": 80 },
{ "item": "winter_jacket_army", "prob": 70 },
{ "item": "elbow_pads", "prob": 10 },
{ "item": "winter_pants_army" },
{ "item": "webbing_belt" },
{ "item": "knee_pads", "prob": 85 },
{ "distribution": [ { "item": "socks", "prob": 10 }, { "item": "socks_wool", "prob": 90 } ] },
{ "item": "boots_combat" },
{ "collection": [ { "item": "helmet_army" }, { "item": "helmet_liner" } ], "prob": 80 },
{ "item": "winter_pants_army", "prob": 80 },
{ "item": "webbing_belt", "prob": 50 },
{ "item": "knee_pads", "prob": 60 },
{ "distribution": [ { "item": "socks", "prob": 10 }, { "item": "socks_wool", "prob": 90 } ], "prob": 90 },
{ "item": "boots_combat", "prob": 70 },
{ "collection": [ { "item": "helmet_army" }, { "item": "helmet_liner" } ], "prob": 60 },
{ "collection": [ { "item": "gloves_liner", "prob": 60 }, { "item": "winter_gloves_army" } ], "prob": 80 },
{ "item": "ballistic_vest", "prob": 90 },
{ "item": "molle_pack", "prob": 85 },
{ "item": "ballistic_vest", "prob": 60 },
{ "item": "molle_pack", "prob": 60 },
{ "group": "clothing_tactical_leg", "prob": 15 },
{
"distribution": [
Expand Down
53 changes: 32 additions & 21 deletions data/json/itemgroups/guns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,30 +514,41 @@
},
{
"type": "item_group",
"id": "guns_cop",
"//": "Police issue weapons of all types",
"id": "longguns_cop",
"items": [
{ "item": "ar15", "prob": 15, "charges": [ 0, 30 ] },
{ "item": "cx4", "prob": 20, "charges": [ 0, 15 ] },
{ "item": "fn_p90", "prob": 5, "charges": [ 0, 50 ] },
{ "item": "hk_mp5", "prob": 10, "charges": [ 0, 30 ] },
{ "item": "mossberg_500", "prob": 15, "charges": [ 0, 8 ] },
{ "item": "remington_700", "prob": 5, "charges": [ 0, 4 ] },
{ "item": "remington_870", "prob": 20, "charges": [ 0, 6 ] }
]
},
{
"type": "item_group",
"id": "sidearms_cop",
"items": [
{ "item": "ar15", "prob": 15, "charges-min": 0, "charges-max": 30 },
{ "item": "cx4", "prob": 20, "charges-min": 0, "charges-max": 15 },
{ "item": "fn57", "prob": 20, "charges-min": 0, "charges-max": 20 },
{ "item": "fn_p90", "prob": 5, "charges-min": 0, "charges-max": 50 },
{ "item": "glock_19", "prob": 15, "charges-min": 0, "charges-max": 15 },
{ "item": "glock_22", "prob": 20, "charges-min": 0, "charges-max": 15 },
{ "item": "hk_mp5", "prob": 10, "charges-min": 0, "charges-max": 30 },
{ "item": "l_enforcer_45", "prob": 10, "charges-min": 0, "charges-max": 6 },
{ "item": "m9", "prob": 5, "charges-min": 0, "charges-max": 15 },
{ "item": "mossberg_500", "prob": 15, "charges-min": 0, "charges-max": 8 },
{ "item": "remington_700", "prob": 5, "charges-min": 0, "charges-max": 4 },
{ "item": "remington_870", "prob": 20, "charges-min": 0, "charges-max": 6 },
{ "item": "sig_40", "prob": 20, "charges-min": 0, "charges-max": 12 },
{ "item": "usp_45", "prob": 10, "charges-min": 0, "charges-max": 12 },
{ "item": "usp_9mm", "prob": 10, "charges-min": 0, "charges-max": 15 },
{ "item": "kp32", "prob": 1, "charges-min": 0, "charges-max": 7 },
{ "item": "kp3at", "prob": 2, "charges-min": 0, "charges-max": 6 },
{ "item": "rugerlcp", "prob": 2, "charges-min": 0, "charges-max": 6 },
{ "item": "kpf9", "prob": 3, "charges-min": 0, "charges-max": 7 }
{ "item": "fn57", "prob": 20, "charges": [ 0, 20 ] },
{ "item": "glock_19", "prob": 15, "charges": [ 0, 15 ] },
{ "item": "glock_22", "prob": 20, "charges": [ 0, 15 ] },
{ "item": "l_enforcer_45", "prob": 10, "charges": [ 0, 6 ] },
{ "item": "m9", "prob": 5, "charges": [ 0, 15 ] },
{ "item": "sig_40", "prob": 20, "charges": [ 0, 12 ] },
{ "item": "usp_45", "prob": 10, "charges": [ 0, 12 ] },
{ "item": "usp_9mm", "prob": 10, "charges": [ 0, 15 ] },
{ "item": "kp32", "prob": 1, "charges": [ 0, 7 ] },
{ "item": "kp3at", "prob": 2, "charges": [ 0, 6 ] },
{ "item": "rugerlcp", "prob": 2, "charges": [ 0, 6 ] },
{ "item": "kpf9", "prob": 3, "charges": [ 0, 7 ] }
]
},
{
"type": "item_group",
"id": "guns_cop",
"//": "Police issue weapons of all types",
"items": [ { "group": "longguns_cop", "prob": 50 }, { "group": "sidearms_cop", "prob": 50 } ]
},
{
"type": "item_group",
"id": "guns_swat",
Expand Down
61 changes: 9 additions & 52 deletions data/json/monsterdrops/monster_drops.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,15 +226,15 @@
"id": "default_zombie_items",
"ammo": 30,
"magazine": 100,
"groups": [
[ "default_zombie_items_bags", 16 ],
[ "default_zombie_items_pockets", 20 ],
[ "ammo_pistol_common", 2 ],
[ "ammo_shotgun_common", 1 ],
[ "guns_pistol_common", 2 ],
[ "guns_shotgun_common", 1 ],
[ "postman_gear", 5 ],
[ "hardware_plumbing", 5 ]
"entries": [
{ "group": "default_zombie_items_bags", "prob": 16 },
{ "group": "default_zombie_items_pockets", "prob": 20 },
{ "group": "ammo_pistol_common", "prob": 2 },
{ "group": "ammo_shotgun_common", "prob": 1 },
{ "group": "guns_pistol_common", "prob": 2 },
{ "group": "guns_shotgun_common", "prob": 1, "contents-item": "shoulder_strap" },
{ "group": "postman_gear", "prob": 5 },
{ "group": "hardware_plumbing", "prob": 5 }
]
},
{
Expand Down Expand Up @@ -363,49 +363,6 @@
{ "item": "cash_card", "charges-min": 0, "charges-max": 50000 }
]
},
{
"type": "item_group",
"subtype": "collection",
"id": "mon_zombie_survivor_elite_death_drops",
"entries": [
{ "group": "survivorzed_gloves", "damage": [ 1, 4 ] },
{ "group": "survivorzed_boots", "damage": [ 1, 4 ] },
{ "group": "survivorzed_head", "damage": [ 1, 4 ] },
{ "group": "survivorzed_extra", "damage": [ 1, 4 ] },
{
"distribution": [
{ "group": "survivorzed_suits", "prob": 25, "damage": [ 1, 4 ] },
{
"collection": [
{ "group": "survivorzed_tops", "prob": 25, "damage": [ 1, 4 ] },
{ "group": "survivorzed_bottoms", "prob": 25, "damage": [ 1, 4 ] }
],
"prob": 75
}
]
},
{
"distribution": [ { "group": "underwear", "prob": 1, "damage": [ 1, 4 ] }, { "group": "loincloth", "prob": 2, "damage": [ 1, 4 ] } ]
},
{
"distribution": [
{ "group": "guns_common", "prob": 24 },
{ "group": "grenades", "prob": 10 },
{ "group": "mil_hw", "prob": 1 },
{ "group": "launchers", "prob": 1 },
{ "group": "stash_food", "prob": 40 },
{ "group": "ammo_common", "prob": 26 },
{ "group": "stash_drugs", "prob": 28 },
{ "group": "gear_survival", "prob": 18 },
{ "group": "mil_food", "prob": 22 },
{ "group": "mil_food_nodrugs", "prob": 34 },
{ "group": "shelter", "prob": 8 },
{ "group": "mil_surplus", "prob": 6 }
]
},
{ "item": "cash_card", "charges-min": 50000, "charges-max": 150000 }
]
},
{
"type": "item_group",
"id": "mon_zombie_thorny_death_drops",
Expand Down
8 changes: 7 additions & 1 deletion data/json/monsterdrops/zombie_cop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@
{
"id": "cop_weapons",
"type": "item_group",
"items": [ { "group": "cop_melee", "prob": 60 }, { "group": "guns_cop", "prob": 40 } ]
"items": [
{ "group": "cop_melee", "prob": 60 },
{
"distribution": [ { "group": "longguns_cop", "prob": 50, "contents-item": "shoulder_strap" }, { "group": "sidearms_cop", "prob": 50 } ],
"prob": 40
}
]
}
]
30 changes: 16 additions & 14 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,15 +14,15 @@
},
{
"distribution": [
{ "group": "military_standard_assault_rifles", "prob": 75 },
{ "group": "military_standard_lmgs", "prob": 10 },
{ "group": "military_standard_sniper_rifles", "prob": 10 },
{ "group": "military_standard_shotguns", "prob": 5 }
]
{ "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 }
],
"prob": 40
},
{ "group": "infantry_common_gear" },
{ "group": "infantry_common_gear", "prob": 30 },
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

30% is unreasonably low. This stuff is standard issue to all infantry and most of them would be carrying it.

Copy link
Contributor Author

@Night-Pryanik Night-Pryanik Jan 2, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're talking about zombified soldiers, not live ones, here. As I already said, zombified soldiers could (and most probably will) lose at least some of their gear.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the pertinent thing here is would they carry them into a firefight? What's doctorine about fighting while carrying a daypack?

{ "group": "military_standard_grenades", "count": [ 1, 3 ], "prob": 20 },
{ "group": "military_patrol_food" },
{ "group": "military_patrol_food", "prob": 30 },
Night-Pryanik marked this conversation as resolved.
Show resolved Hide resolved
{ "distribution": [ { "group": "infantry_officer_gear" }, { "group": "infantry_medical_gear" } ], "prob": 25 },
{ "item": "cash_card", "prob": 10, "charges": [ 0, 50000 ] },
{ "group": "misc_smoking", "prob": 30 }
Expand Down Expand Up @@ -50,16 +50,18 @@
{
"distribution": [
{ "group": "military_standard_assault_rifles", "contents-group": "sopmod", "prob": 75 },
{ "group": "military_standard_lmgs", "prob": 10 },
{ "group": "military_standard_sniper_rifles", "prob": 10 },
{ "group": "military_standard_shotguns", "prob": 5 }
]
{ "group": "military_standard_lmgs", "contents-item": "shoulder_strap", "prob": 10 },
{ "group": "military_standard_sniper_rifles", "contents-item": "shoulder_strap", "prob": 10 },
Night-Pryanik marked this conversation as resolved.
Show resolved Hide resolved
{ "group": "military_standard_shotguns", "contents-item": "shoulder_strap", "prob": 5 }
],
"prob": 40
},
{ "group": "infantry_common_gear" },
{ "group": "infantry_common_gear", "prob": 30 },
{ "group": "military_standard_grenades", "count": [ 1, 3 ], "prob": 20 },
{ "group": "military_patrol_food" },
{ "group": "military_patrol_food", "prob": 30 },
{
"collection": [ { "group": "infantry_officer_gear", "prob": 90 }, { "group": "infantry_medical_gear", "prob": 80 } ]
"collection": [ { "group": "infantry_officer_gear", "prob": 90 }, { "group": "infantry_medical_gear", "prob": 80 } ],
"prob": 25
},
{ "item": "cash_card", "prob": 10, "charges-min": 0, "charges-max": 50000 },
{ "group": "misc_smoking", "prob": 30 }
Expand Down
79 changes: 78 additions & 1 deletion data/json/monsterdrops/zombie_survivor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"subtype": "collection",
"id": "mon_zombie_survivor_death_drops",
"magazine": 100,
"ammo": 60,
"entries": [
{ "group": "clothing_outdoor_set", "damage": [ 1, 4 ] },
{ "group": "bags", "damage": [ 1, 4 ], "prob": 10 },
Expand All @@ -15,7 +16,7 @@
{
"distribution": [
{ "group": "survivor_melee", "prob": 40, "damage": [ 1, 4 ] },
{ "group": "guns_survival", "prob": 60, "damage": [ 1, 4 ] }
{ "group": "survivor_longguns", "prob": 60, "contents-item": "shoulder_strap", "damage": [ 1, 4 ] }
],
"prob": 50
},
Expand All @@ -42,6 +43,57 @@
[ "spear_rebar", 10 ]
]
},
{
"type": "item_group",
"subtype": "collection",
"id": "mon_zombie_survivor_elite_death_drops",
"entries": [
{ "group": "survivorzed_gloves", "damage": [ 1, 4 ] },
{ "group": "survivorzed_boots", "damage": [ 1, 4 ] },
{ "group": "survivorzed_head", "damage": [ 1, 4 ] },
{ "group": "survivorzed_extra", "damage": [ 1, 4 ] },
{
"distribution": [
{ "group": "survivorzed_suits", "prob": 25, "damage": [ 1, 4 ] },
{
"collection": [
{ "group": "survivorzed_tops", "prob": 25, "damage": [ 1, 4 ] },
{ "group": "survivorzed_bottoms", "prob": 25, "damage": [ 1, 4 ] }
],
"prob": 75
}
]
},
{
"distribution": [ { "group": "underwear", "prob": 1, "damage": [ 1, 4 ] }, { "group": "loincloth", "prob": 2, "damage": [ 1, 4 ] } ]
},
{
"distribution": [
{
"distribution": [
{ "group": "guns_pistol_common", "prob": 100 },
{ "group": "guns_rifle_common", "prob": 20, "contents-item": "shoulder_strap" },
{ "group": "guns_smg_common", "prob": 5, "contents-item": "shoulder_strap" },
{ "group": "guns_shotgun_common", "prob": 40, "contents-item": "shoulder_strap" }
],
"prob": 24
},
{ "group": "grenades", "prob": 10 },
{ "group": "mil_hw", "prob": 1 },
{ "group": "launchers", "prob": 1 },
{ "group": "stash_food", "prob": 40 },
{ "group": "ammo_common", "prob": 26 },
{ "group": "stash_drugs", "prob": 28 },
{ "group": "gear_survival", "prob": 18 },
{ "group": "mil_food", "prob": 22 },
{ "group": "mil_food_nodrugs", "prob": 34 },
{ "group": "shelter", "prob": 8 },
{ "group": "mil_surplus", "prob": 6 }
]
},
{ "item": "cash_card", "charges-min": 50000, "charges-max": 150000 }
]
},
{
"id": "survivor_cutting",
"type": "item_group",
Expand Down Expand Up @@ -87,5 +139,30 @@
{ "group": "survivor_melee", "prob": 40 },
{ "group": "guns_survival", "prob": 60 }
]
},
{
"id": "survivor_longguns",
"type": "item_group",
"subtype": "distribution",
"entries": [
{
"distribution": [
{ "group": "guns_smg_improvised", "prob": 10 },
{ "group": "guns_rifle_improvised", "prob": 100 },
{ "group": "guns_shotgun_improvised", "prob": 100 },
{ "group": "guns_launcher_improvised", "prob": 30 }
],
"prob": 200
},
{ "item": "ar15", "prob": 5, "charges": [ 0, 30 ] },
{ "item": "mossberg_500", "prob": 5, "charges": [ 0, 8 ] },
{ "item": "remington_870", "prob": 5, "charges": [ 0, 6 ] },
{ "item": "ruger_1022", "prob": 15, "charges": [ 0, 10 ] },
{ "item": "shotgun_410", "prob": 10, "charges": [ 0, 1 ] },
{ "item": "shotgun_s", "prob": 10, "charges": [ 0, 1 ] },
{ "item": "shotgun_d", "prob": 10, "charges": [ 0, 2 ] },
{ "item": "sten", "prob": 20, "charges": [ 0, 32 ] },
{ "item": "sks", "prob": 10, "charges": [ 0, 10 ] }
]
}
]