Merge pull request #77742 from GuardianDll/no_enchantment_damage_for_…

…weapon Updates for melee enchantment bonuses
CleverRaven · Nov 12, 2024 · 2ce2168 · 2ce2168
2 parents 0b76c57 + 72bda1c
commit 2ce2168
Show file tree

Hide file tree

Showing 13 changed files with 88 additions and 94 deletions.
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -1621,6 +1621,11 @@
     "info": "This item is designed to have special effects",
     "type": "json_flag"
   },
+  {
+    "id": "RELIC_PINK",
+    "//": "For items that do not have relic data, but intended to be magical; changes the color of item to pink",
+    "type": "json_flag"
+  },
   {
     "id": "MUTAGEN_SAMPLE",
     "type": "json_flag",

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
@@ -3610,7 +3610,7 @@
     "vitamin_cost": 160,
     "visibility": 8,
     "ugliness": 4,
-    "enchantments": [ { "melee_damage_bonus": [ { "type": "stab", "add": 2 } ] } ],
+    "enchantments": [ { "condition": { "not": "u_has_weapon" }, "melee_damage_bonus": [ { "type": "stab", "add": 2 } ] } ],
     "description": "Your skin is covered in small, woody thorns.  Whenever an unarmed opponent strikes a part of your body that is not covered by clothing, they will receive minor damage.  Your punches may also deal extra damage.",
     "prereqs": [ "BARK", "BARK2_a", "BARK2_b", "BARK2_c" ],
     "category": [ "PLANT" ]
@@ -3804,7 +3804,12 @@
     "points": 1,
     "vitamin_cost": 60,
     "visibility": 1,
-    "enchantments": [ { "melee_damage_bonus": [ { "type": "stab", "add": 0.5 } ] } ],
+    "enchantments": [
+      {
+        "condition": { "and": [ { "not": "u_has_weapon" }, { "math": [ "u_encumbrance('hand_l') + u_encumbrance('hand_r') <= 0" ] } ] },
+        "melee_damage_bonus": [ { "type": "stab", "add": 0.5 } ]
+      }
+    ],
     "description": "Your fingernails are long and sharp.  If you aren't wearing gloves, your unarmed attacks deal a minor amount of cutting damage.",
     "types": [ "CLAWS" ],
     "changes_to": [ "CLAWS", "TALONS" ],
@@ -4195,7 +4200,7 @@
     "vitamin_cost": 60,
     "visibility": 5,
     "ugliness": 4,
-    "enchantments": [ { "melee_damage_bonus": [ { "type": "acid", "add": { "math": [ "rng(2, 3)" ] } } ] } ],
+    "enchantments": [ { "condition": { "not": "u_has_weapon" }, "melee_damage_bonus": [ { "type": "acid", "add": 3 } ] } ],
     "description": "The skin on your hands is now a mucous membrane that produces a thick, acrid slime.  Attacks using your hand will cause minor acid damage.  Slightly increases wet benefits.",
     "prereqs": [ "SLIMY" ],
     "category": [ "SLIME" ],

diff --git a/data/mods/Defense_Mode/mod_interactions/bombastic_perks/perks.json b/data/mods/Defense_Mode/mod_interactions/bombastic_perks/perks.json
@@ -14,7 +14,7 @@
     "name": { "str": "Slice n' Dice" },
     "points": 0,
     "description": "You've become very skilled with cutting weapons of all sorts, and know how to use them better.",
-    "enchantments": [ { "condition": { "not": "u_has_weapon" }, "melee_damage_bonus": [ { "type": "cut", "add": 5 } ] } ],
+    "enchantments": [ { "condition": { "math": [ "u_melee_damage('cut') > 1" ] }, "melee_damage_bonus": [ { "type": "cut", "add": 5 } ] } ],
     "category": [ "perk" ]
   },
   {
@@ -23,7 +23,9 @@
     "name": { "str": "Bash n' Mash" },
     "points": 0,
     "description": "You've become very skilled with blunt instruments of all sorts, and know how to use them better.",
-    "enchantments": [ { "condition": { "not": "u_has_weapon" }, "melee_damage_bonus": [ { "type": "bash", "add": 5 } ] } ],
+    "enchantments": [
+      { "condition": { "math": [ "u_melee_damage('bash') > 1" ] }, "melee_damage_bonus": [ { "type": "bash", "add": 5 } ] }
+    ],
     "category": [ "perk" ]
   },
   {
@@ -32,7 +34,9 @@
     "name": { "str": "Knifey" },
     "points": 0,
     "description": "You're very in tune with the ways of stabbing somebody.",
-    "enchantments": [ { "melee_damage_bonus": [ { "type": "stab", "add": 5 } ] } ],
+    "enchantments": [
+      { "condition": { "math": [ "u_melee_damage('stab') > 1" ] }, "melee_damage_bonus": [ { "type": "stab", "add": 5 } ] }
+    ],
     "category": [ "perk" ]
   },
   {

diff --git a/data/mods/Magiclysm/Spells/attunements/Crusader.json b/data/mods/Magiclysm/Spells/attunements/Crusader.json
@@ -120,14 +120,20 @@
     "material": [ "concentrated_mana" ],
     "weapon_category": [ "LONG_SWORDS", "GREAT_SWORDS" ],
     "techniques": [ "RSTRIKE", "WBLOCK_2", "BRUTAL", "RAPID" ],
-    "flags": [ "UNBREAKABLE_MELEE", "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "MAGIC_FOCUS", "TRADER_AVOID", "SHEATH_SWORD" ],
+    "flags": [
+      "UNBREAKABLE_MELEE",
+      "NONCONDUCTIVE",
+      "NO_REPAIR",
+      "NO_SALVAGE",
+      "MAGIC_FOCUS",
+      "TRADER_AVOID",
+      "SHEATH_SWORD",
+      "RELIC_PINK"
+    ],
     "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "good" },
     "weight": "1067 g",
     "volume": "2750 ml",
     "longest_side": "120cm",
-    "relic_data": {
-      "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "melee_damage_bonus": [ { "type": "pure", "add": 10 } ] } ]
-    },
     "use_action": [
       {
         "target": "dagger_judgement",
@@ -147,17 +153,23 @@
     "color": "light_gray",
     "looks_like": "kris",
     "description": "A short blade made of glowing, radiant fire.  It explodes with radiance when striking enemies.",
-    "flags": [ "UNBREAKABLE_MELEE", "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "MAGIC_FOCUS", "TRADER_AVOID", "SHEATH_KNIFE" ],
+    "flags": [
+      "UNBREAKABLE_MELEE",
+      "NONCONDUCTIVE",
+      "NO_REPAIR",
+      "NO_SALVAGE",
+      "MAGIC_FOCUS",
+      "TRADER_AVOID",
+      "SHEATH_KNIFE",
+      "RELIC_PINK"
+    ],
     "to_hit": { "grip": "weapon", "length": "hand", "surface": "line", "balance": "good" },
     "weight": "328 g",
     "volume": "750 ml",
     "longest_side": "50 cm",
     "material": "concentrated_mana",
     "techniques": [ "RSTRIKE", "WBLOCK_1", "RAPID" ],
     "weapon_category": [ "KNIVES" ],
-    "relic_data": {
-      "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "melee_damage_bonus": [ { "type": "pure", "add": 5 } ] } ]
-    },
     "use_action": [
       {
         "target": "zwei_judgement",
@@ -186,7 +198,8 @@
       "NO_SALVAGE",
       "MAGIC_FOCUS",
       "TRADER_AVOID",
-      "SHEATH_SWORD"
+      "SHEATH_SWORD",
+      "RELIC_PINK"
     ],
     "weight": "1868 g",
     "volume": "3250 ml",
@@ -195,9 +208,6 @@
     "techniques": [ "RSTRIKE", "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ],
     "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "good" },
     "weapon_category": [ "GREAT_SWORDS" ],
-    "relic_data": {
-      "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "melee_damage_bonus": [ { "type": "pure", "add": 15 } ] } ]
-    },
     "use_action": [
       {
         "target": "qiang_judgement",
@@ -226,7 +236,8 @@
       "NO_SALVAGE",
       "MAGIC_FOCUS",
       "TRADER_AVOID",
-      "SHEATH_SPEAR"
+      "SHEATH_SPEAR",
+      "RELIC_PINK"
     ],
     "weight": "822 g",
     "volume": "2500 ml",
@@ -235,9 +246,6 @@
     "techniques": [ "RSTRIKE", "WBLOCK_1", "IMPALE" ],
     "weapon_category": [ "POLEARMS", "SPEARS" ],
     "to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "neutral" },
-    "relic_data": {
-      "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "melee_damage_bonus": [ { "type": "pure", "add": 11 } ] } ]
-    },
     "use_action": [
       {
         "target": "mace_judgement",
@@ -257,17 +265,23 @@
     "color": "light_gray",
     "looks_like": "mace",
     "description": "A short and hefty mace glowing with radiant fire.  It explodes with radiance when striking enemies.",
-    "flags": [ "UNBREAKABLE_MELEE", "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "MAGIC_FOCUS", "TRADER_AVOID", "BELT_CLIP" ],
+    "flags": [
+      "UNBREAKABLE_MELEE",
+      "NONCONDUCTIVE",
+      "NO_REPAIR",
+      "NO_SALVAGE",
+      "MAGIC_FOCUS",
+      "TRADER_AVOID",
+      "BELT_CLIP",
+      "RELIC_PINK"
+    ],
     "to_hit": { "grip": "weapon", "length": "short", "surface": "any", "balance": "neutral" },
     "weight": "882 g",
     "volume": "1250 ml",
     "longest_side": "80 cm",
     "material": "concentrated_mana",
     "techniques": [ "RSTRIKE", "WBLOCK_1", "SWEEP" ],
     "weapon_category": [ "MACES" ],
-    "relic_data": {
-      "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "melee_damage_bonus": [ { "type": "pure", "add": 13 } ] } ]
-    },
     "use_action": [
       {
         "target": "longsword_judgement",

diff --git a/data/mods/Magiclysm/items/enchanted_unarmed.json b/data/mods/Magiclysm/items/enchanted_unarmed.json
@@ -30,10 +30,7 @@
     "weight": "970 g",
     "price_postapoc": "1 kUSD 240 USD",
     "qualities": [ [ "HAMMER", 1 ] ],
-    "flags": [ "ONLY_ONE", "DURABLE_MELEE", "NONCONDUCTIVE", "FLAMING" ],
-    "relic_data": {
-      "passive_effects": [ { "has": "WORN", "condition": { "not": "u_has_weapon" }, "melee_damage_bonus": [ { "type": "heat", "add": 7 } ] } ]
-    },
+    "flags": [ "ONLY_ONE", "DURABLE_MELEE", "NONCONDUCTIVE", "FLAMING", "RELIC_PINK" ],
     "armor": [
       {
         "material": [
@@ -53,18 +50,15 @@
         "specifically_covers": [ "hand_fingers_l", "hand_fingers_r" ]
       }
     ],
-    "melee_damage": { "bash": 2 }
+    "melee_damage": { "bash": 2, "heat": 7 }
   },
   {
     "type": "GENERIC",
     "id": "flaming_fist_plus_one",
     "copy-from": "flaming_fist",
     "looks_like": "flaming_fist",
     "name": { "str": "flaming fist +1", "str_pl": "flaming fists +1" },
-    "proportional": { "price": 3.0, "weight": 0.9, "melee_damage": { "all": 1.1 } },
-    "relic_data": {
-      "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "melee_damage_bonus": [ { "type": "heat", "add": 11 } ] } ]
-    },
+    "proportional": { "price": 3.0, "weight": 0.9, "melee_damage": { "all": 1.5 } },
     "relative": { "to_hit": 1 }
   },
   {
@@ -73,10 +67,7 @@
     "copy-from": "flaming_fist",
     "looks_like": "flaming_fist",
     "name": { "str": "flaming fist +2", "str_pl": "flaming fists +2" },
-    "proportional": { "price": 6.0, "weight": 0.8, "melee_damage": { "all": 1.2 } },
-    "relic_data": {
-      "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "melee_damage_bonus": [ { "type": "heat", "add": 15 } ] } ]
-    },
+    "proportional": { "price": 6.0, "weight": 0.8, "melee_damage": { "all": 2 } },
     "relative": { "to_hit": 2 }
   },
   {

diff --git a/data/mods/Magiclysm/items/ethereal_items.json b/data/mods/Magiclysm/items/ethereal_items.json
@@ -251,14 +251,12 @@
       "FIRESTARTER",
       "LIGHT_8",
       "FLAMING",
-      "FIRE"
+      "FIRE",
+      "RELIC_PINK"
     ],
     "to_hit": 3,
-    "relic_data": {
-      "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "melee_damage_bonus": [ { "type": "heat", "add": 30 } ] } ]
-    },
     "category": "weapons",
-    "melee_damage": { "cut": 6 }
+    "melee_damage": { "cut": 6, "heat": 30 }
   },
   {
     "id": "fleshpouch",
@@ -664,10 +662,7 @@
     "weight": "900 g",
     "volume": "1250 ml",
     "longest_side": "100 cm",
-    "relic_data": {
-      "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "melee_damage_bonus": [ { "type": "heat", "add": 28 } ] } ]
-    },
-    "melee_damage": { "bash": 12, "cut": 2 }
+    "melee_damage": { "bash": 12, "cut": 2, "heat": 28 }
   },
   {
     "id": "decaying_boneclub",
@@ -685,10 +680,7 @@
     "volume": "800 ml",
     "longest_side": "70 cm",
     "to_hit": 3,
-    "relic_data": {
-      "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "melee_damage_bonus": [ { "type": "biological", "add": 8 } ] } ]
-    },
-    "melee_damage": { "bash": 12 }
+    "melee_damage": { "bash": 12, "biological": 8 }
   },
   {
     "id": "impactsling",
@@ -920,10 +912,7 @@
     ],
     "flags": [ "UNBREAKABLE_MELEE", "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "MAGIC_FOCUS", "TRADER_AVOID" ],
     "qualities": [ [ "CONTAIN", 1 ], [ "BOIL", 1 ] ],
-    "relic_data": {
-      "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "melee_damage_bonus": [ { "type": "pure", "add": 3 } ] } ]
-    },
-    "melee_damage": { "bash": 1 }
+    "melee_damage": { "bash": 1, "pure": 3 }
   },
   {
     "id": "longsword_holy",
@@ -1428,10 +1417,7 @@
     ],
     "qualities": [ [ "WELD", 2 ] ],
     "to_hit": { "grip": "weapon", "length": "hand", "surface": "any", "balance": "neutral" },
-    "melee_damage": { "bash": 2 },
-    "relic_data": {
-      "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "melee_damage_bonus": [ { "type": "electric", "add": 6 } ] } ]
-    }
+    "melee_damage": { "bash": 2, "electric": 6 }
   },
   {
     "type": "GENERIC",
@@ -1747,9 +1733,6 @@
     ],
     "flags": [ "UNBREAKABLE_MELEE", "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "TRADER_AVOID" ],
     "qualities": [ [ "CONTAIN", 1 ] ],
-    "relic_data": {
-      "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "melee_damage_bonus": [ { "type": "pure", "add": 0 } ] } ]
-    },
     "melee_damage": { "bash": 1 }
   },
   {

diff --git a/data/mods/Xedra_Evolved/items/ethereal_items.json b/data/mods/Xedra_Evolved/items/ethereal_items.json
@@ -87,13 +87,19 @@
     "color": "light_gray",
     "techniques": [ "RAPID", "WBLOCK_2", "PRECISE" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 9 ] ],
-    "flags": [ "UNBREAKABLE_MELEE", "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "MAGIC_FOCUS", "TRADER_AVOID", "SHEATH_SWORD" ],
+    "flags": [
+      "UNBREAKABLE_MELEE",
+      "NONCONDUCTIVE",
+      "NO_REPAIR",
+      "NO_SALVAGE",
+      "MAGIC_FOCUS",
+      "TRADER_AVOID",
+      "SHEATH_SWORD",
+      "RELIC_PINK"
+    ],
     "weapon_category": [ "FENCING_WEAPONRY" ],
-    "relic_data": {
-      "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "melee_damage_bonus": [ { "type": "cold", "add": 10 } ] } ]
-    },
     "category": "weapons",
-    "melee_damage": { "bash": 2, "stab": 31 }
+    "melee_damage": { "bash": 2, "stab": 31, "cold": 10 }
   },
   {
     "id": "dagger_dreamdross",
@@ -375,9 +381,6 @@
     ],
     "flags": [ "UNBREAKABLE_MELEE", "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "TRADER_AVOID" ],
     "qualities": [ [ "CONTAIN", 1 ], [ "BOIL", 1 ] ],
-    "relic_data": {
-      "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "melee_damage_bonus": [ { "type": "pure", "add": 0 } ] } ]
-    },
     "melee_damage": { "bash": 1 }
   },
   {

diff --git a/data/mods/Xedra_Evolved/items/inventor/armor.json b/data/mods/Xedra_Evolved/items/inventor/armor.json
@@ -539,6 +539,7 @@
     "weight": "300 g",
     "longest_side": "25 cm",
     "ammo": [ "battery" ],
+    "melee_damage": { "electric": 10 },
     "flags": [ "MORPHIC", "ONLY_ONE", "TRADER_AVOID", "MUNDANE", "INVENTOR_CRAFTED" ],
     "use_action": [
       {
@@ -565,12 +566,7 @@
     ],
     "relic_data": {
       "passive_effects": [
-        {
-          "has": "WORN",
-          "condition": "ACTIVE",
-          "hit_you_effect": [ { "id": "inventor_electric_fist_spell", "once_in": 6 } ],
-          "melee_damage_bonus": [ { "type": "electric", "add": 10 } ]
-        }
+        { "has": "WORN", "condition": "ACTIVE", "hit_you_effect": [ { "id": "inventor_electric_fist_spell", "once_in": 6 } ] }
       ]
     },
     "material_thickness": 0.3,

diff --git a/data/mods/Xedra_Evolved/items/melee.json b/data/mods/Xedra_Evolved/items/melee.json
@@ -48,15 +48,10 @@
     "name": { "str": "frostrimed estoc" },
     "copy-from": "mirror_march_estoc",
     "description": "This sword is covered in shifting frost and seems to move of its own volition in your hands.",
+    "extend": { "flags": [ "RELIC_PINK" ] },
+    "relative": { "melee_damage": { "cold": 9 } },
     "relic_data": {
-      "passive_effects": [
-        {
-          "has": "WIELD",
-          "condition": "ALWAYS",
-          "melee_damage_bonus": [ { "type": "cold", "add": 9 } ],
-          "values": [ { "value": "ATTACK_SPEED", "add": -20 } ]
-        }
-      ]
+      "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "values": [ { "value": "ATTACK_SPEED", "add": -20 } ] } ]
     }
   },
   {