Skip to content

Commit

Permalink
Thermal electric gear power draw reduction (#78834)
Browse files Browse the repository at this point in the history
* Update tool_armor.json

Applied values from 

#78798 (comment) 

Changed:
thermal socks power draw
thermal suit power draw, battery flag, and default battery
thermal gloves power draw
thermal mask power draw
thermal outfit power draw

* Update tool_armor.json

Moved all thermal electric gear up one battery tier (ultralight/small -> medium, medium -> heavy)

* Update TE gear power draw in tool_armor.json

Increased power draw for TE gear to a total of 9 W from 5 W.

* Update thermal electric gear in tool_armor.json

Changed thermal electric gear power draws to a total of 8 W with a different ratio equalizing power draw between the balaclava, gloves, and socks. Added MEDIUM_BATTERY flags to the TE suit and outfit.
  • Loading branch information
mark-ik authored Jan 5, 2025
1 parent 51a54ce commit 337b4d4
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions data/json/items/tool_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -657,8 +657,8 @@
{
"pocket_type": "MAGAZINE_WELL",
"rigid": true,
"flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
"default_magazine": "light_battery_cell"
"flag_restriction": [ "BATTERY_MEDIUM" ],
"default_magazine": "medium_battery_cell"
}
],
"armor": [ { "coverage": 100, "covers": [ "foot_l", "foot_r" ] } ]
Expand All @@ -670,7 +670,7 @@
"name": { "str": "pair of thermal electric socks (on)", "str_pl": "pairs of thermal electric socks (on)" },
"description": "A pair of socks with internal battery-powered heating elements. They are currently on, and continually draining batteries. Use it to turn them off.",
"flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID" ],
"power_draw": "7500 mW",
"power_draw": "400 mW",
"revert_to": "thermal_socks",
"use_action": {
"ammo_scale": 0,
Expand Down Expand Up @@ -711,8 +711,8 @@
{
"pocket_type": "MAGAZINE_WELL",
"rigid": true,
"flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
"default_magazine": "light_battery_cell"
"flag_restriction": [ "BATTERY_MEDIUM", "BATTERY_HEAVY" ],
"default_magazine": "heavy_battery_cell"
}
],
"armor": [ { "coverage": 100, "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ] } ]
Expand All @@ -724,7 +724,7 @@
"name": { "str": "thermal electric suit (on)", "str_pl": "thermal electric suits (on)" },
"description": "A full-body suit of thin thermal underwear equipped with internal battery-powered heating elements. It is currently on, and continually draining batteries. Use it to turn it off.",
"flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID" ],
"power_draw": "120 W",
"power_draw": "6800 mW",
"revert_to": "thermal_suit",
"warmth": 60,
"use_action": {
Expand Down Expand Up @@ -765,8 +765,8 @@
{
"pocket_type": "MAGAZINE_WELL",
"rigid": true,
"flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
"default_magazine": "light_battery_cell"
"flag_restriction": [ "BATTERY_MEDIUM" ],
"default_magazine": "medium_battery_cell"
}
],
"armor": [ { "coverage": 100, "covers": [ "hand_l", "hand_r" ] } ]
Expand All @@ -778,7 +778,7 @@
"name": { "str": "pair of thermal electric gloves (on)", "str_pl": "pairs of thermal electric gloves (on)" },
"description": "A pair of gloves with internal battery-powered heating elements. They are currently on, and continually draining batteries. Use it to turn them off.",
"flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID" ],
"power_draw": "7500 mW",
"power_draw": "400 mW",
"revert_to": "thermal_gloves",
"use_action": {
"ammo_scale": 0,
Expand Down Expand Up @@ -819,8 +819,8 @@
{
"pocket_type": "MAGAZINE_WELL",
"rigid": true,
"flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
"default_magazine": "light_battery_cell"
"flag_restriction": [ "BATTERY_MEDIUM" ],
"default_magazine": "medium_battery_cell"
}
],
"armor": [ { "coverage": 100, "covers": [ "head", "mouth" ] } ]
Expand All @@ -832,7 +832,7 @@
"name": { "str": "thermal electric balaclava (on)", "str_pl": "thermal electric balaclavas (on)" },
"description": "A snug cloth mask with internal battery-powered heating elements. It is are currently on, and continually draining batteries. Use it to turn it off.",
"flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID" ],
"power_draw": "7500 mW",
"power_draw": "400 mW",
"revert_to": "thermal_mask",
"use_action": {
"ammo_scale": 0,
Expand Down Expand Up @@ -2800,8 +2800,8 @@
{
"pocket_type": "MAGAZINE_WELL",
"rigid": true,
"flag_restriction": [ "BATTERY_MEDIUM" ],
"default_magazine": "medium_battery_cell"
"flag_restriction": [ "BATTERY_MEDIUM", "BATTERY_HEAVY" ],
"default_magazine": "heavy_battery_cell"
}
],
"armor": [
Expand All @@ -2818,7 +2818,7 @@
"name": { "str": "thermal electric outfit (on)", "str_pl": "thermal electric outfits (on)" },
"description": "A suit of thin thermal underwear that covers you from head to toe and is equipped with internal battery-powered heating elements. It is currently on, and continually draining batteries. Use it to turn it off.",
"flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID" ],
"power_draw": "130 W",
"power_draw": "8 W",
"revert_to": "thermal_outfit",
"use_action": {
"ammo_scale": 0,
Expand Down

0 comments on commit 337b4d4

Please sign in to comment.