Merge pull request #82696 from Standing-Storm/invisible-werewolf-gear

Maleclypse · web-flow · commit 2da5461433a5 · 2025-08-31T10:59:56.000-05:00
[Magiclysm/XE] Fix shapeshifted gear that's subsumed into your form still being damaged
diff --git a/data/mods/Magiclysm/effect_on_conditions/transformations.json b/data/mods/Magiclysm/effect_on_conditions/transformations.json
@@ -23,7 +23,8 @@
                   { "npc_set_flag": "SEMITANGIBLE" },
                   { "npc_set_flag": "UNRESTRICTED" },
                   { "npc_set_flag": "INTANGIBLE_ARMOR" },
-                  { "npc_set_flag": "NO_TAKEOFF" }
+                  { "npc_set_flag": "NO_TAKEOFF" },
+                  { "npc_set_flag": "UNBREAKABLE" }
                 ]
               }
             ]
@@ -47,7 +48,8 @@
               { "npc_unset_flag": "INTANGIBLE_ARMOR" },
               { "npc_unset_flag": "UNRESTRICTED" },
               { "npc_unset_flag": "NO_TAKEOFF" },
-              { "npc_unset_flag": "SHAPESHIFTED_ARMOR" }
+              { "npc_unset_flag": "SHAPESHIFTED_ARMOR" },
+              { "npc_unset_flag": "UNBREAKABLE" }
             ]
           }
         ]
diff --git a/data/mods/Xedra_Evolved/eocs/shapeshifter_eocs.json b/data/mods/Xedra_Evolved/eocs/shapeshifter_eocs.json
@@ -385,7 +385,8 @@
                   { "npc_set_flag": "SEMITANGIBLE" },
                   { "npc_set_flag": "UNRESTRICTED" },
                   { "npc_set_flag": "INTANGIBLE_ARMOR" },
-                  { "npc_set_flag": "NO_TAKEOFF" }
+                  { "npc_set_flag": "NO_TAKEOFF" },
+                  { "npc_set_flag": "UNBREAKABLE" }
                 ]
               }
             ]
@@ -409,7 +410,8 @@
               { "npc_unset_flag": "INTANGIBLE_ARMOR" },
               { "npc_unset_flag": "UNRESTRICTED" },
               { "npc_unset_flag": "NO_TAKEOFF" },
-              { "npc_unset_flag": "SHAPESHIFTED_ARMOR" }
+              { "npc_unset_flag": "SHAPESHIFTED_ARMOR" },
+              { "npc_unset_flag": "UNBREAKABLE" }
             ]
           }
         ]

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@`
`23`	`23`	`{ "npc_set_flag": "SEMITANGIBLE" },`
`24`	`24`	`{ "npc_set_flag": "UNRESTRICTED" },`
`25`	`25`	`{ "npc_set_flag": "INTANGIBLE_ARMOR" },`
`26`		`- { "npc_set_flag": "NO_TAKEOFF" }`
	`26`	`+ { "npc_set_flag": "NO_TAKEOFF" },`
	`27`	`+ { "npc_set_flag": "UNBREAKABLE" }`
`27`	`28`	`]`
`28`	`29`	`}`
`29`	`30`	`]`
`@@ -47,7 +48,8 @@`
`47`	`48`	`{ "npc_unset_flag": "INTANGIBLE_ARMOR" },`
`48`	`49`	`{ "npc_unset_flag": "UNRESTRICTED" },`
`49`	`50`	`{ "npc_unset_flag": "NO_TAKEOFF" },`
`50`		`- { "npc_unset_flag": "SHAPESHIFTED_ARMOR" }`
	`51`	`+ { "npc_unset_flag": "SHAPESHIFTED_ARMOR" },`
	`52`	`+ { "npc_unset_flag": "UNBREAKABLE" }`
`51`	`53`	`]`
`52`	`54`	`}`
`53`	`55`	`]`
Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,8 @@`
`385`	`385`	`{ "npc_set_flag": "SEMITANGIBLE" },`
`386`	`386`	`{ "npc_set_flag": "UNRESTRICTED" },`
`387`	`387`	`{ "npc_set_flag": "INTANGIBLE_ARMOR" },`
`388`		`- { "npc_set_flag": "NO_TAKEOFF" }`
	`388`	`+ { "npc_set_flag": "NO_TAKEOFF" },`
	`389`	`+ { "npc_set_flag": "UNBREAKABLE" }`
`389`	`390`	`]`
`390`	`391`	`}`
`391`	`392`	`]`
`@@ -409,7 +410,8 @@`
`409`	`410`	`{ "npc_unset_flag": "INTANGIBLE_ARMOR" },`
`410`	`411`	`{ "npc_unset_flag": "UNRESTRICTED" },`
`411`	`412`	`{ "npc_unset_flag": "NO_TAKEOFF" },`
`412`		`- { "npc_unset_flag": "SHAPESHIFTED_ARMOR" }`
	`413`	`+ { "npc_unset_flag": "SHAPESHIFTED_ARMOR" },`
	`414`	`+ { "npc_unset_flag": "UNBREAKABLE" }`
`413`	`415`	`]`
`414`	`416`	`}`
`415`	`417`	`]`