From 413e119cce0fd45924e04100268410c138908560 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Sun, 17 Aug 2014 01:50:23 +0000
Subject: [PATCH] BETA: Quest Aiding the Floran Village (660) in Java.
---
L2J_DataPack_BETA/dist/game/data/scripts.cfg | 1 -
.../660_AidingtheFloranVillage/30291-01.htm | 6 -
.../660_AidingtheFloranVillage/30291-02.htm | 3 -
.../660_AidingtheFloranVillage/30291-04.htm | 5 -
.../660_AidingtheFloranVillage/30291-05.htm | 5 -
.../660_AidingtheFloranVillage/30291-06.htm | 3 -
.../660_AidingtheFloranVillage/30291-07.htm | 8 -
.../660_AidingtheFloranVillage/30291-09.htm | 10 -
.../660_AidingtheFloranVillage/30291-11.htm | 6 -
.../660_AidingtheFloranVillage/30291-12.htm | 6 -
.../660_AidingtheFloranVillage/30291-13.htm | 6 -
.../660_AidingtheFloranVillage/30291-14.htm | 3 -
.../660_AidingtheFloranVillage/30291-15.htm | 4 -
.../660_AidingtheFloranVillage/30291-16.htm | 4 -
.../660_AidingtheFloranVillage/30608-01.htm | 5 -
.../660_AidingtheFloranVillage/30608-02.htm | 5 -
.../660_AidingtheFloranVillage/30608-05.htm | 3 -
.../660_AidingtheFloranVillage/30608-06.htm | 3 -
.../660_AidingtheFloranVillage/__init__.py | 191 ---------
.../30291-01.htm | 4 +
.../30291-02.htm | 4 +
.../30291-03.htm | 4 +
.../30291-04.html | 4 +
.../30291-05.html | 5 +
.../30291-06.html} | 6 +-
.../30291-07.html | 3 +
.../30291-08.html | 3 +
.../30291-08a.html | 3 +
.../30291-09.html | 8 +
.../30291-10.html} | 6 +-
.../30291-11.html | 3 +
.../30291-12.html | 5 +
.../30291-13.html | 5 +
.../30291-14.html | 8 +
.../30291-15.html | 3 +
.../30291-16.html | 5 +
.../30291-17.html | 5 +
.../30291-18.html} | 9 +-
.../30291-19.html | 3 +
.../30291-20.html | 5 +
.../30291-21.html | 5 +
.../30291-22.html | 4 +
.../30291-23.html | 3 +
.../30608-01.htm | 5 +
.../30608-02.htm} | 11 +-
.../30608-03.html | 3 +
.../30608-04.html | 4 +
.../30608-05.html | 3 +
.../30608-06.htm} | 2 +-
.../30608-06a.htm | 4 +
.../Q00660_AidingTheFloranVillage.java | 387 ++++++++++++++++++
.../scripts/quests/QuestMasterHandler.java | 2 +
.../dist/sql/game/updates/20140816update.sql | 1 +
53 files changed, 518 insertions(+), 294 deletions(-)
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-01.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-02.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-04.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-05.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-06.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-07.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-09.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-11.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-12.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-13.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-14.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-15.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-16.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-01.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-02.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-05.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-06.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/__init__.py
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-01.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-02.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-03.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-04.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-05.html
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{660_AidingtheFloranVillage/30291-03.htm => Q00660_AidingTheFloranVillage/30291-06.html} (55%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-07.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-08.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-08a.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-09.html
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{660_AidingtheFloranVillage/30291-08.htm => Q00660_AidingTheFloranVillage/30291-10.html} (58%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-11.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-12.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-13.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-14.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-15.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-16.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-17.html
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{660_AidingtheFloranVillage/30291-10.htm => Q00660_AidingTheFloranVillage/30291-18.html} (55%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-19.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-20.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-21.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-22.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-23.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-01.htm
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{660_AidingtheFloranVillage/30608-03.htm => Q00660_AidingTheFloranVillage/30608-02.htm} (55%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-03.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-04.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-05.html
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{660_AidingtheFloranVillage/30608-04.htm => Q00660_AidingTheFloranVillage/30608-06.htm} (65%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-06a.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
create mode 100644 L2J_DataPack_BETA/dist/sql/game/updates/20140816update.sql
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index 62c9cff2aa..75993d5f30 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -297,7 +297,6 @@ quests/501_ProofOfClanAlliance/__init__.py
quests/503_PursuitClanAmbition/__init__.py
quests/604_DaimontheWhiteEyedPart2/__init__.py
quests/620_FourGoblets/__init__.py
-quests/660_AidingtheFloranVillage/__init__.py
quests/663_SeductiveWhispers/__init__.py
quests/999_T1Tutorial/__init__.py
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-01.htm
deleted file mode 100644
index f85ca8e2dc..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-01.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Captain Alex:<br>
-Maria sent you, you say? Hrmph. Unfortunate business, that, Is she doing better?<br>
-In any event, I'm glad to see you. We're having a problem with monster incursions, and the militia's spread too thin to handle it. Most of the attacks have been on farmers trying to reclaim and cultivate nearby abandoned land.<br>
-I'll wager you're just the type of adventurer we need to fight this problem, and there's a reward in it. Just bring me the <font color="LEVEL">Watching Eyes</font>, a <font color="LEVEL">Golem Shard</font> and a <font color="LEVEL">Delu Lizardman Scale</font> to prove your kills.<br>
-Good hunting!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-02.htm
deleted file mode 100644
index e234a7529b..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-02.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Captain Alex:<br>
-Oh you're back so soon? Do I need to remind you how important this is? Just bring me the <font color="LEVEL">Watching Eyes</font>, a <font color="LEVEL">Golem Shard</font> and a <font color="LEVEL">Delu Lizardman Scale</font> to prove your kills.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-04.htm
deleted file mode 100644
index 854abedbd8..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-04.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Captain Alex:<br>
-Ha! You've done it. Fine work! I knew you had it in you. And here is the proof I asked for - a sight for sore eyes, if I do say so myself! Well, I spoke of a reward, and a reward you shall have!<br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-05.htm">"Thanks - we'll try not to spend it all in one place! Ha ha!"</a><br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-07.htm">"Reward? Sir there has been a mistake, surely. One doesn't do such things for a reward, but for the satisfaction of the deed itself."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-05.htm
deleted file mode 100644
index dc0d197e6f..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-05.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Captain Alex:<br>
-I'll wager you're just the type of adventurer we need to fight this problem, and there's your reward.<br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-15.htm">"I'll keep working for you."</a><br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-06.htm">"I'll guilt."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-06.htm
deleted file mode 100644
index 91d5d99b98..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-06.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Captain Alex:<br>
-Then set down your sword and staff now, and go seek rest. May you find tranquility and safety in the darkness of the abyss.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-07.htm
deleted file mode 100644
index 83334de9cb..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-07.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><body>Captain Alex:<br>
-Hmmm. I can see that you are a practiced band of adventurers, and as one old soldier to others, I think we understand each other. There's always a bond between those who fight for order.<br>
-Soldier to soldier, then... we're having troubles in Floran, and my militia can't keep up. Don't take my word for it, though. Hear it from those who are suffering.<br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-08.htm">Hear about Timothy, a farmer who lost a friend to a monster.</a><br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-09.htm">Hear about Maria, a lady who lost her husband to a monster.</a><br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-10.htm">Hear about the Floran village chief,</a><br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-04.htm">Conclude the conversation.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-09.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-09.htm
deleted file mode 100644
index fdac7e11f1..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-09.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<html><body>Captain Alex:<br>
-Ah, Maria. Poor, poor girl. If ever a bride meant her vow I' "for better or for worse it was she. Maria married JasonP at the height of our monster troubles, but you wouldn't have known anything was wrong to see the two of them so happy, so in love. It did us all good to see them.
-Jason worked his fields as hard as any man could, but they didn't yield enough to support them, and Maria was soon great with child. He did what many men would in his place: he took a chance. He found some wild, abandoned fields with fertile soil, and he began to work them. He didn't recognize the signs of monsters in the area; he was a farmer, not a tracker or an adventurer. One day, he didn't return from his new field, and we haven't seem him since.<br>
-It makes my blood boil to think of it. We all failed him. We of the militia didn't protect him. We should have! If only we could have! What good are we if we can't even keep our farmers safe against monsters? They can't fight fields with fertile soil, and he began to work them. He didn't recognize the signs of monsters in the area; he was a farmer, not a tracker or an adventurer. One day, he didn't return from his new field, and we haven't seem him since.
-It makes my blood boil to think of it. We all failed him. We of the militia didn't protect him. We should have! If only we could have! What good are we if we can't even keep our farmers safe against monsters? They can't fight! That's our job, by thunder, and we failed to do it!<br>
-Hrmph. Forgive me. Hadn't meant to go on so. Anyway, Maria is bereft. She wants 200 dead monsters to put Jason's soul to rest. I wish I could give 'em to her; she
-I' could use some peace. But where could I get 200 dead monsters?<br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-12.htm">Donate proof of 200 dead monsters.</a><br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-04.htm">Finish the conversation.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-11.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-11.htm
deleted file mode 100644
index 735d116a0a..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-11.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Captain Alex:<br>
-Good job! Collecting 100 Watching Eyes, a Golem Shard and a Delu Lizardman Scale is never an easy task!<br>
-Please accept this reward..<br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-15.htm">"I'll keep working for you."</a><br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-06.htm">"I'll guilt."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-12.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-12.htm
deleted file mode 100644
index d2eb801b10..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-12.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Captain Alex:<br>
-Good job! Collecting 200 Watching Eyes, a Golem Shard and a Delu Lizardman Scale is never an easy task!<br>
-Please accept this reward..<br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-15.htm">"I'll keep working for you."</a><br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-06.htm">"I'll guilt."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-13.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-13.htm
deleted file mode 100644
index 7406327f31..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-13.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Captain Alex:<br>
-Good job! Collecting 500 Watching Eyes, a Golem Shard and a Delu Lizardman Scale is never an easy task!<br>
-Please accept this reward..<br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-15.htm">"I'll keep working for you."</a><br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-06.htm">"I'll guilt."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-14.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-14.htm
deleted file mode 100644
index 51f13f3126..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-14.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Captain Alex:<br>
-Are you kidding me? Just bring me the <font color="LEVEL">Watching Eyes</font>, a <font color="LEVEL">Golem Shard</font> and a <font color="LEVEL">Delu Lizardman Scale</font> to prove your kills.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-15.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-15.htm
deleted file mode 100644
index 8018f94d0f..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-15.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Captain Alex:<br>
-Exellent! Just bring me the <font color="LEVEL">Watching Eyes</font>, a <font color="LEVEL">Golem Shard</font> and a <font color="LEVEL">Delu Lizardman Scale</font> to prove your kills.<br>
-And dont forget to bring me proof of your kills... Good luck!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-16.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-16.htm
deleted file mode 100644
index 8018f94d0f..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-16.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Captain Alex:<br>
-Exellent! Just bring me the <font color="LEVEL">Watching Eyes</font>, a <font color="LEVEL">Golem Shard</font> and a <font color="LEVEL">Delu Lizardman Scale</font> to prove your kills.<br>
-And dont forget to bring me proof of your kills... Good luck!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-01.htm
deleted file mode 100644
index 2a3ada5b0c..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-01.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Maria:<br>
-Hello, traveler! Did you know that at one time Dion was considered the most beautiful place on the continent? Now, however, it has become spiritually and environmentally defiled.
-The souls of the unjustly slain call out to all that can I hear... Do you hear them?<br>
-(Quest for characters level 30 and above.)
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-02.htm
deleted file mode 100644
index d2c729371a..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-02.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Maria:<br>
-What do you think of the Dion Peasant Riot?<br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30608-03.htm">"It was a result of the unusually bitter cold and the oppressive policies of the Lord. The riot was justified."</a><br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30608-05.htm">"The situation was bad. but the peasants were disloyal and the actions of the Lord were justified."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-05.htm
deleted file mode 100644
index 623a6b7e5a..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-05.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Maria:<br>
-Then set down your sword and staff now, and go seek rest. May you find tranquility and safety in the darkness of the abyss.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-06.htm
deleted file mode 100644
index d61d9156cd..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-06.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Maria:<br>
-Floran Village is autonomous, and has no protection against organized military attacks. But they've recently formed a militia to protect the village from the monsters... Go to <font color="LEVEL">Floran Village</font> and meet Militia <font color="LEVEL">Captain Alex...</font>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/__init__.py
deleted file mode 100644
index 69b5862f61..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/__init__.py
+++ /dev/null
@@ -1,191 +0,0 @@
-#made by Kerb
-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 = "660_AidingtheFloranVillage"
-
-# NPC
-MARIA = 30608
-ALEX = 30291
-
-# MOBS
-CARSED_SEER = 21106
-PLAIN_WATCMAN = 21102
-ROUGH_HEWN_ROCK_GOLEM = 21103
-DELU_LIZARDMAN_SHAMAN = 20781
-DELU_LIZARDMAN_SAPPLIER = 21104
-DELU_LIZARDMAN_COMMANDER = 21107
-DELU_LIZARDMAN_SPESIAL_AGENT = 21105
-
-#QUEST ITEMS
-WATCHING_EYES = 8074
-DELU_LIZARDMAN_SCALE =8076
-ROUGHLY_HEWN_ROCK_GOLEM_SHARD = 8075
-
-#REWARDS
-ADENA = 57
-SCROLL_ENCANT_ARMOR = 956
-SCROLL_ENCHANT_WEAPON = 955
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = [WATCHING_EYES, DELU_LIZARDMAN_SCALE, ROUGHLY_HEWN_ROCK_GOLEM_SHARD]
-
- def onEvent (self,event,st) :
- EYES=st.getQuestItemsCount(WATCHING_EYES)
- SCALE=st.getQuestItemsCount(DELU_LIZARDMAN_SCALE)
- SHARD=st.getQuestItemsCount(ROUGHLY_HEWN_ROCK_GOLEM_SHARD)
- htmltext = event
- if event =="30608-04.htm" :
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- if event == "30291-15.htm" :
- st.playSound("ItemSound.quest_middle")
- if event == "30291-05.htm" :
- if EYES+SCALE+SHARD >= 45 :
- st.giveItems(ADENA, EYES*100+SCALE*100+SHARD*100+9000)
- st.takeItems(WATCHING_EYES,-1)
- st.takeItems(DELU_LIZARDMAN_SCALE,-1)
- st.takeItems(ROUGHLY_HEWN_ROCK_GOLEM_SHARD,-1)
- else :
- st.giveItems(ADENA,EYES*100+SCALE*100+SHARD*100)
- st.takeItems(WATCHING_EYES,-1)
- st.takeItems(DELU_LIZARDMAN_SCALE,-1)
- st.takeItems(ROUGHLY_HEWN_ROCK_GOLEM_SHARD,-1)
- st.playSound("ItemSound.quest_finish")
- if event == "30291-11.htm" :
- if EYES+SCALE+SHARD >= 99 :
- n = 100 - EYES
- t = 100 - SCALE - EYES
- if EYES >= 100 :
- st.takeItems(WATCHING_EYES,100)
- else :
- st.takeItems(WATCHING_EYES,-1)
- if SCALE >= n :
- st.takeItems(DELU_LIZARDMAN_SCALE,n)
- else :
- st.takeItems(DELU_LIZARDMAN_SCALE,-1)
- st.takeItems(ROUGHLY_HEWN_ROCK_GOLEM_SHARD,t)
- if self.getRandom(10)<8 :
- st.giveItems(ADENA,13000)
- st.giveItems(SCROLL_ENCANT_ARMOR,1)
- else :
- st.giveItems(ADENA,1000)
- st.playSound("ItemSound.quest_finish")
- else :
- htmltext="30291-14.htm"
- if event == "30291-12.htm" :
- if EYES+SCALE+SHARD >= 199 :
- n = 200 - EYES
- t = 200 - SCALE - EYES
- luck = self.getRandom(15)
- if EYES >= 200 :
- st.takeItems(WATCHING_EYES,200)
- else :
- st.takeItems(WATCHING_EYES,-1)
- if SCALE >= n :
- st.takeItems(DELU_LIZARDMAN_SCALE,n)
- else :
- st.takeItems(DELU_LIZARDMAN_SCALE,-1)
- st.takeItems(ROUGHLY_HEWN_ROCK_GOLEM_SHARD,t)
- if luck in range (0,8) :
- st.giveItems(ADENA,20000)
- st.giveItems(SCROLL_ENCANT_ARMOR,1)
- if luck in range (8,12) :
- st.giveItems(SCROLL_ENCHANT_WEAPON,1)
- if luck in range (12,15) :
- st.giveItems(ADENA,2000)
- st.playSound("ItemSound.quest_finish")
- else :
- htmltext="30291-14.htm"
- if event == "30291-13.htm" :
- if EYES+SCALE+SHARD >= 499 :
- n = 500 - EYES
- t = 500 - SCALE - EYES
- if EYES >= 500 :
- st.takeItems(WATCHING_EYES,500)
- else :
- st.takeItems(WATCHING_EYES,-1)
- if SCALE >= n :
- st.takeItems(DELU_LIZARDMAN_SCALE,n)
- else :
- st.takeItems(DELU_LIZARDMAN_SCALE,-1)
- st.takeItems(ROUGHLY_HEWN_ROCK_GOLEM_SHARD,t)
- if self.getRandom(10)<8 :
- st.giveItems(ADENA,45000)
- st.giveItems(SCROLL_ENCHANT_WEAPON,1)
- else :
- st.giveItems(ADENA,5000)
- st.playSound("ItemSound.quest_finish")
- else :
- htmltext="30291-14.htm"
- elif event == "30291-06.htm" :
- st.unset("cond")
- st.exitQuest(True)
- st.playSound("ItemSound.quest_finish")
- return htmltext
-
- def onTalk (self,npc,player):
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st: return
- npcId = npc.getId()
- SHARD=st.getQuestItemsCount(ROUGHLY_HEWN_ROCK_GOLEM_SHARD)
- SCALE=st.getQuestItemsCount(DELU_LIZARDMAN_SCALE)
- EYES=st.getQuestItemsCount(WATCHING_EYES)
- id = st.getState()
- cond = st.getInt("cond")
- if npcId == MARIA and cond == 0 :
- if st.getPlayer().getLevel() >= 30 :
- htmltext = "30608-02.htm"
- else :
- htmltext = "30608-01.htm"
- st.exitQuest(1)
- elif npcId == MARIA and cond == 1 :
- htmltext = "30608-06.htm"
- elif npcId == ALEX and cond == 1 :
- htmltext = "30291-01.htm"
- st.playSound("ItemSound.quest_middle")
- st.set("cond","2")
- elif npcId == ALEX and cond == 2 :
- if EYES+SCALE+SHARD == 0 :
- htmltext = "30291-02.htm"
- else :
- htmltext = "30291-03.htm"
- return htmltext
-
- def onKill(self,npc,player,isPet):
- st = player.getQuestState(qn)
- if not st: return
- npcId = npc.getId()
- chance = self.getRandom(100)
- if st.getInt("cond") == 2 :
- if npcId in [21106,21102] and chance < 79 :
- st.giveItems(WATCHING_EYES,1)
- st.playSound("ItemSound.quest_itemget")
- elif npcId == ROUGH_HEWN_ROCK_GOLEM and chance < 75 :
- st.giveItems(ROUGHLY_HEWN_ROCK_GOLEM_SHARD,1)
- st.playSound("ItemSound.quest_itemget")
- elif npcId in [20781,21104,21107,21105] and chance < 67 :
- st.giveItems(DELU_LIZARDMAN_SCALE,1)
- st.playSound("ItemSound.quest_itemget")
- return
-
-QUEST = Quest(660,qn,"Aiding the Floran Village")
-
-QUEST.addStartNpc(MARIA)
-
-QUEST.addTalkId(MARIA)
-QUEST.addTalkId(ALEX)
-QUEST.addKillId(CARSED_SEER)
-QUEST.addKillId(PLAIN_WATCMAN)
-QUEST.addKillId(ROUGH_HEWN_ROCK_GOLEM)
-QUEST.addKillId(DELU_LIZARDMAN_SHAMAN)
-QUEST.addKillId(DELU_LIZARDMAN_SAPPLIER)
-QUEST.addKillId(DELU_LIZARDMAN_COMMANDER)
-QUEST.addKillId(DELU_LIZARDMAN_SPESIAL_AGENT)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-01.htm
new file mode 100644
index 0000000000..9dad28caec
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-01.htm
@@ -0,0 +1,4 @@
+<html><body>Captain Alex:<br>
+We've been having problems in Floran with monsters violating our perimeter. There have been a few skirmishes with our militia, but even worse than that, some monsters have gotten past our sentries and attacked citizens. I'm embarrassed to admit that - it's our job to keep this community safe, but we're just spread too darn thin! Reports indicate the monsters are targeting farmers out plowing their fields. I'm telling you this because I'd like your help in dealing with these monsters. If we can stop them, it'd go a long way toward restoring peace and order in Floran Village. Will you help us?<br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-03.htm">"I'll help."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-02.htm
new file mode 100644
index 0000000000..9265f25ab1
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-02.htm
@@ -0,0 +1,4 @@
+<html><body>Captain Alex:<br>
+Hrm. Harrumph. That's awfully generous of you youngsters, and it absolutely shows the right spirit, but I just can't accept your help in good conscience. These monsters are far too much for our militia to handle, and honestly I can't see you succeeding where my men have failed. Maybe a more experienced band could do the job, but I fear you'd just be throwing your lives away.<br>
+Now don't be offended. My men haven't exactly been up to the challenge either. But who knows? You may see more action in the future and come back twice as capable as before! If that happens, and if we're still stuck with this problem, then I'll gladly accept your help.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-03.htm
new file mode 100644
index 0000000000..cec2070fa9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-03.htm
@@ -0,0 +1,4 @@
+<html><body>Captain Alex:<br>
+Ha! I'll be honest - I was hoping for someone of your caliber to step forward. Here's the situation: we have a major problem with monster incursions in <font color = "LEVEL">the Floran Agricultural Area</font>. They've been killing innocent citizens, and we can't have that. I'll need proof of your kills, of course. No offense, but I can't pay out a reward unless I'm sure it's done. Bring me <font color = "LEVEL">the Watching Eyes, a Golem Shard and a Delu Lizardman Scale</font>, and I'll gladly pay you.<br>
+Good hunting! We're counting on you.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-04.html
new file mode 100644
index 0000000000..df27556e0e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-04.html
@@ -0,0 +1,4 @@
+<html><body>Captain Alex:<br>
+Maria sent you, you say? Hrmph. Unfortunate business, that. Is she doing better?<br>
+In any event, I'm glad to see you. We're having a problem with monster incursions, and the militia's spread too thin to handle it. Most of the attacks have been on farmers trying to reclaim and cultivate nearby abandoned land. I'll wager you're just the type of adventurer we need to fight this problem, and there's a reward in it. Just bring me <font color = "LEVEL">the Watching Eyes, a Golem Shard and a Delu Lizardman Scale</font> to prove your kills. Good hunting!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-05.html
new file mode 100644
index 0000000000..4663a9f4e7
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-05.html
@@ -0,0 +1,5 @@
+<html><body>Captain Alex:<br>
+Ha! You've done it. Fine work! I knew you had it in you. And here is the proof I asked for - a sight for sore eyes, if I do say so myself! Well, I spoke of a reward, and a reward you shall have!<br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-06.html">"Thanks - we'll try not to spend it all in one place! Ha ha!"<a><br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-09.html">"Reward? Sir, there has been a mistake, surely. One doesn't do such things for a reward, but for the satisfaction of the deed itself."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-06.html
similarity index 55%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-06.html
index 830207d3ec..9c1bdd7c72 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-06.html
@@ -1,6 +1,6 @@
<html><body>Captain Alex:<br>
-Great rumbling thunder, you've done some work here that's for sure! You have this soldier's thanks. Now we can get those fields working, and that means more food for everyone. Well, I can't offer you much, but please take this adena as compensation for the great good you've done us.<br>
+Great rumbling thunder, you've done some work here that's for sure! You have this soldier's thanks. Now we can get those fields working, and that means more food for everyone. Well, I can't offer you much, but please take this Adena as compensation for the great good you've done us.<br>
It's obvious you are a person of action, and to be honest, we have more problems that could use your attention. You've proven your mettle to all of us, so... are you interested?<br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-04.htm">"Always happy to help. What's the task?"</a><br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-06.htm">"We appreciate your gratitude. but we can't tarry, Best wishes to you and your community."</a>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-07.html">"Always happy to help. What's the task?"</a><br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-08a.html">"We appreciate your gratitude, but we can't tarry. Best wishes to you and your community."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-07.html
new file mode 100644
index 0000000000..e0f8c734d3
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-07.html
@@ -0,0 +1,3 @@
+<html><body>Captain Alex:<br>
+Hrmph. Well, I understand. I hope to see you again - y'never know, after all. In the meantime, best wishes and many thanks!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-08.html
new file mode 100644
index 0000000000..96670c645a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-08.html
@@ -0,0 +1,3 @@
+<html><body>Captain Alex:<br>
+Eh? I fear you've made a mistake, folks; your work's not done. There's nothing to fight standing here, so you'd best head out to the Floran Agricultural Area. Go on, kill what needs killing, and don't forget - bring me the Watching Eyes, a Roughly Hewn Rock Golem Shard and a Delu Lizardman Scale to earn your reward.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-08a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-08a.html
new file mode 100644
index 0000000000..08d4495212
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-08a.html
@@ -0,0 +1,3 @@
+<html><body>Captain Alex:<br>
+Well, if that's what you want, I won't stop you. Obviously there's no shortage of adventure out there. But don't forget us in Floran Village, should you find yourself at loose ends. We're not the plaything of some idle lord; we're an independent farmers' commune, and we welcome the help of a competent band of adventurers. Good luck in your travels.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-09.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-09.html
new file mode 100644
index 0000000000..0e535730d8
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-09.html
@@ -0,0 +1,8 @@
+<html><body>Captain Alex:<br>
+Hmmm. I can see that you are a practiced band of adventurers, and as one old soldier to others, I think we understand each other. There's always a bond between those who fight for order.<br>
+Soldier to soldier, then... we're having troubles in Floran, and my militia can't keep up. Don't take my word for it, though. Hear it from those who are suffering.<br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-10.html">Hear about Timothy, a farmer who lost a friend to a monster.</a><br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-14.html">Hear about Maria, a lady who lost her husband to a monster.</a><br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-18.html">Hear about the Floran village chief.</a><br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-07.html">Conclude the conversation.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-08.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-10.html
similarity index 58%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-08.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-10.html
index 6ede96e5a9..62268c67f4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-08.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-10.html
@@ -1,6 +1,6 @@
<html><body>Captain Alex:<br>
-Take Timothy there. He and his friend Jeremy were working a new field they had bought with their shared savings. They put everything into that effort. Not long ago, the two of them were hard at work, each taking turns at the plow, when something - we're not sure what -attacked them. Jeremy was at the plow, and it slowed him down, so he didn't make it. Timothy wanted to help, but in the face of such an attack he was helpless, and with a bitter curse, he ran.<br>
+Take Timothy there. He and his friend Jeremy were working a new field they had bought with their shared savings. They put everything into that effort. Not long ago, the two of them were hard at work, each taking turns at the plow, when something - we're not sure what - attacked them. Jeremy was at the plow, and it slowed him down, so he didn't make it. Timothy wanted to help, but in the face of such an attack he was helpless, and with a bitter curse, he ran.<br>
Timothy says the only way he can live with himself now is to offer 100 dead monsters as recompense, to put his friend's soul to rest. I've told him it won't bring Jeremy back, but he won't listen. Honestly, though, I have no idea how he'd get 100 dead monsters. But it sure would take a load off of his soul.<br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-11.htm">Donate proof of 100 dead monsters.</a><br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-04.htm">Finish the conversation.</a>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-12.html">Donate proof of 100 dead monsters.</a><br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-07.html">Finish the conversation.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-11.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-11.html
new file mode 100644
index 0000000000..aad7c71731
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-11.html
@@ -0,0 +1,3 @@
+<html><body>Captain Alex:<br>
+Heh. I appreciate the thought, but I fear it won't do. Timothy's pretty insistent on this point, and if he says it'll take 100 monster corpses to placate Jeremy's ghost, he's not likely to settle for less.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-12.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-12.html
new file mode 100644
index 0000000000..243a0a5675
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-12.html
@@ -0,0 +1,5 @@
+<html><body>Captain Alex:<br>
+Soldier, I can't thank you enough. You've helped our farming community enormously, and we all appreciate it. It's not much, but Timothy wanted me to give you something as an extra reward for your help. It's of no economic value, but it's a gift, and you'd oblige us both by taking it. And, again, my undying thanks.<br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-07.html">I will continue to help the Floran farmers.</a><br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-22.html">I will now embark on a new adventure.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-13.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-13.html
new file mode 100644
index 0000000000..e14c57970b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-13.html
@@ -0,0 +1,5 @@
+<html><body>Captain Alex:<br>
+You have the gratitude of the whole of Floran! I'm sorry we have no gold or other reward to offer you beyond our thanks. Of course, for soldiers like us, that's often times a greater reward than gold. Well, I suppose I can offer you a small gift. I wish it were more, but you'd oblige me by taking it, and poor Timothy as well.<br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-07.html">I'll keep helping the farmers of Floran Village.</a><br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-22.html">I'd like to move on to another adventure.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-14.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-14.html
new file mode 100644
index 0000000000..48eff10725
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-14.html
@@ -0,0 +1,8 @@
+<html><body>Captain Alex:<br>
+Ah, Maria. Poor, poor girl. If ever a bride meant her vow "for better or for worse," it was she. Maria married Jason at the height of our monster troubles, but you wouldn't have known anything was wrong to see the two of them so happy, so in love. It did us all good to see them.<br>
+Jason worked his fields as hard as any man could, but they didn't yield enough to support them, and Maria was soon great with child. He did what many men would in his place: he took a chance. He found some wild, abandoned fields with fertile soil, and he began to work them. He didn't recognize the signs of monsters in the area; he was a farmer, not a tracker or an adventurer. One day, he didn't return from his new field, and we haven't seem him since.<br>
+It makes my blood boil to think of it. We all failed him. We of the militia didn't protect him. We should have! If only we could have! What good are we if we can't even keep our farmers safe against monsters? They can't fight! That's our job, by thunder, and we failed to do it!<br>
+Hrmph. Forgive me. Hadn't meant to go on so. Anyway, Maria is bereft. She wants 200 dead monsters to put Jason's soul to rest. I wish I could give 'em to her; she could use some peace. But where could I get 200 dead monsters?<br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-16.html">Donate proof of 200 dead monsters.</a><br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-07.html">Finish the conversation.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-15.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-15.html
new file mode 100644
index 0000000000..3b9aeb96f3
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-15.html
@@ -0,0 +1,3 @@
+<html><body>Captain Alex:<br>
+That's a fine gesture, but it won't do for Maria. She wants 200 monsters to die for her man, and nothing less will give her peace.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-16.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-16.html
new file mode 100644
index 0000000000..2a6fbf7dc7
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-16.html
@@ -0,0 +1,5 @@
+<html><body>Captain Alex:<br>
+Soldier, you've done us a great favor, and mere thanks aren't enough. I can't offer much, but Maria insisted that I give you something. It won't fetch you any gold, but it's valuable to her, and it's a gift from the heart. You'd be doing all of us a kindness by accepting it. And who knows? It might help you somehow, somewhere.<br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-07.html">I will continue to help the Floran farmers.</a><br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-22.html">I'd like to embark on a new adventure.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-17.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-17.html
new file mode 100644
index 0000000000..5013696fc5
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-17.html
@@ -0,0 +1,5 @@
+<html><body>Captain Alex:<br>
+I can't thank you enough, soldier. You've helped our poor little farming community beyond measure. Maria thanks you, too. Here's all I have to offer you for your help — aside from our appreciation, which for soldiers like us is the highest reward. It's a small gift, but please accept it. Maybe it'll help you somehow, in some way.<br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-07.html">I'll keep helping the Floran farmers.</a><br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-22.html">I'd like to move on to another adventure.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-10.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-18.html
similarity index 55%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-10.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-18.html
index b110f84676..0cfb763a1c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30291-10.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-18.html
@@ -1,7 +1,6 @@
<html><body>Captain Alex:<br>
-Well, you've seen the area, and you well know we can't be protected by the lord's army. We've formed a citizen militia, but it's done us precious little good. Myself aside, most of our farmers barely know which end of a knife to hold, and not a sword among them. They're helpless against the vicious monsters that plague us.
-I'd normally hire adventurers to help us, but we can't afford the gold to pay anyone experienced enough to do it for money, and we're not exactly being overwhelmed with volunteers. So we fight, and we die, and the village chief's face grows longer with every funeral he has to attend.
-The chief wants to hold a memorial service for the victims. Nothing fancy, but with the losses we've suffered, we'd need five hundred monster sacrifices to put the victims' souls to rest. I have no idea where we'll get them.<br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-13.htm">Donate proof of 500 dead monsters.</a><br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30291-04.htm">Finish the conversation.</a>
+Well, you've seen the area, and you well know we can't be protected by the lord's army. We've formed a citizen militia, but it's done us precious little good. Myself aside, most of our farmers barely know which end of a knife to hold, and not a sword among them. They're helpless against the vicious monsters that plague us.<br>
+I'd normally hire adventurers to help us, but we can't afford the gold to pay anyone experienced enough to do it for money, and we're not exactly being overwhelmed with volunteers. So we fight, and we die, and the village chief's face grows longer with every funeral he has to attend.<br> The chief wants to hold a memorial service for the victims. Nothing fancy, but with the losses we've suffered, we'd need five hundred monster sacrifices to put the victims' souls to rest. I have no idea where we'll get them.<br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-20.html">Donate proof of 500 dead monsters.</a><br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-07.html">Finish the conversation.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-19.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-19.html
new file mode 100644
index 0000000000..883fd56091
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-19.html
@@ -0,0 +1,3 @@
+<html><body>Captain Alex:<br>
+I appreciate the thought, but we've lost so many militiamen that it would take 500 monster sacrifices to put their souls to rest.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-20.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-20.html
new file mode 100644
index 0000000000..b8fd04db29
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-20.html
@@ -0,0 +1,5 @@
+<html><body>Captain Alex:<br>
+I thank you for that, I truly do. As the captain of the militia, it'll relieve me, as well as the chief, to put the souls of our dead militiamen to rest. No reward could match the great service you've done us, and I have precious little to give besides our thanks. But the chief entrusted me with something for a great-hearted adventurer and, by thunder, I see one before me now. Please accept it, and let's hope for better days for our struggling village.<br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-07.html">I will continue to help the Floran farmers.</a><br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-22.html">I will now embark on a new adventure.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-21.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-21.html
new file mode 100644
index 0000000000..84eb716b32
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-21.html
@@ -0,0 +1,5 @@
+<html><body>Captain Alex:<br>
+I can't thank you enough for this. With these sacrifices, we can put our brave dead to rest. The chief thanks you on behalf of the whole village. I haven't much to offer you in return, but here's a small token of our appreciation; please accept it. And let's hope for better days for Floran!<br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-07.html">I'll keep helping the Floran farmers.</a><br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30291-22.html">I'd like to move on to another adventure.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-22.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-22.html
new file mode 100644
index 0000000000..210949c224
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-22.html
@@ -0,0 +1,4 @@
+<html><body>Captain Alex:<br>
+So, you're off to other adventures? Very well, but... I see you have proof of completing the quest. I can offer you a reward for it, although I'm sure it won't be of any other use to you. Let's make that trade now, shall we?<br>
+Thank you, and here's your reward. Good luck in your travels, and don't forget us here in Floran. Our doors are always open to you!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-23.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-23.html
new file mode 100644
index 0000000000..c55f36b63d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30291-23.html
@@ -0,0 +1,3 @@
+<html><body>Captain Alex:<br>
+So, you're on to other adventures, are you? Well, good luck to you, and don't forget us here in Floran. We farmers know how to welcome adventurers who have helped us. Farewell!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-01.htm
new file mode 100644
index 0000000000..e012fdaf8a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-01.htm
@@ -0,0 +1,5 @@
+<html><body>Maria:<br>
+What do you think of the Dion Peasant Riot?<br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30608-02.htm">"It was a result of the unusually bitter cold and the oppressive policies of the Lord. The riot was justified."</a><br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30608-03.html">"The situation was bad, but the peasants were disloyal and the actions of the Lord were justified."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-02.htm
similarity index 55%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-02.htm
index b5c60ef853..5f2d18e881 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-02.htm
@@ -1,11 +1,12 @@
<html><body>Maria:<br>
Oh, really?<br>
-Come closer, so no one will hear us...<br1>
-...Some peasants actually survived that brutal repression!<br1>
-They've established an autonomous community called Floran Village. There they have been leading free lives, or at least as free as peasants1 hard lives can be, that<br1>
-I'm so proud of them!<br1>
+Come closer, so no one will hear us...<br>
+...Some peasants actually survived that brutal repression!<br>
+They've established an autonomous community called Floran Village. There they have been leading free lives, or at least as free as peasants' hard lives can be, that is...<br>
+I'm so proud of them!<br>
Still, I'm afraid things aren't going so well in Floran Village right now. But they have their pride, and hesitate to ask for the help they need from adventurers like you.<br>
Oh, did I mention that I'm from Floran Village? I'm here on business for my village, as a matter of fact.<br>
Would you help my village?<br>
-<a action="bypass -h Quest 660_AidingtheFloranVillage 30608-04.htm">"What can I do to help?"</a>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30608-06.htm">"What can I do to help?"</a><br>
+<a action="bypass -h Quest Q00660_AidingTheFloranVillage 30608-03.html">"No, sorry, I don't have the time."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-03.html
new file mode 100644
index 0000000000..12f3cfe663
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-03.html
@@ -0,0 +1,3 @@
+<html><body>Maria:<br>
+Hmm... You should think about whether or not you're cut out to be an adventurer. Good deeds often come back as favors when you need them most! Humph!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-04.html
new file mode 100644
index 0000000000..d2c034ede4
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-04.html
@@ -0,0 +1,4 @@
+<html><body>Maria:<br>
+Did you know there were survivors of the Dion Peasant Riot? They're desperately in need of help from an adventurer like you! You should try to help them when you've had more experience!<br>
+(This quest may only be undertaken by characters of level 30 and above.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-05.html
new file mode 100644
index 0000000000..de2431473b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-05.html
@@ -0,0 +1,3 @@
+<html><body>Maria:<br>
+You're a true friend of the farmer! I expect great things from you! By the way, how is Alex in Floran Village?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-06.htm
similarity index 65%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-06.htm
index a16599e22e..5d58ef928a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/660_AidingtheFloranVillage/30608-04.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-06.htm
@@ -1,5 +1,5 @@
<html><body>Maria:<br>
I was right about you! You have a deep sense of what is right and wrong. We think you'll be a great help to us!<br>
-Floran Village is autonomous, and has no protection against organized military attacks. But they've recently formed a militia to protect the village from the monsters... Go to <font color="LEVEL">Floran Village</font> and meet Militia <font color="LEVEL">Captain Alex...</font><br>
+Floran Village is autonomous, and has no protection against organized military attacks. But they've recently formed a militia to protect the village from the monsters... Go to <font color = "LEVEL">Floran Village</font> and meet <font color = "LEVEL">Militia Captain Alex</font>...<br>
Tell him I sent you! Good luck!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-06a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-06a.htm
new file mode 100644
index 0000000000..96e8f91906
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/30608-06a.htm
@@ -0,0 +1,4 @@
+<html><body>Maria:<br>
+When you're more experienced, maybe I can show you how to help them.<br>
+(Only characters of level 30 and above may undertake this quest.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
new file mode 100644
index 0000000000..b57fccd5ab
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
@@ -0,0 +1,387 @@
+/*
+ * Copyright (C) 2004-2014 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.Q00660_AidingTheFloranVillage;
+
+import java.util.HashMap;
+import java.util.Map;
+
+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.holders.ItemChanceHolder;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+
+/**
+ * Aiding the Floran Village (660)
+ * @author Zoey76
+ */
+public final class Q00660_AidingTheFloranVillage extends Quest
+{
+ // NPC
+ private static final int ALEX = 30291;
+ private static final int MARIA = 30608;
+ // Items
+ private static final int SCROLL_ENCHANT_WEAPON_D_GRADE = 955;
+ private static final int SCROLL_ENCHANT_ARMOR_D_GRADE = 956;
+ private static final int WATCHING_EYES = 8074;
+ private static final int ROUGHLY_HEWN_ROCK_GOLEM_SHARD = 8075;
+ private static final int DELU_LIZARDMANS_SCALE = 8076;
+ // Misc
+ private static final int MIN_LEVEL = 30;
+ private static final int ADENA_REWARD_1 = 13000;
+ private static final int ADENA_REWARD_2 = 1000;
+ private static final int ADENA_REWARD_3 = 20000;
+ private static final int ADENA_REWARD_4 = 2000;
+ private static final int ADENA_REWARD_5 = 45000;
+ private static final int ADENA_REWARD_6 = 5000;
+ private static final int DELU_LIZARDMAN_COMMANDER_DOUBLE_ITEM_CHANCE = 33;
+ // Monsters
+ private static final int DELU_LIZARDMAN_COMMANDER = 21107; // Delu Lizardman Commander
+
+ private static final Map<Integer, ItemChanceHolder> MONSTERS = new HashMap<>();
+ static
+ {
+ MONSTERS.put(21102, new ItemChanceHolder(WATCHING_EYES, 0.500)); // Watchman of the Plains
+ MONSTERS.put(21106, new ItemChanceHolder(WATCHING_EYES, 0.630)); // Cursed Seer
+ MONSTERS.put(21103, new ItemChanceHolder(ROUGHLY_HEWN_ROCK_GOLEM_SHARD, 0.520)); // Roughly Hewn Rock Golem
+ MONSTERS.put(20781, new ItemChanceHolder(DELU_LIZARDMANS_SCALE, 0.650)); // Delu Lizardman Shaman
+ MONSTERS.put(21104, new ItemChanceHolder(DELU_LIZARDMANS_SCALE, 0.650)); // Delu Lizardman Supplier
+ MONSTERS.put(21105, new ItemChanceHolder(DELU_LIZARDMANS_SCALE, 0.750)); // Delu Lizardman Special Agent
+ }
+
+ public Q00660_AidingTheFloranVillage()
+ {
+ super(660, Q00660_AidingTheFloranVillage.class.getSimpleName(), "Aiding the Floran Village");
+ addStartNpc(MARIA, ALEX);
+ addTalkId(MARIA, ALEX);
+ addKillId(MONSTERS.keySet());
+ addKillId(DELU_LIZARDMAN_COMMANDER);
+ registerQuestItems(WATCHING_EYES, ROUGHLY_HEWN_ROCK_GOLEM_SHARD, DELU_LIZARDMANS_SCALE);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if (qs == null)
+ {
+ return null;
+ }
+
+ String htmltext = null;
+ switch (event)
+ {
+ case "30608-06.htm":
+ {
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ qs.startQuest();
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = "30608-06a.htm";
+ }
+ break;
+ }
+ case "30608-02.htm":
+ case "30608-03.html":
+ case "30291-07.html":
+ case "30291-09.html":
+ case "30291-10.html":
+ case "30291-14.html":
+ case "30291-18.html":
+ {
+ htmltext = event;
+ break;
+ }
+ case "30291-03.htm":
+ {
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ if (qs.isCreated())
+ {
+ qs.setState(State.STARTED);
+ qs.setCond(2);
+ playSound(player, QuestSound.ITEMSOUND_QUEST_ACCEPT);
+ }
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = "30291-02.htm";
+ }
+ break;
+ }
+ case "30291-06.html":
+ {
+ final long itemCount = getQuestItemsCount(player, WATCHING_EYES) + getQuestItemsCount(player, ROUGHLY_HEWN_ROCK_GOLEM_SHARD) + getQuestItemsCount(player, DELU_LIZARDMANS_SCALE);
+ if (itemCount > 0)
+ {
+ giveAdena(player, itemCount * 100, true);
+ takeItems(player, -1, WATCHING_EYES, ROUGHLY_HEWN_ROCK_GOLEM_SHARD, DELU_LIZARDMANS_SCALE);
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = "30291-08.html";
+ }
+ break;
+ }
+ case "30291-08a.html":
+ {
+ qs.exitQuest(true, true);
+ takeItems(player, -1, WATCHING_EYES, ROUGHLY_HEWN_ROCK_GOLEM_SHARD, DELU_LIZARDMANS_SCALE);
+ htmltext = event;
+ break;
+ }
+ case "30291-12.html":
+ {
+ final long itemCount1 = getQuestItemsCount(player, WATCHING_EYES);
+ final long itemCount2 = getQuestItemsCount(player, ROUGHLY_HEWN_ROCK_GOLEM_SHARD);
+ final long itemCount3 = getQuestItemsCount(player, DELU_LIZARDMANS_SCALE);
+ final long itemCount = itemCount1 + itemCount2 + itemCount3;
+ if (itemCount < 100)
+ {
+ htmltext = "30291-11.html";
+ }
+ else
+ {
+ tradeItems(player, 100, itemCount1, itemCount2, itemCount3);
+
+ if (getRandom(99) > 50)
+ {
+ giveItems(player, SCROLL_ENCHANT_ARMOR_D_GRADE, 1);
+ giveAdena(player, ADENA_REWARD_1, true);
+ htmltext = event;
+ }
+ else
+ {
+ giveAdena(player, ADENA_REWARD_2, true);
+ htmltext = "30291-13.html";
+ }
+ }
+ break;
+ }
+ case "30291-16.html":
+ {
+ final long itemCount1 = getQuestItemsCount(player, WATCHING_EYES);
+ final long itemCount2 = getQuestItemsCount(player, ROUGHLY_HEWN_ROCK_GOLEM_SHARD);
+ final long itemCount3 = getQuestItemsCount(player, DELU_LIZARDMANS_SCALE);
+ final long itemCount = itemCount1 + itemCount2 + itemCount3;
+ if (itemCount < 200)
+ {
+ htmltext = "30291-15.html";
+ }
+ else
+ {
+ tradeItems(player, 200, itemCount1, itemCount2, itemCount3);
+
+ if (getRandom(100) >= 50)
+ {
+ if (getRandom(2) == 0)
+ {
+ giveItems(player, SCROLL_ENCHANT_ARMOR_D_GRADE, 1);
+ giveAdena(player, ADENA_REWARD_3, true);
+ }
+ else
+ {
+ giveItems(player, SCROLL_ENCHANT_WEAPON_D_GRADE, 1);
+ }
+ htmltext = event;
+ }
+ else
+ {
+ giveAdena(player, ADENA_REWARD_4, true);
+ htmltext = "30291-17.html";
+ }
+ }
+ break;
+ }
+ case "30291-20.html":
+ {
+ final long itemCount1 = getQuestItemsCount(player, WATCHING_EYES);
+ final long itemCount2 = getQuestItemsCount(player, ROUGHLY_HEWN_ROCK_GOLEM_SHARD);
+ final long itemCount3 = getQuestItemsCount(player, DELU_LIZARDMANS_SCALE);
+ final long itemCount = itemCount1 + itemCount2 + itemCount3;
+ if (itemCount < 500)
+ {
+ htmltext = "30291-19.html";
+ }
+ else
+ {
+ tradeItems(player, 500, itemCount1, itemCount2, itemCount3);
+
+ if (getRandom(100) >= 50)
+ {
+ giveItems(player, SCROLL_ENCHANT_ARMOR_D_GRADE, 1);
+ giveAdena(player, ADENA_REWARD_5, true);
+ htmltext = event;
+ }
+ else
+ {
+ giveAdena(player, ADENA_REWARD_6, true);
+ htmltext = "30291-21.html";
+ }
+ }
+ break;
+ }
+ case "30291-22.html":
+ {
+ final long itemCount = getQuestItemsCount(player, WATCHING_EYES) + getQuestItemsCount(player, ROUGHLY_HEWN_ROCK_GOLEM_SHARD) + getQuestItemsCount(player, DELU_LIZARDMANS_SCALE);
+ if (itemCount <= 0)
+ {
+ htmltext = "30291-23.html";
+ }
+ else
+ {
+ giveAdena(player, itemCount * 100, true);
+ htmltext = event;
+ }
+
+ takeItems(player, -1, WATCHING_EYES, ROUGHLY_HEWN_ROCK_GOLEM_SHARD, DELU_LIZARDMANS_SCALE);
+ qs.exitQuest(true, true);
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
+ {
+ final QuestState qs = getRandomPartyMemberState(player, 2, 2, npc);
+ if (qs != null)
+ {
+ final ItemChanceHolder item = MONSTERS.get(npc.getId());
+ if (item != null)
+ {
+ giveItemRandomly(player, npc, item.getId(), item.getCount(), 0, item.getChance(), true);
+ }
+ else
+ {
+ if (getRandom(100) < DELU_LIZARDMAN_COMMANDER_DOUBLE_ITEM_CHANCE)
+ {
+ giveItems(player, DELU_LIZARDMANS_SCALE, 2);
+ }
+ else
+ {
+ giveItems(player, DELU_LIZARDMANS_SCALE, 1);
+ }
+ playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ }
+ return super.onKill(npc, player, isSummon);
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, true);
+ String htmltext = getNoQuestMsg(player);
+ if (qs == null)
+ {
+ return htmltext;
+ }
+
+ if (qs.isCreated())
+ {
+ switch (npc.getId())
+ {
+ case MARIA:
+ {
+ htmltext = player.getLevel() >= MIN_LEVEL ? "30608-01.htm" : "30608-04.html";
+ break;
+ }
+ case ALEX:
+ {
+ htmltext = player.getLevel() >= MIN_LEVEL ? "30291-01.htm" : "30291-02.htm";
+ break;
+ }
+ }
+ }
+ else if (qs.isStarted())
+ {
+ switch (npc.getId())
+ {
+ case MARIA:
+ {
+ htmltext = "30608-05.html";
+ break;
+ }
+ case ALEX:
+ {
+ switch (qs.getCond())
+ {
+ case 1:
+ {
+ // Quest started with Maria.
+ qs.setCond(2, true);
+ htmltext = "30291-04.html";
+ break;
+ }
+ case 2:
+ {
+ htmltext = "30291-05.html";
+ break;
+ }
+ }
+ break;
+ }
+ }
+ }
+ return htmltext;
+ }
+
+ private static final void tradeItems(L2PcInstance player, long required, long itemCount1, long itemCount2, long itemCount3)
+ {
+ if (itemCount1 < required)
+ {
+ takeItems(player, WATCHING_EYES, itemCount1);
+ required -= itemCount1;
+ }
+ else
+ {
+ takeItems(player, WATCHING_EYES, required);
+ required = 0;
+ }
+
+ if (itemCount2 < required)
+ {
+ takeItems(player, ROUGHLY_HEWN_ROCK_GOLEM_SHARD, itemCount2);
+ required -= itemCount2;
+ }
+ else
+ {
+ takeItems(player, ROUGHLY_HEWN_ROCK_GOLEM_SHARD, required);
+ required = 0;
+ }
+
+ if (itemCount3 < required)
+ {
+ takeItems(player, DELU_LIZARDMANS_SCALE, itemCount3);
+ }
+ else
+ {
+ takeItems(player, DELU_LIZARDMANS_SCALE, required);
+ }
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/QuestMasterHandler.java
index 1e02d99db9..979d698eed 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -335,6 +335,7 @@ import quests.Q00652_AnAgedExAdventurer.Q00652_AnAgedExAdventurer;
import quests.Q00653_WildMaiden.Q00653_WildMaiden;
import quests.Q00654_JourneyToASettlement.Q00654_JourneyToASettlement;
import quests.Q00659_IdRatherBeCollectingFairyBreath.Q00659_IdRatherBeCollectingFairyBreath;
+import quests.Q00660_AidingTheFloranVillage.Q00660_AidingTheFloranVillage;
import quests.Q00661_MakingTheHarvestGroundsSafe.Q00661_MakingTheHarvestGroundsSafe;
import quests.Q00662_AGameOfCards.Q00662_AGameOfCards;
import quests.Q00688_DefeatTheElrokianRaiders.Q00688_DefeatTheElrokianRaiders;
@@ -709,6 +710,7 @@ public class QuestMasterHandler
Q00653_WildMaiden.class,
Q00654_JourneyToASettlement.class,
Q00659_IdRatherBeCollectingFairyBreath.class,
+ Q00660_AidingTheFloranVillage.class,
Q00661_MakingTheHarvestGroundsSafe.class,
Q00662_AGameOfCards.class,
Q00688_DefeatTheElrokianRaiders.class,
diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/20140816update.sql b/L2J_DataPack_BETA/dist/sql/game/updates/20140816update.sql
new file mode 100644
index 0000000000..e749ffb7a9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/20140816update.sql
@@ -0,0 +1 @@
+UPDATE character_quests SET name='660_AidingtheFloranVillage' WHERE name='Q00660_AidingTheFloranVillage';
\ No newline at end of file
--
GitLab