Skip to content

Commit

Permalink
put new fridges on the maps (#73250)
Browse files Browse the repository at this point in the history
* put new fridges on the maps

* Apply suggestions from code review

Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>

* fix no hope palettes

---------

Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>
  • Loading branch information
GuardianDll and Qrox authored Apr 26, 2024
1 parent 3e0a5ed commit b658cfa
Show file tree
Hide file tree
Showing 47 changed files with 503 additions and 167 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
"using": [ [ "repair_welding_standard", 3 ], [ "soldering_standard", 5 ] ]
}
},
"breaks_into": [ { "group": "heavy_duty_fridge_destroyed" } ],
"breaks_into": [ { "group": "display_fridge_destroyed" } ],
"flags": [ "CARGO", "OBSTACLE", "FRIDGE", "COVERED", "ENABLED_DRAINS_EPOWER", "APPLIANCE", "CTRL_ELECTRONIC" ]
},
{
Expand Down
67 changes: 0 additions & 67 deletions data/json/furniture_and_terrain/furniture-appliances.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,73 +158,6 @@
]
}
},
{
"type": "furniture",
"id": "f_fridge",
"name": "refrigerator",
"symbol": "{",
"description": "A standard household refrigerator. If powered, it will cool its contents to extend the time before they spoil. Deconstruct it if you want to connect it to the grid.",
"color": "light_cyan",
"move_cost_mod": -1,
"coverage": 90,
"required_str": 10,
"flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "NO_SELF_CONNECT", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
"deconstruct": { "items": [ { "item": "fridge", "count": 1 }, { "item": "apartment_freezer", "count": 1 } ] },
"max_volume": "433 L",
"bash": {
"str_min": 18,
"str_max": 50,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "group": "apartment_fridge_destroyed" }, { "group": "apartment_freezer_destroyed" } ]
}
},
{
"type": "furniture",
"id": "f_glass_fridge",
"name": "glass door fridge",
"looks_like": "f_fridge",
"symbol": "{",
"color": "light_cyan",
"description": "A modern refrigerator with a thick sheet of glass in the door, often specially treated to be more insulative. If powered, it will cool its contents to extend the time before they spoil.",
"move_cost_mod": -1,
"coverage": 90,
"required_str": 10,
"examine_action": { "type": "appliance_convert", "furn_set": "f_null", "item": "glass_fridge" },
"flags": [ "PLACE_ITEM", "BLOCKSDOOR", "NO_SELF_CONNECT", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
"deconstruct": { "items": [ { "item": "glass_fridge", "count": 1 } ] },
"max_volume": "347 L",
"bash": {
"str_min": 12,
"str_max": 50,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "group": "glass_fridge_destroyed" } ]
}
},
{
"type": "furniture",
"id": "f_freezer",
"name": "freezer",
"looks_like": "f_fridge",
"symbol": "{",
"description": "A chest freezer. If powered, it could freeze and preserve its contents.",
"color": "blue",
"move_cost_mod": -1,
"coverage": 60,
"required_str": 10,
"examine_action": { "type": "appliance_convert", "furn_set": "f_null", "item": "chest_freezer" },
"flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "NO_SELF_CONNECT", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
"deconstruct": { "items": [ { "item": "freezer", "count": 1 } ] },
"max_volume": "350 L",
"bash": {
"str_min": 18,
"str_max": 50,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "group": "chest_freezer_destroyed" } ]
}
},
{
"type": "furniture",
"id": "f_home_furnace",
Expand Down
276 changes: 276 additions & 0 deletions data/json/furniture_and_terrain/furniture_refrigeration.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,276 @@
[
{
"type": "furniture",
"id": "f_fridge",
"name": "refrigerator",
"symbol": "{",
"description": "A standard household refrigerator. If powered, it will cool its contents to extend the time before they spoil. Deconstruct it if you want to connect it to the grid.",
"color": "light_cyan",
"move_cost_mod": -1,
"coverage": 90,
"required_str": 10,
"flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "NO_SELF_CONNECT", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
"deconstruct": { "items": [ { "item": "fridge", "count": 1 }, { "item": "apartment_freezer", "count": 1 } ] },
"max_volume": "433 L",
"bash": {
"str_min": 18,
"str_max": 50,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "group": "apartment_fridge_destroyed" }, { "group": "apartment_freezer_destroyed" } ]
}
},
{
"type": "furniture",
"id": "f_minifridge",
"name": "minifridge",
"looks_like": "f_fridge",
"symbol": "{",
"color": "light_cyan",
"description": "Small fridge, often used in places where full-size fridge would be out of place, or to store cold drinks. Activate to connect it to the power grid.",
"move_cost_mod": -1,
"coverage": 90,
"required_str": 10,
"examine_action": { "type": "appliance_convert", "furn_set": "f_null", "item": "minifridge" },
"flags": [ "PLACE_ITEM", "BLOCKSDOOR", "NO_SELF_CONNECT", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
"deconstruct": { "items": [ { "item": "minifridge", "count": 1 } ] },
"max_volume": "96 L",
"bash": {
"str_min": 12,
"str_max": 50,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "group": "minifridge_destroyed" } ]
}
},
{
"type": "furniture",
"id": "f_glass_fridge",
"name": "single glass door fridge",
"looks_like": "f_fridge",
"symbol": "{",
"color": "light_cyan",
"description": "A modern refrigerator with a thick sheet of glass in the door, used in stores to show the goods and cool them at once. Activate to connect it to the power grid.",
"move_cost_mod": -1,
"coverage": 90,
"required_str": 10,
"examine_action": { "type": "appliance_convert", "furn_set": "f_null", "item": "glass_fridge" },
"flags": [ "PLACE_ITEM", "BLOCKSDOOR", "NO_SELF_CONNECT", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
"deconstruct": { "items": [ { "item": "glass_fridge", "count": 1 } ] },
"max_volume": "347 L",
"bash": {
"str_min": 12,
"str_max": 50,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "group": "glass_fridge_destroyed" } ]
}
},
{
"type": "furniture",
"id": "f_glass_fridge_double",
"name": "double glass door fridge",
"looks_like": "f_fridge",
"symbol": "{",
"color": "light_cyan",
"description": "A modern refrigerator with two glass doors, to fit twice as more goods for consumers. Activate to connect it to the power grid.",
"move_cost_mod": -1,
"coverage": 90,
"required_str": 10,
"examine_action": { "type": "appliance_convert", "furn_set": "f_null", "item": "glass_fridge_double" },
"flags": [ "PLACE_ITEM", "BLOCKSDOOR", "NO_SELF_CONNECT", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
"deconstruct": { "items": [ { "item": "glass_fridge_double", "count": 1 } ] },
"max_volume": "991 L",
"bash": {
"str_min": 12,
"str_max": 50,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "group": "glass_fridge_double_destroyed" } ]
}
},
{
"type": "furniture",
"id": "f_heavy_duty_fridge",
"name": "heavy-duty fridge",
"looks_like": "f_fridge",
"symbol": "{",
"color": "light_cyan",
"description": "A heavy, bulky refrigerator, used at professional kitchens. Activate to connect it to the power grid.",
"move_cost_mod": -1,
"coverage": 90,
"required_str": 10,
"examine_action": { "type": "appliance_convert", "furn_set": "f_null", "item": "heavy_duty_fridge" },
"flags": [ "PLACE_ITEM", "BLOCKSDOOR", "NO_SELF_CONNECT", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
"deconstruct": { "items": [ { "item": "heavy_duty_fridge", "count": 1 } ] },
"max_volume": "700 L",
"bash": {
"str_min": 12,
"str_max": 50,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "group": "heavy_duty_fridge_destroyed" } ]
}
},
{
"type": "furniture",
"id": "f_display_fridge",
"name": "display fridge",
"looks_like": "f_fridge",
"symbol": "{",
"color": "light_cyan",
"description": "Big glass chamber, designed to display different food in a multiple rows, while cooling it at the same time. Looks gorgeous, but has nothing good to show to you. Activate to connect it to the power grid.",
"move_cost_mod": -1,
"coverage": 90,
"required_str": 10,
"examine_action": { "type": "appliance_convert", "furn_set": "f_null", "item": "display_fridge" },
"flags": [ "PLACE_ITEM", "BLOCKSDOOR", "NO_SELF_CONNECT", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
"deconstruct": { "items": [ { "item": "display_fridge", "count": 1 } ] },
"max_volume": "600 L",
"bash": {
"str_min": 12,
"str_max": 50,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "group": "display_fridge_destroyed" } ]
}
},
{
"type": "furniture",
"id": "f_minifreezer",
"name": "minifreezer",
"looks_like": "minifreezer",
"symbol": "{",
"description": "Small upright freezer, used to store perishables somewhere in the pantry. Activate to deploy and connect to your electric grid.",
"color": "blue",
"move_cost_mod": -1,
"coverage": 60,
"required_str": 10,
"examine_action": { "type": "appliance_convert", "furn_set": "f_null", "item": "minifreezer" },
"flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "NO_SELF_CONNECT", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
"deconstruct": { "items": [ { "item": "minifreezer", "count": 1 } ] },
"max_volume": "90 L",
"bash": {
"str_min": 18,
"str_max": 50,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "group": "minifreezer_destroyed" } ]
}
},
{
"type": "furniture",
"id": "f_chest_minifreezer",
"name": "chest minifreezer",
"looks_like": "minifreezer",
"symbol": "{",
"description": "Small chest freezer, used to store perishables somewhere in the pantry. Activate to deploy and connect to your electric grid.",
"color": "blue",
"move_cost_mod": -1,
"coverage": 60,
"required_str": 10,
"examine_action": { "type": "appliance_convert", "furn_set": "f_null", "item": "chest_minifreezer" },
"flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "NO_SELF_CONNECT", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
"deconstruct": { "items": [ { "item": "chest_minifreezer", "count": 1 } ] },
"max_volume": "99 L",
"bash": {
"str_min": 18,
"str_max": 50,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "group": "chest_minifreezer_destroyed" } ]
}
},
{
"type": "furniture",
"id": "f_freezer",
"name": "chest freezer",
"looks_like": "f_fridge",
"symbol": "{",
"description": "A chest freezer. Big and power efficient, this should be a dream for every cataclysm survivor. Activate to deploy and connect to your electric grid.",
"color": "blue",
"move_cost_mod": -1,
"coverage": 70,
"required_str": 10,
"examine_action": { "type": "appliance_convert", "furn_set": "f_null", "item": "chest_freezer" },
"flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "NO_SELF_CONNECT", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
"deconstruct": { "items": [ { "item": "chest_freezer", "count": 1 } ] },
"max_volume": "350 L",
"bash": {
"str_min": 18,
"str_max": 50,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "group": "chest_freezer_destroyed" } ]
}
},
{
"type": "furniture",
"id": "f_heavy_duty_freezer",
"name": "heavy-duty freezer",
"looks_like": "f_fridge",
"symbol": "{",
"description": "Heavy-duty upright freezer, one that is used on professional kitchen. Activate to deploy and connect to your electric grid.",
"color": "blue",
"move_cost_mod": -1,
"coverage": 90,
"required_str": 10,
"examine_action": { "type": "appliance_convert", "furn_set": "f_null", "item": "heavy_duty_freezer" },
"flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "NO_SELF_CONNECT", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
"deconstruct": { "items": [ { "item": "heavy_duty_freezer", "count": 1 } ] },
"max_volume": "745 L",
"bash": {
"str_min": 18,
"str_max": 50,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "group": "heavy_duty_freezer_destroyed" } ]
}
},
{
"type": "furniture",
"id": "f_glass_freezer",
"name": "glass door freezer",
"looks_like": "f_fridge",
"symbol": "{",
"description": "Commercial freezer, used to show ice creams, frozen veggies and pizza in grocery store, while conveniently preserving them. Activate to deploy and connect to your electric grid.",
"color": "blue",
"move_cost_mod": -1,
"coverage": 90,
"required_str": 10,
"examine_action": { "type": "appliance_convert", "furn_set": "f_null", "item": "glass_freezer" },
"flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "NO_SELF_CONNECT", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
"deconstruct": { "items": [ { "item": "glass_freezer", "count": 1 } ] },
"max_volume": "400 L",
"bash": {
"str_min": 18,
"str_max": 50,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "group": "glass_freezer_destroyed" } ]
}
},
{
"type": "furniture",
"id": "f_display_freezer",
"name": "display chest freezer",
"looks_like": "f_fridge",
"symbol": "{",
"description": "Commercial freezer, used to show ice creams, frozen veggies and pizza in grocery store, while conveniently preserving them. Activate to deploy and connect to your electric grid.",
"color": "blue",
"move_cost_mod": -1,
"coverage": 90,
"required_str": 10,
"examine_action": { "type": "appliance_convert", "furn_set": "f_null", "item": "display_freezer" },
"flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "NO_SELF_CONNECT", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
"deconstruct": { "items": [ { "item": "display_freezer", "count": 1 } ] },
"max_volume": "320 L",
"bash": {
"str_min": 18,
"str_max": 50,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "group": "display_freezer_destroyed" } ]
}
}
]
22 changes: 22 additions & 0 deletions data/json/itemgroups/appliances.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,26 @@
[
{
"id": "fridges_and_freezers_tradeable",
"//": "for traders",
"type": "item_group",
"items": [
{ "item": "apartment_fridge", "prob": 100 },
{ "item": "minifridge", "prob": 50 },
{ "item": "big_portable_fridge", "prob": 8 },
{ "item": "glass_fridge", "prob": 80 },
{ "item": "glass_fridge_double", "prob": 70 },
{ "item": "heavy_duty_fridge", "prob": 5 },
{ "item": "display_fridge", "prob": 25 },
{ "item": "apartment_freezer", "prob": 100 },
{ "item": "minifreezer", "prob": 22 },
{ "item": "chest_minifreezer", "prob": 16 },
{ "item": "big_portable_freezer", "prob": 6 },
{ "item": "chest_freezer", "prob": 20 },
{ "item": "heavy_duty_freezer", "prob": 6 },
{ "item": "glass_freezer", "prob": 30 },
{ "item": "display_freezer", "prob": 30 }
]
},
{
"id": "apartment_fridge_destroyed",
"//": "allows both terrain/furniture and vehicle/appliances use the same drop list",
Expand Down
Loading

0 comments on commit b658cfa

Please sign in to comment.