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

[MoM] Rebalance Banked Fire (the item) #76395

Merged
merged 12 commits into from
Sep 14, 2024
2 changes: 1 addition & 1 deletion data/mods/MindOverMatter/PowerDescriptionSpoilers.md
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ Powers causing photokinetic damage have a 40% chance to blind the target for 3 s
*Duration*: 8 minutes and 30 seconds to 30 minutes, plus 50 seconds to 20 minutes and 40 seconds per level<br />
*Stamina Cost*: 2500, minus 150 per level to a minimum of 800<br />
*Channeling Time*: 250 moves, minus 10 moves per level to a minimum of 75 moves<br />
*Effects*: Summon a controlled fire in the palm of the psion's hand or nearby. The fire sheds a small amount of light and can be used for anything fire can normally be used for; heating food, cooking, lightning other fires, and so on. The banked flame requires more intense concentration and cannot be sustained in combat.<br />
*Effects*: Summon a controlled fire in the palm of the psion's hand. The fire sheds a small amount of light and can be used for anything fire can normally be used for; heating food, cooking, lightning other fires, and so on. The banked flame requires more intense concentration and cannot be sustained in combat. In addition, it encumbers one of your hands and prevents you from using any weapon requiring two hands.<br />
*Prerequisites*: Fountain of Flames 4<br />

## Quell Fire
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@
{ "u_has_effect": "effect_clair_perfect_shot" },
{ "u_has_effect": "effect_photokin_light_local" },
{ "u_has_item": "pyrokinetic_fire_tool" },
{ "u_has_item": "pyrokinetic_fire_tool_four_arms" },
{ "u_has_item": "pyrokinetic_fire_tool_six_arms" },
{ "u_has_item": "pyrokinetic_fire_tool_eight_arms" },
{ "u_has_item": "pyrokinetic_torch_weld" },
{ "u_has_effect": "effect_telekinetic_strength" },
{ "u_has_item": "telekin_lifting_jack_1" },
Expand Down
5 changes: 2 additions & 3 deletions data/mods/MindOverMatter/effects/effects_psionic.json
Original file line number Diff line number Diff line change
Expand Up @@ -1314,9 +1314,8 @@
{
"type": "effect_type",
"id": "effect_pyrokinetic_fire_tool",
"//": "Hidden effect, used as a tracker",
"name": [ "" ],
"desc": [ "" ],
"name": [ "Banked Flames" ],
"desc": [ "A firm is burning over one of your palms." ],
"rating": "good",
"max_duration": "7 days"
},
Expand Down
7 changes: 7 additions & 0 deletions data/mods/MindOverMatter/enchantments/enchantment_item.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
[
{
"type": "enchantment",
"id": "pyrokinetic_banked_fire_damage_enchant",
"has": "WORN",
"condition": { "not": "u_has_weapon" },
"values": [ { "value": "ITEM_DAMAGE_HEAT", "add": { "math": [ "u_spell_level('pyrokinetic_call_flames') + 5" ] } } ]
},
{
"type": "enchantment",
"id": "telekin_ritual_summon_strength_enchant",
Expand Down
68 changes: 52 additions & 16 deletions data/mods/MindOverMatter/items/psions_summon_items.json
Original file line number Diff line number Diff line change
Expand Up @@ -186,22 +186,6 @@
"copy-from": "electrokinetic_electrohack_1",
"qualities": [ [ "HACK", 4 ] ]
},
{
"id": "pyrokinetic_fire_tool",
"type": "TOOL_ARMOR",
"name": { "str": "[Ψ]pyrokinetic fire" },
"description": "Dancing flames hovering over your hand. You can use this to provide heat and light when necessary.",
"weight": "0 g",
"volume": "0 L",
"price": "1 cent",
"price_postapoc": "1 cent",
"symbol": "$",
"color": "red",
"flags": [ "PERSONAL", "PADDED", "UNBREAKABLE", "INTEGRATED", "SEMITANGIBLE", "ZERO_WEIGHT", "LIGHT_20", "FIRE", "NO_DROP" ],
"qualities": [ [ "BLOW_HOT_AIR", 1 ] ],
"use_action": [ { "type": "firestarter", "moves": 30 }, { "type": "HOTPLATE" } ],
"armor": [ { "encumbrance": 0, "coverage": 0, "covers": [ "hand_l", "hand_r" ] } ]
},
{
"id": "item_photokinetic_radio",
"type": "TOOL_ARMOR",
Expand Down Expand Up @@ -277,6 +261,58 @@
}
]
},
{
"id": "pyrokinetic_fire_tool",
"type": "TOOL_ARMOR",
"name": { "str_sp": "[Ψ]banked flames" },
"description": "Dancing flames hovering over your hand. You can use this to provide heat and light when necessary.",
"weight": "0 g",
"volume": "0 L",
"price": "1 cent",
"price_postapoc": "1 cent",
"symbol": "$",
"color": "red",
"flags": [
"PERSONAL",
"PADDED",
"UNBREAKABLE",
"INTEGRATED",
"RESTRICT_HANDS",
"ZERO_WEIGHT",
"MUNDANE",
"LIGHT_20",
"FIRE",
"NO_DROP"
],
"qualities": [ [ "BLOW_HOT_AIR", 1 ] ],
"use_action": [ { "type": "firestarter", "moves": 30 }, { "type": "HOTPLATE" } ],
"armor": [ { "encumbrance": 25, "coverage": 0, "covers": [ "hand_l" ] } ],
"relic_data": { "passive_effects": [ { "id": "pyrokinetic_banked_fire_damage_enchant" } ] }
},
{
"id": "pyrokinetic_fire_tool_four_arms",
"type": "TOOL_ARMOR",
"name": { "str_sp": "[Ψ]banked flames" },
"copy-from": "pyrokinetic_fire_tool",
"armor": [ { "encumbrance": 12, "coverage": 0, "covers": [ "hand_l" ] } ],
"delete": { "flags": [ "RESTRICT_HANDS" ] }
},
{
"id": "pyrokinetic_fire_tool_six_arms",
"type": "TOOL_ARMOR",
"name": { "str_sp": "[Ψ]banked flames" },
"copy-from": "pyrokinetic_fire_tool",
"armor": [ { "encumbrance": 8, "coverage": 0, "covers": [ "hand_l" ] } ],
"delete": { "flags": [ "RESTRICT_HANDS" ] }
},
{
"id": "pyrokinetic_fire_tool_eight_arms",
"type": "TOOL_ARMOR",
"name": { "str_sp": "[Ψ]banked flames" },
"copy-from": "pyrokinetic_fire_tool",
"armor": [ { "encumbrance": 5, "coverage": 0, "covers": [ "hand_l" ] } ],
"delete": { "flags": [ "RESTRICT_HANDS" ] }
},
{
"id": "pyrokinetic_torch_weld",
"type": "TOOL_ARMOR",
Expand Down
35 changes: 33 additions & 2 deletions data/mods/MindOverMatter/powers/pyrokinesis_concentration_eoc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
"condition": { "not": { "u_has_effect": "effect_pyrokinetic_fire_tool" } },
"effect": [
{ "u_message": "Flames begin dancing in the air above your hand.", "type": "good" },
{ "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" },
{ "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_PYROKIN_CALL_FLAME_GRANT_ITEM" ] },
{ "u_add_effect": "effect_pyrokinetic_fire_tool", "duration": "PERMANENT" },
{ "u_spawn_item": "pyrokinetic_fire_tool", "suppress_message": true, "force_equip": true },
{
"queue_eocs": "EOC_PYROKIN_CALL_FLAME_DRAIN",
"time_in_future": [
Expand All @@ -26,6 +25,35 @@
],
"false_effect": [ { "run_eocs": "EOC_PYRO_REMOVE_FIRE_TOOL" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_PYROKIN_CALL_FLAME_GRANT_ITEM",
"condition": { "u_has_trait": "ARM_TENTACLES_8" },
"effect": [ { "u_spawn_item": "pyrokinetic_fire_tool_eight_arms", "suppress_message": true, "force_equip": true } ],
"false_effect": [
{
"run_eocs": [
{
"id": "EOC_PYROKIN_CALL_FLAME_GRANT_ITEM_2",
"condition": { "u_has_trait": "ARACHNID_ARMS_OK" },
"effect": [ { "u_spawn_item": "pyrokinetic_fire_tool_six_arms", "suppress_message": true, "force_equip": true } ],
"false_effect": [
{
"run_eocs": [
{
"id": "EOC_PYROKIN_CALL_FLAME_GRANT_ITEM_3",
"condition": { "u_has_trait": "ARM_TENTACLES_4" },
"effect": [ { "u_spawn_item": "pyrokinetic_fire_tool_four_arms", "suppress_message": true, "force_equip": true } ],
"false_effect": [ { "u_spawn_item": "pyrokinetic_fire_tool", "suppress_message": true, "force_equip": true } ]
}
]
}
]
}
]
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_PYRO_REMOVE_FIRE_TOOL",
Expand All @@ -34,6 +62,9 @@
{ "u_message": "The flames over your hand gutter and die out.", "type": "bad" },
{ "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" },
{ "u_remove_item_with": "pyrokinetic_fire_tool" },
{ "u_remove_item_with": "pyrokinetic_fire_tool_four_arms" },
{ "u_remove_item_with": "pyrokinetic_fire_tool_six_arms" },
{ "u_remove_item_with": "pyrokinetic_fire_tool_eight_arms" },
{ "u_lose_effect": "effect_pyrokinetic_fire_tool" }
]
},
Expand Down
22 changes: 20 additions & 2 deletions data/mods/MindOverMatter/recipes/recipe_requirements.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,30 @@
{
"id": "surface_heat",
"type": "requirement",
"extend": { "tools": [ [ [ "pyrokinetic_fire_tool", -1 ] ] ] }
"extend": {
"tools": [
[
[ "pyrokinetic_fire_tool", -1 ],
[ "pyrokinetic_fire_tool_four_arms", -1 ],
[ "pyrokinetic_fire_tool_six_arms", -1 ],
[ "pyrokinetic_fire_tool_eight_arms", -1 ]
]
]
}
},
{
"id": "water_boiling_heat",
"type": "requirement",
"extend": { "tools": [ [ [ "pyrokinetic_fire_tool", -1 ] ] ] }
"extend": {
"tools": [
[
[ "pyrokinetic_fire_tool", -1 ],
[ "pyrokinetic_fire_tool_four_arms", -1 ],
[ "pyrokinetic_fire_tool_six_arms", -1 ],
[ "pyrokinetic_fire_tool_eight_arms", -1 ]
]
]
}
},
{
"id": "welding_standard",
Expand Down
Loading