Changeset 5166

Timestamp:

Feb 6, 2012 3:33:55 AM (3 months ago)

Author:

Zoey76

Message:

BETA: Simplified support for daily quests by UnAfraid?.
Spelling fixes in L2Character comments by me.

Usage: Exit quests using exitQuest(QuestType?.DAILY); the quest will be completed and a penalty will be added, use isNowAvailable() to verify if the quest is available.

Location:

branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model

Files:

• actor/L2Character.java (modified) (14 diffs)
• quest/Quest.java (modified) (1 diff)
• quest/QuestState.java (modified) (5 diffs)

branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -343 +343 @@
         }
         
-        // Overrided in L2PcInstance
+        /**
+         * Overridden in L2PcInstance.
+         * @return the access level.
+         */
         public L2AccessLevel getAccessLevel()
         {
@@ -349 +352 @@
         }
         
-        // =========================================================
-        // Constructor
-        /**
-         * Constructor of L2Character.<BR><BR>
-         *
+        /**
+         * Constructor of L2Character.<br>
          * <B><U> Concept</U> :</B><BR><BR>
          * Each L2Character owns generic and static properties (ex : all Keltir have the same number of HP...).
@@ -363 +363 @@
          * <B><U> Actions</U> :</B><BR><BR>
          * <li>Set the _template of the L2Character </li>
-         * <li>Set _overloaded to false (the charcater can take more items)</li><BR><BR>
+         * <li>Set _overloaded to false (the character can take more items)</li><BR><BR>
          *
          * <li>If L2Character is a L2NPCInstance, copy skills from template to object</li>
@@ -391 +391 @@
                 else if (template != null && this instanceof L2Npc)
                 {
-                        // Copy the Standard Calcultors of the L2NPCInstance in _calculators
+                        // Copy the Standard Calculators of the L2NPCInstance in _calculators
                         _calculators = NPC_STD_CALCULATOR;
                         
@@ -751 +751 @@
          *
          * <B><U> Actions</U> :</B><BR><BR>
-         * <li>Get the active weapon (always equiped in the right hand) </li><BR><BR>
+         * <li>Get the active weapon (always equipped in the right hand) </li><BR><BR>
          * <li>If weapon is a bow, check for arrows, MP and bow re-use delay (if necessary, equip the L2PcInstance with arrows in left hand)</li>
          * <li>If weapon is a bow, consume MP and set the new period of bow non re-use </li><BR><BR>
@@ -854 +854 @@
                 L2ItemInstance weaponInst = getActiveWeaponInstance();
                 
-                // Get the active weapon item corresponding to the active weapon instance (always equiped in the right hand)
+                // Get the active weapon item corresponding to the active weapon instance (always equipped in the right hand)
                 L2Weapon weaponItem = getActiveWeaponItem();
                 
@@ -1071 +1071 @@
                                 {
                                         if (target instanceof L2PcInstance && ((L2PcInstance) target).isCursedWeaponEquipped())
-                                                // If a cursed weapon is hitted by a Hero, Cp is reduced to 0
+                                                // If a cursed weapon is hit by a Hero, Cp is reduced to 0
                                                 target.setCurrentCp(0);
                                 }
@@ -1536 +1536 @@
          *
          * <B><U> Actions</U> :</B><BR><BR>
-         * <li>Verify the possibilty of the the cast : skill is a spell, caster isn't muted... </li>
+         * <li>Verify the possibility of the the cast : skill is a spell, caster isn't muted... </li>
          * <li>Get the list of all targets (ex : area effects) and define the L2Charcater targeted (its stats will be used in calculation)</li>
          * <li>Calculate the casting time (base + modifier of MAtkSpd), interrupt time and re-use delay</li>
-         * <li>Send a Server->Client packet MagicSkillUser (to diplay casting animation), a packet SetupGauge (to display casting bar) and a system message </li>
+         * <li>Send a Server->Client packet MagicSkillUser (to display casting animation), a packet SetupGauge (to display casting bar) and a system message </li>
          * <li>Disable all skills during the casting time (create a task EnableAllSkills)</li>
          * <li>Disable the skill during the re-use delay (create a task EnableSkill)</li>
@@ -2051 +2051 @@
          * @param skill
          * @return True if casting is possible
-         * 
-         * 
          */
         protected boolean checkDoCastConditions(L2Skill skill)
@@ -2869 +2867 @@
         
         /**
-         * Task lauching the function onHitTimer().<BR><BR>
+         * Task launching the function onHitTimer().<BR><BR>
          *
          * <B><U> Actions</U> :</B><BR><BR>
@@ -2911 +2909 @@
         }
         
-        /** Task lauching the magic skill phases */
+        /** Task launching the magic skill phases */
         class MagicUseTask implements Runnable
         {
@@ -3021 +3019 @@
         
         // =========================================================
-        /** Task lauching the magic skill phases */
+        /** Task launching the magic skill phases */
         class FlyToLocationTask implements Runnable
         {
@@ -3219 +3217 @@
         public final void startSleeping()
         {
-                /* Aborts any attacks/casts if sleeped */
+                /* Aborts any attacks/casts if asleep */
                 abortAttack();
                 abortCast();
@@ -3593 +3591 @@
         
         /**
-         * Updates Effect Icons for this character(palyer/summon) and his party if any<BR>
+         * Updates Effect Icons for this character(player/summon) and his party if any<BR>
          * 
          * Overridden in:<BR>

branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/Quest.java

@@ -91 +91 @@
         private static final String DEFAULT_ALREADY_COMPLETED_MSG =
                 "<html><body>This quest has already been completed.</body></html>";
+        
+        private static final int RESET_HOUR = 6;
+        private static final int RESET_MINUTES = 30;
+        
+        /**
+         * @return the reset hour for a daily quest, could be overridden on a script.
+         */
+        public int getResetHour()
+        {
+                return RESET_HOUR;
+        }
+        
+        /**
+         * @return the reset minutes for a daily quest, could be overridden on a script.
+         */
+        public int getResetMinutes()
+        {
+                return RESET_MINUTES;
+        }
         
         /**

branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/QuestState.java

@@ -18 +18 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.util.Calendar;
 import java.util.Map;
 import java.util.logging.Level;
@@ -48 +49 @@
 import com.l2jserver.gameserver.network.serverpackets.TutorialEnableClientEvent;
 import com.l2jserver.gameserver.network.serverpackets.TutorialShowHtml;
+import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.gameserver.network.serverpackets.TutorialShowQuestionMark;
 import com.l2jserver.util.Rnd;
@@ -72 +74 @@
         /** boolean flag letting QuestStateManager know to exit quest when cleaning up */
         private boolean _isExitQuestOnCleanUp = false;
+        
+        /**
+         * This enumerate represent the different quest types.
+         */
+        public static enum QuestType
+        {
+                REPEATABLE,
+                ONE_TIME,
+                DAILY
+        }
         
         /**
@@ -1097 +1109 @@
         
         /**
+         * @param type the type of the quest, {@link com.l2jserver.gameserver.model.quest.QuestState.QuestType}.
+         * @return this quest state.
+         */
+        public QuestState exitQuest(QuestType type)
+        {
+                switch (type)
+                {
+                        case REPEATABLE:
+                        case ONE_TIME:
+                        {
+                                exitQuest(type == QuestType.REPEATABLE);
+                                break;
+                        }
+                        case DAILY:
+                        {
+                                exitQuest(false);
+                                setRestartTime();
+                                break;
+                        }
+                }
+                return this;
+        }
+        
+        /**
          * Destroy element used by quest when quest is exited
          * @param repeatable
@@ -1178 +1214 @@
                 npc.dropItem(player, itemId, count);
         }
+        
+        /**
+         * Set the restart time for the daily quests.<br>
+         * The time is hardcoded at {@link Quest#getResetHour()} hours, {@link Quest#getResetMinutes()} minutes of the following day.<br>
+         * It can be overridden in scripts (quests).
+         */
+        public void setRestartTime()
+        {
+                final Calendar reDo = Calendar.getInstance();
+                if (reDo.get(Calendar.HOUR_OF_DAY) >= getQuest().getResetHour())
+                {
+                        reDo.add(Calendar.DATE, 1);
+                }
+                reDo.set(Calendar.HOUR_OF_DAY, getQuest().getResetHour());
+                reDo.set(Calendar.MINUTE, getQuest().getResetMinutes());
+                set("restartTime", String.valueOf(reDo.getTimeInMillis()));
+        }
+        
+        /**
+         * @return {@code true} if the quest is available, for example daily quests, {@code false} otherwise.
+         */
+        public boolean isNowAvailable()
+        {
+                final String val = get("restartTime");
+                return ((val == null) || !Util.isDigit(val)) || (Long.parseLong(val) <= System.currentTimeMillis());
+        }
 }