From e89eb5c65a09651c40791c35c1ea44e32716eef6 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Mon, 10 Sep 2012 19:54:20 +0000
Subject: [PATCH] BETA: Fixing quest sounds, they are case sensitive.
Reported by: valdaron
---
.../scripts/events/HeavyMedal/HeavyMedal.java | 2 +-
.../TheValentineEvent/TheValentineEvent.java | 2 +-
.../scripts/handlers/skillhandlers/Sow.java | 4 +-
.../quests/106_ForgottenTruth/__init__.py | 2 +-
.../quests/211_TrialOfChallenger/__init__.py | 22 ++++----
.../quests/212_TrialOfDuty/__init__.py | 4 +-
.../quests/213_TrialOfSeeker/__init__.py | 24 ++++----
.../quests/216_TrialOfGuildsman/__init__.py | 4 +-
.../quests/217_TestimonyOfTrust/__init__.py | 18 +++---
.../quests/219_TestimonyOfFate/__init__.py | 56 +++++++++----------
.../quests/220_TestimonyOfGlory/__init__.py | 56 +++++++++----------
.../quests/223_TestOfChampion/__init__.py | 22 ++++----
.../quests/224_TestOfSagittarius/__init__.py | 6 +-
.../quests/225_TestOfSearcher/__init__.py | 6 +-
.../quests/226_TestOfHealer/__init__.py | 10 ++--
.../quests/230_TestOfSummoner/__init__.py | 8 +--
.../quests/231_TestOfMaestro/__init__.py | 4 +-
.../quests/234_FatesWhisper/__init__.py | 8 +--
...504_CompetitionfortheBanditStronghold.java | 6 +-
19 files changed, 131 insertions(+), 133 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index 8e025229b5..67f308106d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -183,7 +183,7 @@ public class HeavyMedal extends Quest
st.takeItems(BADGES[level - 1], -1);
}
st.giveItems(BADGES[level], 1);
- st.playSound("Itemsound.quest_itemget");
+ st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
level++;
}
htmltext = "31229-" + event.toLowerCase() + "-" + String.valueOf(level) + ".htm";
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java b/L2J_DataPack_BETA/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java
index fbc28e149f..d198e63eb6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java
@@ -106,7 +106,7 @@ public class TheValentineEvent extends Quest
else
{
st.giveItems(_recipe, 1);
- st.playSound("Itemsound.quest_itemget");
+ st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
st.setState(State.COMPLETED);
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sow.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sow.java
index ea85f942f9..589bbe5ed6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sow.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sow.java
@@ -23,11 +23,11 @@ import com.l2jserver.gameserver.handler.ISkillHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
+import com.l2jserver.gameserver.model.quest.Quest.QuestSound;
import com.l2jserver.gameserver.model.skills.L2Skill;
import com.l2jserver.gameserver.model.skills.L2SkillType;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.PlaySound;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.util.Rnd;
@@ -89,7 +89,7 @@ public class Sow implements ISkillHandler
SystemMessage sm;
if (calcSuccess(activeChar, target, seedId))
{
- activeChar.sendPacket(new PlaySound("Itemsound.quest_itemget"));
+ activeChar.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket());
target.setSeeded(activeChar.getActingPlayer());
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_SEED_WAS_SUCCESSFULLY_SOWN);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/106_ForgottenTruth/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/106_ForgottenTruth/__init__.py
index 14438ea070..733074911e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/106_ForgottenTruth/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/106_ForgottenTruth/__init__.py
@@ -122,7 +122,7 @@ class Quest (JQuest) :
if self.getRandom(100) < 20 :
if st.getQuestItemsCount(ANCIENT_SCROLL) == 0 :
st.giveItems(ANCIENT_SCROLL,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif st.getQuestItemsCount(ANCIENT_CLAY_TABLET) == 0 :
st.giveItems(ANCIENT_CLAY_TABLET,1)
st.playSound("ItemSound.quest_middle")
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/__init__.py
index ad39c333a5..8b65d77dee 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/__init__.py
@@ -44,11 +44,11 @@ class Quest (JQuest) :
htmltext = "30645-02.htm"
st.takeItems(LETTER_OF_KASH,1)
st.set("cond","4")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
elif event == "30647_1" :
if st.getQuestItemsCount(BROKEN_KEY) == 1 :
st.giveItems(SCROLL_OF_SHYSLASSY,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
if self.getRandom(10) < 2 :
htmltext = "30647-03.htm"
st.takeItems(BROKEN_KEY,1)
@@ -60,23 +60,23 @@ class Quest (JQuest) :
st.giveItems(MANTICOR_SKIN_GAITERS_PATTERN,1)
st.giveItems(GAUNTLET_OF_REPOSE_OF_THE_SOUL_PATTERN,1)
st.giveItems(IRON_BOOTS_DESIGN,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
elif n > 70 :
st.giveItems(TOME_OF_BLOOD_PAGE,1)
st.giveItems(ELVEN_NECKLACE_BEADS,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
elif n > 40 :
st.giveItems(WHITE_TUNIC_PATTERN,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else:
st.giveItems(IRON_BOOTS_DESIGN,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else:
htmltext = "30647-02.htm"
n = self.getRandom(1000)+1
st.takeItems(BROKEN_KEY,1)
st.giveItems(ADENA,n)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else:
htmltext = "30647-04.htm"
st.takeItems(BROKEN_KEY,1)
@@ -124,7 +124,7 @@ class Quest (JQuest) :
st.takeItems(SCROLL_OF_SHYSLASSY,1)
st.giveItems(LETTER_OF_KASH,1)
st.set("cond","3")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
elif npcId == 30644 and cond == 1 and st.getQuestItemsCount(LETTER_OF_KASH) == 1 :
htmltext = "30644-08.htm"
elif npcId == 30644 and cond >= 7 :
@@ -137,7 +137,7 @@ class Quest (JQuest) :
htmltext = "30645-04.htm"
st.takeItems(WATCHERS_EYE1,1)
st.set("cond","6")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
elif npcId == 30645 and cond == 6 :
htmltext = "30645-05.htm"
elif npcId == 30645 and cond >= 7 :
@@ -163,14 +163,14 @@ class Quest (JQuest) :
htmltext = "30535-01.htm"
st.addRadar(176560,-184969,-3729);
st.set("cond","8")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else:
htmltext = "30535-03.htm"
elif npcId == 30535 and cond == 8 :
htmltext = "30535-02.htm"
st.addRadar(176560,-184969,-3729);
st.set("cond","9")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
return htmltext
def onKill(self,npc,player,isPet):
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/212_TrialOfDuty/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/212_TrialOfDuty/__init__.py
index 9706126c28..7f95628aee 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/212_TrialOfDuty/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/212_TrialOfDuty/__init__.py
@@ -193,7 +193,7 @@ class Quest (JQuest) :
if cond == 2 :
if self.getRandom(50)<2 :
st.addSpawn(27119,npc,True,0)
- st.playSound("Itemsound.quest_before_battle")
+ st.playSound("ItemSound.quest_before_battle")
elif npcId == 27119 :
if cond == 2 and st.getQuestItemsCount(OLD_KNIGHT_SWORD) > 0 :
st.giveItems(KNIGHTS_TEAR,1)
@@ -225,7 +225,7 @@ class Quest (JQuest) :
if cond == 7 :
if self.getRandom(100)<33 :
st.addSpawn(30656,npc.getX(),npc.getY(),npc.getZ(),npc.getHeading(),True,300000)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
st.set("cond","8")
elif npcId == 20577 :
if cond == 11 and st.getQuestItemsCount(MILITAS_ARTICLE) < 20 :
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/213_TrialOfSeeker/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/213_TrialOfSeeker/__init__.py
index 9ffebaf343..86960ca685 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/213_TrialOfSeeker/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/213_TrialOfSeeker/__init__.py
@@ -49,13 +49,13 @@ class Quest (JQuest) :
st.takeItems(DUFNERS_LETTER_ID,1)
st.giveItems(TERYS_ORDER1_ID,1)
st.set("cond","2")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
elif event == "30064-06.htm" :
st.takeItems(MYSTERIOUS_RUNESTONE_ID,1)
st.takeItems(TERYS_ORDER1_ID,1)
st.giveItems(TERYS_ORDER2_ID,1)
st.set("cond","4")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
elif event == "30064-10.htm" :
st.takeItems(OL_MAHUM_RUNESTONE_ID,1)
st.takeItems(TUREK_RUNESTONE_ID,1)
@@ -65,7 +65,7 @@ class Quest (JQuest) :
st.giveItems(TERYS_LETTER_ID,1)
st.giveItems(TERYS_BOX_ID,1)
st.set("cond","6")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
elif event == "30064-18.htm" :
if st.getPlayer().getLevel()<35 :
htmltext = "30064-17.htm"
@@ -86,25 +86,25 @@ class Quest (JQuest) :
st.takeItems(VIKTORS_LETTER_ID,st.getQuestItemsCount(VIKTORS_LETTER_ID))
st.giveItems(VIKTORS_REQUEST_ID,1)
st.set("cond","9")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
elif event == "30684-15.htm" :
st.takeItems(VIKTORS_REQUEST_ID,1)
st.takeItems(MEDUSAS_SCALES_ID,st.getQuestItemsCount(MEDUSAS_SCALES_ID))
st.giveItems(SILENS_RUNESTONE_ID,1)
st.giveItems(ANALYSIS_REQUEST_ID,1)
st.set("cond","11")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
elif event == "30715-02.htm" :
st.takeItems(SILENS_RUNESTONE_ID,1)
st.takeItems(ANALYSIS_REQUEST_ID,1)
st.giveItems(MARINAS_LETTER_ID,1)
st.set("cond","12")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
elif event == "30715-05.htm" :
st.takeItems(EXPERIMENT_TOOLS_ID,1)
st.giveItems(ANALYSIS_RESULT_ID,1)
st.set("cond","14")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
return htmltext
@@ -160,7 +160,7 @@ class Quest (JQuest) :
st.giveItems(LIST_OF_HOST_ID,1)
st.takeItems(TERYS_ORDER3_ID,1)
st.set("cond","16")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
elif npcId == 30064 and cond == 1 :
htmltext = "30064-01.htm"
elif npcId == 30064 and cond == 2 :
@@ -178,7 +178,7 @@ class Quest (JQuest) :
st.takeItems(VIKTORS_LETTER_ID,1)
st.giveItems(HAWKEYES_LETTER_ID,1)
st.set("cond","8")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
elif npcId == 30064 and cond == 8 :
htmltext = "30064-13.htm"
elif npcId == 30064 and (cond>8 and cond<14) :
@@ -196,7 +196,7 @@ class Quest (JQuest) :
st.takeItems(ABYSS_RUNESTONE4_ID,1)
st.giveItems(TERYS_REPORT_ID,1)
st.set("id","18") #should be cond
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
elif npcId == 30064 and cond == 17 and st.getInt("id") == 18 :
htmltext = "30064-24.htm"
elif npcId == 30684 and cond == 6 :
@@ -242,7 +242,7 @@ class Quest (JQuest) :
if self.getRandom(100) < chance :
st.giveItems(item,1)
if count+1 == maxqty :
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
if cond == 4:
if st.getQuestItemsCount(OL_MAHUM_RUNESTONE_ID)+st.getQuestItemsCount(TUREK_RUNESTONE_ID)+st.getQuestItemsCount(ANT_RUNESTONE_ID)+st.getQuestItemsCount(TURAK_BUGBEAR_RUNESTONE_ID)==4 :
st.set("cond",str(cond+1))
@@ -254,7 +254,7 @@ class Quest (JQuest) :
else:
st.set("cond",str(cond+1))
else :
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
return
QUEST = Quest(213,qn,"Trial Of Seeker")
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/216_TrialOfGuildsman/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/216_TrialOfGuildsman/__init__.py
index 91ecc0148f..3f7032f897 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/216_TrialOfGuildsman/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/216_TrialOfGuildsman/__init__.py
@@ -287,11 +287,11 @@ class Quest (JQuest) :
if st.getInt("cond") >= 1 and st.getQuestItemsCount(ALLTRANS_INSTRUCTIONS_ID) == 1 and st.getQuestItemsCount(PINTERS_INSTRUCTIONS_ID) == 1 :
if st.getQuestItemsCount(AMBER_BEAD_ID) < 70 :
st.giveItems(AMBER_BEAD_ID,5)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
if st.getQuestItemsCount(AMBER_BEAD_ID) >= 70 :
st.playSound("ItemSound.quest_middle")
else:
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
return
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/217_TestimonyOfTrust/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/217_TestimonyOfTrust/__init__.py
index 4992246242..82b2a56d9d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/217_TestimonyOfTrust/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/217_TestimonyOfTrust/__init__.py
@@ -277,12 +277,12 @@ class Quest (JQuest) :
if npcId in [ 20036,20044 ] and st.getQuestItemsCount(BREATH_OF_WINDS_ID) == 0 :
st.set("id",str(st.getInt("id")+1))
if self.getRandom(100)<(st.getInt("id")*33) :
- st.playSound("Itemsound.quest_before_battle")
+ st.playSound("ItemSound.quest_before_battle")
st.addSpawn(27120,npc.getX(),npc.getY(),npc.getZ(),600000)
elif npcId in [ 20013,20019 ] and st.getQuestItemsCount(SEED_OF_VERDURE_ID) == 0 :
st.set("id",str(st.getInt("id")+1))
if self.getRandom(100)<(st.getInt("id")*33) :
- st.playSound("Itemsound.quest_before_battle")
+ st.playSound("ItemSound.quest_before_battle")
st.addSpawn(27121,npc.getX(),npc.getY(),npc.getZ(),600000)
elif cond == 14 : # Condition 14 get 10 Parasite of lota
parasite = st.getQuestItemsCount(PARASITE_OF_LOTA_ID)
@@ -291,9 +291,9 @@ class Quest (JQuest) :
st.giveItems(PARASITE_OF_LOTA_ID,1)
if parasite+1 == 10 :
st.set("cond","15")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else:
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif cond in [ 2,6,19 ] and npcId in DROPLIST.keys() :
required,item,maxqty=DROPLIST[npcId]
count = st.getQuestItemsCount(item)
@@ -315,21 +315,21 @@ class Quest (JQuest) :
# Check if player got all the items of condition 6 and set the condition to 7
if st.getQuestItemsCount(BASILISK_PLASMA_ID) and st.getQuestItemsCount(HONEY_DEW_ID) and st.getQuestItemsCount(STAKATO_ICHOR_ID) :
st.set("cond","7")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else:
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif npcId in [ 27120,27121 ] : # Condition 2 kill the Luel of Zephy and Aktea of the Woods
# Check if player got all the items of condition 2 and set the condition to 3
if st.getQuestItemsCount(SEED_OF_VERDURE_ID) and st.getQuestItemsCount(BREATH_OF_WINDS_ID) :
st.set("cond","3")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else :
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif npcId == 20213 : # Condition 19 Porta
st.set("cond","20")
st.playSound("ItemSound.quest_middle")
else:
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
return
QUEST = Quest(217,qn,"Testimony Of Trust")
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/219_TestimonyOfFate/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/219_TestimonyOfFate/__init__.py
index e847abd540..0263d1138e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/219_TestimonyOfFate/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/219_TestimonyOfFate/__init__.py
@@ -277,142 +277,142 @@ class Quest (JQuest) :
st.giveItems(KASANDRAS_REMAINS_ID,1)
st.takeItems(METHEUS_FUNERAL_JAR_ID,1)
st.set("cond","3")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
elif npcId == 20158 :
if st.getInt("cond") >=1 and st.getQuestItemsCount(IXIAS_LIST_ID) and st.getQuestItemsCount(MEDUSA_ICHOR_ID) < 10 :
if self.getRandom(2) == 1 :
if st.getQuestItemsCount(MEDUSA_ICHOR_ID) == 9 :
st.giveItems(MEDUSA_ICHOR_ID,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
if st.getQuestItemsCount(MEDUSA_ICHOR_ID)>=10 and st.getQuestItemsCount(M_SPIDER_FLUIDS_ID)>=10 and st.getQuestItemsCount(DEAD_SEEKER_DUNG_ID)>=10 and st.getQuestItemsCount(TYRANTS_BLOOD_ID)>=10 and st.getQuestItemsCount(NIGHTSHADE_ROOT_ID)>=10 :
st.set("cond","7")
else:
st.giveItems(MEDUSA_ICHOR_ID,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif npcId == 20233 :
if st.getInt("cond") >=1 and st.getQuestItemsCount(IXIAS_LIST_ID) and st.getQuestItemsCount(M_SPIDER_FLUIDS_ID) < 10 :
if self.getRandom(2) == 1 :
if st.getQuestItemsCount(M_SPIDER_FLUIDS_ID) == 9 :
st.giveItems(M_SPIDER_FLUIDS_ID,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
if st.getQuestItemsCount(MEDUSA_ICHOR_ID)>=10 and st.getQuestItemsCount(M_SPIDER_FLUIDS_ID)>=10 and st.getQuestItemsCount(DEAD_SEEKER_DUNG_ID)>=10 and st.getQuestItemsCount(TYRANTS_BLOOD_ID)>=10 and st.getQuestItemsCount(NIGHTSHADE_ROOT_ID)>=10 :
st.set("cond","7")
else:
st.giveItems(M_SPIDER_FLUIDS_ID,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif npcId == 20202 :
if st.getInt("cond") >=1 and st.getQuestItemsCount(IXIAS_LIST_ID) and st.getQuestItemsCount(DEAD_SEEKER_DUNG_ID) < 10 :
if self.getRandom(2) == 1 :
if st.getQuestItemsCount(DEAD_SEEKER_DUNG_ID) == 9 :
st.giveItems(DEAD_SEEKER_DUNG_ID,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
if st.getQuestItemsCount(MEDUSA_ICHOR_ID)>=10 and st.getQuestItemsCount(M_SPIDER_FLUIDS_ID)>=10 and st.getQuestItemsCount(DEAD_SEEKER_DUNG_ID)>=10 and st.getQuestItemsCount(TYRANTS_BLOOD_ID)>=10 and st.getQuestItemsCount(NIGHTSHADE_ROOT_ID)>=10 :
st.set("cond","7")
else:
st.giveItems(DEAD_SEEKER_DUNG_ID,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif npcId == 20192 :
if st.getInt("cond") >=1 and st.getQuestItemsCount(IXIAS_LIST_ID) and st.getQuestItemsCount(TYRANTS_BLOOD_ID) < 10 :
if self.getRandom(2) == 1 :
if st.getQuestItemsCount(TYRANTS_BLOOD_ID) == 9 :
st.giveItems(TYRANTS_BLOOD_ID,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
if st.getQuestItemsCount(MEDUSA_ICHOR_ID)>=10 and st.getQuestItemsCount(M_SPIDER_FLUIDS_ID)>=10 and st.getQuestItemsCount(DEAD_SEEKER_DUNG_ID)>=10 and st.getQuestItemsCount(TYRANTS_BLOOD_ID)>=10 and st.getQuestItemsCount(NIGHTSHADE_ROOT_ID)>=10 :
st.set("cond","7")
else:
st.giveItems(TYRANTS_BLOOD_ID,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif npcId == 20193 :
if st.getInt("cond") >=1 and st.getQuestItemsCount(IXIAS_LIST_ID) and st.getQuestItemsCount(TYRANTS_BLOOD_ID) < 10 :
if self.getRandom(10) < 6 :
if st.getQuestItemsCount(TYRANTS_BLOOD_ID) == 9 :
st.giveItems(TYRANTS_BLOOD_ID,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
if st.getQuestItemsCount(MEDUSA_ICHOR_ID)>=10 and st.getQuestItemsCount(M_SPIDER_FLUIDS_ID)>=10 and st.getQuestItemsCount(DEAD_SEEKER_DUNG_ID)>=10 and st.getQuestItemsCount(TYRANTS_BLOOD_ID)>=10 and st.getQuestItemsCount(NIGHTSHADE_ROOT_ID)>=10 :
st.set("cond","7")
else:
st.giveItems(TYRANTS_BLOOD_ID,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif npcId == 20230 :
if st.getInt("cond") >=1 and st.getQuestItemsCount(IXIAS_LIST_ID) and st.getQuestItemsCount(NIGHTSHADE_ROOT_ID) < 10 :
if self.getRandom(10) < 3 :
if st.getQuestItemsCount(NIGHTSHADE_ROOT_ID) == 9 :
st.giveItems(NIGHTSHADE_ROOT_ID,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
if st.getQuestItemsCount(MEDUSA_ICHOR_ID)>=10 and st.getQuestItemsCount(M_SPIDER_FLUIDS_ID)>=10 and st.getQuestItemsCount(DEAD_SEEKER_DUNG_ID)>=10 and st.getQuestItemsCount(TYRANTS_BLOOD_ID)>=10 and st.getQuestItemsCount(NIGHTSHADE_ROOT_ID)>=10 :
st.set("cond","7")
else:
st.giveItems(NIGHTSHADE_ROOT_ID,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif npcId == 20157 :
if st.getInt("cond") >=1 and st.getQuestItemsCount(IXIAS_LIST_ID) and st.getQuestItemsCount(NIGHTSHADE_ROOT_ID) < 10 :
if self.getRandom(10) < 4 :
if st.getQuestItemsCount(NIGHTSHADE_ROOT_ID) == 9 :
st.giveItems(NIGHTSHADE_ROOT_ID,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
if st.getQuestItemsCount(MEDUSA_ICHOR_ID)>=10 and st.getQuestItemsCount(M_SPIDER_FLUIDS_ID)>=10 and st.getQuestItemsCount(DEAD_SEEKER_DUNG_ID)>=10 and st.getQuestItemsCount(TYRANTS_BLOOD_ID)>=10 and st.getQuestItemsCount(NIGHTSHADE_ROOT_ID)>=10 :
st.set("cond","7")
else:
st.giveItems(NIGHTSHADE_ROOT_ID,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif npcId == 20232 :
if st.getInt("cond") >=1 and st.getQuestItemsCount(IXIAS_LIST_ID) and st.getQuestItemsCount(NIGHTSHADE_ROOT_ID) < 10 :
if self.getRandom(10) < 5 :
if st.getQuestItemsCount(NIGHTSHADE_ROOT_ID) == 9 :
st.giveItems(NIGHTSHADE_ROOT_ID,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
if st.getQuestItemsCount(MEDUSA_ICHOR_ID)>=10 and st.getQuestItemsCount(M_SPIDER_FLUIDS_ID)>=10 and st.getQuestItemsCount(DEAD_SEEKER_DUNG_ID)>=10 and st.getQuestItemsCount(TYRANTS_BLOOD_ID)>=10 and st.getQuestItemsCount(NIGHTSHADE_ROOT_ID)>=10 :
st.set("cond","7")
else:
st.giveItems(NIGHTSHADE_ROOT_ID,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif npcId == 20234 :
if st.getInt("cond") >=1 and st.getQuestItemsCount(IXIAS_LIST_ID) and st.getQuestItemsCount(NIGHTSHADE_ROOT_ID) < 10 :
if self.getRandom(10) < 6 :
if st.getQuestItemsCount(NIGHTSHADE_ROOT_ID) == 9 :
st.giveItems(NIGHTSHADE_ROOT_ID,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
if st.getQuestItemsCount(MEDUSA_ICHOR_ID)>=10 and st.getQuestItemsCount(M_SPIDER_FLUIDS_ID)>=10 and st.getQuestItemsCount(DEAD_SEEKER_DUNG_ID)>=10 and st.getQuestItemsCount(TYRANTS_BLOOD_ID)>=10 and st.getQuestItemsCount(NIGHTSHADE_ROOT_ID)>=10 :
st.set("cond","7")
else:
st.giveItems(NIGHTSHADE_ROOT_ID,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif npcId == 27079 :
if st.getInt("cond") >=1 and st.getQuestItemsCount(PALUS_CHARM_ID) and st.getQuestItemsCount(ARKENIAS_NOTE_ID) and st.getQuestItemsCount(TIMIRIRAN_SAP_ID) == 0 and st.getQuestItemsCount(TIMIRIRAN_SEED_ID) and st.getQuestItemsCount(BLACK_WILLOW_LEAF_ID) == 0 :
st.giveItems(BLACK_WILLOW_LEAF_ID,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
elif npcId == 20554 :
if st.getInt("cond") >=1 and st.getQuestItemsCount(PALUS_CHARM_ID) and st.getQuestItemsCount(ARKENIAS_NOTE_ID) and st.getQuestItemsCount(RED_FAIRY_DUST_ID) == 0 and st.getQuestItemsCount(PIXY_GARNET_ID) and st.getQuestItemsCount(GRANDIS_SKULL_ID) < 10 :
if st.getQuestItemsCount(GRANDIS_SKULL_ID) == 9 :
st.giveItems(GRANDIS_SKULL_ID,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else:
st.giveItems(GRANDIS_SKULL_ID,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif npcId == 20600 :
if st.getInt("cond") >=1 and st.getQuestItemsCount(PALUS_CHARM_ID) and st.getQuestItemsCount(ARKENIAS_NOTE_ID) and st.getQuestItemsCount(RED_FAIRY_DUST_ID) == 0 and st.getQuestItemsCount(PIXY_GARNET_ID) and st.getQuestItemsCount(KARUL_BUGBEAR_SKULL_ID) < 10 :
if st.getQuestItemsCount(KARUL_BUGBEAR_SKULL_ID) == 9 :
st.giveItems(KARUL_BUGBEAR_SKULL_ID,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else:
st.giveItems(KARUL_BUGBEAR_SKULL_ID,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif npcId == 20270 :
if st.getInt("cond") >=1 and st.getQuestItemsCount(PALUS_CHARM_ID) and st.getQuestItemsCount(ARKENIAS_NOTE_ID) and st.getQuestItemsCount(RED_FAIRY_DUST_ID) == 0 and st.getQuestItemsCount(PIXY_GARNET_ID) and st.getQuestItemsCount(BREKA_OVERLORD_SKULL_ID) < 10 :
if st.getQuestItemsCount(BREKA_OVERLORD_SKULL_ID) == 9 :
st.giveItems(BREKA_OVERLORD_SKULL_ID,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else:
st.giveItems(BREKA_OVERLORD_SKULL_ID,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif npcId == 20582 :
if st.getInt("cond") >=1 and st.getQuestItemsCount(PALUS_CHARM_ID) and st.getQuestItemsCount(ARKENIAS_NOTE_ID) and st.getQuestItemsCount(RED_FAIRY_DUST_ID) == 0 and st.getQuestItemsCount(PIXY_GARNET_ID) and st.getQuestItemsCount(LETO_OVERLORD_SKULL_ID) < 10 :
if st.getQuestItemsCount(LETO_OVERLORD_SKULL_ID) == 9 :
st.giveItems(LETO_OVERLORD_SKULL_ID,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else:
st.giveItems(LETO_OVERLORD_SKULL_ID,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
return
QUEST = Quest(219,qn,"Testimony Of Fate")
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/220_TestimonyOfGlory/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/220_TestimonyOfGlory/__init__.py
index 385f267b14..0f70e5602e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/220_TestimonyOfGlory/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/220_TestimonyOfGlory/__init__.py
@@ -154,13 +154,13 @@ class Quest (JQuest) :
htmltext = "30501-09.htm"
st.giveItems(KASMANS_LETTER3,1)
elif event == "30615-04.htm" : # Chief of Breka Orcs
- st.playSound("Itemsound.quest_before_battle")
+ st.playSound("ItemSound.quest_before_battle")
st.addSpawn(27080,80117,120039,-2259)
st.addSpawn(27081,80058,120038,-2259)
st.giveItems(GLOVE_OF_VOLTAR,1)
st.takeItems(MANAKIAS_LETTER1,1)
elif event == "30616-04.htm" : # Chief of Enku Orcs
- st.playSound("Itemsound.quest_before_battle")
+ st.playSound("ItemSound.quest_before_battle")
st.addSpawn(27082,19456,192245,-3730)
st.addSpawn(27082,19539,192343,-3728)
st.addSpawn(27082,19500,192449,-3729)
@@ -168,7 +168,7 @@ class Quest (JQuest) :
st.giveItems(GLOVE_OF_KEPRA,1)
st.takeItems(MANAKIAS_LETTER2,1)
elif event == "30617-04.htm" : # Chief of Turek Orcs
- st.playSound("Itemsound.quest_before_battle")
+ st.playSound("ItemSound.quest_before_battle")
st.addSpawn(27083,-94292,110781,-3701)
st.addSpawn(27083,-94293,110861,-3701)
st.giveItems(GLOVE_OF_BURAI,1)
@@ -291,7 +291,7 @@ class Quest (JQuest) :
htmltext = "30615-02.htm"
elif st.getQuestItemsCount(GLOVE_OF_VOLTAR) :
htmltext = "30615-05.htm"
- st.playSound("Itemsound.quest_before_battle")
+ st.playSound("ItemSound.quest_before_battle")
st.addSpawn(27080,80117,120039,-2259)
st.addSpawn(27081,80058,120038,-2259)
elif st.getQuestItemsCount(PASHIKAS_HEAD) and st.getQuestItemsCount(VULTUS_HEAD) :
@@ -301,9 +301,9 @@ class Quest (JQuest) :
st.takeItems(VULTUS_HEAD,1)
if st.getQuestItemsCount(SCEPTER_OF_BREKA) and st.getQuestItemsCount(SCEPTER_OF_ENKU) and st.getQuestItemsCount(SCEPTER_OF_VUKU) and st.getQuestItemsCount(SCEPTER_OF_TUREK) and st.getQuestItemsCount(SCEPTER_OF_TUNATH) :
st.set("cond","5")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else :
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif st.getQuestItemsCount(SCEPTER_OF_BREKA) :
htmltext = "30615-07.htm"
else :
@@ -313,7 +313,7 @@ class Quest (JQuest) :
htmltext = "30616-02.htm"
elif st.getQuestItemsCount(GLOVE_OF_KEPRA) :
htmltext = "30616-05.htm"
- st.playSound("Itemsound.quest_before_battle")
+ st.playSound("ItemSound.quest_before_battle")
st.addSpawn(27082,17710,189813,-3581)
st.addSpawn(27082,17674,189798,-3581)
st.addSpawn(27082,17770,189852,-3581)
@@ -324,9 +324,9 @@ class Quest (JQuest) :
st.takeItems(ENKU_OVERLORD_HEAD,4)
if st.getQuestItemsCount(SCEPTER_OF_BREKA) and st.getQuestItemsCount(SCEPTER_OF_ENKU) and st.getQuestItemsCount(SCEPTER_OF_VUKU) and st.getQuestItemsCount(SCEPTER_OF_TUREK) and st.getQuestItemsCount(SCEPTER_OF_TUNATH) :
st.set("cond","5")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else :
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif st.getQuestItemsCount(SCEPTER_OF_ENKU) :
htmltext = "30616-07.htm"
else :
@@ -336,7 +336,7 @@ class Quest (JQuest) :
htmltext = "30617-02.htm"
elif st.getQuestItemsCount(GLOVE_OF_BURAI) :
htmltext = "30617-05.htm"
- st.playSound("Itemsound.quest_before_battle")
+ st.playSound("ItemSound.quest_before_battle")
st.addSpawn(27083,-94292,110781,-3701)
st.addSpawn(27083,-94293,110861,-3701)
elif st.getQuestItemsCount(MAKUM_BUGBEAR_HEAD) == 2 :
@@ -345,9 +345,9 @@ class Quest (JQuest) :
st.takeItems(MAKUM_BUGBEAR_HEAD,2)
if st.getQuestItemsCount(SCEPTER_OF_BREKA) and st.getQuestItemsCount(SCEPTER_OF_ENKU) and st.getQuestItemsCount(SCEPTER_OF_VUKU) and st.getQuestItemsCount(SCEPTER_OF_TUREK) and st.getQuestItemsCount(SCEPTER_OF_TUNATH) :
st.set("cond","5")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else :
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif st.getQuestItemsCount(SCEPTER_OF_TUREK) :
htmltext = "30617-07.htm"
else :
@@ -370,9 +370,9 @@ class Quest (JQuest) :
st.takeItems(DRIKOS_CONTRACT,1)
if st.getQuestItemsCount(SCEPTER_OF_BREKA) and st.getQuestItemsCount(SCEPTER_OF_ENKU) and st.getQuestItemsCount(SCEPTER_OF_VUKU) and st.getQuestItemsCount(SCEPTER_OF_TUREK) and st.getQuestItemsCount(SCEPTER_OF_TUNATH) :
st.set("cond","5")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else :
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
else :
htmltext = "30619-04.htm"
elif st.getQuestItemsCount(SCEPTER_OF_VUKU) :
@@ -453,11 +453,11 @@ class Quest (JQuest) :
if count+1 == maxquanty : # Check if got enough number of items
if st.getQuestItemsCount(MANASHEN_SHARD) == maxquanty and st.getQuestItemsCount(TYRANT_TALON) == maxquanty and st.getQuestItemsCount(GUARDIAN_BASILISK_FANG) == maxquanty :
st.set("cond","2")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else :
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
else :
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif cond == 4 and npcId in DROPLIST_COND_4.keys():
required,item,maxquanty=DROPLIST_COND_4[npcId]
count = st.getQuestItemsCount(item)
@@ -465,23 +465,23 @@ class Quest (JQuest) :
if npcId == 20234 :
st.giveItems(item,1)
if count+1 == maxquanty : # Check if got enough number of items
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else :
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
else :
st.giveItems(item,1)
if count+1 == maxquanty : # Check if got enough number of items
if npcId in [ 27080, 27081 ] :
if st.getQuestItemsCount(PASHIKAS_HEAD) and st.getQuestItemsCount(VULTUS_HEAD) :
st.takeItems(required,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else :
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
else :
st.takeItems(required,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else :
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif cond == 6 and npcId in DROPLIST_COND_6.keys():
required,item,maxquanty,chance=DROPLIST_COND_6[npcId]
count = st.getQuestItemsCount(item)
@@ -491,14 +491,14 @@ class Quest (JQuest) :
if count+1 == maxquanty : # Check if got enough number of items
if st.getQuestItemsCount(TIMAK_ORC_HEAD) == maxquanty and st.getQuestItemsCount(TAMLIN_ORC_SKULL) == maxquanty :
st.set("cond","7")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else :
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
else :
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif cond == 9 and st.getQuestItemsCount(TANAPIS_ORDER1) and st.getQuestItemsCount(SCEPTER_OF_TANTOS) == 0 :
if npcId in [ 20778, 20779 ] :
- # st.playSound("Itemsound.quest_before_battle")
+ # st.playSound("ItemSound.quest_before_battle")
st.addSpawn(27086)
#st.addSpawn(27086, 11839,-106261,-3550,300000)
return "Revenant of Tantos Chief has spawned at X=11839 Y=-106261 Z=-3550"
@@ -507,7 +507,7 @@ class Quest (JQuest) :
elif npcId == 27086 :
st.giveItems(SCEPTER_OF_TANTOS,1)
st.set("cond","10")
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
return
QUEST = Quest(220,qn,"Testimony Of Glory")
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/223_TestOfChampion/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/223_TestOfChampion/__init__.py
index 725add4b0b..1ffe7b3487 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/223_TestOfChampion/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/223_TestOfChampion/__init__.py
@@ -70,13 +70,13 @@ class Quest (JQuest) :
htmltext = "30624-10.htm"
st.giveItems(ASCALONS_LETTER2,1)
st.takeItems(MASONS_LETTER,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
st.set("cond","5")
elif event == "30624_3" :
htmltext = "30624-14.htm"
st.giveItems(ASCALONS_LETTER3,1)
st.takeItems(GROOTS_LETTER,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
st.set("cond","9")
elif event == "30625_1" :
htmltext = "30625-02.htm"
@@ -84,13 +84,13 @@ class Quest (JQuest) :
htmltext = "30625-03.htm"
st.giveItems(IRON_ROSE_RING,1)
st.takeItems(ASCALONS_LETTER1,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
st.set("cond","2")
elif event == "30093_1" :
htmltext = "30093-02.htm"
st.giveItems(WHITE_ROSE_INSIGNIA,1)
st.takeItems(ASCALONS_LETTER2,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
st.set("cond","6")
elif event == "30196_1" :
htmltext = "30196-02.htm"
@@ -98,14 +98,14 @@ class Quest (JQuest) :
htmltext = "30196-03.htm"
st.giveItems(MOUENS_ORDER1,1)
st.takeItems(ASCALONS_LETTER3,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
st.set("cond","10")
elif event == "30196_3" :
htmltext = "30196-06.htm"
st.giveItems(MOUENS_ORDER2,1)
st.takeItems(MOUENS_ORDER1,1)
st.takeItems(ROAD_RATMAN_HEAD,-1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
st.set("cond","12")
return htmltext
@@ -168,7 +168,7 @@ class Quest (JQuest) :
st.giveItems(MASONS_LETTER,1)
st.takeItems(IRON_ROSE_RING,1)
st.takeItems(BLOODY_AXE_HEAD,-1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
st.set("cond","4")
elif npcId == 30625 and st.getInt("cond") == 4 :
htmltext = "30625-06.htm"
@@ -180,7 +180,7 @@ class Quest (JQuest) :
htmltext = "30093-03.htm"
elif npcId == 30093 and st.getInt("cond") == 7 :
htmltext = "30093-04.htm"
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
st.set("cond","8")
st.giveItems(GROOTS_LETTER,1)
st.takeItems(WHITE_ROSE_INSIGNIA,1)
@@ -204,7 +204,7 @@ class Quest (JQuest) :
st.giveItems(MOUENS_LETTER,1)
st.takeItems(MOUENS_ORDER2,1)
st.takeItems(LETO_LIZARDMAN_FANG1,st.getQuestItemsCount(LETO_LIZARDMAN_FANG1))
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
st.set("cond","14")
elif npcId == 30196 and st.getInt("cond") == 14 :
htmltext = "30196-09.htm"
@@ -221,7 +221,7 @@ class Quest (JQuest) :
if cond == step and st.getQuestItemsCount(itemid) < maxcount and self.getRandom(100) < chance:
if st.getQuestItemsCount(itemid) == (maxcount-1):
st.giveItems(itemid,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
if cond == 6:
h_egg = st.getQuestItemsCount(HARPYS_EGG1)
m_ven = st.getQuestItemsCount(MEDUSA_VENOM1)
@@ -232,7 +232,7 @@ class Quest (JQuest) :
st.set("cond",str(cond+1))
else:
st.giveItems(itemid,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
return
QUEST = Quest(223,qn,"Test Of Champion")
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/224_TestOfSagittarius/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/224_TestOfSagittarius/__init__.py
index 0ad7be06c3..d99024721e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/224_TestOfSagittarius/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/224_TestOfSagittarius/__init__.py
@@ -74,13 +74,13 @@ DROPLIST={
}
def giveMiddle(st,itemid,step):
st.giveItems(itemid,1)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
st.set("step",str(step+1))
return
def giveNormal(st,itemid):
st.giveItems(itemid,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
return
@@ -244,7 +244,7 @@ class Quest (JQuest) :
if ((st.getQuestItemsCount(itemid)-120)*5)> self.getRandom(100) :
st.addSpawn(27090,npc,True,0)
st.takeItems(itemid, st.getQuestItemsCount(itemid))
- st.playSound("Itemsound.quest_before_battle")
+ st.playSound("ItemSound.quest_before_battle")
else:
giveNormal(st,itemid)
elif dropcondition == 3 :
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/225_TestOfSearcher/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/225_TestOfSearcher/__init__.py
index 563d70da02..383feeda00 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/225_TestOfSearcher/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/225_TestOfSearcher/__init__.py
@@ -266,7 +266,7 @@ class Quest (JQuest) :
if st.getQuestItemsCount(MAKELS_MAP) ==1 and st.getQuestItemsCount(SOLTS_MAP) ==1 :
st.set("cond",str(cond+1))
else:
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif npcId==20551:
if st.getQuestItemsCount(SOLTS_MAP) ==0:
st.giveItems(itemid,1)
@@ -277,7 +277,7 @@ class Quest (JQuest) :
if st.getQuestItemsCount(MAKELS_MAP) ==1 and st.getQuestItemsCount(SOLTS_MAP) ==1 :
st.set("cond",str(cond+1))
else:
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
else:
st.giveItems(itemid,1)
if count==maxcount-1:
@@ -286,7 +286,7 @@ class Quest (JQuest) :
if npcId == 27093:
st.giveItems(STRANGE_MAP,1)
else:
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
if npcId==20781 and random<30 and count<maxcount:
st.addSpawn(27094,npc.getX(),npc.getY(),npc.getZ(),npc.getHeading(),True,300000)
return
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/226_TestOfHealer/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/226_TestOfHealer/__init__.py
index b248e8152f..9ea3a9c0b8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/226_TestOfHealer/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/226_TestOfHealer/__init__.py
@@ -128,7 +128,7 @@ class Quest (JQuest) :
st.addSpawn(27122)
st.addSpawn(LETO_LEADER)
st.set("cond","11")
- st.playSound("Itemsound.quest_before_battle")
+ st.playSound("ItemSound.quest_before_battle")
elif event == "30665_1" :
htmltext = "30665-02.htm"
st.takeItems(SECRET_LETTER1,1)
@@ -241,21 +241,21 @@ class Quest (JQuest) :
st.addSpawn(LETO_ASSASSIN)
st.addSpawn(LETO_ASSASSIN)
st.addSpawn(LETO_ASSASSIN)
- st.playSound("Itemsound.quest_before_battle")
+ st.playSound("ItemSound.quest_before_battle")
st.set("cond","14")
elif st.getInt("cond")==15 or st.getInt("cond")==16:
htmltext = "30661-02.htm"
st.addSpawn(LETO_SNIPER)
st.addSpawn(LETO_SNIPER)
st.addSpawn(LETO_SNIPER)
- st.playSound("Itemsound.quest_before_battle")
+ st.playSound("ItemSound.quest_before_battle")
st.set("cond","16")
elif st.getInt("cond")==17 or st.getInt("cond")==18:
htmltext = "30661-03.htm"
st.addSpawn(LETO_WIZARD)
st.addSpawn(LETO_WIZARD)
st.addSpawn(LETO_LORD)
- st.playSound("Itemsound.quest_before_battle")
+ st.playSound("ItemSound.quest_before_battle")
st.set("cond","18")
elif st.getInt("cond") == 19 :
htmltext = "30661-04.htm"
@@ -285,7 +285,7 @@ class Quest (JQuest) :
st.giveItems(item,1)
if next_condition != 0:
st.set("cond",next_condition)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
return
QUEST = Quest(226,qn,"Test Of Healer")
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/230_TestOfSummoner/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/230_TestOfSummoner/__init__.py
index 53e82350eb..fa3734e869 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/230_TestOfSummoner/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/230_TestOfSummoner/__init__.py
@@ -324,7 +324,7 @@ class Quest (JQuest) :
st.set(var,"3")
st.giveItems(progress,1)
st.takeItems(start,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
self.inProgressDuelMobs[npcId] = [player, player.getPet(), False] #mark the attack
return
@@ -341,9 +341,9 @@ class Quest (JQuest) :
if st.getInt(var) == value and count < 30 and random < chance:
st.giveItems(item,1)
if count == 29:
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
else:
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
# Part for npc summon death (duels part). Some of this must run for all players.
else : # if npcId in DROPLIST_SUMMON.keys():
var,start,progress,foul,defeat,victory = DROPLIST_SUMMON[npcId]
@@ -375,7 +375,7 @@ class Quest (JQuest) :
st.set(var,"6")
st.giveItems(victory,1) # if he wons without cheating, set stat won and give victory crystal
st.getPlayer().removeNotifyQuestOfDeath(st)
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
# if a foul has occured, find the player who had the duel in progress and give a foul crystal
else :
foulPlayer = self.inProgressDuelMobs[npcId][0]
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/231_TestOfMaestro/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/231_TestOfMaestro/__init__.py
index 2b044135b2..c8700b603f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/231_TestOfMaestro/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/231_TestOfMaestro/__init__.py
@@ -227,14 +227,14 @@ class Quest (JQuest) :
if progress == progress_drop and count < maxcount :
st.giveItems(item,1)
if count == maxcount-1 :
- st.playSound("Itemsound.quest_middle")
+ st.playSound("ItemSound.quest_middle")
itemcount=0
for id in [WEIRD_BEES_NEEDLE,MARSH_SPIDERS_WEB,BLOOD_OF_LEECH]:
itemcount+=st.getQuestItemsCount(id)
if npcId==27133 or itemcount>29:
st.set("progress",str(progress+1))
else:
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
return
QUEST = Quest(231,qn,"Test Of Maestro")
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/234_FatesWhisper/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/234_FatesWhisper/__init__.py
index b41a83081c..3fb057a216 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/234_FatesWhisper/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/234_FatesWhisper/__init__.py
@@ -268,7 +268,7 @@ class Quest (JQuest) :
if npcId ==NPC[8] and st.getQuestItemsCount(REIRIAS_SOUL_ORB)==0 :
htmltext = "31027-01.htm"
st.giveItems(REIRIAS_SOUL_ORB,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
elif cond==2 :
# Kernon's Chest
if npcId == NPC[5] and st.getQuestItemsCount(KERMONS_INFERNIUM_SCEPTER)==0 :
@@ -297,7 +297,7 @@ class Quest (JQuest) :
if player.getActiveWeaponItem() and player.getActiveWeaponItem().getItemId() == PIPETTE_KNIFE and st.getQuestItemsCount(RED_PIPETTE_KNIFE) == 0:
st.giveItems(RED_PIPETTE_KNIFE,1)
st.takeItems(PIPETTE_KNIFE,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
return
def onKill(self,npc,player,isPet):
@@ -321,7 +321,7 @@ class Quest (JQuest) :
stw = PartyQuestMembers[Rnd.get(len(PartyQuestMembers))]
stw.giveItems(dropId,1)
stw.takeItems(WHITE_CLOTH,1)
- stw.playSound("Itemsound.quest_itemget")
+ stw.playSound("ItemSound.quest_itemget")
if stw.getQuestItemsCount(dropId) >= 30:
stw.set("cond","9")
else:
@@ -333,7 +333,7 @@ class Quest (JQuest) :
if value == 8 and st.getQuestItemsCount(dropId) < 30:
st.giveItems(dropId,1)
st.takeItems(WHITE_CLOTH,1)
- st.playSound("Itemsound.quest_itemget")
+ st.playSound("ItemSound.quest_itemget")
if st.getQuestItemsCount(dropId) >= 30:
st.set("cond","9")
return
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00504_CompetitionfortheBanditStronghold/Q00504_CompetitionfortheBanditStronghold.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00504_CompetitionfortheBanditStronghold/Q00504_CompetitionfortheBanditStronghold.java
index b0b52e100e..a67af2bc02 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00504_CompetitionfortheBanditStronghold/Q00504_CompetitionfortheBanditStronghold.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00504_CompetitionfortheBanditStronghold/Q00504_CompetitionfortheBanditStronghold.java
@@ -154,15 +154,13 @@ public final class Q00504_CompetitionfortheBanditStronghold extends Quest
st.giveItems(TARLK_AMULET, 1);
if (st.getQuestItemsCount(TARLK_AMULET) < 30)
{
- st.playSound("Itemsound.quest_itemget");
+ st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
else
{
- st.playSound("Itemsound.quest_middle");
- st.set("cond", "2");
+ st.setCond(2, true);
}
}
-
return null;
}
--
GitLab