diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index 30b8bbb8d8987f89cbe8dc9c3a727a25426a7707..a51f92867dd0ccafef7ef025af4e22187b8b9358 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -281,7 +281,7 @@ quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
quests/107_MercilessPunishment/__init__.py
-quests/108_JumbleTumbleDiamondFuss/__init__.py
+quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
quests/111_Elrokian_Hunters_Proof/__init__.py
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30516-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30516-02.htm
deleted file mode 100644
index 91219f3bd0a275e01772c5ad9f78cb7910633561..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30516-02.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Weapon Merchant Reep:<br>
-Why have you come back? Didn't I tell you? I don't have the star diamond!!! The last person who had the jewel was<font color="LEVEL"> Carrier Torocco</font>. If you find him, show him the contract I gave you and ask him why the delivery is taking so long. I have nothing to do with this anymore, so don't come back to me again.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30516-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30516-03.htm
deleted file mode 100644
index c01fe0530a84ed5cd3dc24d4f7ea87493f33e812..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30516-03.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Weapon Merchant Reep:<br>
-Why have you come back? Didn't I tell you? I don't have the star diamond! The last person who had the jewel was<font color="LEVEL"> Carrier Torocco</font>. If you find him, show him the contract I gave you and ask him why the delivery is taking so long. I have nothing to do with this anymore, so don't come back to me again.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30521-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30521-01.htm
deleted file mode 100644
index 2618163943480e933f97b16e5c1ad8b36166e8a9..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30521-01.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Warehouse Keeper Murdoc:<br>
-Has Brunon sent you? Ah ha! You came to the right place! I was going to visit him regarding the same matter! I opened the treasure chest I got from Brunon, and was very surprised to find a jewel in it! I then realized that the treasure chests must have been switched.<br>
-But then, something happened! My friend<font color="LEVEL"> Warehouse Keeper Airy's</font> pet bat all of a sudden swooped in and swallowed the jewel. I was trying to catch the bat and make it spit the jewel out, but it flew out the window ... Airy is very upset that I made her lovely Kurupuru fly away, and she won't talk to me!<br>
-This berry tart is Airy's favorite dessert. Please give this to her. Her anger will be alleviated somewhat. I need to find that stupid bat as soon as possible ...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30521-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30521-02.htm
deleted file mode 100644
index abbab3adce0d3fe2cd0ad6e0749bffb2026bdfbe..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30521-02.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Warehouse Keeper Murdoc:<br>
-Hey, you! Don't be shy, and give those pastries to<font color="LEVEL"> Warehouse Keeper Airy</font>! Also, tell her that I'm very sorry ...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30521-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30521-03.htm
deleted file mode 100644
index 67f88744cd8cde2e8496f27483253e42e713b34c..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30521-03.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Warehouse Keeper Murdoc:<br>
-... My colleague Airy is very upset ... Whew ... Well, it's all my fault ... What should I do ...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30522-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30522-01.htm
deleted file mode 100644
index 5ade5427c14b1047ebb9a922f379c5e98e6faeb0..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30522-01.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Warehouse Keeper Airy:<br>
-Berry tart ...? Wow ... My favorite ... Is that for me? Wow! Thank you very much!<br>
-It's from Murphy? Humph! I hate Murphy! He harassed my lovely Kurupuru ... It was just a stupid jewel ... He didn't have to run after Kurupuru with a knife ... Kurupuru got scared and flew away!!!<br>
-Find my Kurupuru! I've had that lovely<font color="LEVEL"> blade bat</font> for one year! Look at this drawing! Kurupuru looks like this! What do you think? You can find him, right? You can find the jewel if you bring Kurupuru, right ...? Right? Right? So please find him ...!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30522-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30522-02.htm
deleted file mode 100644
index eea10dbfea44e8cc5c74abc97afcb99bbf9aa0d9..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30522-02.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Warehouse Keeper Airy:<br>
-You haven't found Kurupuru yet? I even gave you a drawing!!! He's a very cute<font color="LEVEL"> blade bat</font>! Kurupuru swallowed that star diamond or whatever it is you are looking for, and flew away ... He must be somewhere outside the village, all cold and dark ... trembling ... My poor Kurupuru ... You must find him!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30522-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30522-03.htm
deleted file mode 100644
index 94552349bee79400c6dc6eb3c201ff84bfeeea19..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30522-03.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Warehouse Keeper Airy:<br>
-That diamond is ...? It's the jewel Kurupuru swallowed, right ...? Right? Then, have you found Kurupuru? What? What?<br>
-Wait ...! What is this blood on the jewel ... It can't be ... Kurupuru? Kurupuru!!!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30522-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30522-04.htm
deleted file mode 100644
index c91d289c9777d21963402b7316b329d0c7ab7e89..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30522-04.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Warehouse Keeper Airy:<br>
-Ugh ... Poor Kurupuru ... He must be cold and hungry ... trembling in some cave ... Ughh ... Please come back ...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-01.htm
deleted file mode 100644
index 0b98547874119150c42401d3fbeff5d20fd0f3a5..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Collector Gouph<br>
-Hey, young friend! Have you ever heard of the jewel called the star diamond? It's a very rare gem of which only twelve exist on the entire continent. Due to a recent stroke of luck, I've managed to obtain one of those star diamonds ... It will be delivered here in few days ... I am so excited ...! Hoo Hoo Hoo ...<br>
-(Quest for Dwarven characters level 10 and above.)
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-02.htm
deleted file mode 100644
index 8bacc5b5bd591d7abba2cbcf91080d23da77ba11..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-02.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Collector Gouph:<br>
-Hey, young friend. Have you ever heard of a jewel called the<font color="LEVEL"> star diamond</font>? It's a very rare gem of which only twelve exist on the entire continent. Due to a recent stroke of luck, I've managed to obtain one of those star diamonds ...<br>
-But it's been more than three days since it was supposed to be delivered ...! Hmmph ... What's going on?<br>
-Look here, chum! Are you interested in some work? Go and find out why the delivery is taking so long. Don't worry about the reward. I'll pay you more than enough! Those who work for me are all satisfied with their pay. You won't regret it!<br>
-<a action="bypass -h Quest 108_JumbleTumbleDiamondFuss 1">Say you will take the task</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-03.htm
deleted file mode 100644
index 4e835548d5f20d71a5f7d34338cbe21ad992f1e6..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-03.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Collector Gouph<br>
-Good! Do you know<font color="LEVEL"> Weapon Merchant Reep of the weapons shop</font>? He got the star diamond for me as my agent in Giran. That fellow is a master of bargaining, and so he got me a really nice price for the jewel. Go see him and ask him what's going on. If you show him this contract, that scoundrel can't play innocent!<br>
-And tell him this ... if that no-good crook is planning to cheat me, I will not let him get away with it!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-04.htm
deleted file mode 100644
index 8f1235e6e76c69c43ae42b6419674380db9a642d..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-04.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Collector Gouph<br>
-Have you met Reep? Not yet? What in the world are you doing? If you've made up your mind to do this job, you'd better be responsible and get to it! Go and meet<font color="LEVEL"> Weapon Merchant Reep</font> at the weapon shop and ask him where my diamond is, right now. If you show him this contract, he can't pretend that he doesn't know anything!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-06.htm
deleted file mode 100644
index 3fbff6d39fb82d06eeb2b0679d721939ab30d7db..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-06.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Collector Gouph<br>
-Oooh! You've finally brought me my jewel. My precious star diamond ... Heh, heh, heh ... Let me see ... my baby ...<br>
-What in the world is this?<font color="LEVEL"> A lump of coal?</font> Look, young friend, what is the meaning of this? Can't you do a simple job right? Why have you brought me the wrong box? Take this dirty coal piece back immediately!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-08.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-08.htm
deleted file mode 100644
index 363b523d3240b98e1cdfa3a021cd94dfd3718612..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-08.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Collector Gouph<br>
-Oooh! You've finally found it! My star diamond ...! Heh, heh, heh ... Give it to me now! Thank you! Thank you! Thank you!<br>
-You've done well, young friend. As promised, I will give you a reward. Here, take this weapon. This hammer was used by silversmiths from the Elmoreden period. I got it from Gracia a few days ago, and what do you know, they say that someone stole it from the personal vaults of Count Boldstone and smuggled it here ... As I hold a public position as one of the leaders of the guild, it is not good for me to have smuggled goods in my possession ... So feel free to take it! You can use it or sell it. It's up to you!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-01.htm
deleted file mode 100644
index 9c175109f3c4bd82ab7730a377b62ba67e9e5b8b..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-01.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Blacksmith Brunon:<br>
- ... This dice ...? Where did you get this? Thanks anyway. Is there anything else you want to tell me about?<br>
-Star diamond? Oh, you mean the fool's jewel that I won from gambling yesterday! I don't care about you people, but I won that jewel through a fair dice game. The jewel is mine now! No matter what you say, I will not give it back to him! You shouldn't ignore the sacred rules of gambling!<br>
-But, it seems like you are in some kind of trouble ... Then, how about this? If you do me a favor ... I will give you the jewel.<br>
-<a action="bypass -h Quest 108_JumbleTumbleDiamondFuss 30526_1">Say you will take the task</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-02.htm
deleted file mode 100644
index ca1665dfefadfecae45edae449501fde93bd6f91..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-02.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Blacksmith Brunon:<br>
-All right. I will explain this quest to you, so listen carefully. This happened few weeks ago ...<br>
- ... When I was delivering jewels that I got at the Mithril Mines, I was attacked by goblin brigands ... I barely got out alive, but they took all the jewels I was delivering ... I fired those guards, but ... Anyway, I didn't get the jewels back yet ... I think the<font color="LEVEL"> Goblin Brigand Lieutenant</font> split the jewels ...<br>
-Please go to the Spine Mines, defeat them, and bring the jewels back. They are ten aquamarines and ten chrysoberyls. Should you return all of them, I shall give you the jewel your friend had lost from me. You have my word. I consider our agreement to be a binding contract and I hope it will satisfy you. Please concentrate on finding my precious jewels.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-03.htm
deleted file mode 100644
index 712e8c4f455b90a34e096d743543e217c05e3f08..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-03.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Blacksmith Brunon:<br>
-Have you recovered all my jewels? Not yet? Have you forgotten about our contract? I promised that if you restore all my jewels that the<font color="LEVEL"> Goblin Brigand Lieutenant</font> took from me, I would give you the diamond back that I won from your friend, Torocco. You have to find my<font color="LEVEL"> ten Aquamarines</font> and<font color="LEVEL"> ten Chrysoberyls</font>.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-06.htm
deleted file mode 100644
index 256a5332fe86db01efa48a06290a1c31275a4e3f..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-06.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Blacksmith Brunon:<br>
-What? Isn't that Murdoc's lucky coal piece? Why do you have it?<br>
-Oh my! I gave you the wrong gem box! How on earth...? Look, I didn't mean to deceive you. This sounds terrible, but I thought the gem box that<font color="LEVEL"> Warehouse Keeper Murdoc</font> entrusted to me was the gem box with the diamond in it. Ha ha ha... I didn't mean this to happen, so please forgive me.<br>
-I'm very sorry. I will write a letter explaining this situation, so take this to Warehouse Keeper Murdoc. Then you will be able to get your gem box back.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-07.htm
deleted file mode 100644
index c6165dbc041cd967b71978a743b3b9701973ec60..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-07.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Blacksmith Brunon:<br>
-Look! I didn't mean it! I was not trying to deceive you! Take the letter I wrote to<font color="LEVEL"> Warehouse Keeper Murphy</font>. Then, you will be able to get your gem box back.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-08.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-08.htm
deleted file mode 100644
index 9663830b4bd74cdbcdef9944dc37486809684f64..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-08.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Blacksmith Brunon:<br>
-... Look. I am very busy now ... I don't know what you are up to, but can we talk about this later?
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30529-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30529-01.htm
deleted file mode 100644
index ea62f76286ef934027a8d7216b370716690db1b2..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30529-01.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Miner Maron:<br>
-Elven wine ...? A gift from Torocco? Oh my ... This gift is great, but ... he's going to have to fix that bad drinking habit of his ... I'm always worried that Torocco might start trouble while drinking ...<br>
-Whew ... I am worried about him ... My friend, Torocco, is a fine, steady lad, but ... He has two bad habits ... One is drinking ... . And the other is gambling ...<br>
- ... We were drinking together last night ... Then,<font color="LEVEL"> Blacksmith Bruno</font> suggested we gamble with dice ... I told him not to ... but Torocco just couldn't resist the temptation, and started to roll the dice ... These exact dice here ... He was very drunk and lost everything he had ... Whew ... He may be my friend, but I'm very ashamed of him ...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30529-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30529-02.htm
deleted file mode 100644
index 4a7397255c60e44fed590e1bd599dffc55e8f8fb..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30529-02.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Miner Maron:<br>
-Ah! You again ... Are you an investigator of the Bronze Key Guild? I told you everything I know ... I don't know about the star diamond ... But what I know for sure is that my friend lost everything he had while gambling ... to<font color="LEVEL"> Blacksmith Bruno</font>.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30529-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30529-03.htm
deleted file mode 100644
index 1e95eb5e273f3dd964a7f875caf689ca7a1f05a3..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30529-03.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Miner Maron:<br>
-Whew ... I am very worried about my friend, Torocco ... He is a nice fellow ... Except for his terrible drinking and gambling habits ... I don't know when he will cause another problem, so I can't let down my guard ... Whew ...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30555-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30555-01.htm
deleted file mode 100644
index 1fb89465ad5b37e645eb1a72cb6bfad8aa1970b4..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30555-01.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Carrier Torocco:<br>
-Blast... What should I do? What should I do? How can I ever get that diamond back? I am in so much trouble... Gouph will kill me... What should I do?<br>
-...What the?! Who are you? How long have you been there? Did Gouph sent you?? Agghh... I</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30555-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30555-02.htm
deleted file mode 100644
index fdff516246c93cd3350ccfa18647c7e03bed30a9..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30555-02.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Carrier Torocco:<br>
-I received the star diamond at Giran ... .and drew a contract with Reep ... I told him that I would be responsible for delivery ... Everything was great when I was traveling ... And I got here, Kingdom of the Dwarves, last night ... I drank with my old friend,<font color="LEVEL"> Miner Maron</font> ... We have been friends ever since we were very young ... When we meet once in awhile, we have the bad habit of drinking until we pass out ...<br>
-... and we had quite a bit to drink last night ... But when I woke up in the morning, I found that my weapons, equipment, travel money, and the box where I put the star diamond were missing ...! I don't know what could have happened ... Agghhhhh ...! However ... Perhaps my friend Maron remembers something about last night ...<br>
-But he paid for the drinks last night, as well as for the tables and chairs I broke ... I'm too ashamed to meet him ... Why don't you go to the<font color="LEVEL"> strip mine</font> and ask him? Give this wine to Maron for me ... This is a rare wine I brought for him from Giran as a present ...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30555-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30555-03.htm
deleted file mode 100644
index 48c6c45386adbce06caf4397ef3025bd99cadacd..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30555-03.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Carrier Torocco:<br>
-Have you found the star diamond ...? Not yet ... Oh no, oh no ... What should I do ...<br>
-But you ... Didn't you say that you would meet my friend,<font color="LEVEL"> Miner Maron</font>, and ask him about the jewel? Hurry up and go to the<font color="LEVEL"> strip mine</font> and meet Maron!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30555-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30555-04.htm
deleted file mode 100644
index f39d7658265927e38d43a4594a10b5c2e68cdbc2..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30555-04.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Carrier Torocco:<br>
-This is ...? Oh wow! The treasure chest I was delivering ...! You've found the star diamond!!! Thank you. Thank you. How can I ever repay you ... But first, please take this treasure chest to<font color="LEVEL"> Collector Gouph</font> ... He must be waiting ...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30555-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30555-05.htm
deleted file mode 100644
index af7abea9a949ebf3f911a950d5d4ec090a2f0da2..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30555-05.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Carrier Torocco:<br>
-... What should I do ... What should I do ... How can I ever get the diamond back ... I am in so much trouble ... Gouph will kill me ... What should I do ... What should I do ... Disqualification and excommunication from the guild ... ... Expensive fines that I can never pay back in this lifetime ... The mocking laughter of my colleagues and my family ... Aghh ... This is the end of my life ...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/__init__.py
deleted file mode 100644
index 581c47beaa4d831077756a813da7fb5905df6f1b..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/__init__.py
+++ /dev/null
@@ -1,257 +0,0 @@
-# Made by Mr. Have fun! Version 0.3 by Censor for www.l2jdp.com
-import sys
-from com.l2jserver import Config
-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 = "108_JumbleTumbleDiamondFuss"
-
-GOUPHS_CONTRACT = 1559
-REEPS_CONTRACT = 1560
-ELVEN_WINE = 1561
-BRONPS_DICE = 1562
-BRONPS_CONTRACT = 1563
-AQUAMARINE = 1564
-CHRYSOBERYL = 1565
-GEM_BOX1 = 1566
-COAL_PIECE = 1567
-BRONPS_LETTER = 1568
-BERRY_TART = 1569
-BAT_DIAGRAM = 1570
-STAR_DIAMOND = 1571
-SILVERSMITH_HAMMER = 1511
-#Newbie/one time rewards section
-#Any quest should rely on a unique bit, but
-#it could be shared among quest that were mutually
-#exclusive or race restricted.
-#Bit #1 isn't used for backwards compatibility.
-NEWBIE_REWARD = 2
-SOULSHOT_NO_GRADE_FOR_BEGINNERS = 5789
-SPIRITSHOT_NO_GRADE_FOR_BEGINNERS = 5790
-
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = [GEM_BOX1, STAR_DIAMOND, GOUPHS_CONTRACT, REEPS_CONTRACT, ELVEN_WINE, BRONPS_CONTRACT, AQUAMARINE, CHRYSOBERYL, COAL_PIECE, BRONPS_DICE, BRONPS_LETTER, BERRY_TART, BAT_DIAGRAM]
-
- def onAdvEvent (self,event,npc, player) :
- htmltext = event
- st = player.getQuestState(qn)
- if not st : return
- if event == "1" :
- htmltext = "30523-03.htm"
- st.giveItems(GOUPHS_CONTRACT,1)
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- elif event == "30555_1" :
- htmltext = "30555-02.htm"
- st.takeItems(REEPS_CONTRACT,1)
- st.giveItems(ELVEN_WINE,1)
- elif event == "30526_1" :
- htmltext = "30526-02.htm"
- st.takeItems(BRONPS_DICE,1)
- st.giveItems(BRONPS_CONTRACT,1)
- return htmltext
-
-
- def onTalk (self,npc,player):
-
- npcId = npc.getId()
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st : return htmltext
-
- id = st.getState()
- if id == State.CREATED :
- st.set("cond","0")
- if npcId == 30523 and id == State.COMPLETED :
- htmltext = Quest.getAlreadyCompletedMsg(player)
- elif npcId == 30523 and st.getInt("cond")==0 :
- if player.getRace().ordinal() != 4 :
- htmltext = "30523-00.htm"
- st.exitQuest(1)
- elif player.getLevel() >= 10 :
- htmltext = "30523-02.htm"
- return htmltext
- else:
- htmltext = "30523-01.htm"
- st.exitQuest(1)
- elif npcId == 30523 and st.getInt("cond")==1 and st.getQuestItemsCount(GOUPHS_CONTRACT) :
- htmltext = "30523-04.htm"
- elif npcId == 30523 and st.getInt("cond")==1 and (st.getQuestItemsCount(REEPS_CONTRACT) or st.getQuestItemsCount(ELVEN_WINE) or st.getQuestItemsCount(BRONPS_DICE) or st.getQuestItemsCount(BRONPS_CONTRACT)) :
- htmltext = "30523-05.htm"
- elif npcId == 30523 and st.getInt("cond")==1 and st.getQuestItemsCount(GEM_BOX1) :
- htmltext = "30523-06.htm"
- st.takeItems(GEM_BOX1,1)
- st.giveItems(COAL_PIECE,1)
- elif npcId == 30523 and st.getInt("cond")==1 and (st.getQuestItemsCount(BRONPS_LETTER) or st.getQuestItemsCount(COAL_PIECE) or st.getQuestItemsCount(BERRY_TART) or st.getQuestItemsCount(BAT_DIAGRAM)) :
- htmltext = "30523-07.htm"
- elif npcId == 30523 and st.getInt("cond")==1 and st.getQuestItemsCount(STAR_DIAMOND) :
- htmltext = "30523-08.htm"
- # check the player state against this quest newbie rewarding mark.
- st.giveItems(57,14666)
- newbie = player.getNewbie()
- if newbie | NEWBIE_REWARD != newbie :
- player.setNewbie(newbie|NEWBIE_REWARD)
- if player.getClassId().isMage() :
- st.giveItems(SPIRITSHOT_NO_GRADE_FOR_BEGINNERS,3000)
- st.playTutorialVoice("tutorial_voice_027")
- else :
- st.giveItems(SOULSHOT_NO_GRADE_FOR_BEGINNERS,7000)
- st.playTutorialVoice("tutorial_voice_026")
- st.rewardItems(1060,100) # Lesser Healing Potions
- st.giveItems(SILVERSMITH_HAMMER,1)
- for item in range(4412,4417) :
- st.rewardItems(item,10) # Echo crystals
- st.takeItems(STAR_DIAMOND,-1)
- st.addExpAndSp(34565,2962)
- st.set("cond","0")
- st.exitQuest(False)
- st.playSound("ItemSound.quest_finish")
- elif id == State.STARTED :
- if npcId == 30516 and st.getInt("cond")==1 and st.getQuestItemsCount(GOUPHS_CONTRACT) and st.getQuestItemsCount(REEPS_CONTRACT)==0 :
- htmltext = "30516-01.htm"
- st.giveItems(REEPS_CONTRACT,1)
- st.takeItems(GOUPHS_CONTRACT,1)
- elif npcId == 30516 and st.getInt("cond")==1 and st.getQuestItemsCount(GOUPHS_CONTRACT)==0 and st.getQuestItemsCount(REEPS_CONTRACT) :
- htmltext = "30516-02.htm"
- elif npcId == 30516 and st.getInt("cond")==1 and st.getQuestItemsCount(GOUPHS_CONTRACT)==0 and st.getQuestItemsCount(REEPS_CONTRACT)==0 :
- htmltext = "30516-03.htm"
- elif npcId == 30555 and st.getInt("cond")==1 and st.getQuestItemsCount(REEPS_CONTRACT)==0 and st.getQuestItemsCount(ELVEN_WINE)==0 :
- htmltext = "30555-01.htm"
- elif npcId == 30555 and st.getInt("cond")==1 and st.getQuestItemsCount(REEPS_CONTRACT) and st.getQuestItemsCount(ELVEN_WINE)==0 :
- htmltext = "30555-02.htm"
- st.giveItems(ELVEN_WINE,1)
- st.takeItems(REEPS_CONTRACT,1)
- elif npcId == 30555 and st.getInt("cond")==1 and st.getQuestItemsCount(REEPS_CONTRACT)==0 and st.getQuestItemsCount(ELVEN_WINE) :
- htmltext = "30555-03.htm"
- elif npcId == 30555 and st.getInt("cond")==1 and st.getQuestItemsCount(GEM_BOX1)==1 :
- htmltext = "30555-04.htm"
- elif npcId == 30555 and st.getInt("cond")==1 and st.getQuestItemsCount(GEM_BOX1)==0 and st.getQuestItemsCount(REEPS_CONTRACT)==0 and st.getQuestItemsCount(ELVEN_WINE)==0 :
- htmltext = "30555-05.htm"
- elif npcId == 30529 and st.getInt("cond")==1 and st.getQuestItemsCount(ELVEN_WINE) and st.getQuestItemsCount(BRONPS_DICE)==0 :
- htmltext = "30529-01.htm"
- st.giveItems(BRONPS_DICE,1)
- st.takeItems(ELVEN_WINE,1)
- elif npcId == 30529 and st.getInt("cond")==1 and st.getQuestItemsCount(ELVEN_WINE)==0 and st.getQuestItemsCount(BRONPS_DICE) :
- htmltext = "30529-02.htm"
- elif npcId == 30529 and st.getInt("cond")==1 and st.getQuestItemsCount(ELVEN_WINE)==0 and st.getQuestItemsCount(BRONPS_DICE)==0 :
- htmltext = "30529-03.htm"
- elif npcId == 30526 and st.getInt("cond")==1 and st.getQuestItemsCount(BRONPS_DICE) :
- htmltext = "30526-01.htm"
- elif npcId == 30526 and st.getInt("cond")==1 and st.getQuestItemsCount(BRONPS_CONTRACT) and (st.getQuestItemsCount(AQUAMARINE)+st.getQuestItemsCount(CHRYSOBERYL)<20) :
- htmltext = "30526-03.htm"
- elif npcId == 30526 and st.getInt("cond")==1 and st.getQuestItemsCount(BRONPS_CONTRACT) and (st.getQuestItemsCount(AQUAMARINE)+st.getQuestItemsCount(CHRYSOBERYL)>=20) :
- htmltext = "30526-04.htm"
- st.takeItems(BRONPS_CONTRACT,1)
- st.takeItems(AQUAMARINE,st.getQuestItemsCount(AQUAMARINE))
- st.takeItems(CHRYSOBERYL,st.getQuestItemsCount(CHRYSOBERYL))
- st.giveItems(GEM_BOX1,1)
- elif npcId == 30526 and st.getInt("cond")==1 and st.getQuestItemsCount(GEM_BOX1) :
- htmltext = "30526-05.htm"
- elif npcId == 30526 and st.getInt("cond")==1 and st.getQuestItemsCount(COAL_PIECE) :
- htmltext = "30526-06.htm"
- st.takeItems(COAL_PIECE,1)
- st.giveItems(BRONPS_LETTER,1)
- elif npcId == 30526 and st.getInt("cond")==1 and st.getQuestItemsCount(BRONPS_LETTER) :
- htmltext = "30526-07.htm"
- elif npcId == 30526 and st.getInt("cond")==1 and st.getQuestItemsCount(BERRY_TART) or st.getQuestItemsCount(BAT_DIAGRAM) or st.getQuestItemsCount(STAR_DIAMOND) :
- htmltext = "30526-08.htm"
- elif npcId == 30521 and st.getInt("cond")==1 and st.getQuestItemsCount(BRONPS_LETTER) and st.getQuestItemsCount(BERRY_TART)==0 :
- htmltext = "30521-01.htm"
- st.giveItems(BERRY_TART,1)
- st.takeItems(BRONPS_LETTER,1)
- elif npcId == 30521 and st.getInt("cond")==1 and st.getQuestItemsCount(BRONPS_LETTER)==0 and st.getQuestItemsCount(BERRY_TART) :
- htmltext = "30521-02.htm"
- elif npcId == 30521 and st.getInt("cond")==1 and st.getQuestItemsCount(BRONPS_LETTER)==0 and st.getQuestItemsCount(BERRY_TART)==0 :
- htmltext = "30521-03.htm"
- elif npcId == 30522 and st.getInt("cond")==1 and st.getQuestItemsCount(BAT_DIAGRAM)==0 and st.getQuestItemsCount(BERRY_TART) and st.getQuestItemsCount(STAR_DIAMOND)==0 :
- htmltext = "30522-01.htm"
- st.giveItems(BAT_DIAGRAM,1)
- st.takeItems(BERRY_TART,1)
- elif npcId == 30522 and st.getInt("cond")==1 and st.getQuestItemsCount(BAT_DIAGRAM) and st.getQuestItemsCount(BERRY_TART)==0 and st.getQuestItemsCount(STAR_DIAMOND)==0 :
- htmltext = "30522-02.htm"
- elif npcId == 30522 and st.getInt("cond")==1 and st.getQuestItemsCount(BAT_DIAGRAM)==0 and st.getQuestItemsCount(BERRY_TART)==0 and st.getQuestItemsCount(STAR_DIAMOND) :
- htmltext = "30522-03.htm"
- elif npcId == 30522 and st.getInt("cond")==1 and st.getQuestItemsCount(BAT_DIAGRAM)==0 and st.getQuestItemsCount(BERRY_TART)==0 and st.getQuestItemsCount(STAR_DIAMOND)==0 :
- htmltext = "30522-04.htm"
- return htmltext
-
- def onKill(self,npc,player,isPet):
- st = player.getQuestState(qn)
- if not st : return
- if st.getState() != State.STARTED : return
-
- npcId = npc.getId()
- if npcId == 20323 :
- if st.getInt("cond") == 1 and st.getQuestItemsCount(BRONPS_CONTRACT) :
- if self.getRandom(10) < 8 :
- st.giveItems(AQUAMARINE,1)
- if st.getQuestItemsCount(AQUAMARINE)+st.getQuestItemsCount(CHRYSOBERYL) == 19 :
- if st.getQuestItemsCount(AQUAMARINE) < 10 :
- st.playSound("ItemSound.quest_itemget")
- else :
- st.playSound("ItemSound.quest_middle")
- else:
- if st.getQuestItemsCount(AQUAMARINE) < 10 :
- st.playSound("ItemSound.quest_itemget")
- else :
- st.playSound("ItemSound.quest_middle")
- if self.getRandom(10) < 8 :
- if st.getQuestItemsCount(AQUAMARINE)+st.getQuestItemsCount(CHRYSOBERYL) == 19 :
- if st.getQuestItemsCount(CHRYSOBERYL) < 10 :
- st.giveItems(CHRYSOBERYL,1)
- st.playSound("ItemSound.quest_middle")
- elif st.getQuestItemsCount(AQUAMARINE)+st.getQuestItemsCount(CHRYSOBERYL) < 20 :
- if st.getQuestItemsCount(CHRYSOBERYL) < 10 :
- st.giveItems(CHRYSOBERYL,1)
- st.playSound("ItemSound.quest_itemget")
- elif npcId == 20324 :
- if st.getInt("cond") == 1 and st.getQuestItemsCount(BRONPS_CONTRACT) :
- if self.getRandom(10) < 6 :
- if st.getQuestItemsCount(AQUAMARINE)+st.getQuestItemsCount(CHRYSOBERYL) == 19 :
- if st.getQuestItemsCount(AQUAMARINE) < 10 :
- st.giveItems(AQUAMARINE,1)
- st.playSound("ItemSound.quest_middle")
- else:
- if st.getQuestItemsCount(AQUAMARINE) < 10 :
- st.giveItems(AQUAMARINE,1)
- st.playSound("ItemSound.quest_itemget")
- if self.getRandom(10) < 6 :
- if st.getQuestItemsCount(AQUAMARINE)+st.getQuestItemsCount(CHRYSOBERYL) == 19 :
- if st.getQuestItemsCount(CHRYSOBERYL) < 10 :
- st.giveItems(CHRYSOBERYL,1)
- st.playSound("ItemSound.quest_middle")
- elif st.getQuestItemsCount(AQUAMARINE)+st.getQuestItemsCount(CHRYSOBERYL) < 20 :
- if st.getQuestItemsCount(CHRYSOBERYL) < 10 :
- st.giveItems(CHRYSOBERYL,1)
- st.playSound("ItemSound.quest_itemget")
- elif npcId == 20480 :
- if st.getInt("cond") == 1 and st.getQuestItemsCount(BAT_DIAGRAM) and st.getQuestItemsCount(STAR_DIAMOND) == 0 :
- if self.getRandom(10) < 2 :
- st.giveItems(STAR_DIAMOND,1)
- st.takeItems(BAT_DIAGRAM,1)
- st.playSound("ItemSound.quest_middle")
- return
-
-QUEST = Quest(108,qn,"Jumble Tumble Diamond Fuss")
-
-QUEST.addStartNpc(30523)
-
-QUEST.addTalkId(30523)
-
-QUEST.addTalkId(30516)
-QUEST.addTalkId(30521)
-QUEST.addTalkId(30522)
-QUEST.addTalkId(30523)
-QUEST.addTalkId(30526)
-QUEST.addTalkId(30529)
-QUEST.addTalkId(30555)
-
-QUEST.addKillId(20323)
-QUEST.addKillId(20324)
-QUEST.addKillId(20480)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30516-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30516-01.html
similarity index 58%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30516-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30516-01.html
index 3e3d4628e1205938403295c12da2b2ed8652447c..a0ea8b2fccde6b44387f0cb15a78d8c8152d0aec 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30516-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30516-01.html
@@ -1,5 +1,5 @@
-<html><body>Weapon Merchant Reep:<br>
-Star diamond? I went on a business trip to Giran expressly for Gouph, and acquired the star diamond, that is a fact. I was going to bring it here myself... But Gouph insisted that one of his guild members,<font color="LEVEL"> Carrier Torocco,</font> be in charge of delivery... So, I gave the jewel to Torocco as he asked. I don't know what happened afterwards.<br>
-As our contract states, I acquired the star diamond for him. It was Gouph who insisted that someone else should deliver it. This contract was drawn up when requesting the delivery. It may be of aid, so take it. I have nothing to do with this anymore.<br>
-Ah! And when you see Gouph again, tell him that Trader Reep wants the rest of the payment for the jewel. And!!! If he's trying to cheat me, tell him I won't let him get away with it!!!
+<html><body>Trader Reep:<br>
+Star Diamond? I went on a business trip to Giran expressly for Gouph, and acquired the Star Diamond, that is a fact. I was going to bring it here myself... But Gouph insisted that one of his guild members, <font color="LEVEL">Carrier Torocco</font>, be in charge of delivery... So, I gave the jewel to Torocco as he asked. I don't know what happened afterwards.<br>
+As our Contract states, I acquired the Star Diamond for him. It was Gouph who insisted that someone else should deliver it. This Contract was drawn up when requesting the delivery. It may be of aid, so take it. I have nothing to do with this anymore.<br>
+Ah! And when you see Gouph again, tell him that Trader Reep wants the rest of the payment for the jewel. And!!! If he's trying to cheat me, tell him I won't let him get away with it!!!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30516-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30516-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..26e59707d77f417f8aae067828755322a12e1697
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30516-02.html
@@ -0,0 +1,3 @@
+<html><body>Trader Reep:<br>
+Why have you come back? Didn't I tell you? I don't have the Star Diamond! The last person who had the jewel was <font color="LEVEL">Carrier Torocco</font>. If you find him, show him the Contract I gave you and ask him why the delivery is taking so long. I have nothing to do with this anymore, so don't come back to me again.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30521-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30521-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..f9e2eeca8d9f87d670d90bf02a05c1ae30b6afff
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30521-01.html
@@ -0,0 +1,5 @@
+<html><body>Warehouse Keeper Murdoc:<br>
+Has Brunon sent you? Ah ha! You came to the right place! I was going to visit him regarding the same matter! I opened the Treasure Chest I got from Brunon, and was very surprised to find a jewel in it! I then realized that the Treasure Chests must have been switched.<br>
+But then, something happened! My friend <font color="LEVEL">Warehouse Keeper Airy's</font> pet bat all of a sudden swooped in and swallowed the jewel. I was trying to catch the bat and make it spit the jewel out, but it flew out the window... Airy is very upset that I made her lovely Kurupuru fly away, and she won't talk to me!<br>
+This Berry Tart is Airy's favorite dessert. Please give this to her. Her anger will be alleviated somewhat. I need to find that stupid bat as soon as possible...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30521-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30521-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..013659b8ef29c353d4069398e0a364e145ffdaf2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30521-02.html
@@ -0,0 +1,3 @@
+<html><body>Warehouse Keeper Murdoc:<br>
+Hey, you! Don't be shy, and give those pastries to <font color="LEVEL">Warehouse Keeper Airy</font>! Also, tell her that I'm very sorry...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30521-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30521-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..173be2b13432f537eff22814b97b01b649f1d3df
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30521-03.html
@@ -0,0 +1,3 @@
+<html><body>Warehouse Keeper Murdoc:<br>
+My colleague Airy is very upset... Whew... Well, it's all my fault... What should I do...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30522-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30522-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..37a801bd509fe8978d01fb1a95b621b494391fcc
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30522-01.html
@@ -0,0 +1,5 @@
+<html><body>Warehouse Keeper Airy:<br>
+Berry Tart...? Wow... My favorite... Is that for me? Wow! Thank you very much!<br>
+It's from Murdoc? Humph! I hate Murdoc! He harassed my lovely Kurupuru... It was just a stupid jewel... He didn't have to run after Kurupuru with a knife... Kurupuru got scared and flew away!!!<br>
+Find my Kurupuru! I've had that lovely <font color="LEVEL">blade bat</font> for one year! Look at this drawing! Kurupuru looks like this! What do you think? You can find him, right? You can find the jewel if you bring Kurupuru, right...? Right? Right? So please find him...!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30522-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30522-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..8e50731605b9d3b48395c3b04b59527834cb32d0
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30522-02.html
@@ -0,0 +1,3 @@
+<html><body>Warehouse Keeper Airy:<br>
+You haven't found Kurupuru yet? I even gave you a drawing!!! He's a very cute <font color="LEVEL">blade bat</font>! Kurupuru swallowed that Star Diamond or whatever it is you are looking for, and flew away... He must be somewhere outside the village, all cold and dark... trembling... My poor Kurupuru... You must find him!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30522-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30522-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..a550b576156a9fb0aaf9356c63c38c7ee235e746
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30522-03.html
@@ -0,0 +1,4 @@
+<html><body>Warehouse Keeper Airy:<br>
+That diamond is...? It's the jewel Kurupuru swallowed, right...? Right? Then, have you found Kurupuru? What? What?<br>
+Wait...! What is this blood on the jewel... It can't be... Kurupuru? Kurupuru!!!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30522-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30522-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..a608a732fcd8e44ffb8d597209fe740eec30807d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30522-04.html
@@ -0,0 +1,3 @@
+<html><body>Warehouse Keeper Airy:<br>
+Ugh... Poor Kurupuru... He must be cold and hungry... trembling in some cave... Ughh... Please come back...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-01.htm
similarity index 98%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-00.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-01.htm
index 493b401ddac4e0769409fdeba2b3ca759cbf99d4..e45901888702a178727d81593db74024c603cc4b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-00.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-01.htm
@@ -1,4 +1,4 @@
-<html><body>Collector Gouph:<br>
-I can't ask an honored guest of another race who has visited our Dwarven town to run an errand for me! Take your time looking around, and enjoy!<br>
-(Quest for Dwarven characters.)
+<html><body>Collector Gouph:<br>
+I can't ask an honored guest of another race who has visited our Dwarven town to run an errand for me! Take your time looking around, and enjoy!<br>
+(Quest for Dwarven characters.)
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-02.htm
new file mode 100644
index 0000000000000000000000000000000000000000..3f312bf84e1167f3ebbeda20fc5ac44319ab97e2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-02.htm
@@ -0,0 +1,4 @@
+<html><body>Collector Gouph:<br>
+Hey, young friend! Have you ever heard of the jewel called the Star Diamond? It's a very rare gem of which only twelve exist on the entire continent. Due to a recent stroke of luck, I've managed to obtain one of those Star Diamonds... It will be delivered here in few days... I am so excited...! Hoo Hoo Hoo...<br>
+(Quest for Dwarven characters level 10 and above.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-03.htm
new file mode 100644
index 0000000000000000000000000000000000000000..edaec657c069d7fdf03ab4e81669f6fe6beee59c
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-03.htm
@@ -0,0 +1,6 @@
+<html><body>Collector Gouph:<br>
+Look here, friend. Have you heard of a jewel called the <font color="LEVEL">Star Diamond</font>? It's an incredibly rare gem -- only 12 in existence. Well, I got a lead on one of them a while back. It was quite a bit of trouble... Heh, heh...<br>
+But the delivery is already four days late...! Ergh...<br>
+Hey, friend! Do you feel like taking on a job? Go find out why my jewel delivery is late. I'll make it well worth your while, so don't worry! I take care of everyone who does work for me. You won't regret it.<br>
+<a action="bypass -h Quest Q00108_JumbleTumbleDiamondFuss 30523-04.htm">Say that you'll take the job.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-04.htm
new file mode 100644
index 0000000000000000000000000000000000000000..029af3a45374a86dfc6bbf1f04b3bdea99c341b0
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-04.htm
@@ -0,0 +1,4 @@
+<html><body>Collector Gouph:<br>
+Good! Do you know <font color="LEVEL">Trader Reep of the weapons shop</font>? He got the Star Diamond for me as my agent in Giran. That fellow is a master of bargaining, and so he got me a really nice price for the jewel. Go see him and ask him what's going on. If you show him this Contract, that scoundrel can't play innocent!<br>
+And tell him this ... if that no-good crook is planning to cheat me, I will not let him get away with it!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..bc7cb353fc5b43564224dabaee51e1695496f239
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-05.html
@@ -0,0 +1,3 @@
+<html><body>Collector Gouph:<br>
+Have you met Reep? Not yet? What in the world are you doing? If you've made up your mind to do this job, you'd better be responsible and get to it! Go and meet <font color="LEVEL">Trader Reep</font> at the weapon shop and ask him where my diamond is, right now. If you show him this Contract, he can't pretend that he doesn't know anything!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-06.html
similarity index 82%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-05.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-06.html
index b5c331b95a93da52064346a237edfef7e729d749..8c81f3fabcf1255ab1212fb7e8fec689cc17388b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-05.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-06.html
@@ -1,3 +1,3 @@
-<html><body>Collector Gouph<br>
-What did Reep say? Where is my jewel? Hey, youngster, hurry up and find my jewel! You should be more responsible when you're hired to do a job!
+<html><body>Collector Gouph:<br>
+What did Reep say? Where is my jewel? Hey, youngster, hurry up and find my jewel! You should be more responsible when you're hired to do a job!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..8fcfa03d4ee9f8a254f0161985ca0b877c3bbfda
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-07.html
@@ -0,0 +1,4 @@
+<html><body>Collector Gouph:<br>
+Oooh! You've finally brought me my jewel. My precious Star Diamond... Heh, heh, heh... Let me see... my baby...<br>
+What in the world is this? <font color="LEVEL">A lump of Coal</font>? Look, young friend, what is the meaning of this? Can't you do a simple job right? Why have you brought me the wrong box? Take this dirty Coal Piece back immediately!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-08.html
similarity index 53%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-07.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-08.html
index 2df3f2d596a6ec2a41d6a147911eeb1bf7d0f2d3..c0f844028156a2722ac8f22ef318498e2e01107e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30523-07.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-08.html
@@ -1,3 +1,3 @@
-<html><body>Collector Gouph<br>
-Are you still running around with that lump of coal? When are you going to bring me my jewel? Can't you do this job right! Look, youngster, don't disappoint me!
+<html><body>Collector Gouph:<br>
+Are you still running around with that lump of Coal? When are you going to bring me my jewel? Can't you do this job right! Look, youngster, don't disappoint me!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-09.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-09.html
new file mode 100644
index 0000000000000000000000000000000000000000..ad1aa68d236a372321f9ca4e786164d7ad6438e9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30523-09.html
@@ -0,0 +1,4 @@
+<html><body>Collector Gouph:<br>
+Oooh! You've finally found it! My Star Diamond...! Heh, heh, heh... Give it to me now! Thank you! Thank you! Thank you!<br>
+You've done well, young friend. As promised, I will give you a reward. Here, take this weapon. This hammer was used by silversmiths from the Elmoreden period. I got it from Gracia a few days ago, and what do you know, they say that someone stole it from the personal vaults of Count Boldstone and smuggled it here... As I hold a public position as one of the leaders of the guild, it is not good for me to have smuggled goods in my possession... So feel free to take it! You can use it or sell it. It's up to you!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..645718a8d5389bfa065f021b37c168327636298b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-01.html
@@ -0,0 +1,6 @@
+<html><body>Blacksmith Brunon:<br>
+... This dice...? Where did you get this? Thanks anyway. Is there anything else you want to tell me about?<br>
+Star Diamond? Oh, you mean the fool's jewel that I won from gambling yesterday! I don't care about you people, but I won that jewel through a fair dice game. The jewel is mine now! No matter what you say, I will not give it back to him! You shouldn't ignore the sacred rules of gambling!<br>
+But, it seems like you are in some kind of trouble... Then, how about this? If you do me a favor... I will give you the jewel.<br>
+<a action="bypass -h Quest Q00108_JumbleTumbleDiamondFuss 30526-02.html">Say you will take the task</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..d6a4c23d5ce6cadde361a4d67c06c665b5d7e8cc
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-02.html
@@ -0,0 +1,5 @@
+<html><body>Blacksmith Brunon:<br>
+All right. I will explain this quest to you, so listen carefully. This happened few weeks ago...<br>
+... When I was delivering jewels that I got at the Mithril Mines, I was attacked by goblin brigands... I barely got out alive, but they took all the jewels I was delivering... I fired those guards, but... Anyway, I didn't get the jewels back yet... I think the <font color="LEVEL">goblin brigand lieutenant</font> split the jewels...<br>
+Please go to the west of the Spine Mines, defeat them, and bring the jewels back. They are ten Aquamarines and ten Chrysoberyls. Should you return all of them, I shall give you the jewel your friend had lost from me. You have my word. I consider our agreement to be a binding Contract and I hope it will satisfy you. Please concentrate on finding my precious jewels.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..7e4e089c08c4047501f275a8f985e2fb3411cf7f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-03.html
@@ -0,0 +1,3 @@
+<html><body>Blacksmith Brunon:<br>
+Have you recovered all my jewels? Not yet? Have you forgotten about our Contract? I promised that if you restore all my jewels that the <font color="LEVEL">goblin brigand lieutenant</font> took from me, I would give you the diamond back that I won from your friend, Torocco. You have to find my <font color="LEVEL">ten Aquamarines</font> and <font color="LEVEL">ten Chrysoberyls</font>.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-04.html
similarity index 56%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-04.html
index f754b7d75ed897687462ba8ca964ec90b8128b7f..5bd6811cbb2c1c0ee7e5fbce259a8bc8083726f4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-04.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-04.html
@@ -1,3 +1,3 @@
-<html><body>Blacksmith Brunon:<br>
-Good job! You found all my jewels! Thank you! Now, as we agreed, I will give your friend's diamond back. Take this<font color="LEVEL"> gem box</font>! You don't need to worry about anything. I've never opened it ever since I got it from your friend.
+<html><body>Blacksmith Brunon:<br>
+Good job! You found all my jewels! Thank you! Now, as we agreed, I will give your friend's diamond back. Take this <font color="LEVEL">Gem Box</font>! You don't need to worry about anything. I've never opened it ever since I got it from your friend.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-05.html
similarity index 62%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-05.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-05.html
index 9c55dbd02226adbe80c05782e412ce0f25067b5f..f9aaddfd93c33cf33f19304760cf1c3ba4dd35e9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/108_JumbleTumbleDiamondFuss/30526-05.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-05.html
@@ -1,3 +1,3 @@
-<html><body>Blacksmith Brunon:<br>
-Why have you come back? You got the gem box. What else do you need from me? Hurry up and give the diamond back to the owner.
+<html><body>Blacksmith Brunon:<br>
+Why have you come back? You got the Gem Box. What else do you need from me? Hurry up and give the diamond back to the owner.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..f9908cd97071e1b98e7c52a8c4a419916c3444d2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-06.html
@@ -0,0 +1,5 @@
+<html><body>Blacksmith Brunon:<br>
+Woot?! Is that Murdoc's coal...? How did you...?<br>
+Oh yeah! The treasure chests must have been mixed up! Haha...! How could it have...?! Hey, don't look at me.. Somehow the chest with diamonds got mixed up with the treasure chest of <font color="LEVEL">Warehouse Keeper Murdoc</font>. Hahaha... ah nuts.<br>
+Look, I'm sorry, I'll write a letter explaining this whole mess. Give it to Warehouse Keeper Murdoc. He can correct this for us.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..9c60e2c689c92bab90436859b54fbb03215354a5
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-07.html
@@ -0,0 +1,3 @@
+<html><body>Blacksmith Brunon:<br>
+Look! I didn't mean it! I was not trying to deceive you! Take the letter I wrote to <font color="LEVEL">Warehouse Keeper Murdoc</font>. Then, you will be able to get your Gem Box back.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-08.html
new file mode 100644
index 0000000000000000000000000000000000000000..1475c0ea3b810a5094b052f68481520ebb225406
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30526-08.html
@@ -0,0 +1,3 @@
+<html><body>Blacksmith Brunon:<br>
+... Look. I am very busy now... I don't know what you are up to, but can we talk about this later?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30529-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30529-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..00f7a663d9c11e6f5e11bfadb0ec23b05f6bd89f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30529-01.html
@@ -0,0 +1,5 @@
+<html><body>Miner Maron:<br>
+Elven Wine...? A gift from Torocco? Oh my... This gift is great, but... he's going to have to fix that bad drinking habit of his... I'm always worried that Torocco might start trouble while drinking...<br>
+Whew... I am worried about him... My friend, Torocco, is a fine, steady lad, but... He has two bad habits... One is drinking... And the other is gambling...<br>
+... We were drinking together last night... Then, <font color="LEVEL">Blacksmith Brunon</font> suggested we gamble with dice... I told him not to... but Torocco just couldn't resist the temptation, and started to roll the dice... These exact dice here... He was very drunk and lost everything he had... Whew... He may be my friend, but I'm very ashamed of him...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30529-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30529-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..0e1e5eea7dce2a843a04205add8eea758c79cd7d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30529-02.html
@@ -0,0 +1,3 @@
+<html><body>Miner Maron:<br>
+Ah! You again... Are you an investigator of the Bronze Key Guild? I told you everything I know... I don't know about the Star Diamond... But what I know for sure is that my friend lost everything he had while gambling... to <font color="LEVEL">Blacksmith Brunon</font>.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30529-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30529-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..c7daca04e4f0500265316e3bc6a40921a18f70bb
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30529-03.html
@@ -0,0 +1,3 @@
+<html><body>Miner Maron:<br>
+Whew... I am very worried about my friend, Torocco... He is a nice fellow... Except for his terrible drinking and gambling habits... I don't know when he will cause another problem, so I can't let down my guard... Whew...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30555-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30555-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..6fb09260c5b479313f128fcaf24fbaa4aa7a47c4
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30555-01.html
@@ -0,0 +1,5 @@
+<html><body>Carrier Torocco:<br>
+Blast... What should I do? What should I do? How can I ever get that diamond back? I am in so much trouble... Gouph will kill me... What should I do?<br>
+... What the?! Who are you? How long have you been there? Did Gouph sent you?? Agghh... I'm sorry! Please forgive me...!!! I don't know what to do!!! I lost the legendary Star Diamond, that was my responsibility!!! I dishonored the Carriers, who are famous for their competence... My guild will excommunicate me... I won't be able to pay off the expensive fines even if I worked for the rest of my life? My colleagues and my family will laugh at me... Aghh... This is the end of my life!<br>
+<a action="bypass -h Quest Q00108_JumbleTumbleDiamondFuss 30555-02.html">Ask what happened.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30555-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30555-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..43d536b714f66f41cb3402ee2b46b928e131bbb9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30555-02.html
@@ -0,0 +1,5 @@
+<html><body>Carrier Torocco:<br>
+I received the Star Diamond at Giran... and drew a Contract with Reep... I told him that I would be responsible for delivery... Everything was great when I was traveling... And I got here, Kingdom of the Dwarves, last night... I drank with my old friend, <font color="LEVEL">Miner Maron</font>... We have been friends ever since we were very young... When we meet once in awhile, we have the bad habit of drinking until we pass out...<br>
+... and we had quite a bit to drink last night... But when I woke up in the morning, I found that my weapons, equipment, travel money, and the box where I put the Star Diamond were missing...! I don't know what could have happened... Agghhhhh...! However... Perhaps my friend Maron remembers something about last night...<br>
+But he paid for the drinks last night, as well as for the tables and chairs I broke... I'm too ashamed to meet him... Why don't you go to the <font color="LEVEL">Strip Mine</font> and ask him? Give this wine to Maron for me... This is a rare wine I brought for him from Giran as a present...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30555-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30555-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..5e490195551e6f5590e2f6038287623eacd3510a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30555-03.html
@@ -0,0 +1,4 @@
+<html><body>Carrier Torocco:<br>
+Have you found the Star Diamond...? Not yet... Oh no, oh no... What should I do...<br>
+But you... Didn't you say that you would meet my friend, <font color="LEVEL">Miner Maron</font>, and ask him about the jewel? Hurry up and go to the <font color="LEVEL">Strip Mine</font> and meet Maron!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30555-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30555-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..8481bff8dfdf0c53d5ad4833c23d8f34737e7f23
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30555-04.html
@@ -0,0 +1,3 @@
+<html><body>Carrier Torocco:<br>
+This is...? Oh wow! The Treasure Chest I was delivering...! You've found the Star Diamond!!! Thank you. Thank you. How can I ever repay you... But first, please take this Treasure Chest to <font color="LEVEL">Collector Gouph</font>... He must be waiting...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30555-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30555-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..20b712fcc6f5bfcc68f9981b8a17362d29f36572
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/30555-05.html
@@ -0,0 +1,3 @@
+<html><body>Carrier Torocco:<br>
+What should I do... What should I do... How can I ever get the diamond back... I am in so much trouble... Gouph will kill me... What should I do... What should I do... Disqualification and excommunication from the guild... ... Expensive fines that I can never pay back in this lifetime... The mocking laughter of my colleagues and my family... Aghh... This is the end of my life...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
new file mode 100644
index 0000000000000000000000000000000000000000..59917611207b337c86bb0e4f5c20796b51401ea9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
@@ -0,0 +1,573 @@
+/*
+ * 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.Q00108_JumbleTumbleDiamondFuss;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
+
+import com.l2jserver.gameserver.enums.PcRace;
+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.ItemHolder;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.network.serverpackets.SocialAction;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Jumble, Tumble, Diamond Fuss (108)
+ * @author Janiko
+ */
+public final class Q00108_JumbleTumbleDiamondFuss extends Quest
+{
+ // NPCs
+ private static final int COLLECTOR_GOUPH = 30523;
+ private static final int TRADER_REEP = 30516;
+ private static final int CARRIER_TOROCCO = 30555;
+ private static final int MINER_MARON = 30529;
+ private static final int BLACKSMITH_BRUNON = 30526;
+ private static final int WAREHOUSE_KEEPER_MURDOC = 30521;
+ private static final int WAREHOUSE_KEEPER_AIRY = 30522;
+ // Monsters
+ private static final int GOBLIN_BRIGAND_LEADER = 20323;
+ private static final int GOBLIN_BRIGAND_LIEUTENANT = 20324;
+ private static final int BLADE_BAT = 20480;
+ // Items
+ private static final int GOUPHS_CONTRACT = 1559;
+ private static final int REEPS_CONTRACT = 1560;
+ private static final int ELVEN_WINE = 1561;
+ private static final int BRUNONS_DICE = 1562;
+ private static final int BRUNONS_CONTRACT = 1563;
+ private static final int AQUAMARINE = 1564;
+ private static final int CHRYSOBERYL = 1565;
+ private static final int GEM_BOX = 1566;
+ private static final int COAL_PIECE = 1567;
+ private static final int BRUNONS_LETTER = 1568;
+ private static final int BERRY_TART = 1569;
+ private static final int BAT_DIAGRAM = 1570;
+ private static final int STAR_DIAMOND = 1571;
+ // Rewards
+ private static final ItemHolder[] REWARDS =
+ {
+ new ItemHolder(1060, 100), // Lesser Healing Potion
+ new ItemHolder(4412, 10), // Echo Crystal - Theme of Battle
+ new ItemHolder(4413, 10), // Echo Crystal - Theme of Love
+ new ItemHolder(4414, 10), // Echo Crystal - Theme of Solitude
+ new ItemHolder(4415, 10), // Echo Crystal - Theme of Feast
+ new ItemHolder(4416, 10), // Echo Crystal - Theme of Celebration
+ };
+ private static final int SILVERSMITH_HAMMER = 1511;
+ // Misc
+ private static final int MIN_LVL = 10;
+ private static final int MAX_GEM_COUNT = 10;
+ private static final Map<Integer, Double> GOBLIN_DROP_CHANCES = new HashMap<>();
+ static
+ {
+ GOBLIN_DROP_CHANCES.put(GOBLIN_BRIGAND_LEADER, 0.8);
+ GOBLIN_DROP_CHANCES.put(GOBLIN_BRIGAND_LIEUTENANT, 0.6);
+ }
+
+ private Q00108_JumbleTumbleDiamondFuss(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+ addStartNpc(COLLECTOR_GOUPH);
+ addTalkId(COLLECTOR_GOUPH, TRADER_REEP, CARRIER_TOROCCO, MINER_MARON, BLACKSMITH_BRUNON, WAREHOUSE_KEEPER_MURDOC, WAREHOUSE_KEEPER_AIRY);
+ addKillId(GOBLIN_BRIGAND_LEADER, GOBLIN_BRIGAND_LIEUTENANT, BLADE_BAT);
+ registerQuestItems(GOUPHS_CONTRACT, REEPS_CONTRACT, ELVEN_WINE, BRUNONS_DICE, BRUNONS_CONTRACT, AQUAMARINE, CHRYSOBERYL, GEM_BOX, COAL_PIECE, BRUNONS_LETTER, BERRY_TART, BAT_DIAGRAM, STAR_DIAMOND);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState st = player.getQuestState(getName());
+ String htmltext = null;
+ if (st == null)
+ {
+ return htmltext;
+ }
+ switch (event)
+ {
+ case "30523-04.htm":
+ {
+ if (st.isCreated())
+ {
+ st.startQuest();
+ st.giveItems(GOUPHS_CONTRACT, 1);
+ htmltext = event;
+ }
+ break;
+ }
+ case "30555-02.html":
+ {
+ if (st.isCond(2) && st.hasQuestItems(REEPS_CONTRACT))
+ {
+ st.takeItems(REEPS_CONTRACT, -1);
+ st.giveItems(ELVEN_WINE, 1);
+ st.setCond(3, true);
+ htmltext = event;
+ }
+ break;
+ }
+ case "30526-02.html":
+ {
+ if (st.isCond(4) && st.hasQuestItems(BRUNONS_DICE))
+ {
+ st.takeItems(BRUNONS_DICE, -1);
+ st.giveItems(BRUNONS_CONTRACT, 1);
+ st.setCond(5, true);
+ htmltext = event;
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance talker)
+ {
+ final QuestState st = talker.getQuestState(getName());
+ String htmltext = getNoQuestMsg(talker);
+ if (st == null)
+ {
+ return htmltext;
+ }
+ switch (npc.getId())
+ {
+ case COLLECTOR_GOUPH:
+ {
+ switch (st.getState())
+ {
+ case State.CREATED:
+ {
+ if (talker.getRace() != PcRace.Dwarf)
+ {
+ htmltext = "30523-01.htm";
+ }
+ else if (talker.getLevel() < MIN_LVL)
+ {
+ htmltext = "30523-02.htm";
+ }
+ else
+ {
+ htmltext = "30523-03.htm";
+ }
+ break;
+ }
+ case State.STARTED:
+ {
+ switch (st.getCond())
+ {
+ case 1:
+ {
+ if (st.hasQuestItems(GOUPHS_CONTRACT))
+ {
+ htmltext = "30523-05.html";
+ }
+ break;
+ }
+ case 2:
+ case 3:
+ case 4:
+ case 5:
+ case 6:
+ {
+ if (hasAtLeastOneQuestItem(talker, REEPS_CONTRACT, ELVEN_WINE, BRUNONS_DICE, BRUNONS_CONTRACT))
+ {
+ htmltext = "30523-06.html";
+ }
+ break;
+ }
+ case 7:
+ {
+ if (st.hasQuestItems(GEM_BOX))
+ {
+ st.takeItems(GEM_BOX, -1);
+ st.giveItems(COAL_PIECE, 1);
+ st.setCond(8, true);
+ htmltext = "30523-07.html";
+ }
+ break;
+ }
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ {
+ if (hasAtLeastOneQuestItem(talker, COAL_PIECE, BRUNONS_LETTER, BERRY_TART, BAT_DIAGRAM))
+ {
+ htmltext = "30523-08.html";
+ }
+ break;
+ }
+ case 12:
+ {
+ if (st.hasQuestItems(STAR_DIAMOND))
+ {
+ Q00281_HeadForTheHills.giveNewbieReward(talker);
+ st.addExpAndSp(34565, 2962);
+ st.giveAdena(14666, true);
+ for (ItemHolder reward : REWARDS)
+ {
+ st.giveItems(reward);
+ }
+ st.giveItems(SILVERSMITH_HAMMER, 1);
+ st.exitQuest(false, true);
+ talker.sendPacket(new SocialAction(talker.getObjectId(), 3));
+ htmltext = "30523-09.html";
+ }
+ break;
+ }
+
+ }
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(talker);
+ break;
+ }
+ }
+ break;
+ }
+ case TRADER_REEP:
+ {
+ switch (st.getCond())
+ {
+ case 1:
+ {
+ if (st.hasQuestItems(GOUPHS_CONTRACT))
+ {
+ st.takeItems(GOUPHS_CONTRACT, -1);
+ st.giveItems(REEPS_CONTRACT, 1);
+ st.setCond(2, true);
+ htmltext = "30516-01.html";
+ }
+ break;
+ }
+ case 2:
+ {
+ if (st.hasQuestItems(REEPS_CONTRACT))
+ {
+ htmltext = "30516-02.html";
+ }
+ break;
+ }
+ default:
+ {
+ if (st.getCond() > 2)
+ {
+ htmltext = "30516-02.html";
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case CARRIER_TOROCCO:
+ {
+ switch (st.getCond())
+ {
+ case 2:
+ {
+ if (st.hasQuestItems(REEPS_CONTRACT))
+ {
+ htmltext = "30555-01.html";
+ }
+ break;
+ }
+ case 3:
+ {
+ if (st.hasQuestItems(ELVEN_WINE))
+ {
+ htmltext = "30555-03.html";
+ }
+ break;
+ }
+ case 7:
+ {
+ if (st.hasQuestItems(GEM_BOX))
+ {
+ htmltext = "30555-04.html";
+ }
+ break;
+ }
+ default:
+ {
+ if (st.isStarted())
+ {
+ htmltext = "30555-05.html";
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case MINER_MARON:
+ {
+ switch (st.getCond())
+ {
+ case 3:
+ {
+ if (st.hasQuestItems(ELVEN_WINE))
+ {
+ st.takeItems(ELVEN_WINE, -1);
+ st.giveItems(BRUNONS_DICE, 1);
+ st.setCond(4, true);
+ htmltext = "30529-01.html";
+ }
+ break;
+ }
+ case 4:
+ {
+ if (st.hasQuestItems(BRUNONS_DICE))
+ {
+ htmltext = "30529-02.html";
+ }
+ break;
+ }
+ default:
+ {
+ if (st.getCond() > 4)
+ {
+ htmltext = "30529-03.html";
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case BLACKSMITH_BRUNON:
+ {
+ switch (st.getCond())
+ {
+ case 4:
+ {
+ if (st.hasQuestItems(BRUNONS_DICE))
+ {
+ htmltext = "30526-01.html";
+ }
+ break;
+ }
+ case 5:
+ {
+ if (st.hasQuestItems(BRUNONS_CONTRACT))
+ {
+ htmltext = "30526-03.html";
+ }
+ break;
+ }
+ case 6:
+ {
+ if (st.hasQuestItems(BRUNONS_CONTRACT) && (st.getQuestItemsCount(AQUAMARINE) >= MAX_GEM_COUNT) && (st.getQuestItemsCount(CHRYSOBERYL) >= MAX_GEM_COUNT))
+ {
+ takeItems(talker, -1, BRUNONS_CONTRACT, AQUAMARINE, CHRYSOBERYL);
+ st.giveItems(GEM_BOX, 1);
+ st.setCond(7, true);
+ htmltext = "30526-04.html";
+ }
+ break;
+ }
+ case 7:
+ {
+ if (st.hasQuestItems(GEM_BOX))
+ {
+ htmltext = "30526-05.html";
+ }
+ break;
+ }
+ case 8:
+ {
+ if (st.hasQuestItems(COAL_PIECE))
+ {
+ st.takeItems(COAL_PIECE, -1);
+ st.giveItems(BRUNONS_LETTER, 1);
+ st.setCond(9, true);
+ htmltext = "30526-06.html";
+ }
+ break;
+ }
+ case 9:
+ {
+ if (st.hasQuestItems(BRUNONS_LETTER))
+ {
+ htmltext = "30526-07.html";
+ }
+ break;
+ }
+ case 10:
+ case 11:
+ case 12:
+ {
+ if (hasAtLeastOneQuestItem(talker, BERRY_TART, BAT_DIAGRAM, STAR_DIAMOND))
+ {
+ htmltext = "30526-08.html";
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case WAREHOUSE_KEEPER_MURDOC:
+ {
+ switch (st.getCond())
+ {
+ case 9:
+ {
+ if (st.hasQuestItems(BRUNONS_LETTER))
+ {
+ st.takeItems(BRUNONS_LETTER, -1);
+ st.giveItems(BERRY_TART, 1);
+ st.setCond(10, true);
+ htmltext = "30521-01.html";
+ }
+ break;
+ }
+ case 10:
+ {
+ if (st.hasQuestItems(BERRY_TART))
+ {
+ htmltext = "30521-02.html";
+ }
+ break;
+ }
+ case 11:
+ case 12:
+ {
+ htmltext = "30521-03.html";
+ break;
+ }
+ }
+ break;
+ }
+ case WAREHOUSE_KEEPER_AIRY:
+ {
+ switch (st.getCond())
+ {
+ case 10:
+ {
+ if (st.hasQuestItems(BERRY_TART))
+ {
+ st.takeItems(BERRY_TART, -1);
+ st.giveItems(BAT_DIAGRAM, 1);
+ st.setCond(11, true);
+ htmltext = "30522-01.html";
+ }
+ break;
+ }
+ case 11:
+ {
+ if (st.hasQuestItems(BAT_DIAGRAM))
+ {
+ htmltext = "30522-02.html";
+ }
+ break;
+ }
+ case 12:
+ {
+ if (st.hasQuestItems(STAR_DIAMOND))
+ {
+ htmltext = "30522-03.html";
+ }
+ break;
+ }
+ default:
+ {
+ if (st.isStarted())
+ {
+ htmltext = "30522-04.html";
+ }
+ break;
+ }
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
+ {
+ final QuestState st = killer.getQuestState(getName());
+ if ((st != null) && Util.checkIfInRange(1500, npc, killer, true))
+ {
+ switch (npc.getId())
+ {
+ case GOBLIN_BRIGAND_LEADER:
+ case GOBLIN_BRIGAND_LIEUTENANT:
+ {
+ if (st.isCond(5) && st.hasQuestItems(BRUNONS_CONTRACT))
+ {
+ final double dropChance = GOBLIN_DROP_CHANCES.get(npc.getId());
+ boolean playSound = false;
+ if (st.giveItemRandomly(npc, AQUAMARINE, 1, MAX_GEM_COUNT, dropChance, false))
+ {
+ if (st.getQuestItemsCount(CHRYSOBERYL) >= MAX_GEM_COUNT)
+ {
+ st.setCond(6, true);
+ break;
+ }
+
+ playSound = true;
+ }
+ if (st.giveItemRandomly(npc, CHRYSOBERYL, 1, MAX_GEM_COUNT, dropChance, false))
+ {
+ if (st.getQuestItemsCount(AQUAMARINE) >= MAX_GEM_COUNT)
+ {
+ st.setCond(6, true);
+ break;
+ }
+
+ playSound = true;
+ }
+
+ if (playSound)
+ {
+ st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ break;
+ }
+ case BLADE_BAT:
+ {
+ if (st.isCond(11) && st.hasQuestItems(BAT_DIAGRAM))
+ {
+ if (st.giveItemRandomly(npc, STAR_DIAMOND, 1, 1, 0.2, true))
+ {
+ st.takeItems(BAT_DIAGRAM, -1);
+ st.setCond(12);
+ }
+ }
+ break;
+ }
+ }
+ }
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ public static void main(String[] args)
+ {
+ new Q00108_JumbleTumbleDiamondFuss(108, Q00108_JumbleTumbleDiamondFuss.class.getSimpleName(), "Jumble, Tumble, Diamond Fuss");
+ }
+}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/20130919update.sql b/L2J_DataPack_BETA/dist/sql/game/updates/20130919update.sql
new file mode 100644
index 0000000000000000000000000000000000000000..d9a4e29b0786b9cfb65a5b930188f0ed4d1df6bc
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/20130919update.sql
@@ -0,0 +1 @@
+UPDATE character_quests SET name='Q00108_JumbleTumbleDiamondFuss' WHERE name='108_JumbleTumbleDiamondFuss';
\ No newline at end of file