using Say2 static variables instead of numbers

L2_GameServer/java/net/sf/l2j/gameserver/SevenSignsFestival.java

@@ -45,6 +45,7 @@ import net.sf.l2j.gameserver.model.actor.instance.L2FestivalMonsterInstance;
 import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
 import net.sf.l2j.gameserver.model.base.Experience;
 import net.sf.l2j.gameserver.network.SystemMessageId;
+import net.sf.l2j.gameserver.network.clientpackets.Say2;
 import net.sf.l2j.gameserver.network.serverpackets.CreatureSay;
 import net.sf.l2j.gameserver.network.serverpackets.MagicSkillUse;
 import net.sf.l2j.gameserver.network.serverpackets.SystemMessage;
@@ -1734,10 +1735,10 @@ public class SevenSignsFestival implements SpawnListener
         if (_dawnChatGuide == null || _duskChatGuide == null)
             return;
 
-        CreatureSay cs = new CreatureSay(_dawnChatGuide.getObjectId(), 1, senderName, message);
+        CreatureSay cs = new CreatureSay(_dawnChatGuide.getObjectId(), Say2.SHOUT, senderName, message);
         _dawnChatGuide.broadcastPacket(cs);
 
-        cs = new CreatureSay(_duskChatGuide.getObjectId(), 1, senderName, message);
+        cs = new CreatureSay(_duskChatGuide.getObjectId(), Say2.SHOUT, senderName, message);
         _duskChatGuide.broadcastPacket(cs);
     }
 
@@ -2341,7 +2342,7 @@ public class SevenSignsFestival implements SpawnListener
         {
             if (!_participants.isEmpty())
             {
-                CreatureSay cs = new CreatureSay(_witchInst.getObjectId(), 0, "Festival Witch", message);
+                CreatureSay cs = new CreatureSay(_witchInst.getObjectId(), Say2.ALL, "Festival Witch", message);
 
                 for (L2PcInstance participant : _participants)
                 {

L2_GameServer/java/net/sf/l2j/gameserver/instancemanager/PetitionManager.java

@@ -558,7 +558,7 @@ public final class PetitionManager
 
 		// Notify all GMs that a new petition has been submitted.
 		String msgContent = petitioner.getName() + " has submitted a new petition."; //(ID: " + newPetitionId + ").";
-		GmListTable.broadcastToGMs(new CreatureSay(petitioner.getObjectId(), 17, "Petition System", msgContent));
+		GmListTable.broadcastToGMs(new CreatureSay(petitioner.getObjectId(), Say2.HERO_VOICE, "Petition System", msgContent));
 
 		return newPetitionId;
 	}

L2_GameServer/java/net/sf/l2j/gameserver/model/AutoChatHandler.java

@@ -32,6 +32,7 @@ import net.sf.l2j.gameserver.model.actor.L2Character;
 import net.sf.l2j.gameserver.model.actor.L2Npc;
 import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
 import net.sf.l2j.gameserver.model.actor.instance.L2SiegeGuardInstance;
+import net.sf.l2j.gameserver.network.clientpackets.Say2;
 import net.sf.l2j.gameserver.network.serverpackets.CreatureSay;
 import net.sf.l2j.util.Rnd;
 
@@ -800,7 +801,7 @@ public class AutoChatHandler implements SpawnListener
                             || text.contains("%player_cabal_winner%")
                             || text.contains("%player_random%")) return;
 
-                        CreatureSay cs = new CreatureSay(chatNpc.getObjectId(), 0, creatureName, text);
+                        CreatureSay cs = new CreatureSay(chatNpc.getObjectId(), Say2.ALL, creatureName, text);
 
                         for (L2PcInstance nearbyPlayer : nearbyPlayers)
                             nearbyPlayer.sendPacket(cs);

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2NpcWalkerInstance.java

@@ -22,6 +22,7 @@ import net.sf.l2j.gameserver.ai.L2NpcWalkerAI;
 import net.sf.l2j.gameserver.model.L2Skill;
 import net.sf.l2j.gameserver.model.actor.L2Character;
 import net.sf.l2j.gameserver.model.actor.L2Npc;
+import net.sf.l2j.gameserver.network.clientpackets.Say2;
 import net.sf.l2j.gameserver.network.serverpackets.CreatureSay;
 import net.sf.l2j.gameserver.templates.chars.L2NpcTemplate;
 import net.sf.l2j.gameserver.util.Broadcast;
@@ -83,7 +84,7 @@ public class L2NpcWalkerInstance extends L2Npc
 		//we send message to known players only!
 		if(!_knownPlayers.isEmpty())
 		{
-			CreatureSay cs = new CreatureSay(getObjectId(), 0, getName(), chat);
+			CreatureSay cs = new CreatureSay(getObjectId(), Say2.ALL, getName(), chat);
 			Broadcast.toKnownPlayers(this, cs);
 		}
 	}

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2PenaltyMonsterInstance.java

@@ -55,8 +55,7 @@ public class L2PenaltyMonsterInstance extends L2MonsterInstance
 	{
 		if (Rnd.nextInt(100) <= 80)
 		{
-			CreatureSay cs = new CreatureSay(getObjectId(), Say2.ALL, getName(),
-												"mmm your bait was delicious");
+			CreatureSay cs = new CreatureSay(getObjectId(), Say2.ALL, getName(), "mmm your bait was delicious");
 			this.broadcastPacket(cs);
 		}
 		_ptk = ptk;
@@ -73,8 +72,7 @@ public class L2PenaltyMonsterInstance extends L2MonsterInstance
 
 		if (Rnd.nextInt(100) <= 75)
 		{
-			CreatureSay cs = new CreatureSay(getObjectId(), Say2.ALL, getName(),
-												"I will tell fishes not to take your bait");
+			CreatureSay cs = new CreatureSay(getObjectId(), Say2.ALL, getName(), "I will tell fishes not to take your bait");
 			this.broadcastPacket(cs);
 		}
 		return true;

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2SepulcherNpcInstance.java

@@ -28,6 +28,7 @@ import net.sf.l2j.gameserver.model.L2ItemInstance;
 import net.sf.l2j.gameserver.model.L2World;
 import net.sf.l2j.gameserver.model.actor.L2Npc;
 import net.sf.l2j.gameserver.model.quest.Quest;
+import net.sf.l2j.gameserver.network.clientpackets.Say2;
 import net.sf.l2j.gameserver.network.serverpackets.ActionFailed;
 import net.sf.l2j.gameserver.network.serverpackets.CreatureSay;
 import net.sf.l2j.gameserver.network.serverpackets.MyTargetSelected;
@@ -438,7 +439,7 @@ public class L2SepulcherNpcInstance extends L2Npc
 		Collection<L2PcInstance> knownPlayers = L2World.getInstance().getAllPlayers().values();
 		if (knownPlayers == null || knownPlayers.isEmpty())
 			return;
-		CreatureSay sm = new CreatureSay(0, 1, this.getName(), msg);
+		CreatureSay sm = new CreatureSay(0, Say2.SHOUT, this.getName(), msg);
 		for (L2PcInstance player : knownPlayers)
 		{
 			if (player == null)

L2_GameServer/java/net/sf/l2j/gameserver/model/entity/Instance.java

@@ -29,6 +29,7 @@ import net.sf.l2j.gameserver.model.actor.L2Npc;
 import net.sf.l2j.gameserver.model.actor.instance.L2DoorInstance;
 import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
 import net.sf.l2j.gameserver.network.SystemMessageId;
+import net.sf.l2j.gameserver.network.clientpackets.Say2;
 import net.sf.l2j.gameserver.network.serverpackets.CreatureSay;
 import net.sf.l2j.gameserver.network.serverpackets.SystemMessage;
 import net.sf.l2j.gameserver.templates.chars.L2NpcTemplate;
@@ -434,14 +435,14 @@ public class Instance
 		{
 			timeLeft = remaining / 1000;
 			interval = 30000;
-			cs = new CreatureSay(0, 9, "Notice", timeLeft + " seconds left.");
+			cs = new CreatureSay(0, Say2.ALLIANCE, "Notice", timeLeft + " seconds left.");
 			remaining = remaining - 30000;
 		}
 		else
 		{
 			timeLeft = remaining / 1000;
 			interval = 10000;
-			cs = new CreatureSay(0, 9, "Notice", timeLeft + " seconds left.");
+			cs = new CreatureSay(0, Say2.ALLIANCE, "Notice", timeLeft + " seconds left.");
 			remaining = remaining - 10000;
 		}
 		if (cs != null)

L2_GameServer/java/net/sf/l2j/gameserver/model/olympiad/OlympiadGame.java

@@ -34,6 +34,7 @@ import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
 import net.sf.l2j.gameserver.model.actor.instance.L2PetInstance;
 import net.sf.l2j.gameserver.model.olympiad.Olympiad.COMP_TYPE;
 import net.sf.l2j.gameserver.network.SystemMessageId;
+import net.sf.l2j.gameserver.network.clientpackets.Say2;
 import net.sf.l2j.gameserver.network.serverpackets.CreatureSay;
 import net.sf.l2j.gameserver.network.serverpackets.ExAutoSoulShot;
 import net.sf.l2j.gameserver.network.serverpackets.ExOlympiadMatchEnd;
@@ -912,7 +913,7 @@ class OlympiadGame
 			{
 				int objId = manager.getLastSpawn().getObjectId();
 				String npcName = manager.getLastSpawn().getName();
-				manager.getLastSpawn().broadcastPacket(new CreatureSay(objId, 1, npcName, "Olympiad is going to begin in Arena " + (_stadiumID + 1) + " in a moment."));
+				manager.getLastSpawn().broadcastPacket(new CreatureSay(objId, Say2.SHOUT, npcName, "Olympiad is going to begin in Arena " + (_stadiumID + 1) + " in a moment."));
 			}
 		}
 	}

L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/RequestPetitionCancel.java

@@ -46,8 +46,8 @@ public final class RequestPetitionCancel extends L2GameClientPacket
 	protected void runImpl()
 	{
 		L2PcInstance activeChar = getClient().getActiveChar();
-        if (activeChar == null)
-            return;
+		if (activeChar == null)
+			return;
 
 		if (PetitionManager.getInstance().isPlayerInConsultation(activeChar))
 		{
@@ -69,9 +69,9 @@ public final class RequestPetitionCancel extends L2GameClientPacket
 					activeChar.sendPacket(sm);
 					sm = null;
 
-                    // Notify all GMs that the player's pending petition has been cancelled.
-                    String msgContent = activeChar.getName() + " has canceled a pending petition.";
-                    GmListTable.broadcastToGMs(new CreatureSay(activeChar.getObjectId(), 17, "Petition System", msgContent));
+					// Notify all GMs that the player's pending petition has been cancelled.
+					String msgContent = activeChar.getName() + " has canceled a pending petition.";
+					GmListTable.broadcastToGMs(new CreatureSay(activeChar.getObjectId(), Say2.HERO_VOICE, "Petition System", msgContent));
 				}
 				else
 				{

L2_GameServer/java/net/sf/l2j/status/GameStatusThread.java

@@ -337,7 +337,7 @@ public class GameStatusThread extends Thread
                     try
                     {
                         _usrCommand = _usrCommand.substring(7);
-                        CreatureSay cs = new CreatureSay(0, 9, "Telnet GM Broadcast from " + _cSocket.getInetAddress().getHostAddress(), _usrCommand);
+                        CreatureSay cs = new CreatureSay(0, Say2.ALLIANCE, "Telnet GM Broadcast from " + _cSocket.getInetAddress().getHostAddress(), _usrCommand);
                         GmListTable.broadcastToGMs(cs);
                         _print.println("Your Message Has Been Sent To " + getOnlineGMS() + " GM(s).");
                     }