Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java

Timestamp:

Jan 16, 2012 7:56:19 AM (4 months ago)

Author:

MELERIX

Message:

STABLE: Sync with BETA [8629]

Location:

trunk/L2J_DataPack

Files:

• . (modified) (1 prop)
• dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java (modified) (14 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java

@@ -39 +39 @@
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.util.Rnd;
 
@@ -185 +184 @@
                         if (world.templateId != INSTANCE_ID)
                         {
-                                player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
+                                player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
                                 return;
                         }
@@ -194 +193 @@
                 }
                 //New instance
-                else
-                {
-                        final int instanceId = InstanceManager.getInstance().createDynamicInstance("PailakaDevilsLegacy.xml");
-
-                        world = new InstanceWorld();
-                        world.instanceId = instanceId;
-                        world.templateId = INSTANCE_ID;
-                        InstanceManager.getInstance().addWorld(world);
-
-                        world.allowed.add(player.getObjectId());
-                        teleportPlayer(player, TELEPORT, instanceId);
-                        
-                        _lematanNpc = addSpawn(LEMATAN, 88108, -209252, -3744, 64255, false, 0, false, instanceId);
-                }
+                final int instanceId = InstanceManager.getInstance().createDynamicInstance("PailakaDevilsLegacy.xml");
+
+                world = new InstanceWorld();
+                world.instanceId = instanceId;
+                world.templateId = INSTANCE_ID;
+                InstanceManager.getInstance().addWorld(world);
+
+                world.allowed.add(player.getObjectId());
+                teleportPlayer(player, TELEPORT, instanceId);
+                
+                _lematanNpc = addSpawn(LEMATAN, 88108, -209252, -3744, 64255, false, 0, false, instanceId);
                 
         }
@@ -244 +240 @@
                                 return "32498-07.htm";
                         }
-                        else
-                        {
-                                return "32498-09.htm";
-                        }
+                        return "32498-09.htm";
                 }
                 else if (event.equalsIgnoreCase("32498-05.htm"))
@@ -332 +325 @@
         {
                 final QuestState st = player.getQuestState(qn);
-                if (st != null && npc.getNpcId() == ADVENTURER2 && st.getState() == State.COMPLETED)
+                if (st != null && npc.getNpcId() == ADVENTURER2 && st.isCompleted())
                         return "32511-03.htm";
-                else
-                        return npc.getNpcId() + ".htm";
+                return npc.getNpcId() + ".htm";
         }
 
@@ -360 +352 @@
                                                 if (cond > 1)
                                                         return "32498-08.htm";
-                                                else
-                                                        return "32498-06.htm";
+                                                return "32498-06.htm";
                                         case State.COMPLETED:
                                                 return "32498-10.htm";
@@ -370 +361 @@
                                 if(st.getInt("cond") > 2)
                                         return "32501-04.htm";
-                                else
-                                        return "32501-01.htm";
+                                return "32501-01.htm";
                         case ADVENTURER1:
                                 if(player.getPet() == null)
                                 {
-                                        if (st.getQuestItemsCount(SWORD) > 0)
+                                        if (st.hasQuestItems(SWORD))
                                         {
                                                 if(st.getQuestItemsCount(SCROLL_1) > 0)
@@ -384 +374 @@
                                                         return "32508-03.htm";
                                                 }
-                                                else
-                                                        return "32508-02.htm";
+                                                return "32508-02.htm";
                                         }
                                         else if (st.getQuestItemsCount(ENH_SWORD1) > 0)
@@ -396 +385 @@
                                                         return "32508-05.htm";
                                                 }
-                                                else
-                                                        return "32508-04.htm";
+                                                return "32508-04.htm";
                                         }
                                         else if (st.getQuestItemsCount(ENH_SWORD2) > 0)
@@ -404 +392 @@
                                                 return "32508-00.htm";
                                 }
-                                else
-                                        return "32508-07.htm";
+                                return "32508-07.htm";
                         case ADVENTURER2:
                                 if (player.getPet() == null)
@@ -426 +413 @@
                                         return "32511-01.htm";
                                 }
-                                else
-                                        return "32511-02.htm";
+                                return "32511-02.htm";
                 }
                 return getNoQuestMsg(player);
@@ -488 +474 @@
                 {
                         case KAMS:
-                                if (st.getQuestItemsCount(SWORD) > 0)
+                                if (st.hasQuestItems(SWORD))
                                 {
                                         st.playSound("ItemSound.quest_itemget");
@@ -495 +481 @@
                                 break;
                         case ALKASO:
-                                if (st.getQuestItemsCount(ENH_SWORD1) > 0)
+                                if (st.hasQuestItems(ENH_SWORD1))
                                 {
                                         st.playSound("ItemSound.quest_itemget");
-                                        st.giveItems(SCROLL_2, 1);                                      
+                                        st.giveItems(SCROLL_2, 1);
                                 }
                                 break;
@@ -560 +546 @@
                 }
 
+                @Override
                 public void run()
                 {