Merge pull request #78474 from GuardianDll/enchantment_stuff_again

Deprecate ARMOR_, EXTRA_ and ITEM_ARMOR_ enchantments
CleverRaven · Dec 13, 2024 · fb3126c · fb3126c
2 parents 2ea6a52 + 80c25fc
commit fb3126c
Show file tree

Hide file tree

Showing 57 changed files with 653 additions and 1,405 deletions.
diff --git a/data/json/artifact/relic_procgen_data.json b/data/json/artifact/relic_procgen_data.json
@@ -85,62 +85,6 @@
         "increment": 0.2,
         "power_per_increment": 10
       },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_ACID",
-        "increment": 0.1,
-        "power_per_increment": -125
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_BASH",
-        "increment": 0.1,
-        "power_per_increment": -250
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_CUT",
-        "increment": 0.1,
-        "power_per_increment": -250
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_ELEC",
-        "increment": 0.1,
-        "power_per_increment": -125
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_HEAT",
-        "increment": 0.1,
-        "power_per_increment": -125
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_STAB",
-        "increment": 0.1,
-        "power_per_increment": -250
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_BULLET",
-        "increment": 0.1,
-        "power_per_increment": -250
-      },
       {
         "weight": 50,
         "min_value": -0.4,
@@ -364,62 +308,6 @@
         "increment": 0.2,
         "power_per_increment": 10
       },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_ACID",
-        "increment": 0.1,
-        "power_per_increment": -125
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_BASH",
-        "increment": 0.1,
-        "power_per_increment": -250
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_CUT",
-        "increment": 0.1,
-        "power_per_increment": -250
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_ELEC",
-        "increment": 0.1,
-        "power_per_increment": -125
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_HEAT",
-        "increment": 0.1,
-        "power_per_increment": -125
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_STAB",
-        "increment": 0.1,
-        "power_per_increment": -250
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_BULLET",
-        "increment": 0.1,
-        "power_per_increment": -250
-      },
       {
         "weight": 50,
         "min_value": -0.4,
@@ -647,62 +535,6 @@
         "increment": 0.2,
         "power_per_increment": 10
       },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_ACID",
-        "increment": 0.1,
-        "power_per_increment": -125
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_BASH",
-        "increment": 0.1,
-        "power_per_increment": -250
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_CUT",
-        "increment": 0.1,
-        "power_per_increment": -250
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_ELEC",
-        "increment": 0.1,
-        "power_per_increment": -125
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_HEAT",
-        "increment": 0.1,
-        "power_per_increment": -125
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_STAB",
-        "increment": 0.1,
-        "power_per_increment": -250
-      },
-      {
-        "weight": 100,
-        "min_value": -0.2,
-        "max_value": 1,
-        "type": "ARMOR_BULLET",
-        "increment": 0.1,
-        "power_per_increment": -250
-      },
       {
         "weight": 50,
         "min_value": -0.4,

diff --git a/data/json/effects.json b/data/json/effects.json
@@ -570,13 +570,13 @@
     "enchantments": [
       {
         "condition": "ALWAYS",
-        "values": [
-          { "value": "SPEED", "multiply": -0.5 },
-          { "value": "ARMOR_BASH", "add": 15 },
-          { "value": "ARMOR_STAB", "add": 15 },
-          { "value": "ARMOR_CUT", "add": 15 },
-          { "value": "ARMOR_BULLET", "add": 50 }
-        ]
+        "incoming_damage_mod": [
+          { "type": "bash", "add": 15 },
+          { "type": "stab", "add": 15 },
+          { "type": "cut", "add": 15 },
+          { "type": "bullet", "add": 50 }
+        ],
+        "values": [ { "value": "SPEED", "multiply": -0.5 } ]
       }
     ]
   },
@@ -591,12 +591,13 @@
     "enchantments": [
       {
         "condition": "ALWAYS",
-        "values": [
-          { "value": "SPEED", "multiply": { "math": [ "Nemesis_iteration * 0.01" ] } },
-          { "value": "ARMOR_BASH", "add": { "math": [ "Nemesis_iteration * -1" ] } },
-          { "value": "ARMOR_STAB", "add": { "math": [ "Nemesis_iteration * -1" ] } },
-          { "value": "ARMOR_CUT", "add": { "math": [ "Nemesis_iteration * -1" ] } }
-        ]
+        "incoming_damage_mod": [
+          { "type": "bash", "add": { "math": [ "Nemesis_iteration * -1" ] } },
+          { "type": "stab", "add": { "math": [ "Nemesis_iteration * -1" ] } },
+          { "type": "cut", "add": { "math": [ "Nemesis_iteration * -1" ] } },
+          { "type": "bullet", "add": { "math": [ "Nemesis_iteration * -1" ] } }
+        ],
+        "values": [ { "value": "SPEED", "multiply": { "math": [ "Nemesis_iteration * 0.01" ] } } ]
       }
     ]
   },

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
@@ -2903,8 +2903,8 @@
     "enchantments": [
       {
         "condition": "ALWAYS",
+        "incoming_damage_mod_post_absorbed": [ { "type": "bash", "multiply": 0.4 } ],
         "values": [
-          { "value": "EXTRA_BASH", "multiply": 0.4 },
           { "value": "MOVE_COST", "multiply": -0.1 },
           { "value": "ATTACK_SPEED", "multiply": -0.1 },
           { "value": "CARRY_WEIGHT", "multiply": -0.2 }
@@ -7162,8 +7162,8 @@
     "category": [ "BIRD", "SLIME", "ELFA" ],
     "enchantments": [
       {
+        "incoming_damage_mod_post_absorbed": [ { "type": "bash", "multiply": 0.8 } ],
         "values": [
-          { "value": "EXTRA_BASH", "multiply": 0.8 },
           { "value": "MOVE_COST", "multiply": -0.2 },
           { "value": "ATTACK_SPEED", "multiply": -0.2 },
           { "value": "CARRY_WEIGHT", "multiply": -0.4 }

diff --git a/data/mods/Aftershock/items/item_enchants.json b/data/mods/Aftershock/items/item_enchants.json
@@ -6,7 +6,7 @@
     "condition": "ALWAYS",
     "name": { "str": "Cold Barrier" },
     "description": "Reduces incoming cold damage by 25%.",
-    "values": [ { "value": "ARMOR_COLD", "multiply": -0.25 } ]
+    "incoming_damage_mod": [ { "type": "cold", "multiply": -0.25 } ]
   },
   {
     "type": "enchantment",
@@ -56,7 +56,7 @@
     "has": "WORN",
     "condition": "ACTIVE",
     "name": { "str": "Low Energy Forcefield" },
-    "values": [ { "value": "ARMOR_BASH", "add": -25 }, { "value": "ARMOR_CUT", "add": -25 } ],
+    "incoming_damage_mod": [ { "type": "bash", "add": -25 }, { "type": "cut", "add": -25 } ],
     "description": "Reduces incoming bash and cut damage by 25."
   },
   {
@@ -65,7 +65,7 @@
     "has": "WORN",
     "condition": "ACTIVE",
     "name": { "str": "High Energy Forcefield" },
-    "values": [ { "value": "ARMOR_BULLET", "add": -40 }, { "value": "ARMOR_STAB", "add": -40 } ],
+    "incoming_damage_mod": [ { "type": "stab", "add": -40 }, { "type": "bullet", "add": -40 } ],
     "description": "Reduces incoming pierce and bullet damage by 40."
   },
   {

diff --git a/data/mods/Aftershock/player/bionics.json b/data/mods/Aftershock/player/bionics.json
@@ -179,9 +179,8 @@
     "enchantments": [
       {
         "condition": "ACTIVE",
+        "incoming_damage_mod": [ { "type": "biological", "add": -7 }, { "type": "cold", "add": -5 } ],
         "values": [
-          { "value": "ARMOR_BIO", "add": -7 },
-          { "value": "ARMOR_COLD", "add": -5 },
           { "value": "PAIN_REMOVE", "add": 45 },
           { "value": "METABOLISM", "multiply": 1.5 },
           { "value": "REGEN_HP", "multiply": 2 }

diff --git a/data/mods/Aftershock/spells/enchantments.json b/data/mods/Aftershock/spells/enchantments.json
@@ -42,6 +42,6 @@
     "type": "enchantment",
     "id": "protect_cold",
     "condition": "ACTIVE",
-    "values": [ { "value": "ARMOR_COLD", "add": -15 } ]
+    "incoming_damage_mod": [ { "type": "cold", "add": -15 } ]
   }
 ]
diff --git a/data/mods/BombasticPerks/perkdata/bellringer.json b/data/mods/BombasticPerks/perkdata/bellringer.json
@@ -27,6 +27,6 @@
     "apply_message": "",
     "rating": "bad",
     "max_duration": "1 s",
-    "enchantments": [ { "values": [ { "value": "ARMOR_BASH", "multiply": -0.33 } ] } ]
+    "enchantments": [ { "incoming_damage_mod": [ { "type": "bash", "multiply": -0.33 } ] } ]
   }
 ]
diff --git a/data/mods/BombasticPerks/perkdata/empath.json b/data/mods/BombasticPerks/perkdata/empath.json
@@ -141,11 +141,11 @@
     "enchantments": [
       {
         "condition": "ALWAYS",
-        "values": [
-          { "value": "ARMOR_BASH", "add": -8.0 },
-          { "value": "ARMOR_CUT", "add": -8.0 },
-          { "value": "ARMOR_BULLET", "add": -8.0 },
-          { "value": "ARMOR_ACID", "multiply": 0.0 }
+        "incoming_damage_mod": [
+          { "type": "acid", "multiply": -1 },
+          { "type": "bash", "add": -8 },
+          { "type": "cut", "add": -8 },
+          { "type": "bullet", "add": -8 }
         ]
       }
     ]

diff --git a/data/mods/Magiclysm/Spells/attunements/Crusader.json b/data/mods/Magiclysm/Spells/attunements/Crusader.json
@@ -37,11 +37,11 @@
         {
           "has": "WORN",
           "condition": "ALWAYS",
-          "values": [
-            { "value": "ARMOR_CUT", "add": -6 },
-            { "value": "ARMOR_BASH", "add": -6 },
-            { "value": "ARMOR_STAB", "add": -6 },
-            { "value": "ARMOR_BULLET", "add": -3 }
+          "incoming_damage_mod": [
+            { "type": "bash", "add": -6 },
+            { "type": "stab", "add": -6 },
+            { "type": "cut", "add": -6 },
+            { "type": "bullet", "add": -3 }
           ]
         }
       ]

diff --git a/data/mods/Magiclysm/Spells/attunements/Force_Mage.json b/data/mods/Magiclysm/Spells/attunements/Force_Mage.json
@@ -42,11 +42,11 @@
         {
           "has": "WORN",
           "condition": "ALWAYS",
-          "values": [
-            { "value": "ARMOR_BASH", "multiply": -0.3 },
-            { "value": "ARMOR_CUT", "multiply": -0.3 },
-            { "value": "ARMOR_STAB", "multiply": -0.3 },
-            { "value": "ARMOR_BULLET", "multiply": -0.3 }
+          "incoming_damage_mod": [
+            { "type": "bash", "multiply": -0.3 },
+            { "type": "stab", "multiply": -0.3 },
+            { "type": "cut", "multiply": -0.3 },
+            { "type": "bullet", "multiply": -0.3 }
           ]
         }
       ]

diff --git a/data/mods/Magiclysm/Spells/attunements/Gaias_Chosen.json b/data/mods/Magiclysm/Spells/attunements/Gaias_Chosen.json
@@ -65,20 +65,6 @@
     "name": [ "Terra Armor" ],
     "desc": [ "Your body is covered in dense, ethereal shell, that protect you." ],
     "remove_message": "Your lost your terra shell.",
-    "enchantments": [
-      {
-        "values": [
-          { "value": "ARMOR_ACID", "add": { "math": [ "u_spell_level('terra_armor') * -3" ] } },
-          { "value": "ARMOR_BASH", "add": { "math": [ "u_spell_level('terra_armor') * -3" ] } },
-          { "value": "ARMOR_BIO", "add": { "math": [ "u_spell_level('terra_armor') * -3" ] } },
-          { "value": "ARMOR_BULLET", "add": { "math": [ "u_spell_level('terra_armor') * -3" ] } },
-          { "value": "ARMOR_COLD", "add": { "math": [ "u_spell_level('terra_armor') * -3" ] } },
-          { "value": "ARMOR_CUT", "add": { "math": [ "u_spell_level('terra_armor') * -3" ] } },
-          { "value": "ARMOR_ELEC", "add": { "math": [ "u_spell_level('terra_armor') * -3" ] } },
-          { "value": "ARMOR_HEAT", "add": { "math": [ "u_spell_level('terra_armor') * -3" ] } },
-          { "value": "ARMOR_STAB", "add": { "math": [ "u_spell_level('terra_armor') * -3" ] } }
-        ]
-      }
-    ]
+    "enchantments": [ { "values": [ { "value": "ARMOR_ALL", "add": { "math": [ "u_spell_level('terra_armor') * -3" ] } } ] } ]
   }
 ]