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

Heat immune cleanup #76218

Merged
merged 19 commits into from
Sep 7, 2024
Merged

Heat immune cleanup #76218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
72a616b
Update Vulcanist.json
Naadn Sep 5, 2024
57e710f
Update Flame Immunity
Naadn Sep 5, 2024
62c72d1
Clean up Cleansing_Flame.json
Naadn Sep 5, 2024
08ab397
Update effects_psionic.json
Naadn Sep 5, 2024
7230268
Update Vulcanist.json
Naadn Sep 5, 2024
6e436df
Update Vulcanist.json
Naadn Sep 5, 2024
7da8ce0
Update effects.json
Naadn Sep 5, 2024
1e0a281
make autocheck run again
Naadn Sep 5, 2024
a95e3a6
Update effects.json
Naadn Sep 5, 2024
6d562a8
Update salamander_mutations.json
Naadn Sep 5, 2024
18a3b54
Update effects_psionic.json
Naadn Sep 6, 2024
8e561ed
Update effects.json
Naadn Sep 6, 2024
add24b2
Update effects.json
Naadn Sep 6, 2024
a0ee26a
Update effects_psionic.json
Naadn Sep 6, 2024
4cee43b
Update effects.json
Naadn Sep 6, 2024
d18e4b4
Update salamander_mutations.json
Naadn Sep 6, 2024
87251bb
Update salamander_mutations.json
Naadn Sep 6, 2024
ae4f31f
Update Vulcanist.json
Naadn Sep 6, 2024
d9af815
Update data/mods/Magiclysm/effects/effects.json
Maleclypse Sep 6, 2024
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
6 changes: 4 additions & 2 deletions data/mods/Magiclysm/effects/effects.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1274,8 +1274,10 @@
"desc": [ "You are immune to heat and fire." ],
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"rating": "good",
"show_in_info": true,
"removes_effects": [ "onfire", "blisters" ],
"enchantments": [ "ench_heat_and_fire_immunity" ]
"blocks_effects": [ "blisters" ],
"removes_effects": [ "onfire" ],
"enchantments": [ { "values": [ { "value": "ARMOR_HEAT", "multiply": -1 } ] } ],
"flags": [ "HEAT_IMMUME" ]
},
{
"type": "effect_type",
Expand Down
8 changes: 0 additions & 8 deletions data/mods/Magiclysm/enchantments/Cleansing_Flame.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,5 @@
"description": "Your Cleansing Flame abilities grant you good resistance to temperature conditions. You are also immune to infection, as your body cleanses every tainted part of you, constantly.",
"condition": "ALWAYS",
"values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 30 }, { "value": "CLIMATE_CONTROL_CHILL", "add": 10 } ]
},
{
"type": "enchantment",
"id": "ench_heat_and_fire_immunity",
"name": { "str": "Total Fire Immunity" },
"description": "You are utterly immune to fire and heat.",
"condition": "ALWAYS",
"values": [ { "value": "CLIMATE_CONTROL_CHILL", "add": 1000 }, { "value": "ARMOR_HEAT", "add": -1000 } ]
}
]
4 changes: 2 additions & 2 deletions data/mods/Magiclysm/enchantments/Vulcanist.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"condition": "ALWAYS",
"name": { "str": "Lava" },
"description": "Your Vulcanist abilities grant you good resistance to temperature conditions, total heat immunity, and immunity to smoke.",
"values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 30 }, { "value": "CLIMATE_CONTROL_CHILL", "add": 10 } ],
"values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 30 }, { "value": "ARMOR_HEAT", "multiply": -1.0 } ],
"ench_effects": [ { "effect": "effect_vulcanist_no_smoke_or_blisters", "intensity": 1 } ]
},
{
"type": "effect_type",
"id": "effect_vulcanist_no_smoke_or_blisters",
"name": [ "" ],
"desc": [ "" ],
"removes_effects": [ "smoke_eyes", "smoke_lungs", "blisters" ]
"blocks_effects": [ "smoke_eyes", "smoke_lungs", "blisters" ]
}
]
4 changes: 2 additions & 2 deletions data/mods/MindOverMatter/effects/effects_psionic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1365,8 +1365,8 @@
"max_duration": "7 days",
"max_intensity": 95,
"blocks_effects": [ "blisters" ],
"enchantments": [ { "values": [ { "value": "CLIMATE_CONTROL_CHILL", "add": 100000 }, { "value": "ARMOR_HEAT", "multiply": -1.0 } ] } ],
"flags": [ "HEAT_IMMUNE", "HEATSINK" ]
"enchantments": [ { "values": [ { "value": "ARMOR_HEAT", "multiply": -1.0 } ] } ],
"flags": [ "HEAT_IMMUNE" ]
},
{
"type": "effect_type",
Expand Down
6 changes: 1 addition & 5 deletions data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,11 +585,7 @@
"enchantments": [
{
"condition": "ALWAYS",
"values": [
{ "value": "CLIMATE_CONTROL_CHILL", "add": 1000 },
{ "value": "ARMOR_HEAT", "add": -1000 },
{ "value": "ARMOR_COLD", "multiply": 0.5 }
],
"values": [ { "value": "ARMOR_HEAT", "multiply": -1 }, { "value": "ARMOR_COLD", "multiply": 0.5 } ],
"ench_effects": [ { "effect": "effect_hidden_flame_immunity", "intensity": 1 } ]
}
],
Expand Down
Loading