Skip to content

Commit

Permalink
feat(balance): convert most domestic fridge spawns to use SUS_fridge (
Browse files Browse the repository at this point in the history
  • Loading branch information
chaosvolt authored Jun 12, 2024
1 parent 7ef4676 commit 9530c0b
Show file tree
Hide file tree
Showing 42 changed files with 83 additions and 83 deletions.
2 changes: 1 addition & 1 deletion data/json/itemgroups/collections_domestic.json
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
{
"type": "item_group",
"id": "fridge",
"//": "This is a terrible item group and should be phased out. See SUS_fridge in SUS - > domestic.json for a more modern take on things.",
"//": "Generic fridge kept for compatibility but use should be kept to a minimum. Ideally use SUS_fridge for household fridges.",
"subtype": "distribution",
"entries": [
{ "item": "water_clean", "prob": 90 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/bandit_cabin.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
{ "item": "camping", "x": [ 13, 14 ], "y": [ 13, 13 ], "chance": 70 },
{ "item": "homebooks", "x": [ 10, 11 ], "y": [ 9, 9 ], "chance": 70 },
{ "item": "kitchen", "x": [ 2, 2 ], "y": [ 9, 12 ], "chance": 70 },
{ "item": "fridge", "x": [ 5, 5 ], "y": [ 9, 9 ], "chance": 70 },
{ "item": "SUS_fridge", "x": [ 5, 5 ], "y": [ 9, 9 ], "chance": 70 },
{ "item": "dining", "x": [ 17, 19 ], "y": [ 10, 11 ], "chance": 70 },
{ "item": "magazines", "x": [ 7, 8 ], "y": [ 16, 17 ], "chance": 50 }
],
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/basement/basement_survival.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
{ "group": "cannedfood", "x": 10, "y": 13, "chance": 75 },
{ "group": "cannedfood", "x": 10, "y": 14, "chance": 75 },
{ "group": "cannedfood", "x": 10, "y": 15, "chance": 75 },
{ "group": "fridge", "x": 14, "y": 2, "chance": 80, "repeat": [ 1, 3 ] },
{ "group": "SUS_fridge", "x": 15, "y": 3, "chance": 80 },
{ "group": "book_survival", "x": 15, "y": 7, "chance": 90 },
{ "group": "book_survival", "x": 15, "y": 8, "chance": 30 },
{ "group": "gear_survival", "x": 13, "y": 10, "chance": 75 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"O": { "item": "homebooks", "chance": 60 },
"b": { "item": "bed", "chance": 60 },
"c": { "item": "livingroom", "chance": 25 },
"f": { "item": "fridge", "chance": 70 },
"f": { "item": "SUS_fridge", "chance": 70 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "cleaning", "chance": 60 },
"t": { "item": "dining", "chance": 25 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/city_blocks/urban_11_house_brick.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@": { "item": "magazines", "chance": 10 },
"C": { "item": "kitchen", "chance": 25 },
"c": { "item": "livingroom", "chance": 25 },
"f": { "item": "fridge", "chance": 70 },
"f": { "item": "SUS_fridge", "chance": 70 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"q": { "item": "trash", "chance": 50 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/city_blocks/urban_15_house.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"A": { "item": "livingroom", "chance": 15 },
"C": { "item": "kitchen", "chance": 25 },
"c": { "item": "cleaning", "chance": 25 },
"f": { "item": "fridge", "chance": 70 },
"f": { "item": "SUS_fridge", "chance": 70 },
"o": { "item": "oven", "chance": 30 },
"q": { "item": "trash", "chance": 50 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/city_blocks/urban_16_house_ranch.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@": { "item": "magazines", "chance": 10 },
"C": { "item": "kitchen", "chance": 25 },
"c": { "item": "livingroom", "chance": 25 },
"f": { "item": "fridge", "chance": 70 },
"f": { "item": "SUS_fridge", "chance": 70 },
"o": { "item": "oven", "chance": 30 },
"q": { "item": "trash", "chance": 50 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/city_blocks/urban_17_house_ranch.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"L": { "item": "jackets", "chance": 70 },
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"f": { "item": "fridge", "chance": 70 },
"f": { "item": "SUS_fridge", "chance": 70 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"q": { "item": "trash", "chance": 50 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/city_blocks/urban_18_victorian.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
"items": {
" ": { "item": "livingroom", "chance": 2 },
"C": { "item": "kitchen", "chance": 25 },
"f": { "item": "fridge", "chance": 70 },
"f": { "item": "SUS_fridge", "chance": 70 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "jackets", "chance": 60 },
"t": { "item": "dining", "chance": 25 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/city_blocks/urban_19_victorian.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
"A": { "item": "livingroom", "chance": 15 },
"C": { "item": "kitchen", "chance": 25 },
"c": { "item": "livingroom", "chance": 25 },
"f": { "item": "fridge", "chance": 70 },
"f": { "item": "SUS_fridge", "chance": 70 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "cleaning", "chance": 60 },
Expand Down
4 changes: 2 additions & 2 deletions data/json/mapgen/city_blocks/urban_20_duplex.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"C": { "item": "kitchen", "chance": 25 },
"O": { "item": "homebooks", "chance": 60 },
"c": { "item": "livingroom", "chance": 25 },
"f": { "item": "fridge", "chance": 70 },
"f": { "item": "SUS_fridge", "chance": 70 },
"o": { "item": "oven", "chance": 30 },
"q": { "item": "trash", "chance": 50 },
"r": { "item": "cannedfood", "chance": 60 },
Expand Down Expand Up @@ -182,7 +182,7 @@
"@": { "item": "magazines", "chance": 10 },
"C": { "item": "kitchen", "chance": 25 },
"c": { "item": "livingroom", "chance": 25 },
"f": { "item": "fridge", "chance": 70 },
"f": { "item": "SUS_fridge", "chance": 70 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"q": { "item": "trash", "chance": 50 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/city_blocks/urban_21_house.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"b": { "item": "bed", "chance": 60 },
"c": { "item": "livingroom", "chance": 25 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 70 },
"f": { "item": "SUS_fridge", "chance": 70 },
"o": { "item": "oven", "chance": 30 },
"q": { "item": "trash", "chance": 50 },
"r": { "item": "bedroom", "chance": 60 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/city_blocks/urban_22_house_pool.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"b": { "item": "bed", "chance": 60 },
"c": { "item": "kitchen", "chance": 25 },
"e": { "item": "bedroom", "chance": 60 },
"g": { "item": "fridge", "chance": 70 },
"g": { "item": "SUS_fridge", "chance": 70 },
"r": { "item": "produce", "chance": 60 },
"u": { "item": "cannedfood", "chance": 50 }
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
"O": { "item": "office", "chance": 90 },
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 70 },
"r": { "item": "cleaning", "chance": 60 },
"t": { "item": "dining", "chance": 60 },
Expand Down
12 changes: 6 additions & 6 deletions data/json/mapgen/city_blocks/urban_25_dense_diner_apt.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"L": { "item": "cleaning", "chance": 90, "repeat": 3 },
"O": { "item": "homebooks", "chance": 60 },
"Q": { "item": "trash", "chance": 50, "repeat": 5 },
"f": { "item": "fridge", "chance": 50, "repeat": 2 },
"f": { "item": "restaur_fridge", "chance": 50, "repeat": 4 },
"g": { "item": "produce", "chance": 50, "repeat": 2 },
"o": { "item": "oven", "chance": 30, "repeat": 2 },
"r": { "item": "fast_food", "chance": 40, "repeat": 5 }
Expand Down Expand Up @@ -186,7 +186,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 70 },
"f": { "item": "SUS_fridge", "chance": 70 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "bedroom", "chance": 60 },
"t": { "item": "coffee_table", "chance": 25 }
Expand Down Expand Up @@ -240,7 +240,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 70 },
"f": { "item": "SUS_fridge", "chance": 70 },
"o": { "item": "oven", "chance": 30 },
"t": { "item": "dining", "chance": 25 },
"u": { "item": "cannedfood", "chance": 60 }
Expand Down Expand Up @@ -294,7 +294,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 70 },
"f": { "item": "SUS_fridge", "chance": 70 },
"o": { "item": "oven", "chance": 30 },
"t": { "item": "coffee_table", "chance": 25 },
"u": { "item": "cannedfood", "chance": 60 }
Expand Down Expand Up @@ -348,7 +348,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 70 },
"f": { "item": "SUS_fridge", "chance": 70 },
"o": { "item": "oven", "chance": 30 },
"t": { "item": "coffee_table", "chance": 25 },
"u": { "item": "home_hw", "chance": 60 }
Expand Down Expand Up @@ -402,7 +402,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 70 },
"f": { "item": "SUS_fridge", "chance": 70 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "jackets", "chance": 60 },
"t": { "item": "coffee_table", "chance": 25 }
Expand Down
4 changes: 2 additions & 2 deletions data/json/mapgen/city_blocks/urban_29_dense_row.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
"C": { "item": "kitchen", "chance": 25 },
"Q": { "item": "trash", "chance": 50 },
"c": { "item": "livingroom", "chance": 25 },
"f": { "item": "fridge", "chance": 70 },
"f": { "item": "SUS_fridge", "chance": 70 },
"j": { "item": "dining", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"q": { "item": "trash", "chance": 50 },
Expand Down Expand Up @@ -183,7 +183,7 @@
"O": { "item": "homebooks", "chance": 60 },
"Q": { "item": "trash", "chance": 50 },
"c": { "item": "livingroom", "chance": 25 },
"g": { "item": "fridge", "chance": 70 },
"g": { "item": "SUS_fridge", "chance": 70 },
"j": { "item": "dining", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"q": { "item": "trash", "chance": 50 },
Expand Down
40 changes: 20 additions & 20 deletions data/json/mapgen/city_blocks/urban_36_projects.json
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -284,7 +284,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -343,7 +343,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -404,7 +404,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -464,7 +464,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -524,7 +524,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -584,7 +584,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -644,7 +644,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -704,7 +704,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -764,7 +764,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -824,7 +824,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -884,7 +884,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -944,7 +944,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -1004,7 +1004,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -1064,7 +1064,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -1124,7 +1124,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -1184,7 +1184,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -1244,7 +1244,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -1304,7 +1304,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down Expand Up @@ -1364,7 +1364,7 @@
"c": { "item": "livingroom", "chance": 25 },
"d": { "item": "office", "chance": 40 },
"e": { "item": "dresser", "chance": 60 },
"f": { "item": "fridge", "chance": 60 },
"f": { "item": "SUS_fridge", "chance": 60 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"r": { "item": "home_hw", "chance": 60 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/city_blocks/urban_40_house.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"L": { "item": "home_hw", "chance": 70 },
"O": { "item": "homebooks", "chance": 60 },
"c": { "item": "livingroom", "chance": 25 },
"f": { "item": "fridge", "chance": 70 },
"f": { "item": "SUS_fridge", "chance": 70 },
"j": { "item": "cannedfood", "chance": 50 },
"o": { "item": "oven", "chance": 30 },
"q": { "item": "trash", "chance": 50 },
Expand Down
Loading

0 comments on commit 9530c0b

Please sign in to comment.