BETA: Minor cleanup.

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/CatsEyeBandit.java

@@ -24,15 +24,13 @@ import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 
 /**
- * Cat's Eye Bandit (Quest Monster) AI
+ * Cat's Eye Bandit (Quest Monster) AI.
  * @author Gladicek
  */
-
 public class CatsEyeBandit extends AbstractNpcAI
 {
 	// NPC ID
 	private static final int MOB_ID = 27038;
-	
 	// Weapons
 	private static final int BOW = 1181;
 	private static final int DAGGER = 1182;
@@ -40,8 +38,8 @@ public class CatsEyeBandit extends AbstractNpcAI
 	@Override
 	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isPet)
 	{
-		final QuestState qs = attacker.getQuestState("403_PathToRogue");
-		if (npc.isScriptValue(0) && qs != null && (qs.getItemEquipped(Inventory.PAPERDOLL_RHAND) == BOW || qs.getItemEquipped(Inventory.PAPERDOLL_RHAND) == DAGGER))
+		final QuestState qs = attacker.getQuestState("403_PathToRogue"); // TODO: Replace with class name.
+		if (npc.isScriptValue(0) && (qs != null) && ((qs.getItemEquipped(Inventory.PAPERDOLL_RHAND) == BOW) || (qs.getItemEquipped(Inventory.PAPERDOLL_RHAND) == DAGGER)))
 		{
 			broadcastNpcSay(npc, Say2.NPC_ALL, NpcStringId.YOU_CHILDISH_FOOL_DO_YOU_THINK_YOU_CAN_CATCH_ME);
 			npc.setScriptValue(1);
@@ -52,7 +50,7 @@ public class CatsEyeBandit extends AbstractNpcAI
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isPet)
 	{
-		final QuestState qs = killer.getQuestState("403_PathToRogue");
+		final QuestState qs = killer.getQuestState("403_PathToRogue"); // TODO: Replace with class name.
 		if (qs != null)
 		{
 			broadcastNpcSay(npc, Say2.NPC_ALL, NpcStringId.I_MUST_DO_SOMETHING_ABOUT_THIS_SHAMEFUL_INCIDENT);

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java

@@ -28,24 +28,20 @@ import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.util.Rnd;
 
 /**
- * Frightened Ragna Orc AI
+ * Frightened Ragna Orc AI.
  * @author Gladicek, malyelfik
  */
-
 public class FrightenedRagnaOrc extends AbstractNpcAI
 {
 	// NPC ID
 	private static final int MOB_ID = 18807;
-	
 	// Amount of Health
 	private static final int HP = 4500;
-	
 	// Chances
 	private static final int ADENA = 10000;
 	private static final int CHANCE = 1000;
 	private static final int ADENA2 = 1000000;
 	private static final int CHANCE2 = 10;
-	
 	// Skill
 	private static final SkillHolder SKILL = new SkillHolder(6234, 1);
 	
@@ -90,6 +86,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 		switch (event)
 		{
 			case "say":
+			{
 				if (npc.isDead() || !npc.isScriptValue(1))
 				{
 					cancelQuestTimer("say", npc, null);
@@ -98,13 +95,15 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 				final NpcStringId msg = (Rnd.nextBoolean()) ? NpcStringId.I_DONT_WANT_TO_FIGHT : NpcStringId.IS_THIS_REALLY_NECESSARY;
 				broadcastNpcSay(npc, Say2.NPC_ALL, msg);
 				break;
+			}
 			case "reward":
+			{
 				if (!npc.isDead() && npc.isScriptValue(2))
 				{
 					if (getRandom(100000) < CHANCE2)
 					{
-						final NpcStringId msg1 = (Rnd.nextBoolean()) ? NpcStringId.TH_THANKS_I_COULD_HAVE_BECOME_GOOD_FRIENDS_WITH_YOU : NpcStringId.ILL_GIVE_YOU_10000000_ADENA_LIKE_I_PROMISED_I_MIGHT_BE_AN_ORC_WHO_KEEPS_MY_PROMISES;
-						broadcastNpcSay(npc, Say2.NPC_ALL, msg1);
+						final NpcStringId msg = (Rnd.nextBoolean()) ? NpcStringId.TH_THANKS_I_COULD_HAVE_BECOME_GOOD_FRIENDS_WITH_YOU : NpcStringId.ILL_GIVE_YOU_10000000_ADENA_LIKE_I_PROMISED_I_MIGHT_BE_AN_ORC_WHO_KEEPS_MY_PROMISES;
+						broadcastNpcSay(npc, Say2.NPC_ALL, msg);
 						npc.setScriptValue(3);
 						npc.doCast(SKILL.getSkill());
 						for (int i = 0; i < 10; i++)
@@ -114,8 +113,8 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 					}
 					else if (getRandom(100000) < CHANCE)
 					{
-						final NpcStringId msg1 = (Rnd.nextBoolean()) ? NpcStringId.TH_THANKS_I_COULD_HAVE_BECOME_GOOD_FRIENDS_WITH_YOU : NpcStringId.SORRY_BUT_THIS_IS_ALL_I_HAVE_GIVE_ME_A_BREAK;
-						broadcastNpcSay(npc, Say2.NPC_ALL, msg1);
+						final NpcStringId msg = (Rnd.nextBoolean()) ? NpcStringId.TH_THANKS_I_COULD_HAVE_BECOME_GOOD_FRIENDS_WITH_YOU : NpcStringId.SORRY_BUT_THIS_IS_ALL_I_HAVE_GIVE_ME_A_BREAK;
+						broadcastNpcSay(npc, Say2.NPC_ALL, msg);
 						npc.setScriptValue(3);
 						npc.doCast(SKILL.getSkill());
 						for (int i = 0; i < 10; i++)
@@ -125,18 +124,21 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 					}
 					else
 					{
-						final NpcStringId msg1 = (Rnd.nextBoolean()) ? NpcStringId.THANKS_BUT_THAT_THING_ABOUT_10000000_ADENA_WAS_A_LIE_SEE_YA : NpcStringId.YOURE_PRETTY_DUMB_TO_BELIEVE_ME;
-						broadcastNpcSay(npc, Say2.NPC_ALL, msg1);
+						final NpcStringId msg = (Rnd.nextBoolean()) ? NpcStringId.THANKS_BUT_THAT_THING_ABOUT_10000000_ADENA_WAS_A_LIE_SEE_YA : NpcStringId.YOURE_PRETTY_DUMB_TO_BELIEVE_ME;
+						broadcastNpcSay(npc, Say2.NPC_ALL, msg);
 					}
 					startQuestTimer("despawn", 1000, npc, null);
 				}
 				break;
+			}
 			case "despawn":
+			{
 				npc.setRunning();
 				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new L2CharPosition((npc.getX() + getRandom(-800, 800)), (npc.getY() + getRandom(-800, 800)), npc.getZ(), npc.getHeading()));
 				npc.deleteMe();
 				npc.setScriptValue(0);
 				break;
+			}
 		}
 		return null;
 	}

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

@@ -42,7 +42,13 @@ public class FreyaCelebration extends LongTimeEvent
 	
 	private static final int[] _skills =
 	{
-		9150, 9151, 9152, 9153, 9154, 9155, 9156
+		9150,
+		9151,
+		9152,
+		9153,
+		9154,
+		9155,
+		9156
 	};
 	
 	private static final NpcStringId[] _freya_texts =
@@ -53,7 +59,7 @@ public class FreyaCelebration extends LongTimeEvent
 		NpcStringId.BUT_I_KIND_OF_MISS_IT_LIKE_I_HAD_FELT_THIS_FEELING_BEFORE,
 		NpcStringId.I_AM_ICE_QUEEN_FREYA_THIS_FEELING_AND_EMOTION_ARE_NOTHING_BUT_A_PART_OF_MELISSAA_MEMORIES
 	};
-
+	
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{

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

@@ -33,13 +33,19 @@ public class HeavyMedal extends LongTimeEvent
 	
 	private final static int[] MEDALS =
 	{
-		5, 10, 20, 40
+		5,
+		10,
+		20,
+		40
 	};
 	private final static int[] BADGES =
 	{
-		6399, 6400, 6401, 6402
+		6399,
+		6400,
+		6401,
+		6402
 	};
-
+	
 	public HeavyMedal(int questId, String name, String descr)
 	{
 		super(questId, name, descr);

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

@@ -44,20 +44,26 @@ public class MasterOfEnchanting extends LongTimeEvent
 	
 	private static final int[] _hat_shadow_reward =
 	{
-		13074, 13075, 13076
+		13074,
+		13075,
+		13076
 	};
 	private static final int[] _hat_event_reward =
 	{
-		13518, 13519, 13522
+		13518,
+		13519,
+		13522
 	};
 	private static final int[] _crystal_reward =
 	{
-		9570, 9571, 9572
+		9570,
+		9571,
+		9572
 	};
 	
 	@SuppressWarnings("deprecation")
 	private static final Date _eventStart = new Date(2011, 7, 1);
-
+	
 	public MasterOfEnchanting(int questId, String name, String descr)
 	{
 		super(questId, name, descr);

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

@@ -28,7 +28,7 @@ public class TheValentineEvent extends LongTimeEvent
 {
 	private static final int _npc = 4301;
 	private static final int _recipe = 20191;
-
+	
 	public TheValentineEvent(int questId, String name, String descr)
 	{
 		super(questId, name, descr);