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

fix: replace full-body and balaclava cooling items with suit variant, clarify full-body effect in item description #5767

Merged
merged 1 commit into from
Nov 26, 2024
Merged

fix: replace full-body and balaclava cooling items with suit variant, clarify full-body effect in item description #5767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion data/json/itemgroups/Clothing_Gear/clothing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2207,7 +2207,7 @@
{
"type": "item_group",
"id": "fireman_torso",
"items": [ [ "bunker_coat", 80 ], [ "vest", 30 ], [ "thermal_cooling", 20 ] ]
"items": [ [ "bunker_coat", 80 ], [ "vest", 30 ], [ "thermal_cooling_suit", 20 ] ]
},
{
"type": "item_group",
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/Locations_MapExtras/locations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@
{ "item": "hard_plate", "prob": 50, "count": [ 1, 3 ] },
{ "item": "alloy_plate", "prob": 25, "count": [ 1, 3 ] },
{ "item": "alloy_sheet", "prob": 25, "count": [ 1, 10 ] },
{ "item": "thermal_cooling", "prob": 50, "count": [ 1, 3 ] }
{ "item": "thermal_cooling_suit", "prob": 50, "count": [ 1, 3 ] }
]
},
{
Expand Down
62 changes: 2 additions & 60 deletions data/json/items/tool_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,41 +619,12 @@
"warmth": 60,
"magazine_well": "250 ml"
},
{
"id": "thermal_cooling",
"type": "TOOL_ARMOR",
"copy-from": "thermal_outfit",
"name": { "str": "liquid cooling outfit" },
"description": "This skintight suit covers you from head to toe and is designed to keep you at an ideal temperature using a number of heatsinks and heating coils tied to a liquid coolant system. It also includes some handy features such as a built-in thermometer. Use it to turn it on.",
"flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID", "ONLY_ONE", "THERMOMETER" ],
"weight": "1652 g",
"use_action": {
"type": "transform",
"msg": "You activate your %s.",
"target": "thermal_cooling_on",
"active": true,
"transform_charges": 1,
"need_charges": 1,
"need_charges_msg": "The %s's batteries are dead."
}
},
{
"id": "thermal_cooling_on",
"type": "TOOL_ARMOR",
"copy-from": "thermal_cooling",
"name": { "str": "liquid cooling outfit (on)", "str_pl": "liquid cooling outfits (on)" },
"description": "This skintight suit covers you from head to toe and is designed to keep you at an ideal temperature using a number of heatsinks and heating coils tied to a liquid coolant system. It also includes some handy features such as a built-in thermometer. It is currently on, use it to turn it off.",
"extend": { "flags": [ "CLIMATE_CONTROL" ] },
"power_draw": 130000,
"revert_to": "thermal_cooling",
"use_action": { "type": "transform", "menu_text": "Turn off", "msg": "Your %s deactivates.", "target": "thermal_cooling" }
},
{
"id": "thermal_cooling_suit",
"type": "TOOL_ARMOR",
"copy-from": "thermal_suit",
"name": { "str": "liquid cooling suit" },
"description": "This skintight suit covers you from head to toe and is designed to keep you at an ideal temperature using a number of heatsinks and heating coils tied to a liquid coolant system. It also includes some handy features such as a built-in thermometer. Use it to turn it on.",
"description": "This a bodysuit with a number of heatsinks and heating coils tied to a liquid coolant system, and a built-in thermometer. Use it to turn it on, helping to keep the entire body at an ideal temperature",
"flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID", "ONLY_ONE", "THERMOMETER" ],
"weight": "1652 g",
"use_action": {
Expand All @@ -671,41 +642,12 @@
"type": "TOOL_ARMOR",
"copy-from": "thermal_cooling_suit",
"name": { "str": "liquid cooling suit (on)", "str_pl": "liquid cooling suits (on)" },
"description": "This skintight suit covers you from head to toe and is designed to keep you at an ideal temperature using a number of heatsinks and heating coils tied to a liquid coolant system. It also includes some handy features such as a built-in thermometer. It is currently on, use it to turn it off.",
"description": "This a bodysuit with a number of heatsinks and heating coils tied to a liquid coolant system, and a built-in thermometer. It is currently working to keep the entire body at an ideal temperature, use it to turn it off.",
"extend": { "flags": [ "CLIMATE_CONTROL" ] },
"power_draw": 125000,
"revert_to": "thermal_cooling_suit",
"use_action": { "type": "transform", "menu_text": "Turn off", "msg": "Your %s deactivates.", "target": "thermal_cooling_suit" }
},
{
"id": "thermal_cooling_mask",
"type": "TOOL_ARMOR",
"copy-from": "thermal_mask",
"name": { "str": "liquid cooling balaclava" },
"description": "This face mask is designed to keep your face and head at an ideal temperature using a number of heatsinks and heating coils tied to a liquid coolant system. It also includes some handy features such as a built-in thermometer. Use it to turn it on.",
"flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID", "ONLY_ONE", "THERMOMETER" ],
"weight": "204 g",
"use_action": {
"type": "transform",
"msg": "You activate your %s.",
"target": "thermal_cooling_mask_on",
"active": true,
"transform_charges": 1,
"need_charges": 1,
"need_charges_msg": "The %s's batteries are dead."
}
},
{
"id": "thermal_cooling_mask_on",
"type": "TOOL_ARMOR",
"copy-from": "thermal_cooling_mask",
"name": { "str": "liquid cooling balaclava (on)" },
"description": "This face mask is designed to keep your face and head at an ideal temperature using a number of heatsinks and heating coils tied to a liquid coolant system. It also includes some handy features such as a built-in thermometer. It is currently on, use it to turn it off.",
"extend": { "flags": [ "CLIMATE_CONTROL" ] },
"power_draw": 7500,
"revert_to": "thermal_cooling_mask",
"use_action": { "type": "transform", "menu_text": "Turn off", "msg": "Your %s deactivates.", "target": "thermal_cooling_mask" }
},
{
"id": "binoculars",
"type": "TOOL_ARMOR",
Expand Down
59 changes: 59 additions & 0 deletions data/json/obsoletion/items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5337,5 +5337,64 @@
"symbol": "=",
"color": "yellow",
"ammo_type": "components"
},
{
"id": "thermal_cooling",
"type": "TOOL_ARMOR",
"copy-from": "thermal_outfit",
"name": { "str": "liquid cooling outfit" },
"description": "This skintight suit covers you from head to toe and is designed to keep you at an ideal temperature using a number of heatsinks and heating coils tied to a liquid coolant system. It also includes some handy features such as a built-in thermometer. Use it to turn it on.",
"flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID", "ONLY_ONE", "THERMOMETER" ],
"weight": "1652 g",
"use_action": {
"type": "transform",
"msg": "You activate your %s.",
"target": "thermal_cooling_on",
"active": true,
"transform_charges": 1,
"need_charges": 1,
"need_charges_msg": "The %s's batteries are dead."
}
},
{
"id": "thermal_cooling_on",
"type": "TOOL_ARMOR",
"copy-from": "thermal_cooling",
"name": { "str": "liquid cooling outfit (on)", "str_pl": "liquid cooling outfits (on)" },
"description": "This skintight suit covers you from head to toe and is designed to keep you at an ideal temperature using a number of heatsinks and heating coils tied to a liquid coolant system. It also includes some handy features such as a built-in thermometer. It is currently on, use it to turn it off.",
"extend": { "flags": [ "CLIMATE_CONTROL" ] },
"power_draw": 130000,
"revert_to": "thermal_cooling",
"use_action": { "type": "transform", "menu_text": "Turn off", "msg": "Your %s deactivates.", "target": "thermal_cooling" }
},
{
"id": "thermal_cooling_mask",
"//": "If at some point item sources of CLIMATE_CONTROL are changed to only affect bodyparts covered by the item, we'll want to bring this back in addition to adding glove and sock variants, but for now a bodysuit is good enough for every part.",
"type": "TOOL_ARMOR",
"copy-from": "thermal_mask",
"name": { "str": "liquid cooling balaclava" },
"description": "This face mask is designed to keep your face and head at an ideal temperature using a number of heatsinks and heating coils tied to a liquid coolant system. It also includes some handy features such as a built-in thermometer. Use it to turn it on.",
"flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID", "ONLY_ONE", "THERMOMETER" ],
"weight": "204 g",
"use_action": {
"type": "transform",
"msg": "You activate your %s.",
"target": "thermal_cooling_mask_on",
"active": true,
"transform_charges": 1,
"need_charges": 1,
"need_charges_msg": "The %s's batteries are dead."
}
},
{
"id": "thermal_cooling_mask_on",
"type": "TOOL_ARMOR",
"copy-from": "thermal_cooling_mask",
"name": { "str": "liquid cooling balaclava (on)" },
"description": "This face mask is designed to keep your face and head at an ideal temperature using a number of heatsinks and heating coils tied to a liquid coolant system. It also includes some handy features such as a built-in thermometer. It is currently on, use it to turn it off.",
"extend": { "flags": [ "CLIMATE_CONTROL" ] },
"power_draw": 7500,
"revert_to": "thermal_cooling_mask",
"use_action": { "type": "transform", "menu_text": "Turn off", "msg": "Your %s deactivates.", "target": "thermal_cooling_mask" }
}
]
16 changes: 16 additions & 0 deletions data/json/obsoletion/recipes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3416,5 +3416,21 @@
"result": "fertilizer_liquid",
"id_suffix": "simple",
"obsolete": true
},
{
"type": "recipe",
"result": "thermal_cooling_mask",
"obsolete": true
},
{
"type": "recipe",
"result": "thermal_cooling",
"obsolete": true
},
{
"type": "recipe",
"result": "thermal_cooling",
"id_suffix": "thermal_outfit_from_bits",
"obsolete": true
}
]
25 changes: 0 additions & 25 deletions data/json/recipes/armor/head.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,31 +1403,6 @@
"using": [ [ "sewing_standard", 8 ], [ "soldering_standard", 20 ] ],
"components": [ [ [ "rag", 4 ], [ "scarf", 2 ], [ "scarf_long", 1 ], [ "balclava", 1 ] ], [ [ "element", 2 ] ], [ [ "cable", 6 ] ] ]
},
{
"result": "thermal_cooling_mask",
"type": "recipe",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_SUIT",
"skill_used": "electronics",
"difficulty": 5,
"skills_required": [ "tailor", 4 ],
"time": "1 h 20 m",
"reversible": true,
"book_learn": [ [ "textbook_fabrication", 4 ], [ "tailor_portfolio", 5 ], [ "textbook_tailor", 4 ], [ "atomic_survival", 4 ] ],
"using": [ [ "sewing_standard", 30 ], [ "soldering_standard", 60 ] ],
"components": [
[ [ "rag", 4 ], [ "scarf", 2 ], [ "scarf_long", 1 ], [ "balclava", 1 ] ],
[ [ "element", 2 ] ],
[ [ "hose", 1 ] ],
[ [ "cable", 6 ] ],
[ [ "power_supply", 1 ] ],
[ [ "processor", 1 ] ],
[ [ "amplifier", 1 ] ],
[ [ "condensor_coil", 1 ] ],
[ [ "thermometer", 1 ] ],
[ [ "water", 3 ], [ "water_clean", 3 ] ]
]
},
{
"result": "tinfoil_hat",
"type": "recipe",
Expand Down
52 changes: 2 additions & 50 deletions data/json/recipes/armor/suit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,54 +995,6 @@
"using": [ [ "sewing_standard", 52 ] ],
"components": [ [ [ "scute_piece", 15 ] ], [ [ "fabric_hides_proper", 15, "LIST" ] ] ]
},
{
"result": "thermal_cooling",
"type": "recipe",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_SUIT",
"skill_used": "electronics",
"difficulty": 5,
"skills_required": [ "tailor", 4 ],
"time": "1 h 20 m",
"reversible": true,
"book_learn": [ [ "textbook_fabrication", 4 ], [ "tailor_portfolio", 5 ], [ "textbook_tailor", 4 ], [ "atomic_survival", 4 ] ],
"using": [ [ "sewing_standard", 30 ], [ "soldering_standard", 60 ] ],
"components": [
[ [ "rag", 30 ], [ "union_suit", 1 ] ],
[ [ "element", 6 ] ],
[ [ "hose", 3 ] ],
[ [ "cable", 20 ] ],
[ [ "power_supply", 1 ] ],
[ [ "processor", 3 ] ],
[ [ "amplifier", 3 ] ],
[ [ "condensor_coil", 1 ] ],
[ [ "thermometer", 1 ] ],
[ [ "water", 6 ], [ "water_clean", 6 ] ]
]
},
{
"result": "thermal_cooling",
"type": "recipe",
"id_suffix": "thermal_outfit_from_bits",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_SUIT",
"skill_used": "electronics",
"difficulty": 5,
"skills_required": [ "tailor", 4 ],
"time": "1 h 20 m",
"reversible": true,
"book_learn": [ [ "textbook_fabrication", 4 ], [ "tailor_portfolio", 5 ], [ "textbook_tailor", 4 ], [ "atomic_survival", 4 ] ],
"using": [ [ "sewing_standard", 15 ], [ "soldering_standard", 10 ] ],
"components": [
[ [ "thermal_outfit", 1 ] ],
[ [ "hose", 3 ] ],
[ [ "processor", 3 ] ],
[ [ "amplifier", 3 ] ],
[ [ "condensor_coil", 1 ] ],
[ [ "thermometer", 1 ] ],
[ [ "water", 6 ], [ "water_clean", 6 ] ]
]
},
{
"result": "thermal_cooling_suit",
"type": "recipe",
Expand All @@ -1069,9 +1021,9 @@
]
},
{
"result": "thermal_cooling",
"result": "thermal_cooling_suit",
"type": "recipe",
"id_suffix": "thermal_outfit_from_bits",
"id_suffix": "thermal_suit_from_bits",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_SUIT",
"skill_used": "electronics",
Expand Down
Loading