From 887fbcc6b590a8e51a0f6919c422e3c3de84227b Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 14 Nov 2015 10:17:39 +0000
Subject: [PATCH] Merged Ditty buff abnormal types. Contributed by Matts.

---
 trunk/dist/game/data/stats/skills/11600-11699.xml         | 8 ++++----
 .../l2jserver/gameserver/model/skills/AbnormalType.java   | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/trunk/dist/game/data/stats/skills/11600-11699.xml b/trunk/dist/game/data/stats/skills/11600-11699.xml
index cea4d211c8..9df876c0c4 100644
--- a/trunk/dist/game/data/stats/skills/11600-11699.xml
+++ b/trunk/dist/game/data/stats/skills/11600-11699.xml
@@ -544,7 +544,7 @@
 		<set name="magicLvl" val="99" />
 		<set name="mpConsume" val="181" />
 		<set name="abnormalTime" val="1800" />
-		<set name="abnormalType" val="BATTLE_DITTY" />
+		<set name="abnormalType" val="DITTY_BUFF" />
 		<set name="castRange" val="900" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
@@ -576,7 +576,7 @@
 		<set name="magicLvl" val="99" />
 		<set name="mpConsume" val="181" />
 		<set name="abnormalTime" val="1800" />
-		<set name="abnormalType" val="PROTECTIVE_DITTY" />
+		<set name="abnormalType" val="DITTY_BUFF" />
 		<set name="castRange" val="900" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
@@ -603,7 +603,7 @@
 		<set name="magicLvl" val="99" />
 		<set name="mpConsume" val="181" />
 		<set name="abnormalTime" val="1800" />
-		<set name="abnormalType" val="BATTLE_DITTY" />
+		<set name="abnormalType" val="DITTY_BUFF" />
 		<set name="castRange" val="900" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
@@ -635,7 +635,7 @@
 		<set name="magicLvl" val="99" />
 		<set name="mpConsume" val="181" />
 		<set name="abnormalTime" val="1800" />
-		<set name="abnormalType" val="PROTECTIVE_DITTY" />
+		<set name="abnormalType" val="DITTY_BUFF" />
 		<set name="castRange" val="900" />
 		<set name="effectPoint" val="100" />
 		<set name="effectRange" val="1100" />
diff --git a/trunk/java/com/l2jserver/gameserver/model/skills/AbnormalType.java b/trunk/java/com/l2jserver/gameserver/model/skills/AbnormalType.java
index 9de509392c..04356f40fc 100644
--- a/trunk/java/com/l2jserver/gameserver/model/skills/AbnormalType.java
+++ b/trunk/java/com/l2jserver/gameserver/model/skills/AbnormalType.java
@@ -52,7 +52,6 @@ public enum AbnormalType
 	AVOID_UP,
 	AVOID_UP_SPECIAL,
 	CHANGE_BODY,
-	BATTLE_DITTY,
 	BERSERKER,
 	BETRAYAL_MARK,
 	BIG_BODY,
@@ -120,6 +119,7 @@ public enum AbnormalType
 	DERANGEMENT,
 	DETECT_WEAKNESS,
 	DISARM,
+	DITTY_BUFF,
 	DMG_SHIELD,
 	DOT_ATTR,
 	DOT_MP,
@@ -246,7 +246,6 @@ public enum AbnormalType
 	POTION_OF_GENESIS,
 	PRESERVE_ABNORMAL,
 	PROTECTION,
-	PROTECTIVE_DITTY,
 	PUBLIC_SLOT,
 	PVP_DMG_DOWN,
 	PVP_WEAPON_BUFF,