From 5998aedd16a6f9b3fcb3b92f92f572ce1f31f3b5 Mon Sep 17 00:00:00 2001
From: Adry_85 <Adrya85@hotmail.it>
Date: Sun, 15 Dec 2013 21:26:57 +0000
Subject: [PATCH] BETA: Retail-like quests in Java. * '''Bard's
Mandolin''' (362) * '''Sorrowful Sound of Flute''' (363) * '''Jovial
Accordion''' (364)
---
L2J_DataPack_BETA/dist/game/data/scripts.cfg | 6 +-
.../quests/362_BardsMandolin/30957_2.htm | 4 -
.../quests/362_BardsMandolin/30957_4.htm | 4 -
.../quests/362_BardsMandolin/30957_6.htm | 3 -
.../quests/362_BardsMandolin/__init__.py | 74 ----
.../363_SorrowfulSoundofFlute/30595_1.htm | 4 -
.../363_SorrowfulSoundofFlute/30956_1.htm | 6 -
.../363_SorrowfulSoundofFlute/30956_2.htm | 4 -
.../363_SorrowfulSoundofFlute/30956_3.htm | 3 -
.../363_SorrowfulSoundofFlute/30956_4.htm | 5 -
.../363_SorrowfulSoundofFlute/30956_5.htm | 2 -
.../363_SorrowfulSoundofFlute/30959_1.htm | 4 -
.../363_SorrowfulSoundofFlute/__init__.py | 74 ----
.../quests/364_JovialAccordion/30957-02.htm | 4 -
.../quests/364_JovialAccordion/30957-03.htm | 3 -
.../quests/364_JovialAccordion/30961-01.htm | 4 -
.../quests/364_JovialAccordion/__init__.py | 91 -----
.../Q00116_BeyondTheHillsOfWinter.java | 7 +-
.../30837-01.html} | 6 +-
.../quests/Q00362_BardsMandolin/30837-02.html | 3 +
.../quests/Q00362_BardsMandolin/30837-03.html | 3 +
.../30956-01.html} | 4 +-
.../quests/Q00362_BardsMandolin/30956-02.html | 3 +
.../30957-01.htm} | 6 +-
.../quests/Q00362_BardsMandolin/30957-02.htm | 4 +
.../quests/Q00362_BardsMandolin/30957-03.html | 4 +
.../quests/Q00362_BardsMandolin/30957-04.html | 3 +
.../30957-05.html} | 4 +-
.../quests/Q00362_BardsMandolin/30957-06.html | 5 +
.../quests/Q00362_BardsMandolin/30957-07.html | 4 +
.../30957-08.html} | 2 +-
.../30958-01.html} | 4 +-
.../quests/Q00362_BardsMandolin/30958-02.html | 3 +
.../Q00362_BardsMandolin.java | 198 ++++++++++
.../30057-01.html | 4 +
.../30057-02.html | 4 +
.../30057-03.html | 4 +
.../30057-04.html | 3 +
.../30058-01.html | 4 +
.../30058-02.html | 4 +
.../30058-03.html | 3 +
.../30058-04.html | 3 +
.../30458-01.html | 4 +
.../30458-02.html | 4 +
.../30458-03.html | 4 +
.../30458-04.html | 4 +
.../30594-01.html | 4 +
.../30594-02.html | 4 +
.../30594-03.html | 3 +
.../30594-04.html | 3 +
.../30595-01.html | 4 +
.../30595-02.html | 4 +
.../30595-03.html | 4 +
.../30595-04.html | 3 +
.../Q00363_SorrowfulSoundOfFlute/30956-01.htm | 5 +
.../Q00363_SorrowfulSoundOfFlute/30956-02.htm | 4 +
.../Q00363_SorrowfulSoundOfFlute/30956-03.htm | 4 +
.../30956-04.html | 6 +
.../30956-05.html | 3 +
.../30956-06.html | 3 +
.../30956-07.html | 3 +
.../30956-08.html | 4 +
.../30956-09.html | 3 +
.../30956-10.html | 3 +
.../30959-01.html | 3 +
.../30959-02.html | 4 +
.../30959-03.html | 3 +
.../Q00363_SorrowfulSoundOfFlute.java | 369 ++++++++++++++++++
.../30060-01.html} | 0
.../Q00364_JovialAccordion/30060-02.html | 3 +
.../Q00364_JovialAccordion/30075-01.html | 3 +
.../Q00364_JovialAccordion/30075-02.html | 3 +
.../30957-01.html} | 2 +-
.../Q00364_JovialAccordion/30957-02.html | 4 +
.../Q00364_JovialAccordion/30957-03.html | 3 +
.../30957-04.html} | 0
.../Q00364_JovialAccordion/30957-05.html | 4 +
.../Q00364_JovialAccordion/30957-06.html | 3 +
.../30957-07.html} | 0
.../30959-01.htm | 2 +-
.../30959-02.htm | 2 +-
.../Q00364_JovialAccordion/30959-03.htm | 4 +
.../Q00364_JovialAccordion/30959-04.html | 3 +
.../30959-05.html} | 2 +-
.../30960-01.html} | 2 +-
.../30960-02.html} | 2 +-
.../Q00364_JovialAccordion/30960-03.html | 3 +
.../30960-04.html} | 2 +-
.../Q00364_JovialAccordion/30961-01.html | 4 +
.../Q00364_JovialAccordion/30961-02.html | 3 +
.../30961-03.html} | 2 +-
.../30961-04.html} | 2 +-
.../Q00364_JovialAccordion.java | 295 ++++++++++++++
.../dist/sql/game/updates/20131215update.sql | 5 +-
94 files changed, 1085 insertions(+), 322 deletions(-)
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_2.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_4.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_6.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/__init__.py
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30595_1.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_1.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_2.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_3.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_4.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_5.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30959_1.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/__init__.py
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30957-02.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30957-03.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30961-01.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/__init__.py
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{362_BardsMandolin/30837_1.htm => Q00362_BardsMandolin/30837-01.html} (64%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30837-02.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30837-03.html
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{362_BardsMandolin/30956_1.htm => Q00362_BardsMandolin/30956-01.html} (75%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30956-02.html
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{362_BardsMandolin/30957_1.htm => Q00362_BardsMandolin/30957-01.htm} (73%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-02.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-03.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-04.html
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{362_BardsMandolin/30957_3.htm => Q00362_BardsMandolin/30957-05.html} (71%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-06.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-07.html
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{362_BardsMandolin/30957_5.htm => Q00362_BardsMandolin/30957-08.html} (92%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{362_BardsMandolin/30958_1.htm => Q00362_BardsMandolin/30958-01.html} (78%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30958-02.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30057-01.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30057-02.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30057-03.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30057-04.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30058-01.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30058-02.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30058-03.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30058-04.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30458-01.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30458-02.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30458-03.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30458-04.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30594-01.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30594-02.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30594-03.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30594-04.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30595-01.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30595-02.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30595-03.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30595-04.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-01.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-02.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-03.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-04.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-05.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-06.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-07.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-08.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-09.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-10.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30959-01.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30959-02.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30959-03.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{364_JovialAccordion/30060-01.htm => Q00364_JovialAccordion/30060-01.html} (100%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30060-02.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30075-01.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30075-02.html
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{364_JovialAccordion/30957-01.htm => Q00364_JovialAccordion/30957-01.html} (74%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-02.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-03.html
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{364_JovialAccordion/30957-04.htm => Q00364_JovialAccordion/30957-04.html} (100%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-05.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-06.html
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{364_JovialAccordion/30957-05.htm => Q00364_JovialAccordion/30957-07.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{364_JovialAccordion => Q00364_JovialAccordion}/30959-01.htm (81%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{364_JovialAccordion => Q00364_JovialAccordion}/30959-02.htm (71%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30959-03.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30959-04.html
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{364_JovialAccordion/30959-03.htm => Q00364_JovialAccordion/30959-05.html} (94%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{364_JovialAccordion/30960-01.htm => Q00364_JovialAccordion/30960-01.html} (50%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{364_JovialAccordion/30960-02.htm => Q00364_JovialAccordion/30960-02.html} (76%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30960-03.html
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{364_JovialAccordion/30960-03.htm => Q00364_JovialAccordion/30960-04.html} (73%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30961-01.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30961-02.html
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{364_JovialAccordion/30961-02.htm => Q00364_JovialAccordion/30961-03.html} (77%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{364_JovialAccordion/30961-03.htm => Q00364_JovialAccordion/30961-04.html} (74%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index 2bd218bb67..3dbbb382bb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -498,9 +498,9 @@ quests/357_WarehouseKeepersAmbition/__init__.py
quests/358_IllegitimateChildOfAGoddess/__init__.py
quests/359_ForSleeplessDeadmen/__init__.py
quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
-quests/362_BardsMandolin/__init__.py
-quests/363_SorrowfulSoundofFlute/__init__.py
-quests/364_JovialAccordion/__init__.py
+quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java
+quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
+quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java
quests/366_SilverHairedShaman/__init__.py
quests/367_ElectrifyingRecharge/__init__.py
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_2.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_2.htm
deleted file mode 100644
index b967340d0d..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_2.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Bard Swan:<br>
-Oh, thank you so much! Actually, I have already ordered a flute for her from the<font color="LEVEL"> Trader Woodrow of Aden Castle Town</font>, an specialist in exotic musical instruments. Please check with him to see if the flute has arrived.<br>
-Mention my name and he will tell you the status of my order. Afterwards I will give you a musical score that is necessary to make an echo crystal.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_4.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_4.htm
deleted file mode 100644
index a26a51d674..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_4.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Bard Swan:<br>
-Did you deliver the flute and letter to Nanarin? What did she say? Please tell me!<br>
-<a action="bypass -h Quest 362_BardsMandolin 30957_5.htm">"She liked the flute but she doesn't like you."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_6.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_6.htm
deleted file mode 100644
index 8019a43b96..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_6.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Bard Swan:<br>
-Please, take these items to Musician Nanarin! I must know what she says.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/__init__.py
deleted file mode 100644
index f924f0136d..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/__init__.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# Bards Mandolin Written By MickyLee
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest import Quest as JQuest
-
-qn = "362_BardsMandolin"
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = [4316, 4317]
-
- def onEvent (self,event,st) :
- htmltext = event
- if event == "30957_2.htm" :
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- elif event == "30957_5.htm" :
- st.giveItems(57,10000)
- st.giveItems(4410,1)
- st.exitQuest(1)
- st.playSound("ItemSound.quest_finish")
- return htmltext
-
-
- def onTalk (self,npc,player):
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st : return htmltext
-
- npcId = npc.getId()
- id = st.getState()
- if npcId != 30957 and id != State.STARTED : return htmltext
-
- if id == State.CREATED :
- st.set("cond","0")
- cond = st.getInt("cond")
- if npcId == 30957 and cond == 0 :
- htmltext = "30957_1.htm"
- elif npcId == 30837 and cond == 1 :
- st.set("cond","2")
- htmltext = "30837_1.htm"
- elif npcId == 30958 and cond == 2 :
- st.set("cond","3")
- st.giveItems(4316,1)
- htmltext = "30958_1.htm"
- st.playSound("ItemSound.quest_itemget")
- elif npcId == 30957 and cond == 3 and st.getQuestItemsCount(4316) and not st.getQuestItemsCount(4317) :
- st.set("cond","4")
- st.giveItems(4317,1)
- htmltext = "30957_3.htm"
- elif npcId == 30957 and cond == 4 and st.getQuestItemsCount(4316) and st.getQuestItemsCount(4317) :
- htmltext = "30957_6.htm"
- elif npcId == 30956 and cond == 4 and st.getQuestItemsCount(4316) and st.getQuestItemsCount(4317) :
- st.takeItems(4316,1)
- st.takeItems(4317,1)
- st.set("cond","5")
- htmltext = "30956_1.htm"
- elif npcId == 30957 and cond == 5 :
- htmltext = "30957_4.htm"
- return htmltext
-
-
-QUEST = Quest(362,qn,"Bards Mandolin")
-
-QUEST.addStartNpc(30957)
-QUEST.addTalkId(30957)
-
-QUEST.addTalkId(30956)
-QUEST.addTalkId(30958)
-QUEST.addTalkId(30837)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30595_1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30595_1.htm
deleted file mode 100644
index 9c313ce864..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30595_1.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Opix:<br>
-Hmmm, I think that Barbado could really use a new flute. He's spoke many times of wanting a new one.<br>
-By the way who are you and why are you asking so many questions...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_1.htm
deleted file mode 100644
index 47834323ed..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_1.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Nanarin:<br>
-I'm not really sure I should tell you this but...<br>
-For the longest time I've had a romantic interest in Barbado.<br>
-My problem is that he never seems to notice me and I'm not really sure how I should approach him.<br>
-<a action="bypass -h Quest 363_SorrowfulSoundofFlute 1">"I will help you."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_2.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_2.htm
deleted file mode 100644
index f997c4f08f..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_2.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Nanarin:<br>
-Oh my please don't tell Barbado. I wish to tell him myself.<br>
-Don't go directly to Barbado but please visit his friend Blacksmith Opix and ask him some question for me. If you do this favor for me I'll reward you with some sheet music needed to create echo crystals. Please hurry!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_3.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_3.htm
deleted file mode 100644
index 0acc5a80c2..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_3.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Nanarin:<br>
-So Opix says that Barbado would like to have a new flute. Well then please take this one to Barbado and give it to him but please don't tell him who its from.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_4.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_4.htm
deleted file mode 100644
index 1eb8f57f44..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_4.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Nanarin:<br>
-He loved it and wants to know who its from? I should go speak with him and confess my love to him.<br>
-I know this isnt much but its what I promised you. Thank you again kind stranger!<br>
-<a action="bypass -h Quest 363_SorrowfulSoundofFlute 5">"Thank you and youre welcome"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_5.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_5.htm
deleted file mode 100644
index 80639f959c..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30956_5.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Quest Complete
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30959_1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30959_1.htm
deleted file mode 100644
index d6c26fb639..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/30959_1.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Barbado:<br>
-Oh my is that what I think it is? It sure is! How did you know I wanted a new flute and who is this fine gift from?<br>
-You can't tell me? A secret admirer? I really wonder who this is from...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/__init__.py
deleted file mode 100644
index f6518e90df..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/363_SorrowfulSoundofFlute/__init__.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# Jovial Accordian Written By Elektra
-# Fixed by mr
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest import Quest as JQuest
-
-qn = "363_SorrowfulSoundofFlute"
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = [4319]
-
- def onEvent (self,event,st) :
- htmltext = event
- if event == "1" :
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- htmltext = "30956_2.htm"
- elif event == "5" :
- st.giveItems(4420,1)
- st.playSound("ItemSound.quest_finish")
- st.exitQuest(1)
- htmltext = "30956_5.htm"
- return htmltext
-
-
- def onTalk (self,npc,player):
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st : return htmltext
-
- npcId = npc.getId()
- id = st.getState()
- if npcId != 30956 and id != State.STARTED : return htmltext
-
- if id == State.CREATED :
- st.set("cond","0")
- if npcId == 30956 and st.getInt("cond") == 0 :
- htmltext = "30956_1.htm"
- elif npcId == 30956 and st.getInt("cond") == 1 :
- htmltext = "<html><body>Find Blacksmith Opix..</body></html>"
- elif npcId == 30595 and st.getInt("cond") == 1 :
- st.set("cond","2")
- htmltext = "30595_1.htm"
- elif npcId == 30595 and st.getInt("cond") > 1 :
- htmltext = "<html><body>Go back to Nanarin..</body></html>"
- elif npcId == 30956 and st.getInt("cond") == 2 :
- st.giveItems(4319,1)
- st.set("cond","3")
- htmltext = "30956_3.htm"
- elif npcId == 30956 and st.getInt("cond") == 3 :
- htmltext = "<html><body>Find Barbado..</body></html>"
- elif npcId == 30959 and st.getInt("cond") == 3 :
- st.takeItems(4319,1)
- st.set("cond","4")
- htmltext = "30959_1.htm"
- elif npcId == 30959 and st.getInt("cond") == 4 :
- htmltext = "<html><body>Go back to Nanarin..</body></html>"
- elif npcId == 30956 and st.getInt("cond") == 4 :
- htmltext = "30956_4.htm"
- return htmltext
-
-
-QUEST = Quest(363,qn,"Sorrowful Sounds of Flute")
-
-QUEST.addStartNpc(30956)
-QUEST.addTalkId(30956)
-
-QUEST.addTalkId(30595)
-QUEST.addTalkId(30959)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30957-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30957-02.htm
deleted file mode 100644
index f115cc66d4..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30957-02.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Bard Swan:<br>
-Please get some black beer from Chef Jonas and take it to Trader Sabrin. Jonas keeps his beer in a<font color="LEVEL"> beer chest</font> and stores it in a warehouse... He becomes quite cross when asked for favors, so it would be best if you handle this without talking to him.<br>
-Also, go to the grocery store in the village and find a<font color="LEVEL"> clothes chest</font>. You will find it near Accessory Merchant Sonia. Take the contents of that chest to<font color="LEVEL"> Guard Xaber</font>. Here are the keys to the two chests. Good luck!
-</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30957-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30957-03.htm
deleted file mode 100644
index c30b10fcec..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30957-03.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Bard Swan:<br>
-Is this too complicated for you? Would you like for me to explain it again? Take the black beer from Jonas'<font color="LEVEL"> beer chest</font> located in the warehouse and take it to<font color="LEVEL"> Trader Sabrin</font>. Then go to the grocery store and take Sonia's event clothes from the<font color="LEVEL"> clothes chest </font> and take them to<font color="LEVEL"> Guard Xaber</font>.
-</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30961-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30961-01.htm
deleted file mode 100644
index 02585f0ff8..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30961-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Clothes Chest:<br>
-This chest contains the clothing of Accessory Merchant Sonia.<br>
-<a action="bypass -h Quest 364_JovialAccordion 30961-03.htm">Open the chest.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/__init__.py
deleted file mode 100644
index 4e8b425bc9..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/__init__.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# Made by Mr. Have fun! Version 0.2
-# fixed by Elektra and Rolarga Version 0.3
-# fixed by Mr and Drlecter
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest import Quest as JQuest
-
-qn = "364_JovialAccordion"
-
-KEY_1 = 4323
-KEY_2 = 4324
-BEER = 4321
-ECHO = 4421
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = [KEY_1, KEY_2, BEER]
-
- def onEvent (self,event,st) :
- htmltext = event
- if event == "30959-02.htm" :
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- elif event == "30957-02.htm" :
- st.set("cond","2")
- st.giveItems(KEY_1,1)
- st.giveItems(KEY_2,1)
- elif event == "30961-03.htm" :
- if st.getQuestItemsCount(KEY_1) :
- st.takeItems(KEY_1,1)
- htmltext = "30961-02.htm"
- elif event == "30960-03.htm" :
- if st.getQuestItemsCount(KEY_2) :
- st.takeItems(KEY_2,1)
- st.giveItems(BEER,1)
- htmltext = "30960-02.htm"
- return htmltext
-
- def onTalk (self,npc,player):
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st : return htmltext
-
- npcId = npc.getId()
- id = st.getState()
- if npcId != 30959 and id != State.STARTED : return htmltext
-
- if id == State.CREATED :
- st.set("cond","0")
- st.set("ok","0")
- cond=st.getInt("cond")
- if npcId == 30959 :
- if cond == 0 :
- htmltext = "30959-01.htm"
- elif cond == 3 :
- st.playSound("ItemSound.quest_finish")
- st.giveItems(ECHO,1)
- st.exitQuest(1)
- htmltext = "30959-03.htm"
- elif cond >= 1 :
- htmltext = "30959-02.htm"
- elif npcId == 30957 :
- if cond == 1 :
- htmltext = "30957-01.htm"
- elif cond == 2 and not st.getQuestItemsCount(KEY_1) and st.getInt("ok"):
- st.set("cond","3")
- htmltext = "30957-04.htm"
- elif cond == 3 :
- htmltext = "30957-05.htm"
- elif cond == 2 :
- htmltext = "30957-03.htm"
- elif npcId == 30960 and cond :
- htmltext = "30960-01.htm"
- elif npcId == 30961 and cond :
- htmltext = "30961-01.htm"
- elif npcId == 30060 and st.getQuestItemsCount(BEER) :
- st.set("ok","1")
- st.takeItems(BEER,1)
- htmltext = "30060-01.htm"
- return htmltext
-
-QUEST = Quest(364,qn,"Ask What You Need to Do")
-
-QUEST.addStartNpc(30959)
-
-for npcId in [30959,30957,30060,30961,30960]:
- QUEST.addTalkId(npcId)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java
index bc9c0d3467..f82876229a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java
@@ -119,13 +119,8 @@ public final class Q00116_BeyondTheHillsOfWinter extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = getQuestState(player, true);
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30837_1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30837-01.html
similarity index 64%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30837_1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30837-01.html
index d567ece240..35754d234e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30837_1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30837-01.html
@@ -1,4 +1,4 @@
<html><body>Trader Woodrow:<br>
-Ah, you mean the flute that Swan ordered? It must have arrived at<font color="LEVEL"> Giran Harbor</font> by now...<br>
-If you're in a hurry, you can go directly to the harbor and pick it up. I'll give you the item number so you can pick it up from<font color="LEVEL"> Gallion</font> at the harbor.
-</body></html>
\ No newline at end of file
+Ah, you mean the flute that Swan ordered? It must have arrived at <font color="LEVEL">Giran Harbor</font> by now...<br>
+If you're in a hurry, you can go directly to the harbor and pick it up. I'll give you the item number so you can pick it up from <font color="LEVEL">Gallion</font> at the harbor.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30837-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30837-02.html
new file mode 100644
index 0000000000..32a24e6344
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30837-02.html
@@ -0,0 +1,3 @@
+<html><body>Trader Woodrow:<br>
+Didn't you say that you desperately need the flute? It will take a long time for it to be shipped here. Why don't you go directly to <font color="LEVEL">Giran Harbor</font> and pick it up? Give the item number I gave you to <font color="LEVEL">Gallion</font> at the harbor.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30837-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30837-03.html
new file mode 100644
index 0000000000..2a6cbc3e4b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30837-03.html
@@ -0,0 +1,3 @@
+<html><body>Trader Woodrow:<br>
+So, we meet again! Please give my regards to Mr. Swan.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30956_1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30956-01.html
similarity index 75%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30956_1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30956-01.html
index f9ee245bc6..40f8b59f60 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30956_1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30956-01.html
@@ -1,4 +1,4 @@
<html><body>Musician Nanarin:<br>
-What, another package from<font color="LEVEL"> Bard Swan</font>? Oh, my, this is especially beautiful!<br>
+What, another package from <font color="LEVEL">Bard Swan</font>? Oh, my, this is especially beautiful!<br>
Hey, you aren't waiting around for a reply, are you? I appreciate all the flutes, but the Bard really isn't my type! Please tell him that my knight in shining armor is someone else!
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30956-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30956-02.html
new file mode 100644
index 0000000000..2fd839d9d7
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30956-02.html
@@ -0,0 +1,3 @@
+<html><body>Musician Nanarin:<br>
+What am I to do about Bard Swan? I don't want to hurt his feelings but I am not attracted to him at all!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-01.htm
similarity index 73%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-01.htm
index 47f21a9bf5..192151286b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-01.htm
@@ -1,6 +1,6 @@
<html><body>Bard Swan:<br>
-I am uncomfortable talking about my feelings, but she is so beautiful and pure... She is the perfect woman! No... she is a goddess! If only I could tell her of my feelings...<br>
+I am uncomfortable talking about my feelings, but she is so beautiful and pure... She is the perfect woman! No... she is a goddess! If only I could tell her of my feelings... <br>
Her flute playing is sublime! She is renowned, even among the musicians of her own race, for her incredible talent. A while back I sent her a gift, a flute made of horn, but I haven't gotten any word back from her...<br>
Please help me! I feel like I'm losing my mind!<br>
-<a action="bypass -h Quest 362_BardsMandolin 30957_2.htm">"I will help you."</a>
-</body></html>
\ No newline at end of file
+<a action="bypass -h Quest Q00362_BardsMandolin 30957-02.htm">"I will help you."</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-02.htm
new file mode 100644
index 0000000000..58b1508d4a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-02.htm
@@ -0,0 +1,4 @@
+<html><body>Bard Swan:<br>
+Oh, thank you so much! Actually, I have already ordered a flute for her from <font color="LEVEL">Trader Woodrow of the Town of Aden</font>, a specialist in exotic musical instruments. Please check with him to see if the flute has arrived.<br>
+Mention my name and he will tell you the status of my order. Afterwards I will give you a musical score that is necessary to make an Echo Crystal.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-03.html
new file mode 100644
index 0000000000..12bae47dea
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-03.html
@@ -0,0 +1,4 @@
+<html><body>Bard Swan:<br>
+I am uncomfortable talking about my feelings, but she is so beautiful and pure... She is the perfect woman! No... she is a goddess! You are not worthy to even speak her name!<br>
+(This quest may only be undertaken by a character of level 15 or above.)
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-04.html
new file mode 100644
index 0000000000..8902b4f546
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-04.html
@@ -0,0 +1,3 @@
+<html><body>Bard Swan:<br>
+My goddess... Oh, my dear goddess... I pray the flute makes her happy... What are you still doing here? Go and see <font color="LEVEL">Trader Woodrow of the Town of Aden</font> and find out whether the flute I ordered has arrived.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_3.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-05.html
similarity index 71%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_3.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-05.html
index bb4ffd66ec..9bd77f036f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_3.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-05.html
@@ -1,3 +1,3 @@
<html><body>Bard Swan:<br>
-Oh, thank you! The flute is beautiful! Surely this will please my beloved<font color="LEVEL"> Nanarin</font>. Would you perhaps be willing to take the flute to her, along with my letter? Please say that you will do this one last thing for me.
-</body></html>
\ No newline at end of file
+Oh, thank you! The flute is beautiful! Surely this will please my beloved <font color="LEVEL">Nanarin</font>. Would you perhaps be willing to take the flute to her, along with my letter? Please say that you will do this one last thing for me.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-06.html
new file mode 100644
index 0000000000..e4df982b5d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-06.html
@@ -0,0 +1,5 @@
+<html><body>Bard Swan:<br>
+Did you deliver the flute and letter to Nanarin? What did she say? Please tell me!<br>
+<a action="bypass -h Quest Q00362_BardsMandolin 30957-07.html">"I think she likes you."</a><br>
+<a action="bypass -h Quest Q00362_BardsMandolin 30957-08.html">"She liked the flute but she doesn't like you."</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-07.html
new file mode 100644
index 0000000000..ff309896f9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-07.html
@@ -0,0 +1,4 @@
+<html><body>Bard Swan:<br>
+Oh, I knew it would work! Now, if I can only convince her of my devotion to her...<br>
+I am greatly indebted to you! Unfortunately, I have spent most of my money on the flute... I've managed to scrape together a bit of money for you. Take it, along with this musical score I composed myself.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_5.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-08.html
similarity index 92%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_5.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-08.html
index 2f5b36b4f7..43d7cccf9b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30957_5.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30957-08.html
@@ -2,4 +2,4 @@
Oh, I wish I was dead!<br>
Perhaps it was the wrong gift. I must have not been trying hard enough. I shall never give up! Somehow I will win the heart of my beloved!<br>
Take this as a token of my gratitude for all your help.
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30958_1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30958-01.html
similarity index 78%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30958_1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30958-01.html
index 57877e94c8..f5fd07739f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/362_BardsMandolin/30958_1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30958-01.html
@@ -1,4 +1,4 @@
-<html><body>Gallion:<br>
+<html><body>Galion:<br>
A flute? Wait a moment, let me check...<br>
Ah, yes, here it is! A flute made of horn, imported from Avella. It's quite expensive but has an exquisite tone!
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30958-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30958-02.html
new file mode 100644
index 0000000000..54bc21dbba
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/30958-02.html
@@ -0,0 +1,3 @@
+<html><body>Galion:<br>
+How is my old friend Trader Woodrow? I feel I know him well although we have only spoken by letter...
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java
new file mode 100644
index 0000000000..1989b02856
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2004-2013 L2J DataPack
+ *
+ * This file is part of L2J DataPack.
+ *
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q00362_BardsMandolin;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+
+/**
+ * Bard's Mandolin (362)
+ * @author Adry_85
+ */
+public final class Q00362_BardsMandolin extends Quest
+{
+ // NPCs
+ private static final int WOODROW = 30837;
+ private static final int NANARIN = 30956;
+ private static final int SWAN = 30957;
+ private static final int GALION = 30958;
+ // Items
+ private static final int SWANS_FLUTE = 4316;
+ private static final int SWANS_LETTER = 4317;
+ private static final int THEME_OF_JOURNEY = 4410;
+ // Misc
+ private static final int MIN_LEVEL = 15;
+
+ private Q00362_BardsMandolin()
+ {
+ super(362, Q00362_BardsMandolin.class.getSimpleName(), "Bard's Mandolin");
+ addStartNpc(SWAN);
+ addTalkId(SWAN, GALION, WOODROW, NANARIN);
+ registerQuestItems(SWANS_FLUTE, SWANS_LETTER);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState st = getQuestState(player, false);
+ if (st == null)
+ {
+ return null;
+ }
+
+ String htmltext = null;
+ switch (event)
+ {
+ case "30957-02.htm":
+ {
+ st.startQuest();
+ st.setMemoState(1);
+ htmltext = event;
+ break;
+ }
+ case "30957-07.html":
+ case "30957-08.html":
+ {
+ if (st.isMemoState(5))
+ {
+ st.giveAdena(10000, true);
+ st.rewardItems(THEME_OF_JOURNEY, 1);
+ st.exitQuest(true, true);
+ htmltext = event;
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ final QuestState st = getQuestState(player, true);
+ String htmltext = getNoQuestMsg(player);
+ switch (st.getState())
+ {
+ case State.CREATED:
+ {
+ if (npc.getId() == SWAN)
+ {
+ htmltext = (player.getLevel() >= MIN_LEVEL) ? "30957-01.htm" : "30957-03.html";
+ }
+ break;
+ }
+ case State.STARTED:
+ {
+ switch (npc.getId())
+ {
+ case SWAN:
+ {
+ switch (st.getMemoState())
+ {
+ case 1:
+ case 2:
+ {
+ htmltext = "30957-04.html";
+ break;
+ }
+ case 3:
+ {
+ st.setCond(4, true);
+ st.setMemoState(4);
+ st.giveItems(SWANS_LETTER, 1);
+ htmltext = "30957-05.html";
+ break;
+ }
+ case 4:
+ {
+ htmltext = "30957-05.html";
+ break;
+ }
+ case 5:
+ {
+ htmltext = "30957-06.html";
+ break;
+ }
+ }
+ break;
+ }
+ case GALION:
+ {
+ if (st.isMemoState(2))
+ {
+ st.setMemoState(3);
+ st.setCond(3, true);
+ st.giveItems(SWANS_FLUTE, 1);
+ htmltext = "30958-01.html";
+ }
+ else if (st.getMemoState() >= 3)
+ {
+ htmltext = "30958-02.html";
+ }
+ break;
+ }
+ case WOODROW:
+ {
+ if (st.isMemoState(1))
+ {
+ st.setMemoState(2);
+ st.setCond(2, true);
+ htmltext = "30837-01.html";
+ }
+ else if (st.isMemoState(2))
+ {
+ htmltext = "30837-02.html";
+ }
+ else if (st.getMemoState() >= 3)
+ {
+ htmltext = "30837-03.html";
+ }
+ break;
+ }
+ case NANARIN:
+ {
+ if (st.isMemoState(4) && st.hasQuestItems(SWANS_FLUTE, SWANS_LETTER))
+ {
+ st.setMemoState(5);
+ st.setCond(5, true);
+ st.takeItems(SWANS_FLUTE, -1);
+ st.takeItems(SWANS_LETTER, -1);
+ htmltext = "30956-01.html";
+ }
+ else if (st.getMemoState() >= 5)
+ {
+ htmltext = "30956-02.html";
+ }
+ break;
+ }
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ public static void main(String args[])
+ {
+ new Q00362_BardsMandolin();
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30057-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30057-01.html
new file mode 100644
index 0000000000..fee596f603
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30057-01.html
@@ -0,0 +1,4 @@
+<html><body>Warehouse Freightman Aldo:<br>
+Well, a while back he mentioned he didn't have anything to wear to an event... Maybe he would like a new outfit!<br>
+By the way, how do you know Barbado?
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30057-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30057-02.html
new file mode 100644
index 0000000000..3835340930
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30057-02.html
@@ -0,0 +1,4 @@
+<html><body>Warehouse Freightman Aldo:<br>
+Well, Barbado has a fondness for music... He is quite an accordionist... He once mentioned that he wanted to learn another instrument... I believe it was the flute...<br>
+By the way, who are you? How do you know Barbado?
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30057-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30057-03.html
new file mode 100644
index 0000000000..50c6d8a91f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30057-03.html
@@ -0,0 +1,4 @@
+<html><body>Warehouse Freightman Aldo:<br>
+Ah, Barbado... Yes, he does enjoy a nice cold black beer after he finishes playing his music...<br>
+By the way, who are you? What is your relationship to Barbado?
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30057-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30057-04.html
new file mode 100644
index 0000000000..e828fd574f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30057-04.html
@@ -0,0 +1,3 @@
+<html><body>Warehouse Freightman Aldo:<br>
+I am Aldo. What is your name?
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30058-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30058-01.html
new file mode 100644
index 0000000000..a2331b7c6d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30058-01.html
@@ -0,0 +1,4 @@
+<html><body>Warehouse Keeper Holvas:<br>
+What would Barbado like?<br>
+Well, recently he was complaining about not having anything to wear to an event... Maybe he would like a new outfit!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30058-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30058-02.html
new file mode 100644
index 0000000000..dd263c092f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30058-02.html
@@ -0,0 +1,4 @@
+<html><body>Warehouse Keeper Holvas:<br>
+Hmmm, what would Barbado like to have?<br>
+Well, he is a musician and has expressed an interest in learning to play a new instrument... Yes, I believe he mentioned that he wanted to learn to play the flute!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30058-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30058-03.html
new file mode 100644
index 0000000000..9dd0d8bdaa
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30058-03.html
@@ -0,0 +1,3 @@
+<html><body>Warehouse Keeper Holvas:<br>
+I think Barbado would be happiest with a cold black beer after one of his musical performances!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30058-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30058-04.html
new file mode 100644
index 0000000000..39a33839f6
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30058-04.html
@@ -0,0 +1,3 @@
+<html><body>Warehouse Keeper Holvas:<br>
+You know, come to think of it, a beer sounds pretty good to me, too! If you have the time, could you bring me one?
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30458-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30458-01.html
new file mode 100644
index 0000000000..1ae93f6819
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30458-01.html
@@ -0,0 +1,4 @@
+<html><body>Blacksmith Poitan:<br>
+Oh, Barbado. What would he want?<br>
+Oh, I know! He mentioned recently that he didn't have anything to wear to a special event? Burp! Perhaps what he needs is a new outfit!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30458-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30458-02.html
new file mode 100644
index 0000000000..3affeca7de
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30458-02.html
@@ -0,0 +1,4 @@
+<html><body>Blacksmith Poitan:<br>
+Oh, Barbado. What would he want?<br>
+Oh, I know! He mentioned recently that he wanted to learn a new instrument! Burp! Perhaps what he wants is a flute!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30458-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30458-03.html
new file mode 100644
index 0000000000..9ff2c00c27
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30458-03.html
@@ -0,0 +1,4 @@
+<html><body>Blacksmith Poitan:<br>
+Oh, Barbado. What would he want?<br>
+Oh, I know! He likes nothing better than a cold glass of black beer after a performance!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30458-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30458-04.html
new file mode 100644
index 0000000000..73a96d97d0
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30458-04.html
@@ -0,0 +1,4 @@
+<html><body>Blacksmith Poitan:<br>
+Ha ha ha.... <br>
+I can't stop laughing! Ha ha ha...
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30594-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30594-01.html
new file mode 100644
index 0000000000..5ad25c35e1
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30594-01.html
@@ -0,0 +1,4 @@
+<html><body>Warehouse Chief Ranspo:<br>
+What would Barbado want?<br>
+Well, he did mention something about needing a new set of clothes!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30594-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30594-02.html
new file mode 100644
index 0000000000..b68b1b227a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30594-02.html
@@ -0,0 +1,4 @@
+<html><body>Warehouse Chief Ranspo:<br>
+What does Barbado want?<br>
+Who knows? Well, he did say something once about wanting to pick up a new instrument... A flute, I think it was...
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30594-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30594-03.html
new file mode 100644
index 0000000000..70ee16e9cd
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30594-03.html
@@ -0,0 +1,3 @@
+<html><body>Warehouse Chief Ranspo:<br>
+What would Barbado like? Well, I don't know about him, but I could use a cold, black beer!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30594-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30594-04.html
new file mode 100644
index 0000000000..c1bc885125
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30594-04.html
@@ -0,0 +1,3 @@
+<html><body>Warehouse Chief Ranspo:<br>
+I have no ear for music whatsoever!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30595-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30595-01.html
new file mode 100644
index 0000000000..70626e7e45
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30595-01.html
@@ -0,0 +1,4 @@
+<html><body>Head Blacksmith Opix:<br>
+What would Barbado like?<br>
+Well, I did hear him mention not too long ago that he wished he had something nice to wear to an event. Perhaps he would like a new outfit?
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30595-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30595-02.html
new file mode 100644
index 0000000000..a113fc9548
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30595-02.html
@@ -0,0 +1,4 @@
+<html><body>Head Blacksmith Opix:<br>
+What would Barbado like?<br>
+Well, he is a musician. I have often heard him say that he would like to learn a new instrument... What was it? Ah, yes! It was a flute!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30595-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30595-03.html
new file mode 100644
index 0000000000..c10ea7748c
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30595-03.html
@@ -0,0 +1,4 @@
+<html><body>Head Blacksmith Opix:<br>
+What would Barbado like to have?<br>
+I happen to know that his favorite thing in the whole world is a cold black beer after one of his musical performances.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30595-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30595-04.html
new file mode 100644
index 0000000000..c60248f328
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30595-04.html
@@ -0,0 +1,3 @@
+<html><body>Head Blacksmith Opix:<br>
+I'm extremely busy. Please stop bothering me.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-01.htm
new file mode 100644
index 0000000000..52cfbeb729
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-01.htm
@@ -0,0 +1,5 @@
+<html><body>Musician Nanarin:<br>
+I must admit that his broad shoulders take my breath away, and that lovely beard of his has captured my soul...<br>
+What can I do? I've never felt this way before... Could you please help me?<br>
+<a action="bypass -h Quest Q00363_SorrowfulSoundOfFlute START">"I will help you."</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-02.htm
new file mode 100644
index 0000000000..6e702a0a01
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-02.htm
@@ -0,0 +1,4 @@
+<html><body>Musician Nanarin:<br>
+Could you perhaps find out what would make him happy? I love Barbado... Please ask his friends what he wants the most. Start with the Dwarves in this village, and don't you dare mention my name!<br>
+Will you please do this for me?
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-03.htm
new file mode 100644
index 0000000000..843dec71c2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-03.htm
@@ -0,0 +1,4 @@
+<html><body>Musician Nanarin:<br>
+You know, come to think of it, I don't think that you are the right person for this job.<br>
+(This quest can only be undertaken by a character of level 15 or higher.)
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-04.html
new file mode 100644
index 0000000000..dd6533d1c2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-04.html
@@ -0,0 +1,6 @@
+<html><body>Musician Nanarin:<br>
+So? What does Barbado want?<br>
+<a action="bypass -h Quest Q00363_SorrowfulSoundOfFlute 30956-05.html">"He wants a new outfit."</a><br>
+<a action="bypass -h Quest Q00363_SorrowfulSoundOfFlute 30956-06.html">"He would like to have a flute."</a><br>
+<a action="bypass -h Quest Q00363_SorrowfulSoundOfFlute 30956-07.html">"He would like a black beer."</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-05.html
new file mode 100644
index 0000000000..7c2cebb712
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-05.html
@@ -0,0 +1,3 @@
+<html><body>Musician Nanarin:<br>
+Splendid! Please take him these clothes. If he asks, tell him they are from his secret admirer.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-06.html
new file mode 100644
index 0000000000..91a9a6fcf0
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-06.html
@@ -0,0 +1,3 @@
+<html><body>Musician Nanarin:<br>
+Oh, marvelous! Please take him this flute. If he asks you who sent it, just say that it is from his secret admirer.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-07.html
new file mode 100644
index 0000000000..0631b4561f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-07.html
@@ -0,0 +1,3 @@
+<html><body>Musician Nanarin:<br>
+Oh, great! Please take him this black beer. If he asks who sent it, tell him it is from his secret admirer.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-08.html
new file mode 100644
index 0000000000..63ddfc0559
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-08.html
@@ -0,0 +1,4 @@
+<html><body>Musician Nanarin:<br>
+Oh, my sweet Barbado...<br>
+How I pray that my gift will make him happy...
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-09.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-09.html
new file mode 100644
index 0000000000..694efeed4b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-09.html
@@ -0,0 +1,3 @@
+<html><body>Musician Nanarin:<br>
+Oh, yes, no need to tell me. I've already heard. Take this as a token of my appreciation. It's a score of some music that I enjoy playing on my flute. Take it to a <font color="LEVEL">Melody Maestro </font> and she will make an Echo Crystal for you.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-10.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-10.html
new file mode 100644
index 0000000000..92e0a3fe99
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30956-10.html
@@ -0,0 +1,3 @@
+<html><body>Musician Nanarin:<br>
+What a loser! I was a fool to trust you with such an important errand! Why are you standing there with your mouth hanging open? Get out of my sight, right now!!!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30959-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30959-01.html
new file mode 100644
index 0000000000..e03a50ac19
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30959-01.html
@@ -0,0 +1,3 @@
+<html><body>Musician Barbado:<br>
+Just what I've always wanted! I wish I knew who sent me this! Whoever it is must know me well.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30959-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30959-02.html
new file mode 100644
index 0000000000..b758b28f40
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30959-02.html
@@ -0,0 +1,4 @@
+<html><body>Musician Barbado:<br>
+Thanks anyway, but I don't have any use for that.<br>
+If that is all, would you excuse me, please? I must practice my music.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30959-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30959-03.html
new file mode 100644
index 0000000000..a7918b63ee
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/30959-03.html
@@ -0,0 +1,3 @@
+<html><body>Musician Barbado:<br>
+I am practicing my music. Please don't disturb me.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
new file mode 100644
index 0000000000..dcadc5bdf9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
@@ -0,0 +1,369 @@
+/*
+ * Copyright (C) 2004-2013 L2J DataPack
+ *
+ * This file is part of L2J DataPack.
+ *
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q00363_SorrowfulSoundOfFlute;
+
+import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+
+/**
+ * Sorrowful Sound of Flute (363)
+ * @author Adry_85
+ */
+public final class Q00363_SorrowfulSoundOfFlute extends Quest
+{
+ // NPCs
+ private static final int ALDO = 30057;
+ private static final int HOLVAS = 30058;
+ private static final int POITAN = 30458;
+ private static final int RANSPO = 30594;
+ private static final int OPIX = 30595;
+ private static final int NANARIN = 30956;
+ private static final int BARBADO = 30959;
+ // Items
+ private static final int EVENT_CLOTHES = 4318;
+ private static final int NANARINS_FLUTE = 4319;
+ private static final int SABRINS_BLACK_BEER = 4320;
+ private static final int THEME_OF_SOLITUDE = 4420;
+ // Misc
+ private static final int MIN_LEVEL = 15;
+
+ private Q00363_SorrowfulSoundOfFlute()
+ {
+ super(363, Q00363_SorrowfulSoundOfFlute.class.getSimpleName(), "Sorrowful Sound of Flute");
+ addStartNpc(NANARIN);
+ addTalkId(NANARIN, POITAN, RANSPO, ALDO, HOLVAS, OPIX, BARBADO);
+ registerQuestItems(EVENT_CLOTHES, NANARINS_FLUTE, SABRINS_BLACK_BEER);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState st = getQuestState(player, false);
+ if (st == null)
+ {
+ return null;
+ }
+
+ String htmltext = null;
+ switch (event)
+ {
+ case "START":
+ {
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ st.startQuest();
+ st.setMemoState(2);
+ htmltext = "30956-02.htm";
+ }
+ else
+ {
+ htmltext = "30956-03.htm";
+ }
+ break;
+ }
+ case "30956-05.html":
+ {
+ st.giveItems(EVENT_CLOTHES, 1);
+ st.setMemoState(4);
+ st.setCond(3, true);
+ htmltext = event;
+ break;
+ }
+ case "30956-06.html":
+ {
+ st.giveItems(NANARINS_FLUTE, 1);
+ st.setMemoState(4);
+ st.setCond(3, true);
+ htmltext = event;
+ break;
+ }
+ case "30956-07.html":
+ {
+ st.giveItems(SABRINS_BLACK_BEER, 1);
+ st.setMemoState(4);
+ st.setCond(3, true);
+ htmltext = event;
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ final QuestState st = getQuestState(player, true);
+ String htmltext = getNoQuestMsg(player);
+ switch (st.getState())
+ {
+ case State.CREATED:
+ {
+ if (npc.getId() == NANARIN)
+ {
+ htmltext = "30956-01.htm";
+ }
+ break;
+ }
+ case State.STARTED:
+ {
+ switch (npc.getId())
+ {
+ case NANARIN:
+ {
+ switch (st.getMemoState())
+ {
+ case 2:
+ {
+ htmltext = "30956-04.html";
+ break;
+ }
+ case 4:
+ {
+ htmltext = "30956-08.html";
+ break;
+ }
+ case 5:
+ {
+ st.rewardItems(THEME_OF_SOLITUDE, 1);
+ st.exitQuest(true, true);
+ htmltext = "30956-09.html";
+ break;
+ }
+ case 6:
+ {
+ st.exitQuest(true, false);
+ st.playSound(QuestSound.ITEMSOUND_QUEST_GIVEUP);
+ htmltext = "30956-10.html";
+ break;
+ }
+ }
+ break;
+ }
+ case POITAN:
+ {
+ if (st.isMemoState(2) && ((st.getInt("ex") % 100) < 10))
+ {
+ int ex = st.getInt("ex");
+ st.set("ex", ex + 11);
+ switch (getRandom(3))
+ {
+ case 0:
+ {
+ htmltext = "30458-01.html";
+ break;
+ }
+ case 1:
+ {
+ htmltext = "30458-02.html";
+ break;
+ }
+ case 2:
+ {
+ htmltext = "30458-03.html";
+ break;
+ }
+ }
+ st.setCond(2, true);
+ }
+ else if ((st.getMemoState() >= 2) && ((st.getInt("ex") % 100) >= 10))
+ {
+ htmltext = "30458-04.html";
+ }
+ break;
+ }
+ case RANSPO:
+ {
+ if (st.isMemoState(2) && ((st.getInt("ex") % 10000) < 1000))
+ {
+ int ex = st.getInt("ex");
+ st.set("ex", ex + 1001);
+ switch (getRandom(3))
+ {
+ case 0:
+ {
+ htmltext = "30594-01.html";
+ break;
+ }
+ case 1:
+ {
+ htmltext = "30594-02.html";
+ break;
+ }
+ case 2:
+ {
+ htmltext = "30594-03.html";
+ break;
+ }
+ }
+ st.setCond(2, true);
+ }
+ else if ((st.getMemoState() >= 2) && ((st.getInt("ex") % 10000) >= 1000))
+ {
+ htmltext = "30594-04.html";
+ }
+ break;
+ }
+ case ALDO:
+ {
+ if (st.isMemoState(2) && ((st.getInt("ex") % 100000) < 10000))
+ {
+ int ex = st.getInt("ex");
+ st.set("ex", ex + 10001);
+ switch (getRandom(3))
+ {
+ case 0:
+ {
+ htmltext = "30057-01.html";
+ break;
+ }
+ case 1:
+ {
+ htmltext = "30057-02.html";
+ break;
+ }
+ case 2:
+ {
+ htmltext = "30057-03.html";
+ break;
+ }
+ }
+ st.setCond(2, true);
+ }
+ else if ((st.getMemoState() >= 2) && ((st.getInt("ex") % 100000) >= 10000))
+ {
+ htmltext = "30057-04.html";
+ }
+ break;
+ }
+ case HOLVAS:
+ {
+ if (st.isMemoState(2) && ((st.getInt("ex") % 1000) < 100))
+ {
+ int ex = st.getInt("ex");
+ st.set("ex", ex + 101);
+ switch (getRandom(3))
+ {
+ case 0:
+ {
+ htmltext = "30058-01.html";
+ break;
+ }
+ case 1:
+ {
+ htmltext = "30058-02.html";
+ break;
+ }
+ case 2:
+ {
+ htmltext = "30058-03.html";
+ break;
+ }
+ }
+ st.setCond(2, true);
+ }
+ else if ((st.getMemoState() >= 2) && ((st.getInt("ex") % 1000) >= 100))
+ {
+ htmltext = "30058-04.html";
+ }
+ break;
+ }
+ case OPIX:
+ {
+ if (st.isMemoState(2) && (st.getInt("ex") < 100000))
+ {
+ int ex = st.getInt("ex");
+ st.set("ex", ex + 100001);
+ switch (getRandom(3))
+ {
+ case 0:
+ {
+ htmltext = "30595-01.html";
+ break;
+ }
+ case 1:
+ {
+ htmltext = "30595-02.html";
+ break;
+ }
+ case 2:
+ {
+ htmltext = "30595-03.html";
+ break;
+ }
+ }
+ st.setCond(2, true);
+ }
+ else if ((st.getMemoState() >= 2) && (st.getInt("ex") >= 100000))
+ {
+ htmltext = "30595-04.html";
+ }
+ break;
+ }
+ case BARBADO:
+ {
+ if (st.isMemoState(4))
+ {
+ int ex = (st.getInt("ex") % 10) * 20;
+ if (getRandom(100) < ex)
+ {
+ if (st.hasQuestItems(EVENT_CLOTHES))
+ {
+ st.takeItems(EVENT_CLOTHES, -1);
+ }
+ else if (st.hasQuestItems(NANARINS_FLUTE))
+ {
+ st.takeItems(NANARINS_FLUTE, -1);
+ }
+ else if (st.hasQuestItems(SABRINS_BLACK_BEER))
+ {
+ st.takeItems(SABRINS_BLACK_BEER, -1);
+ }
+ st.setMemoState(5);
+ st.setCond(4, true);
+ htmltext = "30959-01.html";
+ }
+ else
+ {
+ st.setMemoState(6);
+ st.setCond(4, true);
+ htmltext = "30959-02.html";
+ }
+ }
+ else if (st.getMemoState() >= 5)
+ {
+ htmltext = "30959-03.html";
+ }
+ break;
+ }
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ public static void main(String args[])
+ {
+ new Q00363_SorrowfulSoundOfFlute();
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30060-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30060-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30060-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30060-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30060-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30060-02.html
new file mode 100644
index 0000000000..dd343cd447
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30060-02.html
@@ -0,0 +1,3 @@
+<html><body>Trader Sabrin:<br>
+You know, it would be much less trouble if we just stole the recipe for making black beer from Jonas...
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30075-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30075-01.html
new file mode 100644
index 0000000000..60bee08c1d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30075-01.html
@@ -0,0 +1,3 @@
+<html><body>Guard Xaber:<br>
+I received the item. Please tell Swan that I will send someone to him tomorrow.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30075-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30075-02.html
new file mode 100644
index 0000000000..c970a4964d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30075-02.html
@@ -0,0 +1,3 @@
+<html><body>Guard Xaber:<br>
+Needless to say, the best kind of business is one that doesn't need any start-up capital!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30957-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-01.html
similarity index 74%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30957-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-01.html
index f8ce912bb7..152e8d3ab4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30957-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-01.html
@@ -2,5 +2,5 @@
Barbado wants to play a duet with me? Hmmm, I don't know, my beloved seems to actually be attracted to that hairy ape!<br>
I am practically broke from buying gifts for Nanarin.<br>
Well, if you'll run an errand for me, I'll play a duet with Barbado. What do you say?<br>
-<a action="bypass -h Quest 364_JovialAccordion 30957-02.htm">"I will run an errand for you."</a>
+<a action="bypass -h Quest Q00364_JovialAccordion 30957-02.html">"I will run an errand for you."</a>
</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-02.html
new file mode 100644
index 0000000000..c3a6f49715
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-02.html
@@ -0,0 +1,4 @@
+<html><body>Bard Swan:<br>
+Please get some black beer from Chef Jonas and take it to Trader Sabrin. Jonas keeps his beer in a <font color="LEVEL">beer chest</font> and stores it in a warehouse... He becomes quite cross when asked for favors, so it would be best if you handled this without talking to him.<br>
+Also, go to the grocery store in the village and find a <font color="LEVEL">clothes chest</font>. You will find it near Trader Sonia. Take the contents of that chest to <font color="LEVEL">Guard Xaber</font>. Here are the keys to the two chests. Good luck!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-03.html
new file mode 100644
index 0000000000..52b1539973
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-03.html
@@ -0,0 +1,3 @@
+<html><body>Bard Swan:<br>
+Is this too complicated for you? Would you like for me to explain it again? Take the black beer from Jonas' <font color="LEVEL">beer chest</font> located in the warehouse and take it to <font color="LEVEL">Trader Sabrin</font>. Then go to the grocery store and take Sonia's Event Clothes from the <font color="LEVEL">clothes chest </font> and take them to <font color="LEVEL">Guard Xaber</font>.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30957-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-04.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30957-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-04.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-05.html
new file mode 100644
index 0000000000..675828f92f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-05.html
@@ -0,0 +1,4 @@
+<html><body>Bard Swan:<br>
+Good job! As I promised, I will <font color="LEVEL">play a duet </font>. But let him know, I only intend to do this once!<br>
+Here is your reward for running my errand.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-06.html
new file mode 100644
index 0000000000..0175904a13
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-06.html
@@ -0,0 +1,3 @@
+<html><body>Bard Swan:<br>
+How could you have failed so easy a task? I shall never play a duet with Barbado!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30957-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-07.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30957-05.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30957-07.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30959-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30959-01.htm
similarity index 81%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30959-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30959-01.htm
index 29971a1ef2..f7f61b0f1a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30959-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30959-01.htm
@@ -1,5 +1,5 @@
<html><body>Musician Barbado:<br>
Some time ago, I heard Bard Swan playing his mandolin. His skills are quite impressive. I wish he would play a duet with me, but for some reason, whenever he sees me he avoids me...<br>
I hate to ask you to do this, but would you go see Swan and tell him that I want to play a duet with him? Of course you will be rewarded for your effort.<br>
-<a action="bypass -h Quest 364_JovialAccordion 30959-02.htm">"I will help you."</a>
+<a action="bypass -h Quest Q00364_JovialAccordion START">"I will help you."</a>
</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30959-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30959-02.htm
similarity index 71%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30959-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30959-02.htm
index 822e5100c0..1acbe31eba 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30959-02.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30959-02.htm
@@ -1,3 +1,3 @@
<html><body>Musician Barbado:<br>
-Thank you so much! You can find<font color="LEVEL"> Bard Swan</font> beneath the big tree in the center of the village. Please convince him to honor my request. I am sure you are capable of this.
+Thank you so much! You can find <font color="LEVEL">Bard Swan</font> beneath the big tree in the center of the village. Please convince him to honor my request. I am sure you are capable of this.
</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30959-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30959-03.htm
new file mode 100644
index 0000000000..ed2963a496
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30959-03.htm
@@ -0,0 +1,4 @@
+<html><body>Musician Barbado:<br>
+Thank you for offering, but I am afraid that you lack the necessary skills to undertake this task. It will be too much for you.<br>
+(This quest can be undertaken only by a character of level 15 or above.)
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30959-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30959-04.html
new file mode 100644
index 0000000000..65b0f40759
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30959-04.html
@@ -0,0 +1,3 @@
+<html><body>Musician Barbado:<br>
+You must persuade <font color="LEVEL">Bard Swan</font> to play music with me. You will find him under the big tree in the center of the village. I am sure you are capable of this.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30959-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30959-05.html
similarity index 94%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30959-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30959-05.html
index 6ee72b6cc5..ab407e5f4b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30959-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30959-05.html
@@ -1,4 +1,4 @@
<html><body>Musician Barbado:<br>
Thank you so much! At last I get to play a duet with Bard Swan! My dream is coming true! You have made this possible.<br>
-Here! Take this priceless accordion music as a token of my appreciation!
+Here! Take this priceless accordion music as a token of my appreciation!
</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30960-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30960-01.html
similarity index 50%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30960-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30960-01.html
index 3c7252fc3b..2e9741574f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30960-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30960-01.html
@@ -1,4 +1,4 @@
<html><body>Beer Chest:<br>
This chest contains beer made by Jonas...<br>
-<a action="bypass -h Quest 364_JovialAccordion 30960-03.htm">Open the chest.</a>
+<a action="bypass -h Quest Q00364_JovialAccordion OPEN_CHEST">Open the chest.</a>
</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30960-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30960-02.html
similarity index 76%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30960-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30960-02.html
index acdcae6a56..b565ebf466 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30960-02.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30960-02.html
@@ -1,3 +1,3 @@
<html><body>Beer Chest:<br>
The chest contains black beer.
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30960-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30960-03.html
new file mode 100644
index 0000000000..ecfb7f33f6
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30960-03.html
@@ -0,0 +1,3 @@
+<html><body>Beer Chest:<br>
+The key to the chest is broken.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30960-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30960-04.html
similarity index 73%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30960-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30960-04.html
index 7e0eb487cd..b266f3d984 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30960-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30960-04.html
@@ -1,3 +1,3 @@
<html><body>Beer Chest:<br>
The chest is locked.
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30961-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30961-01.html
new file mode 100644
index 0000000000..8246ee1cf8
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30961-01.html
@@ -0,0 +1,4 @@
+<html><body>Clothes Chest:<br>
+This chest contains the clothing of Trader Sonia.<br>
+<a action="bypass -h Quest Q00364_JovialAccordion OPEN_CLOTH_CHEST">Open the chest.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30961-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30961-02.html
new file mode 100644
index 0000000000..8526029914
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30961-02.html
@@ -0,0 +1,3 @@
+<html><body>Clothes Chest:<br>
+Contains magnificent clothing.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30961-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30961-03.html
similarity index 77%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30961-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30961-03.html
index effaeeb3f1..1c3cbfbb45 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30961-02.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30961-03.html
@@ -1,3 +1,3 @@
<html><body>Clothes Chest:<br>
The key to the chest is broken.
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30961-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30961-04.html
similarity index 74%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30961-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30961-04.html
index 7e290b5650..7535e112ce 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/364_JovialAccordion/30961-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/30961-04.html
@@ -1,3 +1,3 @@
<html><body>Clothes Chest:<br>
The chest is locked.
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
new file mode 100644
index 0000000000..68c65684bf
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
@@ -0,0 +1,295 @@
+/*
+ * Copyright (C) 2004-2013 L2J DataPack
+ *
+ * This file is part of L2J DataPack.
+ *
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q00364_JovialAccordion;
+
+import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+
+/**
+ * Jovial Accordion (364)
+ * @author Adry_85
+ */
+public final class Q00364_JovialAccordion extends Quest
+{
+ // NPCs
+ private static final int SABRIN = 30060;
+ private static final int XABER = 30075;
+ private static final int SWAN = 30957;
+ private static final int BARBADO = 30959;
+ private static final int BEER_CHEST = 30960;
+ private static final int CLOTH_CHEST = 30961;
+ // Items
+ private static final int STOLEN_BLACK_BEER = 4321;
+ private static final int STOLEN_EVENT_CLOTHES = 4322;
+ private static final int CLOTHES_CHEST_KEY = 4323;
+ private static final int BEER_CHEST_KEY = 4324;
+ private static final int THEME_OF_THE_FEAST = 4421;
+ // Misc
+ private static final int MIN_LEVEL = 15;
+
+ private Q00364_JovialAccordion()
+ {
+ super(364, Q00364_JovialAccordion.class.getSimpleName(), "Jovial Accordion");
+ addStartNpc(BARBADO);
+ addTalkId(BARBADO, BEER_CHEST, CLOTH_CHEST, SABRIN, XABER, SWAN);
+ registerQuestItems(STOLEN_BLACK_BEER, STOLEN_EVENT_CLOTHES, CLOTHES_CHEST_KEY, BEER_CHEST_KEY);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState st = getQuestState(player, false);
+ if (st == null)
+ {
+ return null;
+ }
+
+ String htmltext = null;
+ switch (event)
+ {
+ case "START":
+ {
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ st.startQuest();
+ st.setMemoState(1);
+ htmltext = "30959-02.htm";
+ }
+ else
+ {
+ htmltext = "30959-03.htm";
+ }
+ break;
+ }
+ case "OPEN_CHEST":
+ {
+ if (st.hasQuestItems(BEER_CHEST_KEY))
+ {
+ if (getRandomBoolean())
+ {
+ st.giveItems(STOLEN_BLACK_BEER, 1);
+ htmltext = "30960-02.html";
+ }
+ else
+ {
+ htmltext = "30960-03.html";
+ }
+ st.takeItems(BEER_CHEST_KEY, -1);
+ }
+ else
+ {
+ htmltext = "30960-04.html";
+ }
+ break;
+ }
+ case "OPEN_CLOTH_CHEST":
+ {
+ if (st.hasQuestItems(CLOTHES_CHEST_KEY))
+ {
+ if (getRandomBoolean())
+ {
+ st.giveItems(STOLEN_EVENT_CLOTHES, 1);
+ htmltext = "30961-02.html";
+ }
+ else
+ {
+ htmltext = "30961-03.html";
+ }
+ st.takeItems(CLOTHES_CHEST_KEY, -1);
+ }
+ else
+ {
+ htmltext = "30961-04.html";
+ }
+ break;
+ }
+ case "30957-02.html":
+ {
+ st.giveItems(CLOTHES_CHEST_KEY, 1);
+ st.giveItems(BEER_CHEST_KEY, 1);
+ st.setMemoState(2);
+ st.setCond(2, true);
+ htmltext = event;
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ final QuestState st = getQuestState(player, true);
+ String htmltext = getNoQuestMsg(player);
+ switch (st.getState())
+ {
+ case State.CREATED:
+ {
+ if (npc.getId() == BARBADO)
+ {
+ htmltext = "30959-01.htm";
+ }
+ break;
+ }
+ case State.STARTED:
+ {
+ switch (npc.getId())
+ {
+ case BARBADO:
+ {
+ switch (st.getMemoState())
+ {
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ {
+ htmltext = "30959-04.html";
+ break;
+ }
+ case 5:
+ {
+ st.rewardItems(THEME_OF_THE_FEAST, 1);
+ st.exitQuest(true, true);
+ htmltext = "30959-05.html";
+ break;
+ }
+ }
+ break;
+ }
+ case BEER_CHEST:
+ {
+ htmltext = "30960-01.html";
+ break;
+ }
+ case CLOTH_CHEST:
+ {
+ htmltext = "30961-01.html";
+ break;
+ }
+ case SABRIN:
+ {
+ if (st.hasQuestItems(STOLEN_BLACK_BEER))
+ {
+ st.takeItems(STOLEN_BLACK_BEER, -1);
+ htmltext = "30060-01.html";
+ if (st.isMemoState(2))
+ {
+ st.setMemoState(3);
+ }
+ else if (st.isMemoState(3))
+ {
+ st.setMemoState(4);
+ }
+ }
+ else
+ {
+ htmltext = "30060-02.html";
+ }
+ break;
+ }
+ case XABER:
+ {
+ if (st.hasQuestItems(STOLEN_EVENT_CLOTHES))
+ {
+ st.takeItems(STOLEN_EVENT_CLOTHES, -1);
+ htmltext = "30075-01.html";
+ if (st.isMemoState(2))
+ {
+ st.setMemoState(3);
+ }
+ else if (st.isMemoState(3))
+ {
+ st.setMemoState(4);
+ }
+ }
+ else
+ {
+ htmltext = "30075-02.html";
+ }
+ break;
+ }
+ case SWAN:
+ {
+ switch (st.getMemoState())
+ {
+ case 1:
+ {
+ htmltext = "30957-01.html";
+ break;
+ }
+ case 2:
+ case 3:
+ {
+ if (hasAtLeastOneQuestItem(player, BEER_CHEST_KEY, CLOTHES_CHEST_KEY, STOLEN_BLACK_BEER, STOLEN_EVENT_CLOTHES))
+ {
+ htmltext = "30957-03.html";
+ }
+ else if (!st.hasQuestItems(BEER_CHEST_KEY, CLOTHES_CHEST_KEY, STOLEN_BLACK_BEER, STOLEN_EVENT_CLOTHES))
+ {
+ if (st.isMemoState(2))
+ {
+ st.playSound(QuestSound.ITEMSOUND_QUEST_GIVEUP);
+ st.exitQuest(true, true);
+ htmltext = "30957-06.html";
+ }
+ else
+ {
+ st.setMemoState(5);
+ st.setCond(3, true);
+ htmltext = "30957-04.html";
+ }
+ }
+ break;
+ }
+ case 4:
+ {
+ if (!st.hasQuestItems(BEER_CHEST_KEY, CLOTHES_CHEST_KEY, STOLEN_BLACK_BEER, STOLEN_EVENT_CLOTHES))
+ {
+ st.setMemoState(5);
+ st.setCond(3, true);
+ st.giveAdena(100, true);
+ htmltext = "30957-05.html";
+ }
+ break;
+ }
+ case 5:
+ {
+ htmltext = "30957-07.html";
+ break;
+ }
+ }
+ break;
+ }
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ public static void main(String args[])
+ {
+ new Q00364_JovialAccordion();
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/20131215update.sql b/L2J_DataPack_BETA/dist/sql/game/updates/20131215update.sql
index e964d59716..1dbe8c6e5b 100644
--- a/L2J_DataPack_BETA/dist/sql/game/updates/20131215update.sql
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/20131215update.sql
@@ -1,2 +1,3 @@
-ALTER TABLE `characters` ALTER `title_color` SET DEFAULT 0xECF9A2;
-UPDATE `characters` SET `title_color` = 0xECF9A2 WHERE `title_color` = 0xFFFFFF;
\ No newline at end of file
+UPDATE character_quests SET name='Q00362_BardsMandolin' WHERE name='362_BardsMandolin';
+UPDATE character_quests SET name='Q00363_SorrowfulSoundOfFlute' WHERE name='363_SorrowfulSoundofFlute';
+UPDATE character_quests SET name='Q00364_JovialAccordion' WHERE name='364_JovialAccordion';
\ No newline at end of file
--
GitLab