From 957efd823fcb684000a972d4e92bed9866f926f1 Mon Sep 17 00:00:00 2001
From: Singe Horizontal <62802903+Singe-Horizontal@users.noreply.github.com>
Date: Tue, 6 Sep 2022 14:52:27 +0200
Subject: [PATCH] Several status fixes (#7216)

* Fixes #7215.
* Fixes endows not being removed on death and staying while switching weapon.
* Fixes some statuses that must disappear when logging off: Strip skills, Asura SP Regen Malus, Critical Explosion, NPC Change Undead.
* Monsters in StoneWait are correctly prevented from attacking.
---
 db/pre-re/status.yml | 18 ++++++++++++++----
 db/re/status.yml     | 18 ++++++++++++++----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/db/pre-re/status.yml b/db/pre-re/status.yml
index def5b5520c..51ed6608d9 100644
--- a/db/pre-re/status.yml
+++ b/db/pre-re/status.yml
@@ -79,6 +79,7 @@ Body:
     DurationLookup: NPC_PETRIFYATTACK
     States:
       NoCast: true
+      NoAttack: true
     Opt1: StoneWait
     Flags:
       SendOption: true
@@ -352,6 +353,8 @@ Body:
     DurationLookup: AS_ENCHANTPOISON
     CalcFlags:
       Atk_Ele: true
+    Flags:
+      RemoveOnUnequipWeapon: true
     End:
       Aspersio: true
       Fireweapon: true
@@ -752,6 +755,7 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
+      NoSave: true
   - Status: Stripshield
     Icon: EFST_NOEQUIPSHIELD
     DurationLookup: RG_STRIPSHIELD
@@ -763,6 +767,7 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
+      NoSave: true
   - Status: Striparmor
     Icon: EFST_NOEQUIPARMOR
     DurationLookup: RG_STRIPARMOR
@@ -774,6 +779,7 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
+      NoSave: true
   - Status: Striphelm
     Icon: EFST_NOEQUIPHELM
     DurationLookup: RG_STRIPHELM
@@ -785,6 +791,7 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
+      NoSave: true
   - Status: Cp_Weapon
     Icon: EFST_PROTECTWEAPON
     DurationLookup: AM_CP_WEAPON
@@ -932,6 +939,7 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
+      NoSave: true
   - Status: Explosionspirits
     Icon: EFST_EXPLOSIONSPIRITS
     DurationLookup: MO_EXPLOSIONSPIRITS
@@ -943,6 +951,7 @@ Body:
     Flags:
       Debuff: true
       NoClearance: true
+      NoSave: true
   - Status: Combo
     Flags:
       NoClearbuff: true
@@ -979,7 +988,7 @@ Body:
     CalcFlags:
       Atk_Ele: true
     Flags:
-      NoRemoveOnDead: true
+      RemoveOnUnequipWeapon: true
     End:
       Encpoison: true
       Aspersio: true
@@ -994,7 +1003,7 @@ Body:
     CalcFlags:
       Atk_Ele: true
     Flags:
-      NoRemoveOnDead: true
+      RemoveOnUnequipWeapon: true
     End:
       Encpoison: true
       Aspersio: true
@@ -1009,7 +1018,7 @@ Body:
     CalcFlags:
       Atk_Ele: true
     Flags:
-      NoRemoveOnDead: true
+      RemoveOnUnequipWeapon: true
     End:
       Encpoison: true
       Aspersio: true
@@ -1024,7 +1033,7 @@ Body:
     CalcFlags:
       Atk_Ele: true
     Flags:
-      NoRemoveOnDead: true
+      RemoveOnUnequipWeapon: true
     End:
       Encpoison: true
       Aspersio: true
@@ -1326,6 +1335,7 @@ Body:
     Flags:
       Debuff: true
       NoClearance: true
+      NoSave: true
     End:
       Blessing: true
       Increaseagi: true
diff --git a/db/re/status.yml b/db/re/status.yml
index 96693fdce3..d3a8cdd3e7 100644
--- a/db/re/status.yml
+++ b/db/re/status.yml
@@ -80,6 +80,7 @@ Body:
     DurationLookup: NPC_PETRIFYATTACK
     States:
       NoCast: true
+      NoAttack: true
     Opt1: StoneWait
     Flags:
       SendOption: true
@@ -363,6 +364,8 @@ Body:
     DurationLookup: AS_ENCHANTPOISON
     CalcFlags:
       Atk_Ele: true
+    Flags:
+      RemoveOnUnequipWeapon: true
     End:
       Aspersio: true
       Fireweapon: true
@@ -767,6 +770,7 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
+      NoSave: true
   - Status: Stripshield
     Icon: EFST_NOEQUIPSHIELD
     DurationLookup: RG_STRIPSHIELD
@@ -778,6 +782,7 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
+      NoSave: true
   - Status: Striparmor
     Icon: EFST_NOEQUIPARMOR
     DurationLookup: RG_STRIPARMOR
@@ -789,6 +794,7 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
+      NoSave: true
   - Status: Striphelm
     Icon: EFST_NOEQUIPHELM
     DurationLookup: RG_STRIPHELM
@@ -800,6 +806,7 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
+      NoSave: true
   - Status: Cp_Weapon
     Icon: EFST_PROTECTWEAPON
     DurationLookup: AM_CP_WEAPON
@@ -947,6 +954,7 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
+      NoSave: true
   - Status: Explosionspirits
     Icon: EFST_EXPLOSIONSPIRITS
     DurationLookup: MO_EXPLOSIONSPIRITS
@@ -958,6 +966,7 @@ Body:
     Flags:
       Debuff: true
       NoClearance: true
+      NoSave: true
   - Status: Combo
     Flags:
       NoClearbuff: true
@@ -994,7 +1003,7 @@ Body:
     CalcFlags:
       All: true
     Flags:
-      NoRemoveOnDead: true
+      RemoveOnUnequipWeapon: true
     End:
       Encpoison: true
       Aspersio: true
@@ -1009,7 +1018,7 @@ Body:
     CalcFlags:
       All: true
     Flags:
-      NoRemoveOnDead: true
+      RemoveOnUnequipWeapon: true
     End:
       Encpoison: true
       Aspersio: true
@@ -1024,7 +1033,7 @@ Body:
     CalcFlags:
       All: true
     Flags:
-      NoRemoveOnDead: true
+      RemoveOnUnequipWeapon: true
     End:
       Encpoison: true
       Aspersio: true
@@ -1039,7 +1048,7 @@ Body:
     CalcFlags:
       All: true
     Flags:
-      NoRemoveOnDead: true
+      RemoveOnUnequipWeapon: true
     End:
       Encpoison: true
       Aspersio: true
@@ -1341,6 +1350,7 @@ Body:
     Flags:
       Debuff: true
       NoClearance: true
+      NoSave: true
     End:
       Blessing: true
       Increaseagi: true