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

trunk/L2J_DataPack/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java

@@ -15 +15 @@
 package events.FreyaCelebration;
 
-import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
+import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
@@ -32 +33 @@
 
 /**
- ** @author Gnacik
- **
- ** Retail Event : 'Freya Celebration'
+ * Retail Event : 'Freya Celebration'
+ * @author Gnacik
  */
 public class FreyaCelebration extends Quest
@@ -43 +43 @@
         private static final int _hours = 20;
         
-        private static final int[] _skills = { 9150, 9151, 9152, 9153, 9154, 9155, 9156 };
+        private static final int[] _skills =
+        {
+                9150, 9151, 9152, 9153, 9154, 9155, 9156
+        };
         
         private static final NpcStringId[] _freya_texts =
@@ -54 +57 @@
         };
         
-        private static final int[][] _spawns = {
-                { -119494, 44882, 360, 24576 },
-                { -117239, 46842, 360, 49151 },
-                { -84023, 243051, -3728, 4096 },
-                { -84411, 244813, -3728, 57343 },
-                { 46908, 50856, -2992, 8192 },
-                { 45538, 48357, -3056, 18000 },
-                { -45372, -114104, -240, 16384 },
-                { -45278, -112766, -240, 0 },
-                { 9929, 16324, -4568, 62999 },
-                { 11546, 17599, -4584, 46900 },
-                { 115096, -178370, -880, 0 },
-                { -13727, 122117, -2984, 16384 },
-                { -14129, 123869, -3112, 40959 },
-                { -83156, 150994, -3120, 0 },
-                { -81031, 150038, -3040, 0 },
-                { 16111, 142850, -2696, 16000 },
-                { 17275, 145000, -3032, 25000 },
-                { 111004, 218928, -3536, 16384 },
-                { 81755, 146487, -3528, 32768 },
-                { 82145, 148609, -3464, 0 },
-                { 83037, 149324, -3464, 44000 },
-                { 81987, 53723, -1488, 0 },
-                { 147200, 25614, -2008, 16384 },
-                { 148557, 26806, -2200, 32768 },
-                { 147421, -55435, -2728, 49151 },
-                { 148206, -55786, -2776, 61439 },
-                { 85584, -142490, -1336, 0 },
-                { 86865, -142915, -1336, 26000 },
-                { 43966, -47709, -792, 49999 },
-                { 43165, -48461, -792, 17000 }
+        private static final Location[] _spawns =
+        {
+                new Location(-119494, 44882, 360, 24576),
+                new Location(-117239, 46842, 360, 49151),
+                new Location(-84023, 243051, -3728, 4096),
+                new Location(-84411, 244813, -3728, 57343),
+                new Location(46908, 50856, -2992, 8192),
+                new Location(45538, 48357, -3056, 18000),
+                new Location(-45372, -114104, -240, 16384),
+                new Location(-45278, -112766, -240, 0),
+                new Location(9929, 16324, -4568, 62999),
+                new Location(11546, 17599, -4584, 46900),
+                new Location(115096, -178370, -880, 0),
+                new Location(-13727, 122117, -2984, 16384),
+                new Location(-14129, 123869, -3112, 40959),
+                new Location(-83156, 150994, -3120, 0),
+                new Location(-81031, 150038, -3040, 0),
+                new Location(16111, 142850, -2696, 16000),
+                new Location(17275, 145000, -3032, 25000),
+                new Location(111004, 218928, -3536, 16384),
+                new Location(81755, 146487, -3528, 32768),
+                new Location(82145, 148609, -3464, 0),
+                new Location(83037, 149324, -3464, 44000),
+                new Location(81987, 53723, -1488, 0),
+                new Location(147200, 25614, -2008, 16384),
+                new Location(148557, 26806, -2200, 32768),
+                new Location(147421, -55435, -2728, 49151),
+                new Location(148206, -55786, -2776, 61439),
+                new Location(85584, -142490, -1336, 0),
+                new Location(86865, -142915, -1336, 26000),
+                new Location(43966, -47709, -792, 49999),
+                new Location(43165, -48461, -792, 17000)
         };
         
@@ -91 +95 @@
         {
                 QuestState st = player.getQuestState(getName());
-                Quest q = QuestManager.getInstance().getQuest(getName());
-                if (st == null || q == null)
+                if (st == null)
+                {
                         return null;
+                }
                 
                 if (event.equalsIgnoreCase("give_potion"))
                 {
-                        if (st.getQuestItemsCount(57) > 1)
+                        if (st.getQuestItemsCount(PcInventory.ADENA_ID) > 1)
                         {
                                 long _curr_time = System.currentTimeMillis();
-                                String value = q.loadGlobalQuestVar(player.getAccountName());
+                                String value = loadGlobalQuestVar(player.getAccountName());
                                 long _reuse_time = value == "" ? 0 : Long.parseLong(value);
                                 
@@ -106 +111 @@
                                 {
                                         st.setState(State.STARTED);
-                                        st.takeItems(57, 1);
+                                        st.takeItems(PcInventory.ADENA_ID, 1);
                                         st.giveItems(_freya_potion, 1);
-                                        q.saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (_hours * 3600000)));
+                                        saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (_hours * 3600000)));
                                 }
                                 else
@@ -125 +130 @@
                         {
                                 SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_UNIT_OF_THE_ITEM_S1_REQUIRED);
-                                sm.addItemName(57);
+                                sm.addItemName(PcInventory.ADENA_ID);
                                 sm.addNumber(1);
                                 player.sendPacket(sm);
@@ -137 +142 @@
         {
                 if ((caster == null) || (npc == null))
+                {
                         return null;
+                }
                 
                 if ((npc.getNpcId() == _freya) && Util.contains(targets, npc) && Util.contains(_skills, skill.getId()))
@@ -145 +152 @@
                                 CreatureSay cs = new CreatureSay(npc.getObjectId(), Say2.ALL, npc.getName(), NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERES_NOTHING_STRANGE_ABOUT_IT_ITS_JUST_A_BIT_OF_MY_CAPRICIOUSNESS);
                                 cs.addStringParameter(caster.getName());
-
+                                
                                 npc.broadcastPacket(cs);
-
+                                
                                 caster.addItem("FreyaCelebration", _freya_gift, 1, npc, true);
                         }
@@ -164 +171 @@
         public String onFirstTalk(L2Npc npc, L2PcInstance player)
         {
-                QuestState st = player.getQuestState(getName());
-                if (st == null)
+                if (player.getQuestState(getName()) == null)
                 {
-                        Quest q = QuestManager.getInstance().getQuest(getName());
-                        st = q.newQuestState(player);
+                        newQuestState(player);
                 }
                 return "13296.htm";
@@ -181 +186 @@
                 addTalkId(_freya);
                 addSkillSeeId(_freya);
-                for (int[] _spawn : _spawns)
+                for (Location loc : _spawns)
                 {
-                        addSpawn(_freya, _spawn[0], _spawn[1], _spawn[2], _spawn[3], false, 0);
+                        addSpawn(_freya, loc, false, 0);
                 }
         }