Jelajahi Sumber

BETA: More Rainbow Springs Chateau fixes:
* RainbowSpringsChateau cleanup and fixes.
* Implemented Messenger's retail HTMLs and AI.
* Implemented Caretaker's retail HTMLs and AI.
* Datapack part for [L5190].

'''Note:''' Rainbow Springs Chateau clan hall siege is still unfinished, this is just some work to get it closer to retail and closer to be finished.

Zoey76 13 tahun lalu
induk
melakukan
4b36d06933
61 mengubah file dengan 395 tambahan dan 202 penghapusan
  1. 192 121
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
  2. 0 3
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/caretaker_no_party.htm
  3. 0 3
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/caretaker_not_allowed.htm
  4. 0 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager001.htm
  5. 7 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager002.htm
  6. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager003.htm
  7. 8 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager004.htm
  8. 9 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager005.htm
  9. 8 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager006.htm
  10. 8 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager007.htm
  11. 8 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager008.htm
  12. 8 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager009.htm
  13. 7 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager010.htm
  14. 8 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager011.htm
  15. 8 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager012.htm
  16. 7 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager013.htm
  17. 8 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager014.htm
  18. 8 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager015.htm
  19. 0 3
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_alredy_registered.htm
  20. 0 4
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_explanation_2.htm
  21. 0 3
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_explanation_3.htm
  22. 0 8
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_main.htm
  23. 0 3
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_no_level.htm
  24. 0 3
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_notinlist.htm
  25. 0 5
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_nowardecrees.htm
  26. 0 3
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_registered.htm
  27. 0 5
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_retrive_wardecrees.htm
  28. 0 6
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_unregister_confirmation_no_retrive.htm
  29. 11 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti001.htm
  30. 9 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti001a.htm
  31. 5 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti002.htm
  32. 5 6
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti003.htm
  33. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti004.htm
  34. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti005.htm
  35. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti008.htm
  36. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti009.htm
  37. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti010.htm
  38. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti011.htm
  39. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti012.htm
  40. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti013.htm
  41. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti014.htm
  42. 3 5
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti015.htm
  43. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti016.htm
  44. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti017.htm
  45. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti018.htm
  46. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti019.htm
  47. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti020.htm
  48. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/no_clan_leader.htm
  49. 1 2
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/yeti_cannot_exchange.htm
  50. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/yeti_item_exchange.htm
  51. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/yeti_passage_used.htm
  52. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
  53. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java
  54. 3 3
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminClan.java
  55. 3 3
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
  56. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Disguise.java
  57. 3 3
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/castle.java
  58. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q147_PathtoBecominganEliteMercenary/Q147_PathtoBecominganEliteMercenary.java
  59. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q148_PathtoBecominganExaltedMercenary/Q148_PathtoBecominganExaltedMercenary.java
  60. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q504_CompetitionfortheBanditStronghold/Q504_CompetitionfortheBanditStronghold.java
  61. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java

+ 192 - 121
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java

@@ -28,9 +28,11 @@ import java.util.Map;
 import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Logger;
 
+import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.Announcements;
 import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.datatables.ClanTable;
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
@@ -40,6 +42,7 @@ import com.l2jserver.gameserver.instancemanager.MapRegionManager.TeleportWhereTy
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2Party;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -49,12 +52,10 @@ import com.l2jserver.gameserver.model.entity.clanhall.SiegeStatus;
 import com.l2jserver.gameserver.model.items.L2Item;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.model.quest.State;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
-import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
+import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
 /**
@@ -80,7 +81,7 @@ public class RainbowSpringsChateau extends Quest
 				if(owner != null)
 				{
 					_rainbow.free();
-					owner.setHasHideout(0);
+					owner.setHideoutId(0);
 					_acceptedClans.add(owner);
 					--spotLeft;
 				}
@@ -252,15 +253,13 @@ public class RainbowSpringsChateau extends Quest
 	public RainbowSpringsChateau(int questId, String name, String descr)
 	{
 		super(questId, name, descr);
+		
 		addFirstTalkId(MESSENGER);
 		addTalkId(MESSENGER);
 		addFirstTalkId(CARETAKER);
 		addTalkId(CARETAKER);
-		for(int npc : YETIS)
-		{
-			addFirstTalkId(npc);
-			addTalkId(npc);
-		}
+		addFirstTalkId(YETIS);
+		addTalkId(YETIS);
 		
 		loadAttackers();
 		
@@ -281,35 +280,47 @@ public class RainbowSpringsChateau extends Quest
 	@Override
 	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
-		if(player.getQuestState(qn) == null)
-		{
-			QuestState state = newQuestState(player);
-			state.setState(State.STARTED);
-		}
-
-		int npcId = npc.getNpcId();
 		String html = "";
-		
+		final int npcId = npc.getNpcId();
 		if(npcId == MESSENGER)
 		{
-			sendMessengerMain(player);
+			final String main = (_rainbow.getOwnerId() > 0) ? "messenger_yetti001.htm" : "messenger_yetti001a.htm";
+			html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/scripts/conquerablehalls/RainbowSpringsChateau/" + main);
+			html = html.replace("%time%", _registrationEnds);
+			if (_rainbow.getOwnerId() > 0)
+			{
+				html = html.replace("%owner%", ClanTable.getInstance().getClan(_rainbow.getOwnerId()).getName());
+			}
 		}
 		else if(npcId == CARETAKER)
 		{
-			html = "caretaker_main.htm";
+			if(_rainbow.isInSiege())
+			{
+				html = "game_manager003.htm";
+			}
+			else
+			{
+				html = "game_manager001.htm";
+			}
 		}
-		else if(_rainbow.isInSiege())
+		else if (Util.contains(YETIS, npcId))
 		{
-			if(!player.isClanLeader())
-				html = "no_clan_leader.htm";	
-			else
+			// TODO: Review.
+			if (_rainbow.isInSiege())
 			{
-				L2Clan clan = player.getClan();
-				if(clan != null && _acceptedClans.contains(clan))
+				if (!player.isClanLeader())
 				{
-					int index = _acceptedClans.indexOf(clan);
-					if(npcId == YETIS[index])
-						html = "yeti_main.htm";
+					html = "no_clan_leader.htm";
+				}
+				else
+				{
+					L2Clan clan = player.getClan();
+					if (_acceptedClans.contains(clan))
+					{
+						int index = _acceptedClans.indexOf(clan);
+						if (npcId == YETIS[index])
+							html = "yeti_main.htm";
+					}
 				}
 			}
 		}
@@ -320,105 +331,173 @@ public class RainbowSpringsChateau extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		if(!player.isClanLeader())
-			return "no_clan_leader.htm";
-
 		String html = event;
-		final L2Clan clan = player.getClan();		
-		final int clanId = clan.getClanId();
-		
-		if(event.equals("register"))
-		{
-			if(!_rainbow.isRegistering())
-				html = "messenger_not_registering.htm";
-			else if(_warDecreesCount.containsKey(clanId))
-				html = "messenger_alredy_registered.htm";
-			else if(clan.getLevel() < 3 || clan.getMembersCount() < 5)
-				html = "messenger_no_level.htm";
-			else
-			{
-				L2ItemInstance warDecrees = player.getInventory().getItemByItemId(WAR_DECREES);
-				if(warDecrees == null)
-					html = "messenger_nowardecrees.htm";
-				else
-				{
-					long count = warDecrees.getCount();
-					_warDecreesCount.put(clanId, count);
-					player.destroyItem("Rainbow Springs Registration", warDecrees, npc, true);
-					updateAttacker(clanId, count, false);
-					html = "messenger_registered.htm";
-				}
-			}
-		}
-		else if(event.equals("unregister"))
+		final L2Clan clan = player.getClan();
+		switch (npc.getNpcId())
 		{
-			if(!_warDecreesCount.containsKey(clanId))
-				html = "messenger_notinlist.htm";
-			else if(_rainbow.isRegistering())
-			{
-				String[] split = event.split("_");
-				int step = Integer.parseInt(split[1]);
-				
-				switch(step)
+			case MESSENGER:
+				switch (event)
 				{
-					case 0:
-						html = "messenger_unregister_confirmation.htm";
+					case "register":
+						if (!player.isClanLeader())
+						{
+							html = "messenger_yetti010.htm";
+						}
+						else if ((clan.getCastleId() > 0) || (clan.getFortId() > 0) || (clan.getHideoutId() > 0))
+						{
+							html = "messenger_yetti012.htm";
+						}
+						else if(!_rainbow.isRegistering())
+						{
+							html = "messenger_yetti014.htm";
+						}
+						else if(_warDecreesCount.containsKey(clan.getClanId()))
+						{
+							html = "messenger_yetti013.htm";
+						}
+						else if(clan.getLevel() < 3 || clan.getMembersCount() < 5)
+						{
+							html = "messenger_yetti011.htm";
+						}
+						else
+						{
+							final L2ItemInstance warDecrees = player.getInventory().getItemByItemId(WAR_DECREES);
+							if(warDecrees == null)
+							{
+								html = "messenger_yetti008.htm";
+							}
+							else
+							{
+								long count = warDecrees.getCount();
+								_warDecreesCount.put(clan.getClanId(), count);
+								player.destroyItem("Rainbow Springs Registration", warDecrees, npc, true);
+								updateAttacker(clan.getClanId(), count, false);
+								html = "messenger_yetti009.htm";
+							}
+						}
 						break;
-					case 1:
-						html = "messenger_retrive_wardecrees.htm";
-						updateAttacker(clanId, 0, true);
+					case "cancel":
+						if (!player.isClanLeader())
+						{
+							html = "messenger_yetti010.htm";
+						}
+						else if(!_warDecreesCount.containsKey(clan.getClanId()))
+						{
+							html = "messenger_yetti016.htm";
+						}
+						else if(!_rainbow.isRegistering())
+						{
+							html = "messenger_yetti017.htm";
+						}
+						else
+						{
+							updateAttacker(clan.getClanId(), 0, true);
+							html = "messenger_yetti018.htm";
+						}
 						break;
-					case 2:
-						html = "messenger_unregistered.htm";
-						long toRetrive = _warDecreesCount.get(clanId) / 2;
-						player.addItem("Rainbow Spring unregister", WAR_DECREES, toRetrive, npc, true);
-						_warDecreesCount.remove(clanId);
+					case "unregister":
+						if(_rainbow.isRegistering())
+						{
+							if (_warDecreesCount.contains(clan.getClanId()))
+							{
+								player.addItem("Rainbow Spring unregister", WAR_DECREES, _warDecreesCount.get(clan.getClanId()) / 2, npc, true);
+								_warDecreesCount.remove(clan.getClanId());
+								html = "messenger_yetti019.htm";
+							}
+							else
+							{
+								html = "messenger_yetti020.htm";
+							}
+						}
+						else if(_rainbow.isWaitingBattle())
+						{
+							_acceptedClans.remove(clan);
+							html = "messenger_yetti020.htm";
+						}
 						break;
-						default:
-							html = "messenger_main.htm";
 				}
-			}
-			else if(_rainbow.isWaitingBattle())
-			{
-				if(!_acceptedClans.contains(clan))
-					return "messenger_notinlist.htm";
-				
-				String[] split = event.split("_");
-				int step = Integer.parseInt(split[1]);
-				
-				switch(step)
+				break;
+			case CARETAKER:
+				if(event.equals("portToArena"))
 				{
-					case 0:
-						html = "messenger_unregister_confirmation_no_retrive.htm";
-						break;
-					case 1:
-						html = "messenger_unregistered.htm";
-						_acceptedClans.remove(clan);
-						break;
-						default:
-							html = "messenger_main.htm";
+					final L2Party party = player.getParty();
+					if (clan == null)
+					{
+						html = "game_manager009.htm";
+					}
+					else if(!player.isClanLeader())
+					{
+						html = "game_manager004.htm";
+					}
+					else if(!player.isInParty())
+					{
+						html = "game_manager005.htm";
+					}
+					else if(party.getPartyLeaderOID() != player.getObjectId())
+					{
+						html = "game_manager006.htm";
+					}
+					else
+					{
+						final int clanId = player.getClanId();
+						boolean nonClanMemberInParty = false;
+						for (L2PcInstance member : party.getPartyMembers())
+						{
+							if (member.getClanId() != clanId)
+							{
+								nonClanMemberInParty = true;
+								break;
+							}
+						}
+						
+						if (nonClanMemberInParty)
+						{
+							html = "game_manager007.htm";
+						}
+						else if(party.getMemberCount() < 5)
+						{
+							html = "game_manager008.htm";
+						}
+						else if ((clan.getCastleId() > 0) || (clan.getFortId() > 0) || (clan.getHideoutId() > 0))
+						{
+							html = "game_manager010.htm";
+						}
+						else if (clan.getLevel() < Config.CHS_CLAN_MINLEVEL)
+						{
+							html = "game_manager011.htm";
+						}
+						// else if () // Something about the rules.
+						// {
+						// 	html = "game_manager012.htm";
+						// }
+						// else if () // Already registered.
+						// {
+						// 	html = "game_manager013.htm";
+						// }
+						else if(!_acceptedClans.contains(clan))
+						{
+							html = "game_manager014.htm";
+						}
+						// else if () // Not have enough cards to register.
+						// {
+						// 	html = "game_manager015.htm";
+						// }
+						else
+						{
+							portToArena(player, _acceptedClans.indexOf(clan));
+						}
+					}
 				}
-			}
-		}
-		else if(event.equals("portToArena"))
-		{
-			if(!_acceptedClans.contains(clan))
-				html = "caretaker_not_allowed.htm";
-			else if(player.getParty() == null)
-				html = "caretaker_no_party.htm";
-			else
-			{
-				int index = _acceptedClans.indexOf(clan);
-				portToArena(player, index);
-			}
+				break;
 		}
-		else if(event.startsWith("enterText"))
+		
+		if(event.startsWith("enterText"))
 		{
-			// Shouldnt happen
+			// Shouldn't happen
 			if(!_acceptedClans.contains(clan))
 				return null;
 			
-			String[] split = event.split("_");
+			String[] split = event.split("_ ");
 			if(split.length < 2)
 				return null;
 			
@@ -765,14 +844,6 @@ public class RainbowSpringsChateau extends Quest
 		_registrationEnds = year+"-"+month+"-"+day+" "+hour+":"+mins;
 	}
 	
-	private static void sendMessengerMain(L2PcInstance player)
-	{
-		NpcHtmlMessage message = new NpcHtmlMessage(5);
-		message.setFile(null, "data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_main.htm");
-		message.replace("%time%", _registrationEnds);
-		player.sendPacket(message);
-	}
-	
 	public static void launchSiege()
 	{
 		_nextSiege.cancel(false);

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/caretaker_no_party.htm

@@ -1,3 +0,0 @@
-<html><body>
-You must have a party in order to enter the arena.
-</body></html>

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/caretaker_not_allowed.htm

@@ -1,3 +0,0 @@
-<html><body>
-Your clan is not allowed to participe in this siege
-</body></html>

+ 0 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/caretaker_main.htm → L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager001.htm


+ 7 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager002.htm

@@ -0,0 +1,7 @@
+<html><body>Caretaker:<br>
+You must follow the rules to play the game. Entry denied!<br>
+(1) Are there more than 5 in the party?<br>
+(2) Is the applicant the Clan Leader?<br>
+(3) Does the party include non-clan members?<br>
+<a action="bypass -h Quest RainbowSpringsChateau portToArena">Try to enter again.</a>
+</body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager003.htm

@@ -0,0 +1,3 @@
+<html><body>Caretaker:<br>
+The arena is closed at this time. Have you applied to participate in the game?
+</body></html>

+ 8 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager004.htm

@@ -0,0 +1,8 @@
+<html><body>Caretaker:<br>
+You must abide by the rules in order to participate in the game.<br>
+Requirements for Participation: <font color="LEVEL">A party of more than five clan members with a Clan Leader.</font><br>
+<br>
+The Clan Leader must be the one to apply for entry to the game.<br>
+Entry denied!<br>
+<a action="bypass -h Quest RainbowSpringsChateau portToArena">Try to enter again.</a>
+</body></html>

+ 9 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager005.htm

@@ -0,0 +1,9 @@
+<html><body>Caretaker:<br>
+You must abide by the following rules in order to participate in the game.<br>
+Rules of Participation: <font color="LEVEL">A party of more than five clan members with a Clan Leader.</font><br>
+<br>
+You need more members in your party.<br>
+Entry denied!<br>
+<br>
+<a action="bypass -h Quest RainbowSpringsChateau portToArena">Try to enter again.</a>
+</body></html>

+ 8 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager006.htm

@@ -0,0 +1,8 @@
+<html><body>Caretaker:<br>
+You must abide by the following rules in order to participate in the game.<br>
+Rules of Participation: <font color="LEVEL">A party of more than five clan members with a Clan Leader.</font><br>
+<br>
+Your Clan Leader must apply as the party leader.<br>
+Entry denied!<br>
+<a action="bypass -h Quest RainbowSpringsChateau portToArena">Try to enter again.</a>
+</body></html>

+ 8 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager007.htm

@@ -0,0 +1,8 @@
+<html><body>Caretaker:<br>
+You must abide by the rules in order to participate in the game.<br>
+Rules of Participation: <font color="LEVEL">A party of more than five clan members with a Clan Leader.</font><br>
+Entry denied!<br>
+You have a non-clan member in your midst.<br>
+<br>
+<a action="bypass -h Quest RainbowSpringsChateau portToArena">Try to enter again.</a>
+</body></html>

+ 8 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager008.htm

@@ -0,0 +1,8 @@
+<html><body>Caretaker:<br>
+You must abide by the following rules in order to participate in the game.<br>
+Rules of Participation: <font color="LEVEL">A party of more than five clan members with a Clan Leader.</font>
+Entry denied!<br>
+<br>
+You need at least five people in order to play the game... Why don't you contact some friends?<br>
+<a action="bypass -h Quest RainbowSpringsChateau portToArena">Try to enter again.</a>
+</body></html>

+ 8 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager009.htm

@@ -0,0 +1,8 @@
+<html><body>Caretaker:<br>
+You must abide by the following rules in order to participate in the game.<br>
+Rules of Participation: <font color="LEVEL">A party of more than five clan members with a Clan Leader.</font><br>
+Entry denied!<br>
+You're not a member of a clan.<br>
+<br>
+<a action="bypass -h Quest RainbowSpringsChateau portToArena">Try to enter again.</a>
+</body></html>

+ 7 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager010.htm

@@ -0,0 +1,7 @@
+<html><body>Caretaker:<br>
+You must abide by the following rules in order to participate in the game.<br>
+Rules of Participation: <font color="LEVEL">A party of more than five clan members with a Clan Leader.</font><br>
+Entry denied!<br>
+You're an ambitious one! One may own only one Clan Hall!<br>
+<a action="bypass -h Quest RainbowSpringsChateau portToArena">Try to enter again.</a>
+</body></html>

+ 8 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager011.htm

@@ -0,0 +1,8 @@
+<html><body>Caretaker:<br>
+You must abide by the rules in order to participate in the game.<br>
+Rules of Participation: <font color="LEVEL">A party of more than five clan members with a Clan Leader.</font><br>
+<br>
+You must be a Clan Leader above Clan level 3 in order to apply.<br>
+Entry denied!<br>
+<a action="bypass -h Quest RainbowSpringsChateau portToArena">Try to enter again.</a>
+</body></html>

+ 8 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager012.htm

@@ -0,0 +1,8 @@
+<html><body>Caretaker:<br>
+You must abide by the following rules in order to participate in the game.<br>
+Rules of Participation: <font color="LEVEL">A party of more than five clan members with a Clan Leader.</font><br>
+Entry denied!<br>
+Read the rules again.<br>
+<br>
+<a action="bypass -h Quest RainbowSpringsChateau portToArena">Try to enter again.</a>
+</body></html>

+ 7 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager013.htm

@@ -0,0 +1,7 @@
+<html><body>Caretaker:<br>
+You must abide by the following rules in order to participate in the game. It appears that you don't meet the requirements.<br>
+Rules of Participation: <font color="LEVEL">A party of more than five clan members with a Clan Leader.</font><br>
+Entry denied!<br>
+Let's see... You're already registered.<br>
+<a action="bypass -h Quest RainbowSpringsChateau portToArena">Try to enter again.</a>
+</body></html>

+ 8 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager014.htm

@@ -0,0 +1,8 @@
+<html><body>Caretaker:<br>
+To participate in the game, you must abide by the rules. I'm afraid that I must deny your entry because you do not meet the following requirement:<br>
+Participation - <font color="LEVEL">You must have a party of at least 5 clan members with a clan leader as the leader of the party.</font><br>
+<br>
+Have you registered for the game?<br>
+<br>
+<a action="bypass -h Quest RainbowSpringsChateau portToArena">Attempt re-entry.</a>
+</body></html>

+ 8 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/game_manager015.htm

@@ -0,0 +1,8 @@
+<html><body>Entrance Manager:<br>
+To participate in the game, you must abide by the rules. I'm afraid that I must deny your entry because you do not meet the following requirement:<br>
+Participation - <font color="LEVEL">You must have a party of at least 5 clan members with a clan leader as the leader of the party.</font><br>
+<br>
+I'm sorry, but your name seems to have been removed from the participants' list. Apparently you didn't have enough cards to register.<br>
+<br>
+<a action="bypass -h Quest RainbowSpringsChateau portToArena">Attempt re-entry.</a>
+</body></html>

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_alredy_registered.htm

@@ -1,3 +0,0 @@
-<html><body>
-Your clan is alredy registered for this siege
-</body></html>

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_explanation_2.htm

@@ -1,4 +0,0 @@
-<html><head><body>
-Messenger Yeti:<br> You need many people to have a fun game. You need leaders and also players...<br> 
-(You must be a Clan Leader of a Clan composed of more than five members and be above Clan level 3 in order to apply.)<br>
-</body></html>

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_explanation_3.htm

@@ -1,3 +0,0 @@
-<html><head><body>
-Messenger Yeti:<br> It's not a game where you fight, but a game played for fun, so only like-minded people are allowed to participate. You need a fair amount of people... If you have more than five, it will work.<br>(You can participate if your party is composed of more than five members and your Clan level is 3 or above.) <br>
-</body></html>

+ 0 - 8
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_main.htm

@@ -1,8 +0,0 @@
-<html><head><body>
-Messenger Yetti:<br>Pettite~ the transparent and lively building behind me is called <font color="LEVEL">Rainbow Spring</font>.It's not your ordinary hideout. You won't see a horde of peasants spilling blood for it. This one is special. Very high class... <br> 
-Registration finished at: <font color="LEVEL">%time%</font><br><br> 
-<a action="bypass -h Quest RainbowSpringsChateau messenger_explanation_1.htm">Hideout battle game instruction</a><br> 
-<a action="bypass -h Quest RainbowSpringsChateau register">Hideout battle game registration</a><br>
-<a action="bypass -h Quest RainbowSpringsChateau unregister_0">Cancel Registration</a><br>
-<a action="bypass -h npc_%objectId%_Chat 0">Get a refund during game</a><br>
-</body></html>

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_no_level.htm

@@ -1,3 +0,0 @@
-<html><body>
-To participate in the siege your clan level must be 3 or higher and have 5 or more members
-</body></html>

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_notinlist.htm

@@ -1,3 +0,0 @@
-<html><body>
-Your clan is not participating in this siege
-</html></body>

+ 0 - 5
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_nowardecrees.htm

@@ -1,5 +0,0 @@
-<html><head>
-<body>
-Messenger Yeti:<br>To register for a Clan Hall War, you must first go fishing in Goddard Territory and obtain Clan Hall War Decrees. They compare the number of decrees submitted and select the four finalists one hour before the game starts. Those selected determine the owner of the Clan Hall by playing the game.<br>Submit as many decrees as possible! There's only one opportunity for registration!<br> 
-<a action="bypass -h Quest RainbowSpringChateau messenger_explanation_1.htm">"How do I play the game?"</a><br>
-</body></html>

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_registered.htm

@@ -1,3 +0,0 @@
-<html><body>
-Your clan has been registered for this siege
-</body></html>

+ 0 - 5
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_retrive_wardecrees.htm

@@ -1,5 +0,0 @@
-<html><body>
-Messenger Yetti:<br>
-The game is cancelled? Okay, so you get all the applications back.<br> 
-<a action="bypass -h Quest RainbowSpringsChateau unregister_2">Receive it back</a><br>
-</body></html>

+ 0 - 6
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_unregister_confirmation_no_retrive.htm

@@ -1,6 +0,0 @@
-<html>
-<body>
-Messenger Yeti:<br> 
-Do you absolutely have to cancel? If you cancel your registration now, we can't return any of the decrees you submitted to us.<br> 
-<a action="bypass -h Quest RainbowSpringsChateau unregister_1">Cancel</a><br>
-</body></html>

+ 11 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti001.htm

@@ -0,0 +1,11 @@
+<html><body>Messenger Yetti:<br>
+Pettite~ the transparent and energetic building behind me is <font color="LEVEL">Rainbow Spring</font>. Not my type, but very high class nonetheless. It's a place so nice, it's simply overlooked by ignorant adventurers. The winner gets ultimate bragging rights.<br>
+The last winner was <font color="LEVEL">%owner%</font>, challenge him if you think you can defeat a clan!<br>
+<br>
+Registration finished at: <font color="LEVEL">%time%</font><br>
+<br>
+<a action="bypass -h Quest RainbowSpringsChateau messenger_yetti002.htm">Hideout battle game instruction</a><br>
+<a action="bypass -h Quest RainbowSpringsChateau register">Hideout battle game registration</a><br>
+<a action="bypass -h Quest RainbowSpringsChateau messenger_yetti015.htm">Cancel registration</a><br>
+<a action="bypass -h Quest RainbowSpringsChateau messenger_yetti018.htm">Get a refund during game</a>
+</body></html>

+ 9 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti001a.htm

@@ -0,0 +1,9 @@
+<html><body>Messenger Yetti:<br>
+Pettite~ the transparent and lively building behind me is called <font color="LEVEL">Rainbow Spring</font>. It's not your ordinary hideout. You won't see a horde of peasants spilling blood for it. This one is special. Very high class...<br>
+Registration finished at: <font color="LEVEL">%time%</font><br>
+<br>
+<a action="bypass -h Quest RainbowSpringsChateau messenger_yetti002.htm">Hideout battle game instruction</a><br>
+<a action="bypass -h Quest RainbowSpringsChateau register">Hideout battle game registration</a><br>
+<a action="bypass -h Quest RainbowSpringsChateau messenger_yetti015.htm">Cancel registration</a><br>
+<a action="bypass -h Quest RainbowSpringsChateau messenger_yetti018.htm">Get a refund during game</a>
+</body></html>

+ 5 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti002.htm

@@ -0,0 +1,5 @@
+<html><body>Messenger Yeti:<br>
+To register for a Clan Hall War, you must first go fishing in Goddard Territory and obtain Clan Hall War Decrees. They compare the number of decrees submitted and select the four finalists one hour before the game starts. Those selected determine the owner of the Clan Hall by playing the game.<br>
+Submit as many decrees as possible! There's only one opportunity for registration!<br>
+<a action="bypass -h Quest RainbowSpringsChateau messenger_yetti003.htm">"How do I play the game?"</a>
+</body></html>

+ 5 - 6
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_explanation_1.htm → L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti003.htm

@@ -1,7 +1,6 @@
-<html>
-<body>
-Messenger Yeti:<br> 
-Have you ever played a high stakes event? If so, you'll understand quickly. Once you enter the arena, my good friend, the Game Coordinator, will provide instructions on how the game is played. He will then call out some words, which you must spell by breaking the treasure boxes in the four circles. Combine the letters you find into words, and take them to the Coordinator! You will then get an item for use in the game!<br>You can use this item against the Coordinator, depending on the situation. You may hit a jackpot or impede others, or sometimes my jerk friend...ehh... Well, you'll find out soon enough.<br> 
-Oh, I almost forgot the most important thing! The only way to open the Treasure Boxes is by hitting them with your <font color="LEVEL">bare hands</font>. Don't forget!<br> 
-<a action="bypass -h Quest RainbowSpringsChateau messenger_explanation_2.htm">"How many people can participate in the game?"</a><br>
+<html><body>Messenger Yeti:<br>
+Have you ever played a high stakes event? If so, you'll understand quickly. Once you enter the arena, my good friend, the Game Coordinator, will provide instructions on how the game is played. He will then call out some words, which you must spell by breaking the treasure boxes in the four circles. Combine the letters you find into words, and take them to the Coordinator! You will then get an item for use in the game!<br>
+You can use this item against the Coordinator, depending on the situation. You may hit a jackpot or impede others, or sometimes my jerk friend...ehh... Well, you'll find out soon enough.<br>
+Oh, I almost forgot the most important thing! The only way to open the Treasure Boxes is by hitting them with your <font color="LEVEL">bare hands</font>. Don't forget!<br>
+<a action="bypass -h Quest RainbowSpringsChateau messenger_yetti004.htm">"How many people can participate in the game?"</a>
 </body></html>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti004.htm

@@ -0,0 +1,4 @@
+<html><body>Messenger Yeti:<br>
+It's not a game where you fight, but a game played for fun, so only like-minded people are allowed to participate. You need a fair amount of people... If you have more than five, it will work.<br>
+(You can participate if your party is composed of more than five members and your Clan level is 3 or above.)
+</body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti005.htm

@@ -0,0 +1,3 @@
+<html><body>Messenger Yeti:<br>
+It would be fun to play together... Grarr... Too bad.
+</body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti008.htm

@@ -0,0 +1,3 @@
+<html><body>Messenger Yeti:<br>
+Grarr! I am sorry but there is a requirement to participate in the game. In order to apply, you must have Rainbow Springs Clan Hall War Decrees, and you can submit these only once. Players are ranked depending on the number of decrees submitted, so gather as many of them as you can.
+</body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti009.htm

@@ -0,0 +1,3 @@
+<html><body>Messenger Yeti:<br>
+Your application was received. We plan to make an announcement one hour before the game starts as to whether you were successfully registered or not. Don't forget to check back.
+</body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti010.htm

@@ -0,0 +1,3 @@
+<html><body>Messenger Yeti:<br>
+The Clan Leader has to come here himself in order to apply to participate in the game, or to cancel it.
+</body></html>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti011.htm

@@ -0,0 +1,4 @@
+<html><body>Messenger Yeti:<br>
+You need many people to have a fun game. You need leaders and also players...<br>
+(You must be a Clan Leader of a Clan composed of more than five members and be above Clan level 3 in order to apply.)
+</body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti012.htm

@@ -0,0 +1,3 @@
+<html><body>Messenger Yeti:<br>
+You already own a Clan Hall. You're greedy! You not allowed to participate in the game!
+</body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti013.htm

@@ -0,0 +1,3 @@
+<html><body>Messenger Yeti:<br>
+You're already registered. You can register only once per game! Grarr!
+</body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti014.htm

@@ -0,0 +1,3 @@
+<html><body>Messenger Yeti:<br>
+Registration for the Clan Hall war game is finished, please try the next game. To participate in a game, you must apply one hour before the game starts.
+</body></html>

+ 3 - 5
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_unregister_confirmation.htm → L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti015.htm

@@ -1,6 +1,4 @@
-<html>
-<body>
-Messenger Yeti:<br> 
-Do you absolutely have to cancel? If you cancel your registration now, we can only return half the decrees you submitted to us.<br> 
-<a action="bypass -h Quest RainbowSpringsChateau unregister_1">Cancel</a><br>
+<html><body>Messenger Yeti:<br>
+Do you absolutely have to cancel? If you cancel your registration now, we can only return half the decrees you submitted to us.<br>
+<a action="bypass -h Quest RainbowSpringsChateau cancel">Cancel</a>
 </body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti016.htm

@@ -0,0 +1,3 @@
+<html><body>Messenger Yeti:<br>
+Grarr! I can't find your name on the applicant list.
+</body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti017.htm

@@ -0,0 +1,3 @@
+<html><body>Messenger Yeti:<br>
+Check back one hour before the game starts when the participating teams are selected in case of a cancellation.
+</body></html>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti018.htm

@@ -0,0 +1,4 @@
+<html><body>Messenger Yetti:<br>
+The game is cancelled? Okay, so you get all the applications back.<br>
+<a action="bypass -h Quest RainbowSpringsChateau unregister">Receive it back</a>
+</body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti019.htm

@@ -0,0 +1,3 @@
+<html><body>Messenger Yetti:<br>
+Pettite~ here is your application!
+</body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/messenger_yetti020.htm

@@ -0,0 +1,3 @@
+<html><body>Messenger Yetti:<br>
+The returning application function is how you give back an application to a participant when the game is cancelled.
+</body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/no_clan_leader.htm

@@ -1,3 +1,3 @@
 <html><body>
-Im only authorized to talk with the clan leader
+I'm only authorized to talk with the clan leader.
 </body></html>

+ 1 - 2
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/yeti_cannot_exchange.htm

@@ -1,4 +1,3 @@
-<html><body>
-Yeti:<br>
+<html><body>Yeti:<br>
 I cannot exchange any item with you!
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/yeti_item_exchange.htm

@@ -1,3 +1,3 @@
 <html><body>
-No data for this html
+No data for this html.
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/yeti_passage_used.htm

@@ -1,3 +1,3 @@
 <html><body>
-That passage have been alredy used for your clan
+That passage have been already used for your clan.
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java

@@ -474,7 +474,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		if(_hall.getOwnerId() > 0)
 		{
 			L2Clan clan = ClanTable.getInstance().getClan(_hall.getOwnerId());
-			clan.setHasHideout(0);
+			clan.setHideoutId(0);
 			_hall.free();
 		}
 		super.endSiege();

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java

@@ -77,7 +77,7 @@ public final class AdminCHSiege implements IAdminCommandHandler
 				if(owner != null)
 				{
 					hall.free();
-					owner.setHasHideout(0);
+					owner.setHideoutId(0);
 					hall.addAttacker(owner);
 				}
 				hall.getSiege().startSiege();

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminClan.java

@@ -106,9 +106,9 @@ public class AdminClan implements IAdminCommandHandler
 			html.replace("%clan_name%", clan.getName());
 			html.replace("%clan_leader%", clan.getLeaderName());
 			html.replace("%clan_level%", String.valueOf(clan.getLevel()));
-			html.replace("%clan_has_castle%", clan.getHasCastle() > 0 ? CastleManager.getInstance().getCastleById(clan.getHasCastle()).getName() : "No");
-			html.replace("%clan_has_clanhall%", clan.getHasHideout() > 0 ? ClanHallManager.getInstance().getClanHallById(clan.getHasHideout()).getName() : "No");
-			html.replace("%clan_has_fortress%", clan.getHasFort() > 0 ? FortManager.getInstance().getFortById(clan.getHasFort()).getName() : "No");
+			html.replace("%clan_has_castle%", clan.getCastleId() > 0 ? CastleManager.getInstance().getCastleById(clan.getCastleId()).getName() : "No");
+			html.replace("%clan_has_clanhall%", clan.getHideoutId() > 0 ? ClanHallManager.getInstance().getClanHallById(clan.getHideoutId()).getName() : "No");
+			html.replace("%clan_has_fortress%", clan.getFortId() > 0 ? FortManager.getInstance().getFortById(clan.getFortId()).getName() : "No");
 			html.replace("%clan_points%", String.valueOf(clan.getReputationScore()));
 			html.replace("%clan_players_count%", String.valueOf(clan.getMembersCount()));
 			html.replace("%clan_ally%", clan.getAllyId() > 0 ? clan.getAllyName() : "Not in ally");

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java

@@ -196,7 +196,7 @@ public class AdminSiege implements IAdminCommandHandler
 					activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
 				else if (clanhall.getOwnerId() > 0)
 					activeChar.sendMessage("This ClanHall isn't free!");
-				else if (player.getClan().getHasHideout() == 0)
+				else if (player.getClan().getHideoutId() == 0)
 				{
 					if (!clanhall.isSiegableHall())
 					{
@@ -207,7 +207,7 @@ public class AdminSiege implements IAdminCommandHandler
 					else if (player.getClan() != null)
 					{
 						clanhall.setOwner(player.getClan());
-						player.getClan().setHasHideout(clanhall.getId());
+						player.getClan().setHideoutId(clanhall.getId());
 					}
 				}
 				else
@@ -232,7 +232,7 @@ public class AdminSiege implements IAdminCommandHandler
 					L2Clan clan = ClanTable.getInstance().getClan(oldOwner);
 					if (clan != null)
 					{
-						clan.setHasHideout(0);
+						clan.setHideoutId(0);
 						clan.broadcastClanStatus();
 					}
 				}

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Disguise.java

@@ -37,7 +37,7 @@ public class Disguise implements IItemHandler
 		int regId = TerritoryWarManager.getInstance().getRegisteredTerritoryId(activeChar);
 		if (regId > 0 && regId == (item.getItemId() - 13596))
 		{
-			if (activeChar.getClan() != null && activeChar.getClan().getHasCastle() > 0)
+			if (activeChar.getClan() != null && activeChar.getClan().getCastleId() > 0)
 			{
 				activeChar.sendPacket(SystemMessageId.TERRITORY_OWNING_CLAN_CANNOT_USE_DISGUISE_SCROLL);
 				return false;

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/castle.java

@@ -38,7 +38,7 @@ public class castle implements IVoicedCommandHandler
 		if (command.startsWith("open doors") && params.equals("castle") && (activeChar.isClanLeader()))
 		{
 			L2DoorInstance door = (L2DoorInstance) activeChar.getTarget();
-			Castle castle = CastleManager.getInstance().getCastleById(activeChar.getClan().getHasCastle());
+			Castle castle = CastleManager.getInstance().getCastleById(activeChar.getClan().getCastleId());
 			if ((door == null) || (castle == null))
 			{
 				return false;
@@ -52,7 +52,7 @@ public class castle implements IVoicedCommandHandler
 		else if (command.startsWith("close doors") && params.equals("castle") && (activeChar.isClanLeader()))
 		{
 			final L2DoorInstance door = (L2DoorInstance) activeChar.getTarget();
-			final Castle castle = CastleManager.getInstance().getCastleById(activeChar.getClan().getHasCastle());
+			final Castle castle = CastleManager.getInstance().getCastleById(activeChar.getClan().getCastleId());
 			if ((door == null) || (castle == null))
 			{
 				return false;
@@ -65,7 +65,7 @@ public class castle implements IVoicedCommandHandler
 		}
 		else if (command.startsWith("ride wyvern") && params.equals("castle"))
 		{
-			if ((activeChar.getClan().getHasCastle() > 0) && activeChar.isClanLeader())
+			if ((activeChar.getClan().getCastleId() > 0) && activeChar.isClanLeader())
 			{
 				activeChar.mount(12621, 0, true);
 			}

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q147_PathtoBecominganEliteMercenary/Q147_PathtoBecominganEliteMercenary.java

@@ -78,7 +78,7 @@ public class Q147_PathtoBecominganEliteMercenary extends Quest
 		switch (st.getState())
 		{
 			case State.CREATED:
-				if ((player.getClan() != null) && (player.getClan().getHasCastle() > 0))
+				if ((player.getClan() != null) && (player.getClan().getCastleId() > 0))
 				{
 					htmltext = "castle.htm";
 				}

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q148_PathtoBecominganExaltedMercenary/Q148_PathtoBecominganExaltedMercenary.java

@@ -73,7 +73,7 @@ public class Q148_PathtoBecominganExaltedMercenary extends Quest
 		{
 			case State.CREATED:
 				QuestState _prev = player.getQuestState("147_PathtoBecominganEliteMercenary");
-				if ((player.getClan() != null) && (player.getClan().getHasCastle() > 0))
+				if ((player.getClan() != null) && (player.getClan().getCastleId() > 0))
 				{
 					htmltext = "castle.htm";
 				}

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q504_CompetitionfortheBanditStronghold/Q504_CompetitionfortheBanditStronghold.java

@@ -73,7 +73,7 @@ public final class Q504_CompetitionfortheBanditStronghold extends Quest
 			 result = "azit_messenger_q0504_04.htm";
 		else if(!player.isClanLeader())
 			 result = "azit_messenger_q0504_05.htm";
-		else if(clan.getHasHideout() > 0 || clan.getHasFort() > 0 || clan.getHasCastle() > 0)
+		else if(clan.getHideoutId() > 0 || clan.getFortId() > 0 || clan.getCastleId() > 0)
 			result = "azit_messenger_q0504_10.htm";
 		else
 		{

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java

@@ -208,7 +208,7 @@ public final class Q511_AwlUnderFoot extends Quest
 		FortDungeon dungeon = _fortDungeons.get(npc.getNpcId());
 		if (player == null || fortress == null || dungeon == null)
 			return "FortressWarden-01.htm";
-		if (player.getClan() == null || player.getClan().getHasFort() != fortress.getFortId())
+		if (player.getClan() == null || player.getClan().getFortId() != fortress.getFortId())
 			return "FortressWarden-01.htm";
 		else if (fortress.getFortState() == 0)
 			return "FortressWarden-02a.htm";