BETA: Minor Cleanup.

L2J_DataPack_BETA/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java

@@ -28,10 +28,10 @@ import com.l2jserver.gameserver.util.Util;
  */
 public class CharacterBirthday extends Quest
 {
-	private static final int _npc = 32600;
-	private static int _spawns = 0;
+	private static final int ALEGRIA = 32600;
+	private static int SPAWNS = 0;
 	
-	private final static int[] _gk =
+	private final static int[] GK =
 	{
 		30006, 30059, 30080, 30134, 30146, 30177, 30233, 30256, 30320, 30540, 30576, 30836, 30848, 30878, 30899, 31275, 31320, 31964, 32163
 	};
@@ -39,13 +39,10 @@ public class CharacterBirthday extends Quest
 	public CharacterBirthday(int questId, String name, String descr)
 	{
 		super(questId, name, descr);
-		addStartNpc(_npc);
-		addTalkId(_npc);
-		for (int id : _gk)
-		{
-			addStartNpc(id);
-			addTalkId(id);
-		}
+		addStartNpc(ALEGRIA);
+		addStartNpc(GK);
+		addTalkId(ALEGRIA);
+		addTalkId(GK);
 	}
 	
 	@Override
@@ -57,7 +54,7 @@ public class CharacterBirthday extends Quest
 		if (event.equalsIgnoreCase("despawn_npc"))
 		{
 			npc.doDie(player);
-			_spawns--;
+			SPAWNS--;
 			
 			htmltext = null;
 		}
@@ -71,7 +68,7 @@ public class CharacterBirthday extends Quest
 				htmltext = null; // FIXME: Probably has html
 				// Despawn npc
 				npc.doDie(player);
-				_spawns--;
+				SPAWNS--;
 			}
 			else
 			{
@@ -84,7 +81,7 @@ public class CharacterBirthday extends Quest
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
-		if (_spawns >= 3)
+		if (SPAWNS >= 3)
 		{
 			return "busy.htm";
 		}
@@ -100,7 +97,7 @@ public class CharacterBirthday extends Quest
 			L2Npc spawned = st.addSpawn(32600, player.getX() + 10, player.getY() + 10, player.getZ() + 10, 0, false, 0, true);
 			st.setState(State.STARTED);
 			st.startQuestTimer("despawn_npc", 180000, spawned);
-			_spawns++;
+			SPAWNS++;
 		}
 		else
 		{
@@ -111,6 +108,6 @@ public class CharacterBirthday extends Quest
 	
 	public static void main(String[] args)
 	{
-		new CharacterBirthday(-1, "CharacterBirthday", "events");
+		new CharacterBirthday(-1, CharacterBirthday.class.getSimpleName(), "events");
 	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java

@@ -35,12 +35,15 @@ import com.l2jserver.gameserver.util.Util;
  */
 public class FreyaCelebration extends LongTimeEvent
 {
-	private static final int _freya = 13296;
-	private static final int _freya_potion = 15440;
-	private static final int _freya_gift = 17138;
-	private static final int _hours = 20;
+	// NPC
+	private static final int FREYA = 13296;
+	// Items
+	private static final int FREYA_POTION = 15440;
+	private static final int FREYA_GIFT = 17138;
+	// Misc
+	private static final int HOURS = 20;
 	
-	private static final int[] _skills =
+	private static final int[] SKILLS =
 	{
 		9150,
 		9151,
@@ -51,7 +54,7 @@ public class FreyaCelebration extends LongTimeEvent
 		9156
 	};
 	
-	private static final NpcStringId[] _freya_texts =
+	private static final NpcStringId[] FREYA_TEXT =
 	{
 		NpcStringId.EVEN_THOUGH_YOU_BRING_SOMETHING_CALLED_A_GIFT_AMONG_YOUR_HUMANS_IT_WOULD_JUST_BE_PROBLEMATIC_FOR_ME,
 		NpcStringId.I_JUST_DONT_KNOW_WHAT_EXPRESSION_I_SHOULD_HAVE_IT_APPEARED_ON_ME_ARE_HUMANS_EMOTIONS_LIKE_THIS_FEELING,
@@ -81,8 +84,8 @@ public class FreyaCelebration extends LongTimeEvent
 				{
 					st.setState(State.STARTED);
 					st.takeItems(PcInventory.ADENA_ID, 1);
-					st.giveItems(_freya_potion, 1);
-					saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (_hours * 3600000)));
+					st.giveItems(FREYA_POTION, 1);
+					saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (HOURS * 3600000)));
 				}
 				else
 				{
@@ -90,7 +93,7 @@ public class FreyaCelebration extends LongTimeEvent
 					int hours = (int) (remainingTime / 3600);
 					int minutes = (int) ((remainingTime % 3600) / 60);
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.AVAILABLE_AFTER_S1_S2_HOURS_S3_MINUTES);
-					sm.addItemName(_freya_potion);
+					sm.addItemName(FREYA_POTION);
 					sm.addNumber(hours);
 					sm.addNumber(minutes);
 					player.sendPacket(sm);
@@ -115,7 +118,7 @@ public class FreyaCelebration extends LongTimeEvent
 			return null;
 		}
 		
-		if ((npc.getNpcId() == _freya) && Util.contains(targets, npc) && Util.contains(_skills, skill.getId()))
+		if ((npc.getNpcId() == FREYA) && Util.contains(targets, npc) && Util.contains(SKILLS, skill.getId()))
 		{
 			if (getRandom(100) < 5)
 			{
@@ -124,13 +127,13 @@ public class FreyaCelebration extends LongTimeEvent
 				
 				npc.broadcastPacket(cs);
 				
-				caster.addItem("FreyaCelebration", _freya_gift, 1, npc, true);
+				caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true);
 			}
 			else
 			{
 				if (getRandom(10) < 2)
 				{
-					npc.broadcastPacket(new CreatureSay(npc.getObjectId(), Say2.ALL, npc.getName(), _freya_texts[getRandom(_freya_texts.length - 1)]));
+					npc.broadcastPacket(new CreatureSay(npc.getObjectId(), Say2.ALL, npc.getName(), FREYA_TEXT[getRandom(FREYA_TEXT.length - 1)]));
 				}
 			}
 		}
@@ -151,14 +154,14 @@ public class FreyaCelebration extends LongTimeEvent
 	{
 		super(questId, name, descr);
 		
-		addStartNpc(_freya);
-		addFirstTalkId(_freya);
-		addTalkId(_freya);
-		addSkillSeeId(_freya);
+		addStartNpc(FREYA);
+		addFirstTalkId(FREYA);
+		addTalkId(FREYA);
+		addSkillSeeId(FREYA);
 	}
 	
 	public static void main(String[] args)
 	{
-		new FreyaCelebration(-1, "FreyaCelebration", "events");
+		new FreyaCelebration(-1, FreyaCelebration.class.getSimpleName(), "events");
 	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java

@@ -30,16 +30,16 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 public class GiftOfVitality extends LongTimeEvent
 {
 	// Reuse between buffs
-	private static final int _hours = 5;
-	
-	private static final int _jack = 4306;
+	private static final int HOURS = 5;
+	// NPC
+	private static final int JACK = 4306;
 	
 	public GiftOfVitality(int questId, String name, String descr)
 	{
 		super(questId, name, descr);
-		addStartNpc(_jack);
-		addFirstTalkId(_jack);
-		addTalkId(_jack);
+		addStartNpc(JACK);
+		addFirstTalkId(JACK);
+		addTalkId(JACK);
 	}
 	
 	@Override
@@ -74,7 +74,7 @@ public class GiftOfVitality extends LongTimeEvent
 				// Gift of Vitality
 				npc.doCast(SkillTable.getInstance().getInfo(23179, 1));
 				st.setState(State.STARTED);
-				st.set("reuse", String.valueOf(System.currentTimeMillis() + (_hours * 3600000)));
+				st.set("reuse", String.valueOf(System.currentTimeMillis() + (HOURS * 3600000)));
 				htmltext = "4306-okvitality.htm";
 			}
 		}
@@ -149,6 +149,6 @@ public class GiftOfVitality extends LongTimeEvent
 	
 	public static void main(String[] args)
 	{
-		new GiftOfVitality(-1, "GiftOfVitality", "events");
+		new GiftOfVitality(-1, GiftOfVitality.class.getSimpleName(), "events");
 	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java

@@ -141,6 +141,6 @@ public class HeavyMedal extends LongTimeEvent
 	
 	public static void main(String[] args)
 	{
-		new HeavyMedal(-1, "HeavyMedal", "events");
+		new HeavyMedal(-1, HeavyMedal.class.getSimpleName(), "events");
 	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java

@@ -31,30 +31,31 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public class MasterOfEnchanting extends LongTimeEvent
 {
-	private static final int _master_yogi = 32599;
-	private static final int _master_yogi_staff = 13539;
-	private static final int _master_yogi_scroll = 13540;
+	// NPC
+	private static final int MASTER_YOGI = 32599;
+	// Items
+	private static final int MASTER_YOGI_STAFF = 13539;
+	private static final int MASTER_YOGI_SCROLL = 13540;
+	// Misc
+	private static final int STAFF_PRICE = 1000000;
+	private static final int SCROLL_24_PRICE = 5000000;
+	private static final int SCROLL_24_TIME = 6;
+	private static final int SCROLL_1_PRICE = 500000;
+	private static final int SCROLL_10_PRICE = 5000000;
 	
-	private static final int _staff_price = 1000000;
-	private static final int _scroll_24_price = 5000000;
-	private static final int _scroll_24_time = 6;
-	
-	private static final int _scroll_1_price = 500000;
-	private static final int _scroll_10_price = 5000000;
-	
-	private static final int[] _hat_shadow_reward =
+	private static final int[] HAT_SHADOW_REWARD =
 	{
 		13074,
 		13075,
 		13076
 	};
-	private static final int[] _hat_event_reward =
+	private static final int[] HAT_EVENT_REWARD =
 	{
 		13518,
 		13519,
 		13522
 	};
-	private static final int[] _crystal_reward =
+	private static final int[] CRYSTAL_REWARD =
 	{
 		9570,
 		9571,
@@ -67,9 +68,9 @@ public class MasterOfEnchanting extends LongTimeEvent
 	public MasterOfEnchanting(int questId, String name, String descr)
 	{
 		super(questId, name, descr);
-		addStartNpc(_master_yogi);
-		addFirstTalkId(_master_yogi);
-		addTalkId(_master_yogi);
+		addStartNpc(MASTER_YOGI);
+		addFirstTalkId(MASTER_YOGI);
+		addTalkId(MASTER_YOGI);
 	}
 	
 	@Override
@@ -79,10 +80,10 @@ public class MasterOfEnchanting extends LongTimeEvent
 		QuestState st = player.getQuestState(getName());
 		if (event.equalsIgnoreCase("buy_staff"))
 		{
-			if (!st.hasQuestItems(_master_yogi_staff) && (st.getQuestItemsCount(PcInventory.ADENA_ID) > _staff_price))
+			if (!st.hasQuestItems(MASTER_YOGI_STAFF) && (st.getQuestItemsCount(PcInventory.ADENA_ID) > STAFF_PRICE))
 			{
-				st.takeItems(PcInventory.ADENA_ID, _staff_price);
-				st.giveItems(_master_yogi_staff, 1);
+				st.takeItems(PcInventory.ADENA_ID, STAFF_PRICE);
+				st.giveItems(MASTER_YOGI_STAFF, 1);
 				htmltext = "32599-staffbuyed.htm";
 			}
 			else
@@ -102,11 +103,11 @@ public class MasterOfEnchanting extends LongTimeEvent
 			
 			if (_curr_time > _reuse_time)
 			{
-				if (st.getQuestItemsCount(PcInventory.ADENA_ID) > _scroll_24_price)
+				if (st.getQuestItemsCount(PcInventory.ADENA_ID) > SCROLL_24_PRICE)
 				{
-					st.takeItems(PcInventory.ADENA_ID, _scroll_24_price);
-					st.giveItems(_master_yogi_scroll, 24);
-					saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (_scroll_24_time * 3600000)));
+					st.takeItems(PcInventory.ADENA_ID, SCROLL_24_PRICE);
+					st.giveItems(MASTER_YOGI_SCROLL, 24);
+					saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000)));
 					htmltext = "32599-scroll24.htm";
 				}
 				else
@@ -138,11 +139,11 @@ public class MasterOfEnchanting extends LongTimeEvent
 				{
 					// Little glitch. There is no SystemMessage with seconds only.
 					// If time is less than 1 minute player can buy scrolls
-					if (st.getQuestItemsCount(PcInventory.ADENA_ID) > _scroll_24_price)
+					if (st.getQuestItemsCount(PcInventory.ADENA_ID) > SCROLL_24_PRICE)
 					{
-						st.takeItems(PcInventory.ADENA_ID, _scroll_24_price);
-						st.giveItems(_master_yogi_scroll, 24);
-						saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (_scroll_24_time * 3600000)));
+						st.takeItems(PcInventory.ADENA_ID, SCROLL_24_PRICE);
+						st.giveItems(MASTER_YOGI_SCROLL, 24);
+						saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000)));
 						htmltext = "32599-scroll24.htm";
 					}
 					else
@@ -154,10 +155,10 @@ public class MasterOfEnchanting extends LongTimeEvent
 		}
 		else if (event.equalsIgnoreCase("buy_scroll_1"))
 		{
-			if (st.getQuestItemsCount(PcInventory.ADENA_ID) > _scroll_1_price)
+			if (st.getQuestItemsCount(PcInventory.ADENA_ID) > SCROLL_1_PRICE)
 			{
-				st.takeItems(PcInventory.ADENA_ID, _scroll_1_price);
-				st.giveItems(_master_yogi_scroll, 1);
+				st.takeItems(PcInventory.ADENA_ID, SCROLL_1_PRICE);
+				st.giveItems(MASTER_YOGI_SCROLL, 1);
 				htmltext = "32599-scroll-ok.htm";
 			}
 			else
@@ -167,10 +168,10 @@ public class MasterOfEnchanting extends LongTimeEvent
 		}
 		else if (event.equalsIgnoreCase("buy_scroll_10"))
 		{
-			if (st.getQuestItemsCount(PcInventory.ADENA_ID) > _scroll_10_price)
+			if (st.getQuestItemsCount(PcInventory.ADENA_ID) > SCROLL_10_PRICE)
 			{
-				st.takeItems(PcInventory.ADENA_ID, _scroll_10_price);
-				st.giveItems(_master_yogi_scroll, 10);
+				st.takeItems(PcInventory.ADENA_ID, SCROLL_10_PRICE);
+				st.giveItems(MASTER_YOGI_SCROLL, 10);
 				htmltext = "32599-scroll-ok.htm";
 			}
 			else
@@ -180,9 +181,9 @@ public class MasterOfEnchanting extends LongTimeEvent
 		}
 		else if (event.equalsIgnoreCase("receive_reward"))
 		{
-			if ((st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == _master_yogi_staff) && (st.getEnchantLevel(_master_yogi_staff) > 3))
+			if ((st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == MASTER_YOGI_STAFF) && (st.getEnchantLevel(MASTER_YOGI_STAFF) > 3))
 			{
-				switch (st.getEnchantLevel(_master_yogi_staff))
+				switch (st.getEnchantLevel(MASTER_YOGI_STAFF))
 				{
 					case 4:
 						st.giveItems(6406, 1); // Firework
@@ -196,7 +197,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 						st.giveItems(6407, 2); // Large Firework
 						break;
 					case 7:
-						st.giveItems(_hat_shadow_reward[getRandom(3)], 1);
+						st.giveItems(HAT_SHADOW_REWARD[getRandom(3)], 1);
 						break;
 					case 8:
 						st.giveItems(955, 1); // Scroll: Enchant Weapon (D)
@@ -219,7 +220,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 						st.giveItems(729, 1); // Scroll: Enchant Weapon (A)
 						break;
 					case 14:
-						st.giveItems(_hat_event_reward[getRandom(3)], 1);
+						st.giveItems(HAT_EVENT_REWARD[getRandom(3)], 1);
 						break;
 					case 15:
 						st.giveItems(13992, 1); // Grade S Accessory Chest (Event)
@@ -237,12 +238,12 @@ public class MasterOfEnchanting extends LongTimeEvent
 						st.giveItems(13990, 1); // Grade S Weapon Chest (Event)
 						break;
 					case 20:
-						st.giveItems(_crystal_reward[getRandom(3)], 1); // Red/Blue/Green Soul Crystal - Stage 14
+						st.giveItems(CRYSTAL_REWARD[getRandom(3)], 1); // Red/Blue/Green Soul Crystal - Stage 14
 						break;
 					case 21:
 						st.giveItems(8762, 1); // Top-Grade Life Stone: level 76
 						st.giveItems(8752, 1); // High-Grade Life Stone: level 76
-						st.giveItems(_crystal_reward[getRandom(3)], 1); // Red/Blue/Green Soul Crystal - Stage 14
+						st.giveItems(CRYSTAL_REWARD[getRandom(3)], 1); // Red/Blue/Green Soul Crystal - Stage 14
 						break;
 					case 22:
 						st.giveItems(13989, 1); // S80 Grade Armor Chest (Event)
@@ -250,13 +251,13 @@ public class MasterOfEnchanting extends LongTimeEvent
 					case 23:
 						st.giveItems(13988, 1); // S80 Grade Weapon Chest (Event)
 					default:
-						if (st.getEnchantLevel(_master_yogi_staff) > 23)
+						if (st.getEnchantLevel(MASTER_YOGI_STAFF) > 23)
 						{
 							st.giveItems(13988, 1); // S80 Grade Weapon Chest (Event)
 						}
 						break;
 				}
-				st.takeItems(_master_yogi_staff, 1);
+				st.takeItems(MASTER_YOGI_STAFF, 1);
 				htmltext = "32599-rewardok.htm";
 			}
 			else
@@ -279,6 +280,6 @@ public class MasterOfEnchanting extends LongTimeEvent
 	
 	public static void main(String[] args)
 	{
-		new MasterOfEnchanting(-1, "MasterOfEnchanting", "events");
+		new MasterOfEnchanting(-1, MasterOfEnchanting.class.getSimpleName(), "events");
 	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java

@@ -26,15 +26,17 @@ import com.l2jserver.gameserver.model.quest.State;
  */
 public class TheValentineEvent extends LongTimeEvent
 {
-	private static final int _npc = 4301;
-	private static final int _recipe = 20191;
+	// NPC
+	private static final int NPC = 4301;
+	// Item
+	private static final int RECIPE = 20191;
 	
 	public TheValentineEvent(int questId, String name, String descr)
 	{
 		super(questId, name, descr);
-		addStartNpc(_npc);
-		addFirstTalkId(_npc);
-		addTalkId(_npc);
+		addStartNpc(NPC);
+		addFirstTalkId(NPC);
+		addTalkId(NPC);
 	}
 	
 	@Override
@@ -55,7 +57,7 @@ public class TheValentineEvent extends LongTimeEvent
 			}
 			else
 			{
-				st.giveItems(_recipe, 1);
+				st.giveItems(RECIPE, 1);
 				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
 				st.setState(State.COMPLETED);
 			}
@@ -75,6 +77,6 @@ public class TheValentineEvent extends LongTimeEvent
 	
 	public static void main(String[] args)
 	{
-		new TheValentineEvent(-1, "TheValentineEvent", "events");
+		new TheValentineEvent(-1, TheValentineEvent.class.getSimpleName(), "events");
 	}
 }