diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/139_ShadowFoxPart1/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/139_ShadowFoxPart1/__init__.py
index d31d3c7493a01c6a1a02a7e67bef1983b12a5a73..477293d27ba6b730135f0a662b62348f55e28532 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/139_ShadowFoxPart1/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/139_ShadowFoxPart1/__init__.py
@@ -92,7 +92,7 @@ class Quest (JQuest) :
st = player.getQuestState(qn)
if not st :
st = self.newQuestState(player)
- qs = st.getPlayer().getQuestState("138_TempleChampionPart2")
+ qs = st.getPlayer().getQuestState("Q00138_TempleChampionPart2")
if qs :
if qs.getState() == State.COMPLETED and st.getState() == State.CREATED :
st.setState(State.STARTED)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
index d1be2814c53fb0ca9800a6951edbc06232fe75b1..4b57a24bb54b07311d741ca23776624df4261c19 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
@@ -65,7 +65,7 @@ public class Q00137_TempleChampionPart1 extends Quest
st.setCond(2, true);
break;
case "30070-16.html":
- if (st.isCond(2) && (st.hasQuestItems(EXECUTOR) && st.hasQuestItems(MISSIONARY)))
+ if (st.isCond(3) && (st.hasQuestItems(EXECUTOR) && st.hasQuestItems(MISSIONARY)))
{
st.takeItems(EXECUTOR, -1);
st.takeItems(MISSIONARY, -1);
@@ -94,7 +94,7 @@ public class Q00137_TempleChampionPart1 extends Quest
{
return getAlreadyCompletedMsg(player);
}
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
switch (st.getInt("talk"))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
index ec667a52d83a49827b14b7e08ea20047ddacaba4..196cabe96e0c1012cf06d1fdfe77d972a28b04b2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
@@ -38,10 +38,10 @@ public class Q00138_TempleChampionPart2 extends Quest
20552, // Fettered Soul
};
// Items
- private static final int MANIFESTO = 10340;
- private static final int RELIC = 10340;
- private static final int ANGUS_REC = 10343;
- private static final int PUPINA_REC = 10344;
+ private static final int TEMPLE_MANIFESTO = 10341;
+ private static final int RELICS_OF_THE_DARK_ELF_TRAINEE = 10342;
+ private static final int ANGUS_RECOMMENDATION = 10343;
+ private static final int PUPINAS_RECOMMENDATION = 10344;
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
@@ -55,7 +55,7 @@ public class Q00138_TempleChampionPart2 extends Quest
{
case "30070-02.htm":
st.startQuest();
- st.giveItems(MANIFESTO, 1);
+ st.giveItems(TEMPLE_MANIFESTO, 1);
break;
case "30070-05.html":
st.giveAdena(84593, true);
@@ -73,23 +73,23 @@ public class Q00138_TempleChampionPart2 extends Quest
break;
case "30118-09.html":
st.setCond(6, true);
- st.giveItems(PUPINA_REC, 1);
+ st.giveItems(PUPINAS_RECOMMENDATION, 1);
break;
case "30474-02.html":
st.setCond(4, true);
break;
case "30666-02.html":
- if (st.hasQuestItems(PUPINA_REC))
+ if (st.hasQuestItems(PUPINAS_RECOMMENDATION))
{
st.set("talk", "1");
- st.takeItems(PUPINA_REC, -1);
+ st.takeItems(PUPINAS_RECOMMENDATION, -1);
}
break;
case "30666-03.html":
- if (st.hasQuestItems(MANIFESTO))
+ if (st.hasQuestItems(TEMPLE_MANIFESTO))
{
st.set("talk", "2");
- st.takeItems(MANIFESTO, -1);
+ st.takeItems(TEMPLE_MANIFESTO, -1);
}
break;
case "30666-08.html":
@@ -109,11 +109,10 @@ public class Q00138_TempleChampionPart2 extends Quest
{
return htmltext;
}
- final int cond = st.getInt("cond");
switch (npc.getNpcId())
{
case SYLVAIN:
- switch (cond)
+ switch (st.getCond())
{
case 1:
htmltext = "30070-02.htm";
@@ -138,7 +137,7 @@ public class Q00138_TempleChampionPart2 extends Quest
}
break;
case PUPINA:
- switch (cond)
+ switch (st.getCond())
{
case 2:
htmltext = "30118-01.html";
@@ -149,9 +148,9 @@ public class Q00138_TempleChampionPart2 extends Quest
break;
case 5:
htmltext = "30118-08.html";
- if (st.hasQuestItems(ANGUS_REC))
+ if (st.hasQuestItems(ANGUS_RECOMMENDATION))
{
- st.takeItems(ANGUS_REC, -1);
+ st.takeItems(ANGUS_RECOMMENDATION, -1);
}
break;
case 6:
@@ -160,16 +159,16 @@ public class Q00138_TempleChampionPart2 extends Quest
}
break;
case ANGUS:
- switch (cond)
+ switch (st.getCond())
{
case 3:
htmltext = "30474-01.html";
break;
case 4:
- if (st.getQuestItemsCount(RELIC) >= 10)
+ if (st.getQuestItemsCount(RELICS_OF_THE_DARK_ELF_TRAINEE) >= 10)
{
- st.takeItems(RELIC, -1);
- st.giveItems(ANGUS_REC, 1);
+ st.takeItems(RELICS_OF_THE_DARK_ELF_TRAINEE, -1);
+ st.giveItems(ANGUS_RECOMMENDATION, 1);
st.setCond(5, true);
htmltext = "30474-04.html";
}
@@ -184,7 +183,7 @@ public class Q00138_TempleChampionPart2 extends Quest
}
break;
case SLA:
- switch (cond)
+ switch (st.getCond())
{
case 6:
switch (st.getInt("talk"))
@@ -213,10 +212,10 @@ public class Q00138_TempleChampionPart2 extends Quest
public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)
{
final QuestState st = player.getQuestState(getName());
- if ((st != null) && st.isStarted() && st.isCond(4) && (st.getQuestItemsCount(RELIC) < 10))
+ if ((st != null) && st.isStarted() && st.isCond(4) && (st.getQuestItemsCount(RELICS_OF_THE_DARK_ELF_TRAINEE) < 10))
{
- st.giveItems(RELIC, 1);
- if (st.getQuestItemsCount(RELIC) >= 10)
+ st.giveItems(RELICS_OF_THE_DARK_ELF_TRAINEE, 1);
+ if (st.getQuestItemsCount(RELICS_OF_THE_DARK_ELF_TRAINEE) >= 10)
{
st.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
}
@@ -234,7 +233,7 @@ public class Q00138_TempleChampionPart2 extends Quest
addStartNpc(SYLVAIN);
addTalkId(SYLVAIN, PUPINA, ANGUS, SLA);
addKillId(MOBS);
- registerQuestItems(MANIFESTO, RELIC, ANGUS_REC, PUPINA_REC);
+ registerQuestItems(TEMPLE_MANIFESTO, RELICS_OF_THE_DARK_ELF_TRAINEE, ANGUS_RECOMMENDATION, PUPINAS_RECOMMENDATION);
}
public static void main(String[] args)