From 72a616be8567ec1986d6172b997c7a3e4661fbd3 Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 00:38:46 +0800 Subject: [PATCH 01/19] Update Vulcanist.json --- data/mods/Magiclysm/enchantments/Vulcanist.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Magiclysm/enchantments/Vulcanist.json b/data/mods/Magiclysm/enchantments/Vulcanist.json index 038b35a339d64..837aeb208083e 100644 --- a/data/mods/Magiclysm/enchantments/Vulcanist.json +++ b/data/mods/Magiclysm/enchantments/Vulcanist.json @@ -5,8 +5,8 @@ "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 } ], - "ench_effects": [ { "effect": "effect_vulcanist_no_smoke_or_blisters", "intensity": 1 } ] + "values": [ { "value": "CLIMATE_CONTROL_CHILL", "add": 10 } ], + "ench_effects": [ { "effect": "effect_vulcanist_no_smoke_or_blisters", "intensity": 1 }, , { "value": "ARMOR_HEAT", "multiply": -1.0 } ] }, { "type": "effect_type", From 57e710f67b0f0e7f394baf842349873cd651430d Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 00:55:38 +0800 Subject: [PATCH 02/19] Update Flame Immunity --- data/mods/Magiclysm/effects/effects.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json index 4b42e1776252e..5113796e7e089 100644 --- a/data/mods/Magiclysm/effects/effects.json +++ b/data/mods/Magiclysm/effects/effects.json @@ -1275,7 +1275,8 @@ "rating": "good", "show_in_info": true, "removes_effects": [ "onfire", "blisters" ], - "enchantments": [ "ench_heat_and_fire_immunity" ] + "enchantments": [ { "values": [ { "value": "ARMOR_HEAT", "multiply": -1 } ], + "flags": [ "HEAT_IMMUME" ] }, { "type": "effect_type", From 62c72d102e13856be3ffa1d26d7687ecb0cae292 Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 00:56:50 +0800 Subject: [PATCH 03/19] Clean up Cleansing_Flame.json --- data/mods/Magiclysm/enchantments/Cleansing_Flame.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/data/mods/Magiclysm/enchantments/Cleansing_Flame.json b/data/mods/Magiclysm/enchantments/Cleansing_Flame.json index adaada3fe0795..5161a3c05af74 100644 --- a/data/mods/Magiclysm/enchantments/Cleansing_Flame.json +++ b/data/mods/Magiclysm/enchantments/Cleansing_Flame.json @@ -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 } ] } ] From 08ab3978771a7a18236988de2fcb1264ae381f21 Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 01:01:19 +0800 Subject: [PATCH 04/19] Update effects_psionic.json --- data/mods/MindOverMatter/effects/effects_psionic.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json index 455e64345898a..b4f350c964a35 100644 --- a/data/mods/MindOverMatter/effects/effects_psionic.json +++ b/data/mods/MindOverMatter/effects/effects_psionic.json @@ -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": [ { "value": "ARMOR_HEAT", "multiply": -1.0 } ], + "flags": [ "HEAT_IMMUNE" ] }, { "type": "effect_type", From 72302686a83de338d129b3e5fa9f54031dd1fd4a Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 01:04:39 +0800 Subject: [PATCH 05/19] Update Vulcanist.json --- data/mods/Magiclysm/enchantments/Vulcanist.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Magiclysm/enchantments/Vulcanist.json b/data/mods/Magiclysm/enchantments/Vulcanist.json index 837aeb208083e..71ba3ba5b53ef 100644 --- a/data/mods/Magiclysm/enchantments/Vulcanist.json +++ b/data/mods/Magiclysm/enchantments/Vulcanist.json @@ -6,13 +6,13 @@ "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_CHILL", "add": 10 } ], - "ench_effects": [ { "effect": "effect_vulcanist_no_smoke_or_blisters", "intensity": 1 }, , { "value": "ARMOR_HEAT", "multiply": -1.0 } ] + "ench_effects": [ { "effect": "effect_vulcanist_no_smoke_or_blisters", "intensity": 1 }, { "value": "ARMOR_HEAT", "multiply": -1.0 } ] }, { "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" ] } ] From 6e436dfe367d150e214f3bbe156682b85545b25c Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 01:06:05 +0800 Subject: [PATCH 06/19] Update Vulcanist.json --- data/mods/Magiclysm/enchantments/Vulcanist.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/enchantments/Vulcanist.json b/data/mods/Magiclysm/enchantments/Vulcanist.json index 71ba3ba5b53ef..bae514f2d606d 100644 --- a/data/mods/Magiclysm/enchantments/Vulcanist.json +++ b/data/mods/Magiclysm/enchantments/Vulcanist.json @@ -5,7 +5,7 @@ "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_CHILL", "add": 10 } ], + "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 30 } ], "ench_effects": [ { "effect": "effect_vulcanist_no_smoke_or_blisters", "intensity": 1 }, { "value": "ARMOR_HEAT", "multiply": -1.0 } ] }, { From 7da8ce02d16e812da6fe8fc86aa53f7689961ce1 Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 01:17:06 +0800 Subject: [PATCH 07/19] Update effects.json --- data/mods/Magiclysm/effects/effects.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json index 5113796e7e089..e93517c457d48 100644 --- a/data/mods/Magiclysm/effects/effects.json +++ b/data/mods/Magiclysm/effects/effects.json @@ -1274,7 +1274,7 @@ "desc": [ "You are immune to heat and fire." ], "rating": "good", "show_in_info": true, - "removes_effects": [ "onfire", "blisters" ], + "blocks_effects": [ "onfire", "blisters" ], "enchantments": [ { "values": [ { "value": "ARMOR_HEAT", "multiply": -1 } ], "flags": [ "HEAT_IMMUME" ] }, From 1e0a28106b27333dde4891763750b4a83f74ab70 Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 01:27:16 +0800 Subject: [PATCH 08/19] make autocheck run again --- data/mods/Magiclysm/effects/effects.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json index e93517c457d48..ef05b0250af03 100644 --- a/data/mods/Magiclysm/effects/effects.json +++ b/data/mods/Magiclysm/effects/effects.json @@ -1271,7 +1271,7 @@ "type": "effect_type", "id": "effect_flame_immunity", "name": [ "Flame Immunity" ], - "desc": [ "You are immune to heat and fire." ], + "desc": [ "You are immune to heat and fire" ], "rating": "good", "show_in_info": true, "blocks_effects": [ "onfire", "blisters" ], From a95e3a6893b47a866b9dd97e4db1afad68dcb661 Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 01:49:57 +0800 Subject: [PATCH 09/19] Update effects.json --- data/mods/Magiclysm/effects/effects.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json index ef05b0250af03..9baec00f0e370 100644 --- a/data/mods/Magiclysm/effects/effects.json +++ b/data/mods/Magiclysm/effects/effects.json @@ -1274,7 +1274,8 @@ "desc": [ "You are immune to heat and fire" ], "rating": "good", "show_in_info": true, - "blocks_effects": [ "onfire", "blisters" ], + "blocks_effects": [ "blisters" ], + "removes_effects": [ "onfire" ], "enchantments": [ { "values": [ { "value": "ARMOR_HEAT", "multiply": -1 } ], "flags": [ "HEAT_IMMUME" ] }, From 6d562a842c1eba7c1ac1735594846f692bfb0e34 Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 03:11:34 +0800 Subject: [PATCH 10/19] Update salamander_mutations.json --- .../mutations/paraclesians/salamander_mutations.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json index 6002927113571..6d692c1b7460d 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json @@ -586,8 +586,7 @@ { "condition": "ALWAYS", "values": [ - { "value": "CLIMATE_CONTROL_CHILL", "add": 1000 }, - { "value": "ARMOR_HEAT", "add": -1000 }, + { "value": "ARMOR_HEAT", "multiply": -1 }, { "value": "ARMOR_COLD", "multiply": 0.5 } ], "ench_effects": [ { "effect": "effect_hidden_flame_immunity", "intensity": 1 } ] From 18a3b5467ebd7a4ec72aec7322f7e971dca2a3c0 Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 08:34:10 +0800 Subject: [PATCH 11/19] Update effects_psionic.json --- data/mods/MindOverMatter/effects/effects_psionic.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json index b4f350c964a35..82f552a7808f8 100644 --- a/data/mods/MindOverMatter/effects/effects_psionic.json +++ b/data/mods/MindOverMatter/effects/effects_psionic.json @@ -1365,7 +1365,7 @@ "max_duration": "7 days", "max_intensity": 95, "blocks_effects": [ "blisters" ], - "enchantments": [ { "value": "ARMOR_HEAT", "multiply": -1.0 } ], + "enchantments": [ { "values": [ "value": "ARMOR_HEAT", "multiply": -1.0 ] } ], "flags": [ "HEAT_IMMUNE" ] }, { From 8e561edefd32d82e6c6377c2c8c58e4974e3e708 Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 10:15:40 +0800 Subject: [PATCH 12/19] Update effects.json --- data/mods/Magiclysm/effects/effects.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json index 9baec00f0e370..b331d400f5092 100644 --- a/data/mods/Magiclysm/effects/effects.json +++ b/data/mods/Magiclysm/effects/effects.json @@ -1276,7 +1276,7 @@ "show_in_info": true, "blocks_effects": [ "blisters" ], "removes_effects": [ "onfire" ], - "enchantments": [ { "values": [ { "value": "ARMOR_HEAT", "multiply": -1 } ], + "enchantments": [ "values": { [ "value": "ARMOR_HEAT", "multiply": -1 ] } ], "flags": [ "HEAT_IMMUME" ] }, { From add24b25f7d040a91426472a75523c9c593b33b8 Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 14:02:35 +0800 Subject: [PATCH 13/19] Update effects.json --- data/mods/Magiclysm/effects/effects.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json index b331d400f5092..f4f14c2d5c20a 100644 --- a/data/mods/Magiclysm/effects/effects.json +++ b/data/mods/Magiclysm/effects/effects.json @@ -1276,7 +1276,7 @@ "show_in_info": true, "blocks_effects": [ "blisters" ], "removes_effects": [ "onfire" ], - "enchantments": [ "values": { [ "value": "ARMOR_HEAT", "multiply": -1 ] } ], + "enchantments": [ { "values": [ { "value": "ARMOR_HEAT", "multiply": -1 ] } ], "flags": [ "HEAT_IMMUME" ] }, { From a0ee26a7dcbf288704c40051dbd48c4e6bb26779 Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 14:04:24 +0800 Subject: [PATCH 14/19] Update effects_psionic.json --- data/mods/MindOverMatter/effects/effects_psionic.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json index 82f552a7808f8..ff428ca7dedab 100644 --- a/data/mods/MindOverMatter/effects/effects_psionic.json +++ b/data/mods/MindOverMatter/effects/effects_psionic.json @@ -1365,7 +1365,7 @@ "max_duration": "7 days", "max_intensity": 95, "blocks_effects": [ "blisters" ], - "enchantments": [ { "values": [ "value": "ARMOR_HEAT", "multiply": -1.0 ] } ], + "enchantments": [ { "values": [ { "value": "ARMOR_HEAT", "multiply": -1.0 } ] } ], "flags": [ "HEAT_IMMUNE" ] }, { From 4cee43be7c5fb0b5c4ff14f9a1cbaca370e5f183 Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 14:05:28 +0800 Subject: [PATCH 15/19] Update effects.json --- data/mods/Magiclysm/effects/effects.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json index f4f14c2d5c20a..781ea3b0d0f3e 100644 --- a/data/mods/Magiclysm/effects/effects.json +++ b/data/mods/Magiclysm/effects/effects.json @@ -1276,7 +1276,7 @@ "show_in_info": true, "blocks_effects": [ "blisters" ], "removes_effects": [ "onfire" ], - "enchantments": [ { "values": [ { "value": "ARMOR_HEAT", "multiply": -1 ] } ], + "enchantments": [ { "values": [ { "value": "ARMOR_HEAT", "multiply": -1 } ] } ], "flags": [ "HEAT_IMMUME" ] }, { From d18e4b4309c08d44b8493ebeb339f04508d475d3 Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 14:54:31 +0800 Subject: [PATCH 16/19] Update salamander_mutations.json From 87251bb6ee30d54b611b7466b01bf5ae8f2b158c Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 15:18:13 +0800 Subject: [PATCH 17/19] Update salamander_mutations.json --- .../mutations/paraclesians/salamander_mutations.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json index 6d692c1b7460d..6a45e547a5dc8 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json @@ -585,10 +585,7 @@ "enchantments": [ { "condition": "ALWAYS", - "values": [ - { "value": "ARMOR_HEAT", "multiply": -1 }, - { "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 } ] } ], From ae4f31f9e317ad9f6e160cdbf6646b8513d2d125 Mon Sep 17 00:00:00 2001 From: Naadn <97841551+Naadn@users.noreply.github.com> Date: Fri, 6 Sep 2024 16:20:25 +0800 Subject: [PATCH 18/19] Update Vulcanist.json --- data/mods/Magiclysm/enchantments/Vulcanist.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Magiclysm/enchantments/Vulcanist.json b/data/mods/Magiclysm/enchantments/Vulcanist.json index bae514f2d606d..5a4a3f13b9ced 100644 --- a/data/mods/Magiclysm/enchantments/Vulcanist.json +++ b/data/mods/Magiclysm/enchantments/Vulcanist.json @@ -5,8 +5,8 @@ "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 } ], - "ench_effects": [ { "effect": "effect_vulcanist_no_smoke_or_blisters", "intensity": 1 }, { "value": "ARMOR_HEAT", "multiply": -1.0 } ] + "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", From d9af8152ca3ad961ec014a1cc35c3a46f57de73b Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 6 Sep 2024 14:35:35 -0500 Subject: [PATCH 19/19] Update data/mods/Magiclysm/effects/effects.json --- data/mods/Magiclysm/effects/effects.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json index 781ea3b0d0f3e..481d62570a56b 100644 --- a/data/mods/Magiclysm/effects/effects.json +++ b/data/mods/Magiclysm/effects/effects.json @@ -1271,7 +1271,7 @@ "type": "effect_type", "id": "effect_flame_immunity", "name": [ "Flame Immunity" ], - "desc": [ "You are immune to heat and fire" ], + "desc": [ "You are immune to heat and fire." ], "rating": "good", "show_in_info": true, "blocks_effects": [ "blisters" ],