BETA: Miscellaneous improvements:

	* Getting rid of qn in conquerable clan hall scripts
	* Event mod constructor changes to match standards
	* A few small ai/fantasy_isle/MC_Show improvements
Patch by: jurchiks
Reviewed by: Adry_85

L2J_DataPack_BETA/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java

@@ -43,33 +43,24 @@ import com.l2jserver.gameserver.network.serverpackets.PlaySound;
 public class MC_Show extends AbstractNpcAI
 {
 	private static int MC = 32433;
-	private static int[] singers =
+	// @formatter:off
+	private static int[] SINGERS =
 	{
-		32431,
-		32432
+		32431, 32432
 	};
 	private static int[] CIRCUS =
 	{
-		32442,
-		32443,
-		32444,
-		32445,
-		32446
+		32442, 32443, 32444, 32445, 32446
 	};
 	private static int[] INDIVIDUALS =
 	{
-		32439,
-		32440,
-		32441
+		32439, 32440, 32441
 	};
 	private static int[] SHOWSTUFF =
 	{
-		32424,
-		32425,
-		32426,
-		32427,
-		32428
+		32424, 32425, 32426, 32427, 32428
 	};
+	// @formatter:on
 	private static boolean IS_STARTED = false;
 	private static NpcStringId[] MESSAGES =
 	{
@@ -81,7 +72,7 @@ public class MC_Show extends AbstractNpcAI
 		NpcStringId.NOW_ID_LIKE_TO_INTRODUCE_THE_MOST_BEAUTIFUL_SINGER_IN_ADEN_PLEASE_WELCOMELEYLA_MIRA,
 		NpcStringId.HERE_SHE_COMES,
 		NpcStringId.THANK_YOU_VERY_MUCH_LEYLA,
-		// NpcStringId.1800089 Now we're in for a real treat.
+		NpcStringId.NOW_WERE_IN_FOR_A_REAL_TREAT,
 		NpcStringId.JUST_BACK_FROM_THEIR_WORLD_TOUR_PUT_YOUR_HANDS_TOGETHER_FOR_THE_FANTASY_ISLE_CIRCUS,
 		NpcStringId.COME_ON_EVERYONE,
 		NpcStringId.DID_YOU_LIKE_IT_THAT_WAS_SO_AMAZING,
@@ -194,18 +185,18 @@ public class MC_Show extends AbstractNpcAI
 		talks.put("3", new ShoutInfo(MESSAGES[3], "4", 4000));
 		talks.put("4", new ShoutInfo(MESSAGES[4], "5", 5000));
 		talks.put("5", new ShoutInfo(MESSAGES[5], "6", 3000));
-		talks.put("8", new ShoutInfo(MESSAGES[8], "9", 5000));
-		talks.put("9", new ShoutInfo(MESSAGES[9], "10", 5000));
-		talks.put("12", new ShoutInfo(MESSAGES[11], "13", 5000));
-		talks.put("13", new ShoutInfo(MESSAGES[12], "14", 5000));
-		talks.put("15", new ShoutInfo(MESSAGES[13], "16", 5000));
-		talks.put("16", new ShoutInfo(MESSAGES[14], "17", 5000));
-		talks.put("18", new ShoutInfo(MESSAGES[16], "19", 5000));
-		talks.put("19", new ShoutInfo(MESSAGES[17], "20", 5000));
-		talks.put("21", new ShoutInfo(MESSAGES[18], "22", 5000));
-		talks.put("22", new ShoutInfo(MESSAGES[19], "23", 400));
-		talks.put("25", new ShoutInfo(MESSAGES[20], "26", 5000));
-		talks.put("26", new ShoutInfo(MESSAGES[21], "27", 5400));
+		talks.put("8", new ShoutInfo(MESSAGES[9], "9", 5000));
+		talks.put("9", new ShoutInfo(MESSAGES[10], "10", 5000));
+		talks.put("12", new ShoutInfo(MESSAGES[12], "13", 5000));
+		talks.put("13", new ShoutInfo(MESSAGES[13], "14", 5000));
+		talks.put("15", new ShoutInfo(MESSAGES[14], "16", 5000));
+		talks.put("16", new ShoutInfo(MESSAGES[15], "17", 5000));
+		talks.put("18", new ShoutInfo(MESSAGES[17], "19", 5000));
+		talks.put("19", new ShoutInfo(MESSAGES[18], "20", 5000));
+		talks.put("21", new ShoutInfo(MESSAGES[19], "22", 5000));
+		talks.put("22", new ShoutInfo(MESSAGES[20], "23", 400));
+		talks.put("25", new ShoutInfo(MESSAGES[21], "26", 5000));
+		talks.put("26", new ShoutInfo(MESSAGES[22], "27", 5400));
 		
 		walks.put("npc1_1", new WalkInfo(new Location(-56546, -56384, -2008, 0), "npc1_2", 1200));
 		walks.put("npc1_2", new WalkInfo(new Location(-56597, -56384, -2008, 0), "npc1_3", 1200));
@@ -322,7 +313,7 @@ public class MC_Show extends AbstractNpcAI
 			SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
 			_log.info("Fantasy Isle: MC show script starting at " + format.format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours.");
 		}
-		// TODO startQuestTimer("Start", 14400000L, null, null, true);
+		// TODO startRepeatingQuestTimer("Start", diff, 14400000, null, null);
 		// missing option to provide different initial delay
 		ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new StartMCShow(), diff, 14400000L);
 	}
@@ -389,18 +380,19 @@ public class MC_Show extends AbstractNpcAI
 		}
 		else if ((npc != null) && IS_STARTED)
 		{
+			// TODO switch on event
 			if (event.equalsIgnoreCase("6"))
 			{
 				autoChat(npc, MESSAGES[6], Say2.NPC_SHOUT);
 				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(-56511, -56647, -2008, 36863));
 				npc.broadcastPacket(new PlaySound(1, "NS22_F", 0, 0, 0, 0, 0));
-				addSpawn(singers[0], -56344, -56328, -2008, 32768, false, 224000);
-				addSpawn(singers[1], -56552, -56245, -2008, 36863, false, 224000);
-				addSpawn(singers[1], -56546, -56426, -2008, 28672, false, 224000);
-				addSpawn(singers[1], -56570, -56473, -2008, 28672, false, 224000);
-				addSpawn(singers[1], -56594, -56516, -2008, 28672, false, 224000);
-				addSpawn(singers[1], -56580, -56203, -2008, 36863, false, 224000);
-				addSpawn(singers[1], -56606, -56157, -2008, 36863, false, 224000);
+				addSpawn(SINGERS[0], -56344, -56328, -2008, 32768, false, 224000);
+				addSpawn(SINGERS[1], -56552, -56245, -2008, 36863, false, 224000);
+				addSpawn(SINGERS[1], -56546, -56426, -2008, 28672, false, 224000);
+				addSpawn(SINGERS[1], -56570, -56473, -2008, 28672, false, 224000);
+				addSpawn(SINGERS[1], -56594, -56516, -2008, 28672, false, 224000);
+				addSpawn(SINGERS[1], -56580, -56203, -2008, 36863, false, 224000);
+				addSpawn(SINGERS[1], -56606, -56157, -2008, 36863, false, 224000);
 				startQuestTimer("7", 215000, npc, null);
 			}
 			else if (event.equalsIgnoreCase("7"))
@@ -438,7 +430,7 @@ public class MC_Show extends AbstractNpcAI
 				switch (npc.getId())
 				{
 					case 32433:
-						autoChat(npc, MESSAGES[10], Say2.NPC_SHOUT);
+						autoChat(npc, MESSAGES[11], Say2.NPC_SHOUT);
 						npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(-56698, -56430, -2008, 32768));
 						startQuestTimer("12", 5000, npc, null);
 						break;
@@ -454,7 +446,7 @@ public class MC_Show extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("17"))
 			{
-				autoChat(npc, MESSAGES[15], Say2.NPC_SHOUT);
+				autoChat(npc, MESSAGES[16], Say2.NPC_SHOUT);
 				startQuestTimer("social1", 2000, addSpawn(INDIVIDUALS[1], -56700, -56340, -2008, 32768, false, 32000), null);
 				startQuestTimer("18", 9000, npc, null);
 			}
@@ -475,7 +467,7 @@ public class MC_Show extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("28"))
 			{
-				autoChat(npc, MESSAGES[22], Say2.NPC_ALL);
+				autoChat(npc, MESSAGES[23], Say2.NPC_ALL);
 				startQuestTimer("social1", 1, npc, null);
 			}
 			else if (event.equalsIgnoreCase("29"))

L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java

@@ -33,8 +33,6 @@ public final class BanditStronghold extends FlagWar
 {
 	static
 	{
-		qn = "BanditStronghold";
-		
 		ROYAL_FLAG = 35422;
 		FLAG_RED = 35423;
 		FLAG_YELLOW = 35424;
@@ -91,7 +89,7 @@ public final class BanditStronghold extends FlagWar
 	
 	private BanditStronghold()
 	{
-		super(-1, qn, "conquerablehalls/flagwar", BANDIT_STRONGHOLD);
+		super(BanditStronghold.class.getSimpleName(), BANDIT_STRONGHOLD);
 	}
 	
 	@Override

L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java

@@ -32,7 +32,6 @@ import com.l2jserver.gameserver.Announcements;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.ai.L2SpecialSiegeGuardAI;
-import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.datatables.ClanTable;
 import com.l2jserver.gameserver.datatables.NpcData;
 import com.l2jserver.gameserver.model.L2Clan;
@@ -59,8 +58,6 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public abstract class FlagWar extends ClanHallSiegeEngine
 {
-	protected static String qn;
-	
 	private static final String SQL_LOAD_ATTACKERS = "SELECT * FROM siegable_hall_flagwar_attackers WHERE hall_id = ?";
 	private static final String SQL_SAVE_ATTACKER = "INSERT INTO siegable_hall_flagwar_attackers_members VALUES (?,?,?)";
 	private static final String SQL_LOAD_MEMEBERS = "SELECT object_id FROM siegable_hall_flagwar_attackers_members WHERE clan_id = ?";
@@ -100,10 +97,9 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 	protected L2Clan _winner;
 	private boolean _firstPhase;
 	
-	public FlagWar(int questId, String name, String descr, int hallId)
+	public FlagWar(String name, int hallId)
 	{
-		super(questId, name, descr, hallId);
-		
+		super(-1, name, "conquerablehalls/flagwar", hallId);
 		addStartNpc(MESSENGER);
 		addFirstTalkId(MESSENGER);
 		addTalkId(MESSENGER);
@@ -133,16 +129,13 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
 		String html = null;
-		/*
-		 * if(player.getQuestState(qn) == null) newQuestState(player);
-		 */
 		if (npc.getId() == MESSENGER)
 		{
 			if (!checkIsAttacker(player.getClan()))
 			{
 				L2Clan clan = ClanTable.getInstance().getClan(_hall.getOwnerId());
-				String content = HtmCache.getInstance().getHtm(null, "data/scripts/conquerablehalls/flagwar/" + qn + "/messenger_initial.htm");
-				content = content.replaceAll("%clanName%", clan == null ? "no owner" : clan.getName());
+				String content = getHtm(player.getHtmlPrefix(), "messenger_initial.htm");
+				content = content.replaceAll("%clanName%", (clan == null) ? "no owner" : clan.getName());
 				content = content.replaceAll("%objectId%", String.valueOf(npc.getObjectId()));
 				html = content;
 			}
@@ -224,7 +217,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 					// Register paying the fee
 					else if (arg[1].equals("wFee") && canPayRegistration())
 					{
-						if (player.reduceAdena(qn + " Siege", 200000, npc, false)) // Fee payed
+						if (player.reduceAdena(getName() + " Siege", 200000, npc, false)) // Fee payed
 						{
 							registerClan(clan);
 							html = getFlagHtml(_data.get(clan.getId()).flag);
@@ -260,7 +253,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 					}
 					catch (Exception e)
 					{
-						_log.warning(qn + "->select_clan_npc->Wrong mahum warrior id: " + var[1]);
+						_log.warning(getName() + "->select_clan_npc->Wrong mahum warrior id: " + var[1]);
 					}
 					if ((id > 0) && ((html = getAllyHtml(id)) != null))
 					{
@@ -270,7 +263,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 				}
 				else
 				{
-					_log.warning(qn + " Siege: Not enough parameters to save clan npc for clan: " + clan.getName());
+					_log.warning(getName() + " Siege: Not enough parameters to save clan npc for clan: " + clan.getName());
 				}
 			}
 		}
@@ -338,7 +331,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 			}
 			else
 			{
-				html = HtmCache.getInstance().getHtm(null, "data/scripts/conquerablehalls/flagwar/" + qn + "/messenger_registeredclans.htm");
+				html = getHtm(player.getHtmlPrefix(), "messenger_registeredclans.htm");
 				int i = 0;
 				for (Entry<Integer, ClanData> clanData : _data.entrySet())
 				{
@@ -559,7 +552,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 			catch (Exception e)
 			{
 				endSiege();
-				_log.warning(qn + ": Problems in siege initialization!");
+				_log.warning(getName() + ": Problems in siege initialization!");
 				e.printStackTrace();
 			}
 		}
@@ -645,12 +638,12 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 			
 			if (flagTemplate == null)
 			{
-				_log.warning(qn + ": Flag L2NpcTemplate[" + data.flag + "] does not exist!");
+				_log.warning(getName() + ": Flag L2NpcTemplate[" + data.flag + "] does not exist!");
 				throw new NullPointerException();
 			}
 			else if (mahumTemplate == null)
 			{
-				_log.warning(qn + ": Ally L2NpcTemplate[" + data.npc + "] does not exist!");
+				_log.warning(getName() + ": Ally L2NpcTemplate[" + data.npc + "] does not exist!");
 				throw new NullPointerException();
 			}
 			
@@ -680,7 +673,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 		catch (Exception e)
 		{
-			_log.warning(qn + ": Couldnt make clan spawns: " + e.getMessage());
+			_log.warning(getName() + ": Couldnt make clan spawns: " + e.getMessage());
 			e.printStackTrace();
 		}
 	}
@@ -779,7 +772,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 	private void sendRegistrationPageDate(L2PcInstance player)
 	{
 		final NpcHtmlMessage msg = new NpcHtmlMessage();
-		msg.setFile(null, "data/scripts/conquerablehalls/flagwar/" + qn + "/siege_date.htm");
+		msg.setHtml(getHtm(player.getHtmlPrefix(), "siege_date.htm"));
 		msg.replace("%nextSiege%", _hall.getSiegeDate().getTime().toString());
 		player.sendPacket(msg);
 	}
@@ -802,7 +795,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 				
 				if (ClanTable.getInstance().getClan(clanId) == null)
 				{
-					_log.warning(qn + ": Loaded an unexistent clan as attacker! Clan Id: " + clanId);
+					_log.warning(getName() + ": Loaded an unexistent clan as attacker! Clan ID: " + clanId);
 					continue;
 				}
 				
@@ -818,7 +811,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 		catch (Exception e)
 		{
-			_log.warning(qn + ".loadAttackers()->" + e.getMessage());
+			_log.warning(getName() + ".loadAttackers()->" + e.getMessage());
 			e.printStackTrace();
 		}
 	}
@@ -831,7 +824,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 			
 			if (listInstance == null)
 			{
-				_log.warning(qn + ": Tried to load unregistered clan: " + clanId + "[clan Id]");
+				_log.warning(getName() + ": Tried to load unregistered clan with ID " + clanId);
 				return;
 			}
 			
@@ -848,7 +841,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 		catch (Exception e)
 		{
-			_log.warning(qn + ".loadAttackerMembers()->" + e.getMessage());
+			_log.warning(getName() + ".loadAttackerMembers()->" + e.getMessage());
 			e.printStackTrace();
 		}
 	}
@@ -867,7 +860,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 		catch (Exception e)
 		{
-			_log.warning(qn + ".saveClan()->" + e.getMessage());
+			_log.warning(getName() + ".saveClan()->" + e.getMessage());
 			e.printStackTrace();
 		}
 	}
@@ -884,7 +877,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 		catch (Exception e)
 		{
-			_log.warning(qn + ".saveNpc()->" + e.getMessage());
+			_log.warning(getName() + ".saveNpc()->" + e.getMessage());
 			e.printStackTrace();
 		}
 	}
@@ -902,7 +895,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 		catch (Exception e)
 		{
-			_log.warning(qn + ".saveMember()->" + e.getMessage());
+			_log.warning(getName() + ".saveMember()->" + e.getMessage());
 			e.printStackTrace();
 		}
 	}
@@ -923,7 +916,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 		catch (Exception e)
 		{
-			_log.warning(qn + ".clearTables()->" + e.getMessage());
+			_log.warning(getName() + ".clearTables()->" + e.getMessage());
 		}
 	}
 	

L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java

@@ -33,8 +33,6 @@ public final class WildBeastReserve extends FlagWar
 {
 	static
 	{
-		qn = "WildBeastReserve";
-		
 		ROYAL_FLAG = 35606;
 		FLAG_RED = 35607; // White flag
 		FLAG_YELLOW = 35608; // Red flag
@@ -91,7 +89,7 @@ public final class WildBeastReserve extends FlagWar
 	
 	private WildBeastReserve()
 	{
-		super(-1, qn, "conquerablehalls/flagwar", BEAST_FARM);
+		super(WildBeastReserve.class.getSimpleName(), BEAST_FARM);
 	}
 	
 	@Override

L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodElpies/eventmodElpies.java

@@ -67,9 +67,9 @@ public final class eventmodElpies extends Event
 	private static int CURRENT_ELPY_COUNT = 0;
 	private ScheduledFuture<?> _eventTask = null;
 	
-	public eventmodElpies(int questId, String name, String descr)
+	private eventmodElpies()
 	{
-		super(questId, name, descr);
+		super(-1, eventmodElpies.class.getSimpleName(), "mods");
 		addSpawnId(ELPY);
 		addKillId(ELPY);
 	}
@@ -245,6 +245,6 @@ public final class eventmodElpies extends Event
 	
 	public static void main(String[] args)
 	{
-		new eventmodElpies(-1, "eventmodElpies", "mods/eventmodElpies");
+		new eventmodElpies();
 	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java

@@ -36,7 +36,7 @@ import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.util.Util;
 
-public class eventmodRabbits extends Event
+public final class eventmodRabbits extends Event
 {
 	// Event NPC's list
 	private List<L2Npc> _npclist;
@@ -77,19 +77,12 @@ public class eventmodRabbits extends Event
 	};
 	// @formatter:on
 	
-	public static void main(String[] args)
+	private eventmodRabbits()
 	{
-		new eventmodRabbits(-1, "eventmodRabbits", "mods");
-	}
-	
-	public eventmodRabbits(int questId, String name, String descr)
-	{
-		super(questId, name, descr);
-		
+		super(-1, eventmodRabbits.class.getSimpleName(), "mods");
 		addStartNpc(_npc_snow);
 		addFirstTalkId(_npc_snow);
 		addTalkId(_npc_snow);
-		
 		addFirstTalkId(_npc_chest);
 		addSkillSeeId(_npc_chest);
 		addSpawnId(_npc_chest);
@@ -300,4 +293,9 @@ public class eventmodRabbits extends Event
 	{
 		return false;
 	}
+	
+	public static void main(String[] args)
+	{
+		new eventmodRabbits();
+	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java

@@ -39,7 +39,7 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 /**
  * @author Gnacik
  */
-public class eventmodRace extends Event
+public final class eventmodRace extends Event
 {
 	// Event NPC's list
 	private List<L2Npc> _npclist;
@@ -101,19 +101,12 @@ public class eventmodRace extends Event
 	};
 	// @formatter:on
 	
-	public static void main(String[] args)
+	private eventmodRace()
 	{
-		new eventmodRace(-1, "eventmodRace", "mods");
-	}
-	
-	public eventmodRace(int questId, String name, String descr)
-	{
-		super(questId, name, descr);
-		
+		super(-1, eventmodRace.class.getSimpleName(), "mods");
 		addStartNpc(_start_npc);
 		addFirstTalkId(_start_npc);
 		addTalkId(_start_npc);
-		
 		addStartNpc(_stop_npc);
 		addFirstTalkId(_stop_npc);
 		addTalkId(_stop_npc);
@@ -428,4 +421,9 @@ public class eventmodRace extends Event
 		Announcements.getInstance().announceToAll(player.getName() + " is a winner!");
 		eventStop();
 	}
+	
+	public static void main(String[] args)
+	{
+		new eventmodRace();
+	}
 }