Browse Source

BETA: Quest fixes:
* getRandom(..) fixes, thanks Tavo22 for report.
* Scripts cleanup.

Zoey76 13 years ago
parent
commit
74f1911ff0

+ 3 - 6
L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java

@@ -18,7 +18,6 @@ import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.instancemanager.InstanceManager.InstanceWorld;
-import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.model.L2Party;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -239,13 +238,12 @@ public class NornilsGarden extends Quest
 		}
 	}
 	
-	private static final void teleportPlayer(L2PcInstance player, int[] coords, int instanceId)
+	private final void teleportPlayer(L2PcInstance player, int[] coords, int instanceId)
 	{
 		QuestState st = player.getQuestState(qn);
 		if (st == null)
 		{
-			Quest q = QuestManager.getInstance().getQuest(qn);
-			st = q.newQuestState(player);
+			st = newQuestState(player);
 		}
 		removeBuffs(player);
 		giveBuffs(player);
@@ -634,8 +632,7 @@ public class NornilsGarden extends Quest
 		QuestState st = player.getQuestState(qn);
 		if (st == null)
 		{
-			Quest q = QuestManager.getInstance().getQuest(qn);
-			st = q.newQuestState(player);
+			st = newQuestState(player);
 		}
 		return npc.getNpcId() + ".html";
 	}

+ 1 - 4
L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java

@@ -23,7 +23,6 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.Announcements;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.SkillTable;
-import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2EventChestInstance;
@@ -31,7 +30,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2EventMonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Event;
-import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.util.Util;
@@ -227,8 +225,7 @@ public class eventmodRabbits extends Event
 		QuestState st = player.getQuestState(getName());
 		if (st == null)
 		{
-			Quest q = QuestManager.getInstance().getQuest(getName());
-			st = q.newQuestState(player);
+			st = newQuestState(player);
 		}
 		return npc.getNpcId() + ".htm";
 	}

+ 1 - 4
L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java

@@ -23,12 +23,10 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.Announcements;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.SkillTable;
-import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.quest.Event;
-import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
@@ -356,8 +354,7 @@ public class eventmodRace extends Event
 		QuestState st = player.getQuestState(getName());
 		if (st == null)
 		{
-			Quest q = QuestManager.getInstance().getQuest(getName());
-			st = q.newQuestState(player);
+			st = newQuestState(player);
 		}
 		if (npc.getNpcId() == _start_npc)
 		{

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/344_1000YearsEndofLamentation/__init__.py

@@ -25,7 +25,7 @@ GARVARENTZ = 30704
 
 def rewards(st,npcId):
     state=False
-    chance=self.getRandom(100)
+    chance = st.getQuest().getRandom(100)
     if npcId == ORVEN and st.getQuestItemsCount(CRUCIFIX) :
        st.set("mission","1")
        st.takeItems(CRUCIFIX,-1)

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/quests/372_LegacyOfInsolence/__init__.py

@@ -78,7 +78,7 @@ def check_n_take(st,collection) :
     return result
 
 def give_reward(st,reward) :
-    luck = self.getRandom(REWARD_RATE[-1])
+    luck = st.getQuest().getRandom(REWARD_RATE[-1])
     prize = REWARD[reward]
     if ALT_RP_100 != 0 :
        for i in range(len(prize)) :
@@ -91,11 +91,11 @@ def give_reward(st,reward) :
        st.giveItems(57,4000)
     elif luck < REWARD_RATE[2] :          # quite nice : 2 recipes
        for k in range(2) :
-          l = self.getRandom(len(prize))
+          l = st.getQuest().getRandom(len(prize))
           st.giveItems(prize[l],1)
           del prize[l]
     else :                                # ordinary reward: 1 recipe or mat
-       st.giveItems(prize[self.getRandom(len(prize))],1)
+       st.giveItems(prize[st.getQuest().getRandom(len(prize))],1)
 
 
 class Quest (JQuest) :

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/39_RedEyedInvaders/__init__.py

@@ -41,7 +41,7 @@ def drop(partyMember,array) :
     st = partyMember.getQuestState(qn)
     count = st.getQuestItemsCount(item)
     numItems,chance = divmod(100*Config.RATE_QUEST_DROP,100)
-    if self.getRandom(100) < chance :
+    if st.getQuest().getRandom(100) < chance :
         numItems = numItems + 1
     if count+numItems > max :
         numItems = max - count

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/419_GetAPet/__init__.py

@@ -67,7 +67,7 @@ def check_questions(st) :
   answers = st.getInt("answers")
   if answers < 10 :
     questions = quiz.split()
-    index = self.getRandom(len(questions) - 1)
+    index = st.getQuest().getRandom(len(questions) - 1)
     question = questions[index]
     if len(questions) > 10 - answers :
       questions[index] = questions[-1]

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/605_AllianceWithKetraOrcs/__init__.py

@@ -147,7 +147,7 @@ def giveReward(st,item,chance,MAX,drop) :
     count = st.getQuestItemsCount(drop)
     if count < MAX or drop == Mane :
       numItems,chance = divmod(chance*Config.RATE_QUEST_DROP,1000)
-      if self.getRandom(1000) < chance :
+      if st.getQuest().getRandom(1000) < chance :
         numItems += 1
       numItems = int(numItems)
       if numItems != 0 :

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/611_AllianceWithVarkaSilenos/__init__.py

@@ -145,7 +145,7 @@ def giveReward(st,item,chance,MAX,drop) :
     count = st.getQuestItemsCount(drop)
     if count < MAX or drop == Molar :
       numItems,chance = divmod(chance*Config.RATE_QUEST_DROP,1000)
-      if self.getRandom(1000) < chance :
+      if st.getQuest().getRandom(1000) < chance :
         numItems += 1
       numItems = int(numItems)
       if numItems != 0 :

+ 1 - 3
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q423_TakeYourBestShot/Q423_TakeYourBestShot.java

@@ -15,7 +15,6 @@
 package quests.Q423_TakeYourBestShot;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -128,8 +127,7 @@ public class Q423_TakeYourBestShot extends Quest
 		QuestState st = player.getQuestState(getName());
 		if (st == null)
 		{
-			Quest q = QuestManager.getInstance().getQuest(getName());
-			st = q.newQuestState(player);
+			st = newQuestState(player);
 		}
 		
 		if (npc.isInsideRadius(96782, 85918, 100, true))