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.

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

Perspiration, evaporation cooling #44880

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions data/json/body_parts.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"fire_warmth_bonus": 150,
"squeamish_penalty": 6,
"base_hp": 60,
"drench_capacity": 40,
"drench_capacity": 4000,
"smash_message": "You smash the %s with a powerful shoulder-check.",
"bionic_slots": 80
},
Expand All @@ -49,7 +49,7 @@
"fire_warmth_bonus": 150,
"squeamish_penalty": 7,
"base_hp": 60,
"drench_capacity": 7,
"drench_capacity": 700,
"smash_message": "You smash the %s with a firm headbutt.",
"smash_efficiency": 0.25,
"bionic_slots": 18
Expand All @@ -72,7 +72,7 @@
"stylish_bonus": 2,
"squeamish_penalty": 8,
"base_hp": 60,
"drench_capacity": 1,
"drench_capacity": 100,
"flags": [ "IGNORE_TEMP" ],
"smash_message": "You use your flippin' face to smash the %s. EXTREME.",
"smash_efficiency": 0.25,
Expand All @@ -98,7 +98,7 @@
"cold_morale_mod": 2,
"squeamish_penalty": 9,
"base_hp": 60,
"drench_capacity": 1,
"drench_capacity": 100,
"smash_message": "You use your flippin' face to smash the %s. EXTREME.",
"smash_efficiency": 0.25,
"bionic_slots": 4
Expand Down Expand Up @@ -129,7 +129,7 @@
"squeamish_penalty": 5,
"is_limb": true,
"base_hp": 60,
"drench_capacity": 10,
"drench_capacity": 1000,
"smash_message": "You elbow-smash the %s.",
"bionic_slots": 20
},
Expand Down Expand Up @@ -158,7 +158,7 @@
"squeamish_penalty": 5,
"is_limb": true,
"base_hp": 60,
"drench_capacity": 10,
"drench_capacity": 1000,
"smash_message": "You elbow-smash the %s.",
"bionic_slots": 20
},
Expand All @@ -185,7 +185,7 @@
"fire_warmth_bonus": 1500,
"squeamish_penalty": 3,
"base_hp": 60,
"drench_capacity": 3,
"drench_capacity": 300,
"smash_message": "You smash the %s with your fist.",
"bionic_slots": 5
},
Expand All @@ -212,7 +212,7 @@
"fire_warmth_bonus": 1500,
"squeamish_penalty": 3,
"base_hp": 60,
"drench_capacity": 3,
"drench_capacity": 300,
"smash_message": "You smash the %s with your fist.",
"bionic_slots": 5
},
Expand Down Expand Up @@ -242,7 +242,7 @@
"squeamish_penalty": 5,
"is_limb": true,
"base_hp": 60,
"drench_capacity": 11,
"drench_capacity": 1100,
"smash_message": "You bring your knee down on the %s, smashing it.",
"bionic_slots": 30
},
Expand Down Expand Up @@ -272,7 +272,7 @@
"squeamish_penalty": 5,
"is_limb": true,
"base_hp": 60,
"drench_capacity": 11,
"drench_capacity": 1100,
"smash_message": "You bring your knee down on the %s, smashing it.",
"bionic_slots": 30
},
Expand All @@ -299,7 +299,7 @@
"fire_warmth_bonus": 300,
"squeamish_penalty": 3,
"base_hp": 60,
"drench_capacity": 3,
"drench_capacity": 300,
"smash_message": "You kick down the %s, smashing it.",
"bionic_slots": 7
},
Expand All @@ -326,7 +326,7 @@
"fire_warmth_bonus": 300,
"squeamish_penalty": 3,
"base_hp": 60,
"drench_capacity": 3,
"drench_capacity": 300,
"smash_message": "You kick down the %s, smashing it.",
"bionic_slots": 7
}
Expand Down
24 changes: 18 additions & 6 deletions data/json/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -1311,20 +1311,32 @@
"type": "effect_type",
"id": "hot",
"name": [ "Warm", "Hot", "Scorching" ],
"desc": [ "Your %s feels warm.", "Your %s is sweating from the heat.", "Your %s is sweating profusely!" ],
"desc": [ "Your %s feels warm and sweaty.", "Your %s is sweating a lot from the heat.", "Your %s is sweating profusely!" ],
"max_intensity": 3,
"part_descs": true,
"base_mods": {
"thirst_tick": [ 2400 ],
"thirst_chance": [ 2 ],
"thirst_min": [ 1 ],
"thirst_tick": [ 200 ],
"thirst_chance": [ 6 ],
"perspiration_min": [ 10 ],
"perspiration_tick": [ 60 ],
"perspiration_chance": [ 1 ],
"pain_min": [ 1 ],
"pain_chance": [ 2 ],
"pain_max_val": [ -1 ],
"hurt_min": [ 1 ],
"hurt_chance": [ -300 ],
"stamina_chance": [ 2 ]
},
"scaling_mods": { "thirst_min": [ 1 ], "thirst_tick": [ -600 ], "pain_max_val": [ 10 ], "hurt_chance": [ 200 ], "stamina_min": [ -1 ] }
"scaling_mods": {
"thirst_tick": [ -50 ],
"thirst_chance": [ -1 ],
"perspiration_min": [ 5 ],
"perspiration_tick": [ -15 ],
"pain_max_val": [ 10 ],
"hurt_chance": [ 200 ],
"stamina_min": [ -1 ]
}
},
{
"type": "effect_type",
Expand All @@ -1334,8 +1346,8 @@
"speed_name": "Heat slowdown",
"max_intensity": 3,
"part_descs": true,
"base_mods": { "speed_mod": [ -2 ] },
"scaling_mods": { "speed_mod": [ -4 ] }
"base_mods": { "speed_mod": [ -1 ] },
"scaling_mods": { "speed_mod": [ -2 ] }
},
{
"type": "effect_type",
Expand Down
5 changes: 5 additions & 0 deletions data/json/item_actions.json
Original file line number Diff line number Diff line change
Expand Up @@ -944,6 +944,11 @@
"id": "WEED_CAKE",
"name": { "str": "Consume" }
},
{
"type": "item_action",
"id": "WET_O_METER",
"name": { "str": "Check wetness of bodyparts" }
},
{
"type": "item_action",
"id": "XANAX",
Expand Down
16 changes: 16 additions & 0 deletions data/json/items/tool/med.json
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,22 @@
"use_action": [ "WEATHER_TOOL" ],
"flags": [ "THERMOMETER" ]
},
{
"id": "wet_o_meter",
"type": "TOOL",
"category": "tools",
"name": { "str": "wet-o-meter" },
"description": "A plastic wet-o-meter that can read the wetness of bodyparts.",
"weight": "1 g",
"volume": "250 ml",
"price": 100,
"price_postapoc": 10,
"to_hit": -3,
"material": [ "plastic" ],
"symbol": ";",
"color": "blue",
"use_action": [ "WET_O_METER" ]
},
{
"id": "oxygen_tank",
"type": "TOOL",
Expand Down
11 changes: 11 additions & 0 deletions data/json/materials.json
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@
"fire_resist": 0,
"elec_resist": 2,
"chip_resist": 6,
"breathability": 90,
"repaired_with": "rag",
"salvaged_into": "rag",
"dmg_adj": [ "ripped", "torn", "shredded", "tattered" ],
Expand Down Expand Up @@ -569,6 +570,7 @@
"fire_resist": 1,
"elec_resist": 2,
"chip_resist": 8,
"breathability": 20,
"repaired_with": "fur",
"salvaged_into": "fur",
"dmg_adj": [ "ripped", "torn", "shredded", "tattered" ],
Expand Down Expand Up @@ -596,6 +598,7 @@
"fire_resist": 1,
"elec_resist": 3,
"chip_resist": 7,
"breathability": 30,
"repaired_with": "faux_fur",
"salvaged_into": "faux_fur",
"dmg_adj": [ "ripped", "torn", "shredded", "tattered" ],
Expand Down Expand Up @@ -943,6 +946,7 @@
"fire_resist": 1,
"elec_resist": 2,
"chip_resist": 7,
"breathability": 20,
"repaired_with": "sheet_kevlar",
"salvaged_into": "sheet_kevlar",
"dmg_adj": [ "ripped", "torn", "shredded", "tattered" ],
Expand All @@ -965,6 +969,7 @@
"fire_resist": 3,
"elec_resist": 2,
"chip_resist": 20,
"breathability": 10,
"repaired_with": "sheet_kevlar_layered",
"salvaged_into": "sheet_kevlar_layered",
"dmg_adj": [ "ripped", "torn", "shredded", "tattered" ],
Expand All @@ -986,6 +991,7 @@
"fire_resist": 3,
"elec_resist": 2,
"chip_resist": 20,
"breathability": 10,
"repaired_with": "rigid_kevlar_plate",
"salvaged_into": "rigid_kevlar_plate",
"dmg_adj": [ "ripped", "torn", "shredded", "tattered" ],
Expand Down Expand Up @@ -1030,6 +1036,7 @@
"fire_resist": 2,
"elec_resist": 2,
"chip_resist": 10,
"breathability": 10,
"repaired_with": "leather",
"salvaged_into": "leather",
"dmg_adj": [ "scratched", "cut", "shredded", "tattered" ],
Expand Down Expand Up @@ -1059,6 +1066,7 @@
"fire_resist": 2,
"elec_resist": 2,
"chip_resist": 6,
"breathability": 80,
"repaired_with": "lycra_patch",
"salvaged_into": "lycra_patch",
"dmg_adj": [ "ripped", "torn", "shredded", "tattered" ],
Expand Down Expand Up @@ -1140,6 +1148,7 @@
"fire_resist": 20,
"elec_resist": 4,
"chip_resist": 8,
"breathability": 80,
"repaired_with": "nomex",
"salvaged_into": "nomex",
"dmg_adj": [ "ripped", "torn", "shredded", "tattered" ],
Expand Down Expand Up @@ -1562,6 +1571,7 @@
"fire_resist": 2,
"elec_resist": 2,
"chip_resist": 7,
"breathability": 40,
"repaired_with": "nylon",
"salvaged_into": "nylon",
"dmg_adj": [ "ripped", "torn", "shredded", "tattered" ],
Expand Down Expand Up @@ -1881,6 +1891,7 @@
"fire_resist": 0,
"elec_resist": 2,
"chip_resist": 6,
"breathability": 80,
"repaired_with": "felt_patch",
"salvaged_into": "felt_patch",
"dmg_adj": [ "ripped", "torn", "shredded", "tattered" ],
Expand Down
9 changes: 9 additions & 0 deletions doc/EFFECTS_JSON.md
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,15 @@ Valid arguments:
"thirst_chance_bot"
"thirst_tick" - Defaults to every tick

"perspiration_amount" - Amount of perspiration it can give/take.
"perspiration_min" - Minimal amount of perspiration, certain effect will give/take
"perspiration_max" - if 0 or missing value will be exactly "perspiration_min"
"perspiration_min_val" - Defaults to 0, which means uncapped
"perspiration_max_val" - Defaults to 0, which means uncapped
"perspiration_chance" - Chance to perspire
"perspiration_chance_bot"
"perspiration_tick" - Defaults to every tick

"fatigue_amount" - Amount of fatigue it can give/take. After certain amount character will need to sleep.
"fatigue_min" - Minimal amount of fatigue, certain effect will give/take
"fatigue_max" - if 0 or missing value will be exactly "fatigue_min"
Expand Down
Loading