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

jmapgen itemgroup item default chance #72458

Merged
merged 14 commits into from
Apr 25, 2024
Merged

jmapgen itemgroup item default chance #72458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e17a9c3
Make clutter explicitly 1%
Procyonae Mar 17, 2024
fb5bf96
No Hope
Procyonae Mar 17, 2024
c1deeb1
Change default
Procyonae Mar 17, 2024
5571957
Add an error when prob is used instead of chance
Procyonae Mar 17, 2024
6e58641
Remove hopefully all existing prob misuses
Procyonae Mar 17, 2024
ab5cd33
Astyle
Procyonae Mar 17, 2024
36a6050
Update data/mods/Defense_Mode/mapgen/mansion.json
Procyonae Mar 17, 2024
c74b68d
Update data/mods/Magiclysm/worldgen/mine_balrog.json
Procyonae Mar 25, 2024
49c649e
Update data/mods/Magiclysm/worldgen/mine_balrog.json
Procyonae Mar 25, 2024
17870f3
Lint
Procyonae Mar 25, 2024
c5c562c
Test Bump
Procyonae Mar 25, 2024
b255968
Update data/json/mapgen/mansion_boarded.json
Maleclypse Mar 29, 2024
322bdad
Update data/json/mapgen/mansion_boarded.json
Maleclypse Mar 29, 2024
2451a22
Revert balrog change bc I forgot you can only apply damage in groups
Procyonae Apr 8, 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
110 changes: 57 additions & 53 deletions data/json/mapgen/mansion.json
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions data/json/mapgen/mansion_boarded.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"palettes": [ "standard_domestic_palette", "standard_domestic_landscaping_palette" ],
"terrain": { "?": "t_water_pool_shallow_outdoors", "o": "t_window_enhanced", "$": "t_door_metal_locked" },
"items": {
" ": { "item": "clutter_mansion" },
" ": { "item": "clutter_mansion", "chance": 1 },
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"K": { "item": "crate_cleaning", "chance": 100 },
"I": { "item": "table_foyer", "chance": 40 }
},
Expand Down Expand Up @@ -136,7 +136,7 @@
},
"furniture": { "&": "f_table", "=": "f_machinery_old", "}": "f_generator_broken", "!": [ "f_crate_c", "f_cardboard_box" ] },
"items": {
".": { "item": "clutter_basement" },
".": { "item": "clutter_basement", "chance": 1 },
"!": { "item": "crate_stack", "chance": 100 },
"H": { "item": "mansion_ammo", "chance": 40 },
"x": { "item": "a_television", "chance": 100 },
Expand Down Expand Up @@ -226,7 +226,7 @@
{ "item": "tailorbooks", "chance": 60, "repeat": [ 0, 1 ] },
{ "item": "SUS_tailoring_fasteners", "chance": 30, "repeat": [ 2, 6 ] }
],
".": { "item": "clutter_basement" },
".": { "item": "clutter_basement", "chance": 1 },
"=": { "item": "sex_lair", "chance": 25, "repeat": [ 2, 4 ] },
"!": { "item": "crate_stack", "chance": 100 },
"D": { "item": "sex_lair", "chance": 55, "repeat": [ 2, 6 ] },
Expand Down Expand Up @@ -280,7 +280,7 @@
")": { "item": "bed", "chance": 40 },
"-": { "item": "clutter_bedroom", "chance": 2 },
" ": { "item": "clutter_bedroom", "chance": 2 },
".": { "item": "clutter_yard" },
".": { "item": "clutter_yard", "chance": 1 },
"~": { "item": "clutter_bathroom", "chance": 10 },
"I": { "item": "vanity", "chance": 40 },
"s": { "item": "nightstand", "chance": 40 },
Expand Down Expand Up @@ -330,7 +330,7 @@
"v": { "item": "mansion_safe", "chance": 100 },
",": { "item": "clutter_bedroom", "chance": 2 },
" ": { "item": "clutter_bedroom", "chance": 2 },
".": { "item": "clutter_yard" },
".": { "item": "clutter_yard", "chance": 1 },
"~": { "item": "clutter_bathroom", "chance": 10 },
")": { "item": "bed", "chance": 40 },
"R": { "item": "mansion_bookcase", "chance": 100 },
Expand Down Expand Up @@ -509,8 +509,8 @@
"furniture": { ")": "f_speaker_cabinet" },
"place_loot": [ { "item": "stereo", "x": 18, "y": 0, "chance": 100 } ],
"items": {
".": { "item": "clutter_yard" },
" ": { "item": "clutter_mansion" },
".": { "item": "clutter_yard", "chance": 1 },
" ": { "item": "clutter_mansion", "chance": 1 },
"J": { "item": "table_sideboard", "chance": 35 },
"x": { "item": "table_livingroom", "chance": 35 }
},
Expand Down Expand Up @@ -612,7 +612,7 @@
},
"furniture": { "&": "f_dive_block" },
"items": {
".": { "item": "clutter_yard" },
".": { "item": "clutter_yard", "chance": 1 },
"i": { "item": "pool_side", "chance": 30 },
",": { "item": "pool_side", "chance": 2 }
},
Expand Down Expand Up @@ -673,7 +673,7 @@
{ "item": "lawn_dart", "x": [ 11, 14 ], "y": [ 4, 6 ], "chance": 100, "repeat": [ 1, 2 ] }
],
"items": {
" ": { "item": "clutter_mansion" },
" ": { "item": "clutter_mansion", "chance": 1 },
"J": { "item": "wetbar_counter", "chance": 25 },
"m": { "item": "wetbar_fridge", "chance": 45 },
"1": { "item": "wetbar_stack", "chance": 100 },
Expand Down Expand Up @@ -732,8 +732,8 @@
},
"place_loot": [ { "item": "stereo", "x": 8, "y": 14, "chance": 100 }, { "item": "television", "x": 9, "y": 14, "chance": 100 } ],
"items": {
".": { "item": "clutter_yard" },
" ": { "item": "clutter_mansion" },
".": { "item": "clutter_yard", "chance": 1 },
" ": { "item": "clutter_mansion", "chance": 1 },
"x": { "item": "mansion_bookcase", "chance": 100 },
"&": { "item": "table_card", "chance": 35 },
"c": { "item": "suit_of_armor", "chance": 100 },
Expand Down Expand Up @@ -851,8 +851,8 @@
},
"furniture": { ")": "f_table" },
"items": {
".": { "item": "clutter_yard" },
" ": { "item": "clutter_mansion" },
".": { "item": "clutter_yard", "chance": 1 },
" ": { "item": "clutter_mansion", "chance": 1 },
"a": { "item": "fireplace_fill", "chance": 30 },
"R": { "item": "mansion_bookcase", "chance": 100 },
")": { "item": "table_livingroom", "chance": 30 }
Expand Down Expand Up @@ -913,7 +913,7 @@
"furniture": { "&": "f_speaker_cabinet" },
"place_loot": [ { "item": "stereo", "x": 22, "y": 15, "chance": 100 } ],
"items": {
" ": { "item": "clutter_mansion" },
" ": { "item": "clutter_mansion", "chance": 1 },
"M": { "item": "art", "chance": 100 },
"s": { "item": "snacks_fancy", "chance": 20 },
"∞": { "item": "mansion_guns", "chance": 100 }
Expand Down Expand Up @@ -959,8 +959,8 @@
"terrain": { "-": "t_carpet_purple", "E": "t_carpet_purple", ")": "t_carpet_purple", "o": "t_window_enhanced" },
"furniture": { ")": "f_bed" },
"items": {
".": { "item": "clutter_yard" },
" ": { "item": "clutter_bedroom" },
".": { "item": "clutter_yard", "chance": 1 },
" ": { "item": "clutter_bedroom", "chance": 1 },
"~": { "item": "clutter_bathroom", "chance": 10 },
"i": { "item": "table_foyer", "chance": 20 },
"R": { "item": "mansion_bookcase", "chance": 100 },
Expand Down Expand Up @@ -1013,7 +1013,7 @@
},
"furniture": { "?": "f_dresser" },
"items": {
" ": { "item": "clutter_mansion" },
" ": { "item": "clutter_mansion", "chance": 1 },
"s": { "item": "nightstand", "chance": 20 },
",": { "item": "softdrugs", "chance": 40 },
"?": { "item": "dresser_servant", "chance": 45 }
Expand Down
Loading
Loading