From f5652e70acd0f4502e55cca248bd9a28aae1c2b2 Mon Sep 17 00:00:00 2001
From: lion <lion@5288da4f-0efc-0310-bd40-8d490a2659fa>
Date: Wed, 1 Feb 2012 21:48:33 +0000
Subject: [PATCH] BETA: cleanup
---
.../quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java | 2 +-
.../Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java | 2 +-
.../Q10269_ToTheSeedOfDestruction.java | 2 +-
.../Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java | 2 +-
.../Q11_SecretMeetingWithKetraOrcs.java | 2 +-
.../scripts/quests/Q13_ParcelDelivery/Q13_ParcelDelivery.java | 2 +-
.../data/scripts/quests/Q251_NoSecrets/Q251_NoSecrets.java | 1 -
.../scripts/quests/Q290_ThreatRemoval/Q290_ThreatRemoval.java | 3 +--
.../Q307_ControlDeviceOfTheGiants.java | 2 +-
.../scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java | 2 +-
.../scripts/quests/Q401_PathToWarrior/Q401_PathToWarrior.java | 2 +-
.../Q452_FindingtheLostSoldiers.java | 2 +-
.../Q453_NotStrongEnoughAlone/Q453_NotStrongEnoughAlone.java | 2 +-
.../quests/Q461_RumbleInTheBase/Q461_RumbleInTheBase.java | 3 +--
.../quests/Q637_ThroughOnceMore/Q637_ThroughOnceMore.java | 2 +-
.../scripts/quests/Q690_JudesRequest/Q690_JudesRequest.java | 2 +-
.../quests/Q702_ATrapForRevenge/Q702_ATrapForRevenge.java | 2 +-
17 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
index 3c7fc083c9..53d776adba 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
@@ -110,8 +110,8 @@ public class Q10267_JourneyToGracia extends Quest
case "32548-02.htm":
st.giveAdena(92500, false);
st.addExpAndSp(75480, 7570);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
break;
}
return htmltext;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
index 9ced5bdf96..e679445f5e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
@@ -68,8 +68,8 @@ public class Q10268_ToTheSeedOfInfinity extends Quest
htmltext = "32530-01.htm";
st.giveAdena(16671, false);
st.addExpAndSp(100640, 10098);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
}
break;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
index 9e0b2a1862..ad2fefa256 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
@@ -68,8 +68,8 @@ public class Q10269_ToTheSeedOfDestruction extends Quest
htmltext = "32526-01.htm";
st.giveAdena(29174, false);
st.addExpAndSp(176121, 7671);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
}
break;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
index 5ca301e1b6..69de2c9701 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
@@ -108,8 +108,8 @@ public class Q10281_MutatedKaneusRune extends Quest
break;
case "31335-03.htm":
st.rewardItems(57, 360000);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
break;
}
return htmltext;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/Q11_SecretMeetingWithKetraOrcs.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/Q11_SecretMeetingWithKetraOrcs.java
index fbb6921873..b966a979ed 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/Q11_SecretMeetingWithKetraOrcs.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/Q11_SecretMeetingWithKetraOrcs.java
@@ -68,8 +68,8 @@ public class Q11_SecretMeetingWithKetraOrcs extends Quest
{
st.takeItems(BOX, -1);
st.addExpAndSp(233125, 18142);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
}
else
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/Q13_ParcelDelivery.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/Q13_ParcelDelivery.java
index 5f7f7ba726..eff8e6e35f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/Q13_ParcelDelivery.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/Q13_ParcelDelivery.java
@@ -60,8 +60,8 @@ public class Q13_ParcelDelivery extends Quest
st.takeItems(PACKAGE, -1);
st.giveItems(57, 157834);
st.addExpAndSp(589092, 58794);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
}
else
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q251_NoSecrets/Q251_NoSecrets.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q251_NoSecrets/Q251_NoSecrets.java
index a4d7e9e1cb..9d4e281aa2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q251_NoSecrets/Q251_NoSecrets.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q251_NoSecrets/Q251_NoSecrets.java
@@ -103,7 +103,6 @@ public class Q251_NoSecrets extends Quest
st.addExpAndSp(56787, 160578);
st.playSound("ItemSound.quest_finish");
st.exitQuest(false);
- st.setState(State.COMPLETED);
}
}
break;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q290_ThreatRemoval/Q290_ThreatRemoval.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q290_ThreatRemoval/Q290_ThreatRemoval.java
index b2c5628130..39f13df33f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q290_ThreatRemoval/Q290_ThreatRemoval.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q290_ThreatRemoval/Q290_ThreatRemoval.java
@@ -97,9 +97,8 @@ public class Q290_ThreatRemoval extends Quest
}
else if (event.equalsIgnoreCase("30201-08.htm"))
{
- st.unset("cond");
- st.exitQuest(true);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(true);
}
}
return htmltext;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q307_ControlDeviceOfTheGiants/Q307_ControlDeviceOfTheGiants.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q307_ControlDeviceOfTheGiants/Q307_ControlDeviceOfTheGiants.java
index 5fc7410573..76425b3dfe 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q307_ControlDeviceOfTheGiants/Q307_ControlDeviceOfTheGiants.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q307_ControlDeviceOfTheGiants/Q307_ControlDeviceOfTheGiants.java
@@ -143,8 +143,8 @@ public class Q307_ControlDeviceOfTheGiants extends Quest
else if (st.getInt("cond") == 2)
{
st.giveItems(SUPPORT_ITEMS, 1);
- st.exitQuest(true);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(true);
htmltext = "32711-10.htm";
}
break;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java
index 35cad054e4..1b18d33e1d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java
@@ -195,8 +195,8 @@ public class Q309_ForAGoodCause extends Quest
}
else if (event.equalsIgnoreCase("32647-14.htm") || event.equalsIgnoreCase("32647-07.htm"))
{
- st.exitQuest(true);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(true);
}
return htmltext;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q401_PathToWarrior/Q401_PathToWarrior.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q401_PathToWarrior/Q401_PathToWarrior.java
index 7d1e21c34e..e877a18b9e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q401_PathToWarrior/Q401_PathToWarrior.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q401_PathToWarrior/Q401_PathToWarrior.java
@@ -166,8 +166,8 @@ public class Q401_PathToWarrior extends Quest
st.giveItems(57, 163800);
st.playSound("ItemSound.quest_finish");
player.sendPacket(new SocialAction(player.getObjectId(), 3));
- st.exitQuest(false);
st.saveGlobalQuestVar("1ClassQuestFinished", "1");
+ st.exitQuest(false);
htmltext = "30010-13.html";
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q452_FindingtheLostSoldiers/Q452_FindingtheLostSoldiers.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q452_FindingtheLostSoldiers/Q452_FindingtheLostSoldiers.java
index ac143ab151..ddda6e9483 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q452_FindingtheLostSoldiers/Q452_FindingtheLostSoldiers.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q452_FindingtheLostSoldiers/Q452_FindingtheLostSoldiers.java
@@ -104,7 +104,6 @@ public class Q452_FindingtheLostSoldiers extends Quest
st.giveItems(57, 95200);
st.addExpAndSp(435024, 50366);
st.playSound("ItemSound.quest_finish");
- st.exitQuest(false);
Calendar reDo = Calendar.getInstance();
reDo.set(Calendar.MINUTE, RESET_MIN);
@@ -112,6 +111,7 @@ public class Q452_FindingtheLostSoldiers extends Quest
reDo.add(Calendar.DATE, 1);
reDo.set(Calendar.HOUR_OF_DAY, RESET_HOUR);
st.set("reDoTime", String.valueOf(reDo.getTimeInMillis()));
+ st.exitQuest(false);
}
break;
case State.COMPLETED :
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q453_NotStrongEnoughAlone/Q453_NotStrongEnoughAlone.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q453_NotStrongEnoughAlone/Q453_NotStrongEnoughAlone.java
index 86b2560f5e..f3daf599a3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q453_NotStrongEnoughAlone/Q453_NotStrongEnoughAlone.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q453_NotStrongEnoughAlone/Q453_NotStrongEnoughAlone.java
@@ -126,7 +126,6 @@ public class Q453_NotStrongEnoughAlone extends Quest
st.giveItems(Reward[0][Rnd.get(Reward[0].length)], 1);
else
st.giveItems(Reward[1][Rnd.get(Reward[1].length)], 1);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
htmltext = "32734-14.html";
@@ -136,6 +135,7 @@ public class Q453_NotStrongEnoughAlone extends Quest
reset.add(Calendar.DATE, 1);
reset.set(Calendar.HOUR_OF_DAY, ResetHour);
st.set("reset", String.valueOf(reset.getTimeInMillis()));
+ st.exitQuest(false);
}
break;
case State.COMPLETED:
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q461_RumbleInTheBase/Q461_RumbleInTheBase.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q461_RumbleInTheBase/Q461_RumbleInTheBase.java
index a2dccc37b4..ef4fa2d4cd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q461_RumbleInTheBase/Q461_RumbleInTheBase.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q461_RumbleInTheBase/Q461_RumbleInTheBase.java
@@ -89,8 +89,6 @@ public class Q461_RumbleInTheBase extends Quest
st.addExpAndSp(224784, 342528);
st.playSound("ItemSound.quest_finish");
htmltext = "30200-07.html";
- st.unset("cond");
- st.exitQuest(false);
Calendar time = Calendar.getInstance();
time.set(Calendar.MINUTE, ResetMin);
@@ -98,6 +96,7 @@ public class Q461_RumbleInTheBase extends Quest
time.add(Calendar.DATE, 1);
time.set(Calendar.HOUR_OF_DAY, ResetHour);
st.set("time", String.valueOf(time.getTimeInMillis()));
+ st.exitQuest(false);
}
break;
case State.COMPLETED:
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q637_ThroughOnceMore/Q637_ThroughOnceMore.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q637_ThroughOnceMore/Q637_ThroughOnceMore.java
index 59fcda7f05..0df54806dc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q637_ThroughOnceMore/Q637_ThroughOnceMore.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q637_ThroughOnceMore/Q637_ThroughOnceMore.java
@@ -106,8 +106,8 @@ public final class Q637_ThroughOnceMore extends Quest
st.takeItems(FADED_MARK, 1);
st.giveItems(MARK, 1);
st.giveItems(8273,10);
- st.exitQuest(true);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(true);
return "32010-05.htm";
}
return "32010-04.htm";
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q690_JudesRequest/Q690_JudesRequest.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q690_JudesRequest/Q690_JudesRequest.java
index 053e30567c..3f150b34b4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q690_JudesRequest/Q690_JudesRequest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q690_JudesRequest/Q690_JudesRequest.java
@@ -80,8 +80,8 @@ public class Q690_JudesRequest extends Quest
else if (event.equalsIgnoreCase("32356-08.htm"))
{
st.takeItems(EVIL_WEAPON, -1);
- st.exitQuest(true);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(true);
}
else if (event.equalsIgnoreCase("32356-09.htm"))
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q702_ATrapForRevenge/Q702_ATrapForRevenge.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q702_ATrapForRevenge/Q702_ATrapForRevenge.java
index 43fdcd7e7f..48c242e4e0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q702_ATrapForRevenge/Q702_ATrapForRevenge.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q702_ATrapForRevenge/Q702_ATrapForRevenge.java
@@ -106,8 +106,8 @@ public class Q702_ATrapForRevenge extends Quest
}
else if (event.equalsIgnoreCase("32555-05.html"))
{
- st.exitQuest(true);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(true);
}
else if (event.equalsIgnoreCase("32555-06.html"))
{
--
GitLab