Skip to content

Commit

Permalink
Gunstore Overhaul (#79285)
Browse files Browse the repository at this point in the history
* gunstore a

Mostly committing to prevent losing progress, just in case

* some boxed guns

again, commiting mainly to prevent data loss

* fix conflicts

* Rifles in boxes + fluff items

* boxed pisols

* cleaning up + commenting

* boxed shotguns

* palette change + restricted mags

* palette/SUS group changes

* occupied + handloading versions

* Work on looted gunstore

* Ransacked store

* Version with range

* Final (hopefully) mapgen change

* Adds a roof (oops)

* Migration of old gunstores

* Further remove old gunstores + fix testing things

* lint

* alt map key fix

* Lint alt map key

* Spelling fix

* fix defense mode fail

* Update desert_regional_map_settings.json

* Temporarily disable gunstore start (defense mode)

Currently can't get it to work with the new gunstores, so I'll add in a specific version in the future. Pinky promise.

* Update data/json/start_locations.json

Co-authored-by: Marc <altairre.atsu@gmail.com>

* So sorry, I missed one in the mods folder during my review

* Fix mapgen and location start error

* Fix case in ransakced

* fix GG migrations

A few migrations caused some errors, and they were mostly wrong about what they should migrate into. Still leaves one error, but that should hopefully be getting fixed soon.

* fixed boxed spaws + added overflow

* apply overflow to correct itemgroup

---------

Co-authored-by: Marc <altairre.atsu@gmail.com>
  • Loading branch information
Holli-Git and QuillInkwell authored Feb 2, 2025
1 parent 3dfe45d commit 0ba3e95
Show file tree
Hide file tree
Showing 28 changed files with 3,102 additions and 1,451 deletions.
64 changes: 64 additions & 0 deletions data/json/itemgroups/SUS/gunstore.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,69 @@
{ "item": "ballistic_vest_esapi", "prob": 5 },
{ "item": "aim_game", "prob": 35 }
]
},
{
"id": "SUS_gunstore_hearing",
"type": "item_group",
"//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.",
"//2": "This group is for gear that protects hearing. Should have more items like proper ear muffs, but needs to be added.",
"subtype": "distribution",
"entries": [
{ "item": "blister_pack", "contents-item": "powered_earmuffs", "prob": 10 },
{ "item": "blister_pack", "contents-item": "powered_earplugs", "prob": 1 },
{ "item": "bag_plastic_small", "contents-item": "ear_plugs", "prob": 90 }
]
},
{
"id": "SUS_gunstore_optics_packaged",
"type": "item_group",
"//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.",
"//2": "This group is for optics, such as red dots or scopes that are in their containers.",
"subtype": "distribution",
"entries": [
{ "item": "box_small", "contents-item": "holo_sight", "prob": 100 },
{ "item": "box_small", "contents-item": "pistol_scope", "prob": 8 },
{ "item": "box_small", "contents-item": "red_dot_sight", "prob": 800 },
{ "item": "box_small", "contents-item": "rifle_scope", "prob": 1000 },
{ "item": "box_small", "contents-item": "rifle_scope_high_end_mount", "prob": 15 },
{ "item": "box_small", "contents-item": "acog_scope", "prob": 12 },
{ "item": "box_small", "contents-item": "holo_magnifier", "prob": 10 },
{ "item": "box_small", "contents-item": "hybrid_sight_4x", "prob": 3 }
]
},
{
"id": "SUS_gunstore_optics_display",
"type": "item_group",
"//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.",
"//2": "This group is for optics, such as red dots or scopes that are for display.",
"subtype": "distribution",
"entries": [
{ "item": "holo_sight", "prob": 100 },
{ "item": "pistol_scope", "prob": 8 },
{ "item": "red_dot_sight", "prob": 800 },
{ "item": "rifle_scope", "prob": 1000 },
{ "item": "rifle_scope_high_end_mount", "prob": 15 },
{ "item": "acog_scope", "prob": 12 },
{ "item": "holo_magnifier", "prob": 10 },
{ "item": "hybrid_sight_4x", "prob": 3 }
]
},
{
"id": "SUS_gunstore_carry_gear",
"type": "item_group",
"//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.",
"//2": "This group is for gear such as holsters, intended to help carry a gun.",
"subtype": "distribution",
"entries": [
{ "item": "holster", "prob": 60 },
{ "item": "sholster", "prob": 25 },
{ "item": "bholster", "prob": 20 },
{ "item": "bbholster", "prob": 10 },
{ "item": "suspenders_holster", "prob": 8 },
{ "item": "tactical_holster", "prob": 25 },
{ "item": "shoulder_holster", "prob": 12 },
{ "item": "bootstrap", "prob": 15 },
{ "item": "nylon_holster", "prob": 120 }
]
}
]
Loading

0 comments on commit 0ba3e95

Please sign in to comment.