From 1fdaaae7902c4b47903a23c5477e5e0b4f1e5deb Mon Sep 17 00:00:00 2001
From: malyelfik <malyelfik@users.noreply.github.com>
Date: Sun, 30 Dec 2012 20:40:20 +0000
Subject: [PATCH] BETA: Updating '''!CabaleBuffer''' AI * Removing
!AutoChatHandler, because it is useless now
Reviewed by: !UnAfraid
---
.../ai/npc/NpcBuffers/CabaleBuffer.java | 154 ++++++++--
.../admincommandhandlers/AdminSpawn.java | 2 -
.../handlers/itemhandlers/MercTicket.java | 2 +-
L2J_DataPack_BETA/dist/sql/game/auto_chat.sql | 44 ---
.../dist/sql/game/auto_chat_text.sql | 264 ------------------
L2J_DataPack_BETA/dist/tools/gs_cleanup.sql | 2 -
6 files changed, 132 insertions(+), 336 deletions(-)
delete mode 100644 L2J_DataPack_BETA/dist/sql/game/auto_chat.sql
delete mode 100644 L2J_DataPack_BETA/dist/sql/game/auto_chat_text.sql
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/CabaleBuffer.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/CabaleBuffer.java
index bc4be3955c..709ab7444e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/CabaleBuffer.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/CabaleBuffer.java
@@ -23,18 +23,41 @@ import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.SkillTable;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.L2Effect;
import com.l2jserver.gameserver.model.skills.L2Skill;
-import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
/**
- * @author UnAfraid
+ * Preacher of Doom and Orator of Revelations AI
+ * @author UnAfraid, malyelfik
*/
public class CabaleBuffer extends AbstractNpcAI
{
private static final int DISTANCE_TO_WATCH_OBJECT = 900;
+ // Messages
+ public static final NpcStringId[] ORATOR_MSG =
+ {
+ NpcStringId.THE_DAY_OF_JUDGMENT_IS_NEAR,
+ NpcStringId.THE_PROPHECY_OF_DARKNESS_HAS_BEEN_FULFILLED,
+ NpcStringId.AS_FORETOLD_IN_THE_PROPHECY_OF_DARKNESS_THE_ERA_OF_CHAOS_HAS_BEGUN,
+ NpcStringId.THE_PROPHECY_OF_DARKNESS_HAS_COME_TO_PASS
+ };
+ public static final NpcStringId[] PREACHER_MSG =
+ {
+ NpcStringId.THIS_WORLD_WILL_SOON_BE_ANNIHILATED,
+ NpcStringId.ALL_IS_LOST_PREPARE_TO_MEET_THE_GODDESS_OF_DEATH,
+ NpcStringId.ALL_IS_LOST_THE_PROPHECY_OF_DESTRUCTION_HAS_BEEN_FULFILLED,
+ NpcStringId.THE_END_OF_TIME_HAS_COME_THE_PROPHECY_OF_DESTRUCTION_HAS_BEEN_FULFILLED
+ };
+
+ // Skill Id
+ private static final int ORATOR_FIGTER = 4364;
+ private static final int ORATOR_MAGE = 4365;
+ private static final int PREACHER_FIGTER = 4361;
+ private static final int PREACHER_MAGE = 4362;
+
protected CabaleBuffer(String name, String descr)
{
super(name, descr);
@@ -52,9 +75,35 @@ public class CabaleBuffer extends AbstractNpcAI
public String onSpawn(L2Npc npc)
{
ThreadPoolManager.getInstance().scheduleGeneral(new CabaleAI(npc), 3000);
+ ThreadPoolManager.getInstance().scheduleGeneral(new Talk(npc), 60000);
return super.onSpawn(npc);
}
+ protected class Talk implements Runnable
+ {
+ private final L2Npc _npc;
+
+ protected Talk(L2Npc npc)
+ {
+ _npc = npc;
+ }
+
+ @Override
+ public void run()
+ {
+ if ((_npc != null) && !_npc.isDecayed())
+ {
+ NpcStringId[] messages = ORATOR_MSG;
+ if (_npc.getNpcId() == SevenSigns.PREACHER_NPC_ID)
+ {
+ messages = PREACHER_MSG;
+ }
+ broadcastSay(_npc, messages[getRandom(messages.length)], null, -1);
+ ThreadPoolManager.getInstance().scheduleGeneral(this, 60000);
+ }
+ }
+ }
+
protected class CabaleAI implements Runnable
{
private final L2Npc _npc;
@@ -101,16 +150,32 @@ public class CabaleBuffer extends AbstractNpcAI
{
if (!player.isMageClass())
{
- if (handleCast(player, 4364))
+ if (handleCast(player, ORATOR_FIGTER))
{
+ if (getAbnormalLvl(player, ORATOR_FIGTER) == 2)
+ {
+ broadcastSay(_npc, NpcStringId.S1_I_GIVE_YOU_THE_BLESSING_OF_PROPHECY, player.getName(), 500);
+ }
+ else
+ {
+ broadcastSay(_npc, NpcStringId.I_BESTOW_UPON_YOU_A_BLESSING, null, 1);
+ }
isBuffAWinner = true;
continue;
}
}
else
{
- if (handleCast(player, 4365))
+ if (handleCast(player, ORATOR_MAGE))
{
+ if (getAbnormalLvl(player, ORATOR_MAGE) == 2)
+ {
+ broadcastSay(_npc, NpcStringId.S1_I_BESTOW_UPON_YOU_THE_AUTHORITY_OF_THE_ABYSS, player.getName(), 500);
+ }
+ else
+ {
+ broadcastSay(_npc, NpcStringId.HERALD_OF_THE_NEW_ERA_OPEN_YOUR_EYES, null, 1);
+ }
isBuffAWinner = true;
continue;
}
@@ -120,16 +185,32 @@ public class CabaleBuffer extends AbstractNpcAI
{
if (!player.isMageClass())
{
- if (handleCast(player, 4361))
+ if (handleCast(player, PREACHER_FIGTER))
{
+ if (getAbnormalLvl(player, PREACHER_FIGTER) == 2)
+ {
+ broadcastSay(_npc, NpcStringId.A_CURSE_UPON_YOU, player.getName(), 500);
+ }
+ else
+ {
+ broadcastSay(_npc, NpcStringId.YOU_DONT_HAVE_ANY_HOPE_YOUR_END_HAS_COME, null, 1);
+ }
isBuffALoser = true;
continue;
}
}
else
{
- if (handleCast(player, 4362))
+ if (handleCast(player, PREACHER_MAGE))
{
+ if (getAbnormalLvl(player, PREACHER_MAGE) == 2)
+ {
+ broadcastSay(_npc, NpcStringId.S1_YOU_MIGHT_AS_WELL_GIVE_UP, player.getName(), 500);
+ }
+ else
+ {
+ broadcastSay(_npc, NpcStringId.S1_YOU_BRING_AN_ILL_WIND, player.getName(), 1);
+ }
isBuffALoser = true;
continue;
}
@@ -141,7 +222,6 @@ public class CabaleBuffer extends AbstractNpcAI
break;
}
}
-
ThreadPoolManager.getInstance().scheduleGeneral(this, 3000);
}
@@ -154,36 +234,64 @@ public class CabaleBuffer extends AbstractNpcAI
* - Mystics: -25% Casting Speed, -25% Effect Resistance<BR>
* <BR>
* <BR>
- * Blessing of Prophecy (Winner) - Fighters: +25% Max Load, +25% Effect Resistance<BR>
+ * Blessing of Prophecy (Winner)<br>
+ * - Fighters: +25% Max Load, +25% Effect Resistance<BR>
* - Mystics: +25% Magic Cancel Resist, +25% Effect Resistance<BR>
- * @param player
- * @param skillId
- * @return
+ * @param player
+ * @param skillId
+ * @return
*/
private boolean handleCast(L2PcInstance player, int skillId)
{
- int skillLevel = (player.getLevel() > 40) ? 1 : 2;
-
if (player.isDead() || !player.isVisible() || !_npc.isInsideRadius(player, DISTANCE_TO_WATCH_OBJECT, false, false))
{
return false;
}
- L2Skill skill = SkillTable.getInstance().getInfo(skillId, skillLevel);
- if (player.getFirstEffect(skill) == null)
+ boolean doCast = false;
+ int skillLevel = 1;
+
+ final int level = getAbnormalLvl(player, skillId);
+ if (level == 0)
{
- skill.getEffects(_npc, player);
- _npc.broadcastPacket(new MagicSkillUse(_npc, player, skill.getId(), skillLevel, skill.getHitTime(), 0));
- SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_FEEL_S1_EFFECT);
- sm.addSkillName(skill);
- player.sendPacket(sm);
- return true;
+ doCast = true;
+
+ }
+ else if ((level == 1) && (getRandom(100) < 5))
+ {
+ doCast = true;
+ skillLevel = 2;
}
+ if (doCast)
+ {
+ final L2Skill skill = SkillTable.getInstance().getInfo(skillId, skillLevel);
+ _npc.setTarget(player);
+ _npc.doCast(skill);
+ return true;
+ }
return false;
}
}
+ public void broadcastSay(L2Npc npc, NpcStringId message, String param, int chance)
+ {
+ if (chance == -1)
+ {
+ broadcastNpcSay(npc, Say2.NPC_ALL, message);
+ }
+ else if (getRandom(10000) < chance)
+ {
+ broadcastNpcSay(npc, Say2.NPC_ALL, message, param);
+ }
+ }
+
+ public int getAbnormalLvl(L2PcInstance player, int skillId)
+ {
+ final L2Effect effect = player.getFirstEffect(skillId);
+ return (effect != null) ? effect.getAbnormalLvl() : 0;
+ }
+
public static void main(String[] args)
{
new CabaleBuffer(CabaleBuffer.class.getSimpleName(), "ai/npc");
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index fb3dd2420c..435f2aba16 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -31,7 +31,6 @@ import com.l2jserver.gameserver.instancemanager.DayNightSpawnManager;
import com.l2jserver.gameserver.instancemanager.InstanceManager;
import com.l2jserver.gameserver.instancemanager.QuestManager;
import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager;
-import com.l2jserver.gameserver.model.AutoChatHandler;
import com.l2jserver.gameserver.model.AutoSpawnHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Spawn;
@@ -237,7 +236,6 @@ public class AdminSpawn implements IAdminCommandHandler
SpawnTable.getInstance().reloadAll();
RaidBossSpawnManager.getInstance().load();
AutoSpawnHandler.getInstance().reload();
- AutoChatHandler.getInstance().reload();
SevenSigns.getInstance().spawnSevenSignsNPC();
QuestManager.getInstance().reloadAllQuests();
AdminTable.getInstance().broadcastMessageToGMs("NPC Respawn completed!");
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
index 4a204cf32c..2576ab17f1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
@@ -123,7 +123,7 @@ public class MercTicket implements IItemHandler
return false;
}
- MercTicketManager.getInstance().addTicket(item.getItemId(), activeChar, null);
+ MercTicketManager.getInstance().addTicket(item.getItemId(), activeChar);
activeChar.destroyItem("Consume", item.getObjectId(), 1, null, false); // Remove item from char's inventory
activeChar.sendPacket(SystemMessageId.PLACE_CURRENT_LOCATION_DIRECTION);
return true;
diff --git a/L2J_DataPack_BETA/dist/sql/game/auto_chat.sql b/L2J_DataPack_BETA/dist/sql/game/auto_chat.sql
deleted file mode 100644
index ddb40a531a..0000000000
--- a/L2J_DataPack_BETA/dist/sql/game/auto_chat.sql
+++ /dev/null
@@ -1,44 +0,0 @@
-DROP TABLE IF EXISTS `auto_chat`;
-CREATE TABLE `auto_chat` (
- `groupId` INT NOT NULL DEFAULT '0',
- `npcId` INT NOT NULL DEFAULT '0',
- `chatDelay` BIGINT NOT NULL DEFAULT '-1',
- PRIMARY KEY (`groupId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-INSERT INTO `auto_chat` VALUES
--- Preacher of Doom
-(1,31093,-1),
-(2,31172,-1),
-(3,31174,-1),
-(4,31176,-1),
-(5,31178,-1),
-(6,31180,-1),
-(7,31182,-1),
-(8,31184,-1),
-(9,31186,-1),
-(10,31188,-1),
-(11,31190,-1),
-(12,31192,-1),
-(13,31194,-1),
-(14,31196,-1),
-(15,31198,-1),
-(16,31200,-1),
-
--- Orator of Revelations
-(17,31094,-1),
-(18,31173,-1),
-(19,31175,-1),
-(20,31177,-1),
-(21,31179,-1),
-(22,31181,-1),
-(23,31183,-1),
-(24,31185,-1),
-(25,31187,-1),
-(26,31189,-1),
-(27,31191,-1),
-(28,31193,-1),
-(29,31195,-1),
-(30,31197,-1),
-(31,31199,-1),
-(32,31201,-1);
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/sql/game/auto_chat_text.sql b/L2J_DataPack_BETA/dist/sql/game/auto_chat_text.sql
deleted file mode 100644
index d0938ddce8..0000000000
--- a/L2J_DataPack_BETA/dist/sql/game/auto_chat_text.sql
+++ /dev/null
@@ -1,264 +0,0 @@
-DROP TABLE IF EXISTS `auto_chat_text`;
-CREATE TABLE `auto_chat_text` (
- `groupId` tinyint(2) unsigned NOT NULL DEFAULT '0',
- `chatText` varchar(255) NOT NULL DEFAULT '',
- PRIMARY KEY (`groupId`,`chatText`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-INSERT INTO `auto_chat_text` VALUES
-(1,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
-(1,'%player_cabal_loser%! You bring an ill wind!'),
-(1,'%player_cabal_loser%! You might as well give up!'),
-(1,'A curse upon you!'),
-(1,'All is lost! Prepare to meet the goddess of death!'),
-(1,'All is lost! The prophecy of destruction has been fulfilled!'),
-(1,'The prophecy of doom has awoken!'),
-(1,'This world will soon be annihilated!'),
-(2,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
-(2,'%player_cabal_loser%! You bring an ill wind!'),
-(2,'%player_cabal_loser%! You might as well give up!'),
-(2,'A curse upon you!'),
-(2,'All is lost! Prepare to meet the goddess of death!'),
-(2,'All is lost! The prophecy of destruction has been fulfilled!'),
-(2,'The prophecy of doom has awoken!'),
-(2,'This world will soon be annihilated!'),
-(3,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
-(3,'%player_cabal_loser%! You bring an ill wind!'),
-(3,'%player_cabal_loser%! You might as well give up!'),
-(3,'A curse upon you!'),
-(3,'All is lost! Prepare to meet the goddess of death!'),
-(3,'All is lost! The prophecy of destruction has been fulfilled!'),
-(3,'The prophecy of doom has awoken!'),
-(3,'This world will soon be annihilated!'),
-(4,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
-(4,'%player_cabal_loser%! You bring an ill wind!'),
-(4,'%player_cabal_loser%! You might as well give up!'),
-(4,'A curse upon you!'),
-(4,'All is lost! Prepare to meet the goddess of death!'),
-(4,'All is lost! The prophecy of destruction has been fulfilled!'),
-(4,'The prophecy of doom has awoken!'),
-(4,'This world will soon be annihilated!'),
-(5,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
-(5,'%player_cabal_loser%! You bring an ill wind!'),
-(5,'%player_cabal_loser%! You might as well give up!'),
-(5,'A curse upon you!'),
-(5,'All is lost! Prepare to meet the goddess of death!'),
-(5,'All is lost! The prophecy of destruction has been fulfilled!'),
-(5,'The prophecy of doom has awoken!'),
-(5,'This world will soon be annihilated!'),
-(6,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
-(6,'%player_cabal_loser%! You bring an ill wind!'),
-(6,'%player_cabal_loser%! You might as well give up!'),
-(6,'A curse upon you!'),
-(6,'All is lost! Prepare to meet the goddess of death!'),
-(6,'All is lost! The prophecy of destruction has been fulfilled!'),
-(6,'The prophecy of doom has awoken!'),
-(6,'This world will soon be annihilated!'),
-(7,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
-(7,'%player_cabal_loser%! You bring an ill wind!'),
-(7,'%player_cabal_loser%! You might as well give up!'),
-(7,'A curse upon you!'),
-(7,'All is lost! Prepare to meet the goddess of death!'),
-(7,'All is lost! The prophecy of destruction has been fulfilled!'),
-(7,'The prophecy of doom has awoken!'),
-(7,'This world will soon be annihilated!'),
-(8,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
-(8,'%player_cabal_loser%! You bring an ill wind!'),
-(8,'%player_cabal_loser%! You might as well give up!'),
-(8,'A curse upon you!'),
-(8,'All is lost! Prepare to meet the goddess of death!'),
-(8,'All is lost! The prophecy of destruction has been fulfilled!'),
-(8,'The prophecy of doom has awoken!'),
-(8,'This world will soon be annihilated!'),
-(9,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
-(9,'%player_cabal_loser%! You bring an ill wind!'),
-(9,'%player_cabal_loser%! You might as well give up!'),
-(9,'A curse upon you!'),
-(9,'All is lost! Prepare to meet the goddess of death!'),
-(9,'All is lost! The prophecy of destruction has been fulfilled!'),
-(9,'The prophecy of doom has awoken!'),
-(9,'This world will soon be annihilated!'),
-(10,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
-(10,'%player_cabal_loser%! You bring an ill wind!'),
-(10,'%player_cabal_loser%! You might as well give up!'),
-(10,'A curse upon you!'),
-(10,'All is lost! Prepare to meet the goddess of death!'),
-(10,'All is lost! The prophecy of destruction has been fulfilled!'),
-(10,'The prophecy of doom has awoken!'),
-(10,'This world will soon be annihilated!'),
-(11,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
-(11,'%player_cabal_loser%! You bring an ill wind!'),
-(11,'%player_cabal_loser%! You might as well give up!'),
-(11,'A curse upon you!'),
-(11,'All is lost! Prepare to meet the goddess of death!'),
-(11,'All is lost! The prophecy of destruction has been fulfilled!'),
-(11,'The prophecy of doom has awoken!'),
-(11,'This world will soon be annihilated!'),
-(12,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
-(12,'%player_cabal_loser%! You bring an ill wind!'),
-(12,'%player_cabal_loser%! You might as well give up!'),
-(12,'A curse upon you!'),
-(12,'All is lost! Prepare to meet the goddess of death!'),
-(12,'All is lost! The prophecy of destruction has been fulfilled!'),
-(12,'The prophecy of doom has awoken!'),
-(12,'This world will soon be annihilated!'),
-(13,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
-(13,'%player_cabal_loser%! You bring an ill wind!'),
-(13,'%player_cabal_loser%! You might as well give up!'),
-(13,'A curse upon you!'),
-(13,'All is lost! Prepare to meet the goddess of death!'),
-(13,'All is lost! The prophecy of destruction has been fulfilled!'),
-(13,'The prophecy of doom has awoken!'),
-(13,'This world will soon be annihilated!'),
-(14,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
-(14,'%player_cabal_loser%! You bring an ill wind!'),
-(14,'%player_cabal_loser%! You might as well give up!'),
-(14,'A curse upon you!'),
-(14,'All is lost! Prepare to meet the goddess of death!'),
-(14,'All is lost! The prophecy of destruction has been fulfilled!'),
-(14,'The prophecy of doom has awoken!'),
-(14,'This world will soon be annihilated!'),
-(15,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
-(15,'%player_cabal_loser%! You bring an ill wind!'),
-(15,'%player_cabal_loser%! You might as well give up!'),
-(15,'A curse upon you!'),
-(15,'All is lost! Prepare to meet the goddess of death!'),
-(15,'All is lost! The prophecy of destruction has been fulfilled!'),
-(15,'The prophecy of doom has awoken!'),
-(15,'This world will soon be annihilated!'),
-(16,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
-(16,'%player_cabal_loser%! You bring an ill wind!'),
-(16,'%player_cabal_loser%! You might as well give up!'),
-(16,'A curse upon you!'),
-(16,'All is lost! Prepare to meet the goddess of death!'),
-(16,'All is lost! The prophecy of destruction has been fulfilled!'),
-(16,'The prophecy of doom has awoken!'),
-(16,'This world will soon be annihilated!'),
-(17,'%player_cabal_winner%! I bestow on you the authority of the abyss!'),
-(17,'%player_cabal_winner%, Darkness shall be banished forever!'),
-(17,'%player_cabal_winner%, the time for glory is at hand!'),
-(17,'All hail the eternal twilight!'),
-(17,'As foretold in the prophecy of darkness, the era of chaos has begun!'),
-(17,'The day of judgment is near!'),
-(17,'The prophecy of darkness has been fulfilled!'),
-(17,'The prophecy of darkness has come to pass!'),
-(18,'%player_cabal_winner%! I bestow on you the authority of the abyss!'),
-(18,'%player_cabal_winner%, Darkness shall be banished forever!'),
-(18,'%player_cabal_winner%, the time for glory is at hand!'),
-(18,'All hail the eternal twilight!'),
-(18,'As foretold in the prophecy of darkness, the era of chaos has begun!'),
-(18,'The day of judgment is near!'),
-(18,'The prophecy of darkness has been fulfilled!'),
-(18,'The prophecy of darkness has come to pass!'),
-(19,'%player_cabal_winner%! I bestow on you the authority of the abyss!'),
-(19,'%player_cabal_winner%, Darkness shall be banished forever!'),
-(19,'%player_cabal_winner%, the time for glory is at hand!'),
-(19,'All hail the eternal twilight!'),
-(19,'As foretold in the prophecy of darkness, the era of chaos has begun!'),
-(19,'The day of judgment is near!'),
-(19,'The prophecy of darkness has been fulfilled!'),
-(19,'The prophecy of darkness has come to pass!'),
-(20,'%player_cabal_winner%! I bestow on you the authority of the abyss!'),
-(20,'%player_cabal_winner%, Darkness shall be banished forever!'),
-(20,'%player_cabal_winner%, the time for glory is at hand!'),
-(20,'All hail the eternal twilight!'),
-(20,'As foretold in the prophecy of darkness, the era of chaos has begun!'),
-(20,'The day of judgment is near!'),
-(20,'The prophecy of darkness has been fulfilled!'),
-(20,'The prophecy of darkness has come to pass!'),
-(21,'%player_cabal_winner%! I bestow on you the authority of the abyss!'),
-(21,'%player_cabal_winner%, Darkness shall be banished forever!'),
-(21,'%player_cabal_winner%, the time for glory is at hand!'),
-(21,'All hail the eternal twilight!'),
-(21,'As foretold in the prophecy of darkness, the era of chaos has begun!'),
-(21,'The day of judgment is near!'),
-(21,'The prophecy of darkness has been fulfilled!'),
-(21,'The prophecy of darkness has come to pass!'),
-(22,'%player_cabal_winner%! I bestow on you the authority of the abyss!'),
-(22,'%player_cabal_winner%, Darkness shall be banished forever!'),
-(22,'%player_cabal_winner%, the time for glory is at hand!'),
-(22,'All hail the eternal twilight!'),
-(22,'As foretold in the prophecy of darkness, the era of chaos has begun!'),
-(22,'The day of judgment is near!'),
-(22,'The prophecy of darkness has been fulfilled!'),
-(22,'The prophecy of darkness has come to pass!'),
-(23,'%player_cabal_winner%! I bestow on you the authority of the abyss!'),
-(23,'%player_cabal_winner%, Darkness shall be banished forever!'),
-(23,'%player_cabal_winner%, the time for glory is at hand!'),
-(23,'All hail the eternal twilight!'),
-(23,'As foretold in the prophecy of darkness, the era of chaos has begun!'),
-(23,'The day of judgment is near!'),
-(23,'The prophecy of darkness has been fulfilled!'),
-(23,'The prophecy of darkness has come to pass!'),
-(24,'%player_cabal_winner%! I bestow on you the authority of the abyss!'),
-(24,'%player_cabal_winner%, Darkness shall be banished forever!'),
-(24,'%player_cabal_winner%, the time for glory is at hand!'),
-(24,'All hail the eternal twilight!'),
-(24,'As foretold in the prophecy of darkness, the era of chaos has begun!'),
-(24,'The day of judgment is near!'),
-(24,'The prophecy of darkness has been fulfilled!'),
-(24,'The prophecy of darkness has come to pass!'),
-(25,'%player_cabal_winner%! I bestow on you the authority of the abyss!'),
-(25,'%player_cabal_winner%, Darkness shall be banished forever!'),
-(25,'%player_cabal_winner%, the time for glory is at hand!'),
-(25,'All hail the eternal twilight!'),
-(25,'As foretold in the prophecy of darkness, the era of chaos has begun!'),
-(25,'The day of judgment is near!'),
-(25,'The prophecy of darkness has been fulfilled!'),
-(25,'The prophecy of darkness has come to pass!'),
-(26,'%player_cabal_winner%! I bestow on you the authority of the abyss!'),
-(26,'%player_cabal_winner%, Darkness shall be banished forever!'),
-(26,'%player_cabal_winner%, the time for glory is at hand!'),
-(26,'All hail the eternal twilight!'),
-(26,'As foretold in the prophecy of darkness, the era of chaos has begun!'),
-(26,'The day of judgment is near!'),
-(26,'The prophecy of darkness has been fulfilled!'),
-(26,'The prophecy of darkness has come to pass!'),
-(27,'%player_cabal_winner%! I bestow on you the authority of the abyss!'),
-(27,'%player_cabal_winner%, Darkness shall be banished forever!'),
-(27,'%player_cabal_winner%, the time for glory is at hand!'),
-(27,'All hail the eternal twilight!'),
-(27,'As foretold in the prophecy of darkness, the era of chaos has begun!'),
-(27,'The day of judgment is near!'),
-(27,'The prophecy of darkness has been fulfilled!'),
-(27,'The prophecy of darkness has come to pass!'),
-(28,'%player_cabal_winner%! I bestow on you the authority of the abyss!'),
-(28,'%player_cabal_winner%, Darkness shall be banished forever!'),
-(28,'%player_cabal_winner%, the time for glory is at hand!'),
-(28,'All hail the eternal twilight!'),
-(28,'As foretold in the prophecy of darkness, the era of chaos has begun!'),
-(28,'The day of judgment is near!'),
-(28,'The prophecy of darkness has been fulfilled!'),
-(28,'The prophecy of darkness has come to pass!'),
-(29,'%player_cabal_winner%! I bestow on you the authority of the abyss!'),
-(29,'%player_cabal_winner%, Darkness shall be banished forever!'),
-(29,'%player_cabal_winner%, the time for glory is at hand!'),
-(29,'All hail the eternal twilight!'),
-(29,'As foretold in the prophecy of darkness, the era of chaos has begun!'),
-(29,'The day of judgment is near!'),
-(29,'The prophecy of darkness has been fulfilled!'),
-(29,'The prophecy of darkness has come to pass!'),
-(30,'%player_cabal_winner%! I bestow on you the authority of the abyss!'),
-(30,'%player_cabal_winner%, Darkness shall be banished forever!'),
-(30,'%player_cabal_winner%, the time for glory is at hand!'),
-(30,'All hail the eternal twilight!'),
-(30,'As foretold in the prophecy of darkness, the era of chaos has begun!'),
-(30,'The day of judgment is near!'),
-(30,'The prophecy of darkness has been fulfilled!'),
-(30,'The prophecy of darkness has come to pass!'),
-(31,'%player_cabal_winner%! I bestow on you the authority of the abyss!'),
-(31,'%player_cabal_winner%, Darkness shall be banished forever!'),
-(31,'%player_cabal_winner%, the time for glory is at hand!'),
-(31,'All hail the eternal twilight!'),
-(31,'As foretold in the prophecy of darkness, the era of chaos has begun!'),
-(31,'The day of judgment is near!'),
-(31,'The prophecy of darkness has been fulfilled!'),
-(31,'The prophecy of darkness has come to pass!'),
-(32,'%player_cabal_winner%! I bestow on you the authority of the abyss!'),
-(32,'%player_cabal_winner%, Darkness shall be banished forever!'),
-(32,'%player_cabal_winner%, the time for glory is at hand!'),
-(32,'All hail the eternal twilight!'),
-(32,'As foretold in the prophecy of darkness, the era of chaos has begun!'),
-(32,'The day of judgment is near!'),
-(32,'The prophecy of darkness has been fulfilled!'),
-(32,'The prophecy of darkness has come to pass!');
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/tools/gs_cleanup.sql b/L2J_DataPack_BETA/dist/tools/gs_cleanup.sql
index 94ccda3f89..b6343ae14e 100644
--- a/L2J_DataPack_BETA/dist/tools/gs_cleanup.sql
+++ b/L2J_DataPack_BETA/dist/tools/gs_cleanup.sql
@@ -13,8 +13,6 @@ auction,
auction_bid,
auction_watch,
auto_announcements,
-auto_chat_text,
-auto_chat,
castle,
castle_doorupgrade,
castle_functions,
--
GitLab