Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/quests/Q307_ControlDeviceOfTheGiants/Q307_ControlDeviceOfTheGiants.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/quests/Q307_ControlDeviceOfTheGiants/Q307_ControlDeviceOfTheGiants.java (modified) (4 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/quests/Q307_ControlDeviceOfTheGiants/Q307_ControlDeviceOfTheGiants.java

@@ -28 +28 @@
 public class Q307_ControlDeviceOfTheGiants extends Quest
 {
+        private static final String qn = "307_ControlDeviceOfTheGiants";
         // NPC
         private final static int DROPH = 32711;
@@ -59 +60 @@
                                 st.set("cond", "1");
                                 st.playSound("ItemSound.quest_accept");
-                                if (st.getQuestItemsCount(CET_1_SHEET) < 1 || st.getQuestItemsCount(CET_2_SHEET) < 1 || st.getQuestItemsCount(CET_3_SHEET) < 1)
+                                if (!st.hasQuestItems(CET_1_SHEET) || !st.hasQuestItems(CET_2_SHEET) || !st.hasQuestItems(CET_3_SHEET))
                                         htmltext = "32711-04.htm";
-                                else if (st.getQuestItemsCount(CET_1_SHEET) >= 1 && st.getQuestItemsCount(CET_2_SHEET) >= 1 && st.getQuestItemsCount(CET_3_SHEET) >= 1)
+                                else if (st.hasQuestItems(CET_1_SHEET) && st.hasQuestItems(CET_2_SHEET) && st.hasQuestItems(CET_3_SHEET))
                                         htmltext = "32711-04a.htm";
                         }
@@ -135 +136 @@
                                 else if (st.getInt("cond") == 1)
                                 {
-                                        if (st.getQuestItemsCount(CET_1_SHEET) < 1 || st.getQuestItemsCount(CET_2_SHEET) < 1 || st.getQuestItemsCount(CET_3_SHEET) < 1)
+                                        if (!st.hasQuestItems(CET_1_SHEET) || !st.hasQuestItems(CET_2_SHEET) || !st.hasQuestItems(CET_3_SHEET))
                                                 htmltext = "32711-07.htm";
                                         else
@@ -223 +224 @@
         public static void main(String[] args)
         {
-                new Q307_ControlDeviceOfTheGiants(307, "Q307_ControlDeviceOfTheGiants", "Control Device Of The Giants");
+                new Q307_ControlDeviceOfTheGiants(307, qn, "Control Device Of The Giants");
         }
 }