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

Item demographics test and gun appearance rate rebalancing. #73037

Merged
merged 7 commits into from
Apr 22, 2024
Merged

Item demographics test and gun appearance rate rebalancing. #73037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
db2948c
Labpocalypse Now, remove and reduce a bunch of legacy lab spawns
kevingranade Mar 24, 2024
a73d88a
Massive overhaul of overmap generation test to add item demographics …
kevingranade Mar 24, 2024
0bd9b39
Uniqueify some exodii spawns that were way too common
kevingranade Mar 24, 2024
73657f7
Dial down microlab occurrence rates
kevingranade Apr 1, 2024
15c9c6b
Tune up some misc oter type and extra spawn ratios
kevingranade Mar 24, 2024
4e59f3c
Overhaul core gun spawning item groups
kevingranade Apr 15, 2024
00f9d95
Extensive tweaks to gun spawns in various mapgen
kevingranade Apr 15, 2024
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
36 changes: 17 additions & 19 deletions data/json/itemgroups/Locations_MapExtras/locations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,14 @@
"ammo": 100,
"subtype": "distribution",
"entries": [
{ "group": "guns_pistol_common", "prob": 20 },
kevingranade marked this conversation as resolved.
Show resolved Hide resolved
{ "group": "guns_rifle_common", "prob": 20 },
{ "group": "guns_shotgun_common", "prob": 20 },
{ "group": "guns_pistol_obscure", "prob": 60 },
{ "group": "guns_rifle_obscure", "prob": 60 },
{ "group": "guns_shotgun_obscure", "prob": 60 },
{ "group": "guns_survival", "prob": 30 },
{ "group": "ammo_obscure", "prob": 90 },
{ "group": "ammo_reloaded", "prob": 30 },
{ "group": "mags_obscure", "prob": 30 }
{ "group": "guns_pistol_common", "prob": 162 },
{ "group": "guns_rifle_common", "prob": 36 },
{ "group": "guns_shotgun_common", "prob": 2 },
{ "group": "guns_pistol_obscure", "prob": 81 },
{ "group": "guns_rifle_obscure", "prob": 18 },
{ "group": "guns_shotgun_obscure", "prob": 1 },
{ "group": "ammo_obscure", "prob": 40 },
{ "group": "mags_obscure", "prob": 40 }
]
},
{
Expand All @@ -106,10 +104,10 @@
"ammo": 100,
"subtype": "distribution",
"entries": [
{ "group": "guns_pistol_common", "prob": 50 },
{ "group": "guns_rifle_common", "prob": 50 },
{ "group": "guns_shotgun_common", "prob": 50 },
{ "group": "guns_survival", "prob": 100 },
{ "group": "guns_pistol_common", "prob": 81 },
{ "group": "guns_rifle_common", "prob": 18 },
{ "group": "guns_shotgun_common", "prob": 2 },
{ "group": "guns_survival", "prob": 1 },
{ "item": "flaregun", "prob": 25 },
{ "item": "large_repairkit", "prob": 5, "charges": [ 0, 500 ] },
{ "item": "signal_flare", "prob": 20 },
Expand Down Expand Up @@ -1473,11 +1471,11 @@
[ "tonfa_wood", 10 ],
{ "item": "shocktonfa_off", "prob": 25, "charges": [ 0, 500 ] },
{ "item": "tazer", "prob": 25, "charges": [ 0, 500 ] },
{ "item": "remington_700", "prob": 5, "charges": [ 0, 4 ] },
{ "item": "3006", "prob": 5, "charges": [ 1, 20 ] },
{ "item": "ksg", "prob": 8, "charges": [ 0, 7 ] },
{ "item": "remington_870_express", "prob": 8, "charges": [ 0, 7 ] },
{ "item": "benelli_tsa", "variant": "mossberg_500_security", "prob": 8, "charges": [ 0, 6 ] },
{ "item": "remington_700", "prob": 1, "charges": [ 0, 4 ] },
{ "item": "3006", "prob": 1, "charges": [ 1, 20 ] },
{ "item": "ksg", "prob": 1, "charges": [ 0, 7 ] },
{ "item": "remington_870_express", "prob": 1, "charges": [ 0, 7 ] },
{ "item": "benelli_tsa", "variant": "mossberg_500_security", "prob": 1, "charges": [ 0, 6 ] },
{ "item": "shot_beanbag", "prob": 25, "charges": [ 1, 10 ] },
{ "item": "rm120c", "prob": 2, "charges": [ 0, 5 ] },
{ "item": "rm20", "prob": 1, "charges": [ 0, 20 ] },
Expand Down
20 changes: 3 additions & 17 deletions data/json/itemgroups/Locations_MapExtras/locations_commercial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,23 +210,9 @@
"type": "item_group",
"id": "pawn_guns",
"items": [
[ "win70_458", 1 ],
[ "combination_gun", 1 ],
[ "458wm", 1 ],
[ "sw629", 3 ],
{ "group": "modular_deagle_44", "prob": 2 },
[ "m1911", 5 ],
[ "mosin91_30", 1 ],
[ "match_trigger", 3 ],
[ "remington_870", 9 ],
[ "browning_blr", 8 ],
[ "remington_700", 14 ],
[ "m1903", 1 ],
[ "garand", 2 ],
[ "moss_brownie", 5 ],
[ "cop_38", 5 ],
[ "rifle_flintlock", 1 ],
[ "pistol_flintlock", 1 ]
{ "group": "guns_common", "prob": 100 },
{ "group": "guns_rare", "prob": 10 },
{ "group": "guns_obscure", "prob": 1 }
]
},
{
Expand Down
18 changes: 9 additions & 9 deletions data/json/itemgroups/SUS/alien.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@
"entries": [
{ "group": "SUS_exodii_storage_lowvalue", "prob": 30 },
{
"collection": [ { "item": "pamd68", "count": [ 15, 20 ] }, { "item": "pamd71z", "count": [ 10, 15 ] } ],
kevingranade marked this conversation as resolved.
Show resolved Hide resolved
"prob": 30
"collection": [ { "item": "pamd68", "count": [ 2, 3 ] }, { "item": "pamd71z", "count": [ 1, 2 ] } ],
"prob": 5
},
{
"collection": [ { "item": "exodiiminimag", "count": [ 30, 50 ] }, { "item": "exodiiBRmag", "count": [ 20, 40 ] } ],
"prob": 20
"collection": [ { "item": "exodiiminimag", "count": [ 2, 5 ] }, { "item": "exodiiBRmag", "count": [ 2, 3 ] } ],
"prob": 5
},
{
"distribution": [
Expand All @@ -81,14 +81,14 @@
"//2": "This group is for Exodii storage pods and lockers that processed ingots and the like, ready for use.",
"subtype": "distribution",
"entries": [
{ "collection": [ { "item": "pamd68", "count": [ 15, 20 ] }, { "item": "pamd71z", "count": [ 10, 15 ] } ], "prob": 20 },
{ "collection": [ { "item": "pamd68", "count": [ 2, 3 ] }, { "item": "pamd71z", "count": [ 1, 2 ] } ], "prob": 5 },
{
"collection": [
{ "item": "exodiiminimag", "count": [ 30, 50 ] },
{ "item": "exodiiBRmag", "count": [ 20, 40 ] },
{ "item": "123ln", "count": [ 0, 200 ] }
{ "item": "exodiiminimag", "count": [ 2, 3 ] },
{ "item": "exodiiBRmag", "count": [ 1, 2 ] },
{ "item": "123ln", "count": [ 0, 100 ] }
],
"prob": 20
"prob": 5
},
{
"distribution": [
Expand Down
21 changes: 12 additions & 9 deletions data/json/itemgroups/SUS/gunstore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"//2": "This group is for the contents of gunsafes",
"subtype": "collection",
"entries": [
{ "group": "ammo_common_collection", "prob": 85 },
{ "group": "ammo_rare_collection", "prob": 20 },
{ "group": "ammo_obscure_collection", "prob": 10 },
{ "group": "guns_rare_display", "prob": 10 }
{ "group": "ammo_common_collection", "prob": 100 },
{ "group": "ammo_rare_collection", "prob": 1 },
{ "group": "ammo_obscure_collection", "prob": 1 },
{ "group": "guns_rare_display", "prob": 1 }
]
},
{
Expand All @@ -26,15 +26,15 @@
},
{
"collection": [ { "group": "guns_shotgun_obscure_display" }, { "group": "mags_shotgun_rare", "count": [ 1, 2 ] } ],
"prob": 10
"prob": 1
},
{
"collection": [
{ "group": "guns_smg_display" },
{ "group": "mags_smg_common", "count": [ 1, 8 ] },
{ "group": "mags_smg_rare", "count": [ 1, 8 ] }
],
"prob": 45
"prob": 2
}
]
},
Expand Down Expand Up @@ -93,9 +93,12 @@
"//2": "This group is for the contents of gunstore displaycases",
"subtype": "distribution",
"entries": [
{ "group": "guns_rifle_rare_display", "prob": 80 },
{ "group": "guns_pistol_rare_display", "prob": 40 },
{ "group": "guns_shotgun_rare_display", "prob": 5 }
{ "group": "guns_pistol_common_display", "prob": 60 },
{ "group": "guns_rifle_common_display", "prob": 20 },
{ "group": "guns_shotgun_common_display", "prob": 2 },
{ "group": "guns_pistol_rare_display", "prob": 30 },
{ "group": "guns_rifle_rare_display", "prob": 10 },
{ "group": "guns_shotgun_rare_display", "prob": 1 }
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions data/json/itemgroups/Weapons_Mods_Ammo/arsenal/collections.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"items": [
{ "group": "milspec_arsenal_9mm_gun&mags&cans", "prob": 96 },
{ "group": "milspec_arsenal_9mm_sub_gun&mags&cans", "prob": 100 },
{ "group": "milspec_arsenal_shot_gun&mags&cans", "prob": 150 },
{ "group": "milspec_arsenal_shot_gun&mags&cans", "prob": 15 },
{ "group": "milspec_arsenal_223_pouch_gun&mags&cans", "prob": 1000 },
{ "group": "milspec_arsenal_223_mg_gun&mags&cans", "prob": 260 },
{ "group": "milspec_arsenal_300blk_gun&mags&cans", "prob": 100 },
Expand Down Expand Up @@ -113,7 +113,7 @@
"items": [
{ "group": "milspec_arsenal_9mm_gun&mags", "count": [ 1, 2 ], "prob": 96 },
{ "group": "milspec_arsenal_9mm_sub_gun&mags", "count": [ 1, 2 ], "prob": 100 },
{ "group": "milspec_arsenal_shot_gun&mags", "count": [ 1, 2 ], "prob": 150 },
{ "group": "milspec_arsenal_shot_gun&mags", "count": [ 1, 2 ], "prob": 15 },
{ "group": "milspec_arsenal_223_gun&mags", "count": [ 1, 2 ], "prob": 1000 },
{ "group": "milspec_arsenal_223_mg_gun&mags", "count": [ 1, 2 ], "prob": 260 },
{ "group": "milspec_arsenal_300blk_gun&mags", "count": [ 1, 2 ], "prob": 100 },
Expand Down
Loading
Loading