From 115106b86d3b927e15229bc10d7a79f96c4ac4f0 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 3 Aug 2020 04:43:33 +0000
Subject: [PATCH] Greater Might and Greater Shield stack with each other.
 Contributed by Iris.

---
 .../dist/game/data/stats/skills/01300-01399.xml           | 8 ++++----
 .../dist/game/data/stats/skills/07000-07099.xml           | 4 ++--
 .../l2jmobius/gameserver/model/skills/AbnormalType.java   | 2 ++
 .../dist/game/data/stats/skills/01300-01399.xml           | 8 ++++----
 .../dist/game/data/stats/skills/07000-07099.xml           | 4 ++--
 .../l2jmobius/gameserver/model/skills/AbnormalType.java   | 2 ++
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/01300-01399.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/01300-01399.xml
index db0ca8f84b..a59c6149e7 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/01300-01399.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/01300-01399.xml
@@ -4157,7 +4157,7 @@
 			<value level="3">3</value>
 		</abnormalLvl>
 		<abnormalTime>1200</abnormalTime>
-		<abnormalType>PA_PD_UP</abnormalType>
+		<abnormalType>PA_UP2</abnormalType>
 		<castRange>400</castRange>
 		<effectPoint>
 			<value level="1">549</value>
@@ -4209,7 +4209,7 @@
 			<value level="3">3</value>
 		</abnormalLvl>
 		<abnormalTime>1200</abnormalTime>
-		<abnormalType>PA_PD_UP</abnormalType>
+		<abnormalType>PD_UP2</abnormalType>
 		<castRange>400</castRange>
 		<effectPoint>
 			<value level="1">549</value>
@@ -4261,7 +4261,7 @@
 			<value level="3">3</value>
 		</abnormalLvl>
 		<abnormalTime>1200</abnormalTime>
-		<abnormalType>PA_PD_UP</abnormalType>
+		<abnormalType>PA_UP2</abnormalType>
 		<affectRange>1000</affectRange>
 		<effectPoint>
 			<value level="1">549</value>
@@ -4313,7 +4313,7 @@
 			<value level="3">3</value>
 		</abnormalLvl>
 		<abnormalTime>1200</abnormalTime>
-		<abnormalType>PA_PD_UP</abnormalType>
+		<abnormalType>PD_UP2</abnormalType>
 		<affectRange>1000</affectRange>
 		<effectPoint>
 			<value level="1">549</value>
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/07000-07099.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/07000-07099.xml
index 2fb03aaf8f..8dad17bcd4 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/07000-07099.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/07000-07099.xml
@@ -972,7 +972,7 @@
 		<icon>icon.skill1388</icon>
 		<abnormalLvl>4</abnormalLvl>
 		<abnormalTime>3600</abnormalTime>
-		<abnormalType>PA_PD_UP</abnormalType>
+		<abnormalType>PA_UP2</abnormalType>
 		<castRange>900</castRange>
 		<effectPoint>1</effectPoint>
 		<effectRange>1500</effectRange>
@@ -998,7 +998,7 @@
 		<icon>icon.skill1389</icon>
 		<abnormalLvl>4</abnormalLvl>
 		<abnormalTime>3600</abnormalTime>
-		<abnormalType>PA_PD_UP</abnormalType>
+		<abnormalType>PD_UP2</abnormalType>
 		<castRange>900</castRange>
 		<effectPoint>1</effectPoint>
 		<effectRange>1500</effectRange>
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
index 5fd0427ef0..83cedeaca8 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -518,6 +518,8 @@ public enum AbnormalType
 	STEEL_MIND(596),
 	BUFF_QUEEN_OF_CAT2(600),
 	BUFF_UNICORN_SERAPHIM2(601),
+	PA_UP2(602),
+	PD_UP2(603),
 	STRAWBERRY_FRUIT(-1),
 	MONGO_FRUIT(-1),
 	CHERRY_FRUIT(-1),
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01300-01399.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01300-01399.xml
index 0c5d006234..7289139edd 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01300-01399.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01300-01399.xml
@@ -4189,7 +4189,7 @@
 			<value level="3">3</value>
 		</abnormalLvl>
 		<abnormalTime>1200</abnormalTime>
-		<abnormalType>PA_PD_UP</abnormalType>
+		<abnormalType>PA_UP2</abnormalType>
 		<castRange>400</castRange>
 		<effectPoint>
 			<value level="1">549</value>
@@ -4241,7 +4241,7 @@
 			<value level="3">3</value>
 		</abnormalLvl>
 		<abnormalTime>1200</abnormalTime>
-		<abnormalType>PA_PD_UP</abnormalType>
+		<abnormalType>PD_UP2</abnormalType>
 		<castRange>400</castRange>
 		<effectPoint>
 			<value level="1">549</value>
@@ -4293,7 +4293,7 @@
 			<value level="3">3</value>
 		</abnormalLvl>
 		<abnormalTime>1200</abnormalTime>
-		<abnormalType>PA_PD_UP</abnormalType>
+		<abnormalType>PA_UP2</abnormalType>
 		<affectRange>1000</affectRange>
 		<effectPoint>
 			<value level="1">549</value>
@@ -4345,7 +4345,7 @@
 			<value level="3">3</value>
 		</abnormalLvl>
 		<abnormalTime>1200</abnormalTime>
-		<abnormalType>PA_PD_UP</abnormalType>
+		<abnormalType>PD_UP2</abnormalType>
 		<affectRange>1000</affectRange>
 		<effectPoint>
 			<value level="1">549</value>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/07000-07099.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/07000-07099.xml
index 2fb03aaf8f..8dad17bcd4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/07000-07099.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/07000-07099.xml
@@ -972,7 +972,7 @@
 		<icon>icon.skill1388</icon>
 		<abnormalLvl>4</abnormalLvl>
 		<abnormalTime>3600</abnormalTime>
-		<abnormalType>PA_PD_UP</abnormalType>
+		<abnormalType>PA_UP2</abnormalType>
 		<castRange>900</castRange>
 		<effectPoint>1</effectPoint>
 		<effectRange>1500</effectRange>
@@ -998,7 +998,7 @@
 		<icon>icon.skill1389</icon>
 		<abnormalLvl>4</abnormalLvl>
 		<abnormalTime>3600</abnormalTime>
-		<abnormalType>PA_PD_UP</abnormalType>
+		<abnormalType>PD_UP2</abnormalType>
 		<castRange>900</castRange>
 		<effectPoint>1</effectPoint>
 		<effectRange>1500</effectRange>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
index 5fd0427ef0..83cedeaca8 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -518,6 +518,8 @@ public enum AbnormalType
 	STEEL_MIND(596),
 	BUFF_QUEEN_OF_CAT2(600),
 	BUFF_UNICORN_SERAPHIM2(601),
+	PA_UP2(602),
+	PD_UP2(603),
 	STRAWBERRY_FRUIT(-1),
 	MONGO_FRUIT(-1),
 	CHERRY_FRUIT(-1),