From f0c85d342a842844081b2cd3a8c736519037e8ad Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Mon, 30 Jan 2012 07:39:42 +0000
Subject: [PATCH] BETA: Quests in Java by nonom: * Secret Meeting With
Ketra Orcs (11) * Secret Meeting With Varka Silenos (12) *
Parcel Delivery (13) * Whereabouts of the Archaeologist (14) *
Sweet Whispers (15) * The Coming Darkness (16) * Light and Darkness
(17) * Meeting with the Golden Ram (18) * Added SQL update queries for
quests that changed it's name.
Review, tests and fixes by me, thanks jurchiks for suggestions for improvements and typos.
---
L2J_DataPack_BETA/dist/game/data/scripts.cfg | 16 +-
.../11_SecretMeetingWithKetraOrcs/__init__.py | 80 ---------
.../31258-03.htm | 3 -
.../__init__.py | 80 ---------
.../quests/13_ParcelDelivery/__init__.py | 71 --------
.../__init__.py | 69 --------
.../quests/15_SweetWhisper/31302-1a.htm | 3 -
.../quests/15_SweetWhisper/__init__.py | 73 --------
.../quests/16_TheComingDarkness/31517-0.htm | 4 -
.../quests/16_TheComingDarkness/__init__.py | 110 ------------
.../quests/17_LightAndDarkness/__init__.py | 136 ---------------
.../18_MeetingWithTheGoldenRam/__init__.py | 77 ---------
.../31256-01.html} | 2 +-
.../31256-02.html} | 0
.../31256-03.html} | 0
.../31296-01.htm | 2 +-
.../31296-02.html} | 0
.../31296-03.html} | 0
.../31296-04.html} | 0
.../31371-01.html} | 2 +-
.../31371-02.html} | 0
.../31371-03.html | 3 +
.../Q11_SecretMeetingWithKetraOrcs.java | 147 +++++++++++++++++
.../31258-01.html} | 2 +-
.../31258-02.html} | 0
.../31258-03.html | 3 +
.../31296-01.htm | 2 +-
.../31296-02.html} | 0
.../31296-03.html} | 0
.../31296-04.html} | 0
.../31378-01.html} | 2 +-
.../31378-02.html} | 0
.../31378-03.html | 3 +
.../Q12_SecretMeetingWithVarkaSilenos.java | 144 ++++++++++++++++
.../31274-00.htm} | 2 +-
.../31274-01.html} | 0
.../31274-02.html} | 0
.../31539-00.html} | 2 +-
.../31539-01.html} | 0
.../quests/Q13_ParcelDelivery/31539-02.html | 3 +
.../Q13_ParcelDelivery.java | 134 +++++++++++++++
.../31263-00.htm} | 2 +-
.../31263-01.html} | 0
.../31263-02.html} | 0
.../31538-00.html} | 2 +-
.../31538-01.html} | 0
.../31538-02.html | 3 +
.../Q14_WhereaboutsOfTheArchaeologist.java | 128 ++++++++++++++
.../31302-00.htm} | 2 +-
.../31302-00a.html} | 0
.../31302-01.html} | 0
.../quests/Q15_SweetWhispers/31302-1a.html | 3 +
.../31517-00.html} | 2 +-
.../31517-01.html} | 0
.../31518-00.html} | 2 +-
.../31518-01.html} | 0
.../31518-01a.html} | 0
.../Q15_SweetWhispers/Q15_SweetWhispers.java | 142 ++++++++++++++++
.../31512-00.html} | 2 +-
.../31512-01.html} | 0
.../31513-00.html} | 2 +-
.../31513-01.html} | 0
.../31514-00.html} | 2 +-
.../31514-01.html} | 0
.../31515-00.html} | 2 +-
.../31515-01.html} | 0
.../31516-00.html} | 2 +-
.../31516-01.html} | 0
.../quests/Q16_TheComingDarkness/31517-00.htm | 4 +
.../31517-01.htm} | 4 +-
.../31517-02.htm} | 4 +-
.../Q16_TheComingDarkness/31517-02a.html | 3 +
.../31517-03.html} | 4 +-
.../Q16_TheComingDarkness/31517-04.html | 3 +
.../Q16_TheComingDarkness/31517-05.html | 4 +
.../Q16_TheComingDarkness.java | 152 +++++++++++++++++
.../31508-00.html} | 2 +-
.../31508-01.html} | 0
.../31508-02.html} | 0
.../31508-03.html} | 0
.../31509-00.html} | 2 +-
.../31509-01.html} | 0
.../31509-02.html} | 0
.../31509-03.html} | 0
.../31510-00.html} | 2 +-
.../31510-01.html} | 0
.../31510-02.html} | 0
.../31510-03.html} | 0
.../31511-00.html} | 2 +-
.../31511-01.html} | 0
.../31511-02.html} | 0
.../31511-03.html} | 0
.../31517-00.htm | 0
.../31517-01.htm | 2 +-
.../31517-02.html} | 0
.../31517-02a.html} | 0
.../31517-03.html} | 0
.../31517-04.html} | 0
.../31517-05.html} | 0
.../quests/Q17_LightAndDarkness/31517-06.html | 3 +
.../Q17_LightAndDarkness.java | 156 ++++++++++++++++++
.../31314-01.htm | 2 +-
.../31314-02.html} | 3 +-
.../31314-03.html} | 3 +-
.../31314-04.html} | 3 +-
.../31315-01.html} | 2 +-
.../31315-02.html} | 3 +-
.../31315-03.html} | 3 +-
.../31555-01.html} | 2 +-
.../31555-02.html} | 3 +-
.../Q18_MeetingWithTheGoldenRam.java | 136 +++++++++++++++
.../dist/sql/game/updates/20120130update.sql | 2 +
112 files changed, 1228 insertions(+), 752 deletions(-)
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/__init__.py
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31258-03.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/__init__.py
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/13_ParcelDelivery/__init__.py
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/__init__.py
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31302-1a.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/__init__.py
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31517-0.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/__init__.py
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/__init__.py
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/__init__.py
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{11_SecretMeetingWithKetraOrcs/31256-01.htm => Q11_SecretMeetingWithKetraOrcs/31256-01.html} (95%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{11_SecretMeetingWithKetraOrcs/31256-02.htm => Q11_SecretMeetingWithKetraOrcs/31256-02.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{11_SecretMeetingWithKetraOrcs/31256-03.htm => Q11_SecretMeetingWithKetraOrcs/31256-03.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{11_SecretMeetingWithKetraOrcs => Q11_SecretMeetingWithKetraOrcs}/31296-01.htm (92%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{11_SecretMeetingWithKetraOrcs/31296-02.htm => Q11_SecretMeetingWithKetraOrcs/31296-02.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{11_SecretMeetingWithKetraOrcs/31296-03.htm => Q11_SecretMeetingWithKetraOrcs/31296-03.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{11_SecretMeetingWithKetraOrcs/31296-04.htm => Q11_SecretMeetingWithKetraOrcs/31296-04.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{11_SecretMeetingWithKetraOrcs/31371-01.htm => Q11_SecretMeetingWithKetraOrcs/31371-01.html} (77%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{11_SecretMeetingWithKetraOrcs/31371-02.htm => Q11_SecretMeetingWithKetraOrcs/31371-02.html} (100%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31371-03.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/Q11_SecretMeetingWithKetraOrcs.java
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{12_SecretMeetingWithVarkaSilenos/31258-01.htm => Q12_SecretMeetingWithVarkaSilenos/31258-01.html} (91%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{12_SecretMeetingWithVarkaSilenos/31258-02.htm => Q12_SecretMeetingWithVarkaSilenos/31258-02.html} (100%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31258-03.html
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{12_SecretMeetingWithVarkaSilenos => Q12_SecretMeetingWithVarkaSilenos}/31296-01.htm (91%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{12_SecretMeetingWithVarkaSilenos/31296-02.htm => Q12_SecretMeetingWithVarkaSilenos/31296-02.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{12_SecretMeetingWithVarkaSilenos/31296-03.htm => Q12_SecretMeetingWithVarkaSilenos/31296-03.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{12_SecretMeetingWithVarkaSilenos/31296-04.htm => Q12_SecretMeetingWithVarkaSilenos/31296-04.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{12_SecretMeetingWithVarkaSilenos/31378-01.htm => Q12_SecretMeetingWithVarkaSilenos/31378-01.html} (75%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{12_SecretMeetingWithVarkaSilenos/31378-02.htm => Q12_SecretMeetingWithVarkaSilenos/31378-02.html} (100%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31378-03.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/Q12_SecretMeetingWithVarkaSilenos.java
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{13_ParcelDelivery/31274-0.htm => Q13_ParcelDelivery/31274-00.htm} (66%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{13_ParcelDelivery/31274-1.htm => Q13_ParcelDelivery/31274-01.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{13_ParcelDelivery/31274-2.htm => Q13_ParcelDelivery/31274-02.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{13_ParcelDelivery/31539-0.htm => Q13_ParcelDelivery/31539-00.html} (66%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{13_ParcelDelivery/31539-1.htm => Q13_ParcelDelivery/31539-01.html} (100%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/31539-02.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/Q13_ParcelDelivery.java
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{14_WhereaboutsOfTheArchaeologist/31263-0.htm => Q14_WhereaboutsOfTheArchaeologist/31263-00.htm} (91%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{14_WhereaboutsOfTheArchaeologist/31263-1.htm => Q14_WhereaboutsOfTheArchaeologist/31263-01.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{14_WhereaboutsOfTheArchaeologist/31263-2.htm => Q14_WhereaboutsOfTheArchaeologist/31263-02.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{14_WhereaboutsOfTheArchaeologist/31538-0.htm => Q14_WhereaboutsOfTheArchaeologist/31538-00.html} (88%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{14_WhereaboutsOfTheArchaeologist/31538-1.htm => Q14_WhereaboutsOfTheArchaeologist/31538-01.html} (100%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/31538-02.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/Q14_WhereaboutsOfTheArchaeologist.java
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{15_SweetWhisper/31302-0.htm => Q15_SweetWhispers/31302-00.htm} (66%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{15_SweetWhisper/31302-0a.htm => Q15_SweetWhispers/31302-00a.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{15_SweetWhisper/31302-1.htm => Q15_SweetWhispers/31302-01.html} (100%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31302-1a.html
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{15_SweetWhisper/31517-0.htm => Q15_SweetWhispers/31517-00.html} (55%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{15_SweetWhisper/31517-1.htm => Q15_SweetWhispers/31517-01.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{15_SweetWhisper/31518-0.htm => Q15_SweetWhispers/31518-00.html} (55%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{15_SweetWhisper/31518-1.htm => Q15_SweetWhispers/31518-01.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{15_SweetWhisper/31518-1a.htm => Q15_SweetWhispers/31518-01a.html} (100%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/Q15_SweetWhispers.java
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{16_TheComingDarkness/31512-0.htm => Q16_TheComingDarkness/31512-00.html} (54%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{16_TheComingDarkness/31512-1.htm => Q16_TheComingDarkness/31512-01.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{16_TheComingDarkness/31513-0.htm => Q16_TheComingDarkness/31513-00.html} (53%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{16_TheComingDarkness/31513-1.htm => Q16_TheComingDarkness/31513-01.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{16_TheComingDarkness/31516-0.htm => Q16_TheComingDarkness/31514-00.html} (54%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{16_TheComingDarkness/31514-1.htm => Q16_TheComingDarkness/31514-01.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{16_TheComingDarkness/31514-0.htm => Q16_TheComingDarkness/31515-00.html} (54%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{16_TheComingDarkness/31515-1.htm => Q16_TheComingDarkness/31515-01.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{16_TheComingDarkness/31515-0.htm => Q16_TheComingDarkness/31516-00.html} (54%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{16_TheComingDarkness/31516-1.htm => Q16_TheComingDarkness/31516-01.html} (100%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-00.htm
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{16_TheComingDarkness/31517-1.htm => Q16_TheComingDarkness/31517-01.htm} (71%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{16_TheComingDarkness/31517-2.htm => Q16_TheComingDarkness/31517-02.htm} (86%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-02a.html
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{16_TheComingDarkness/31517-3.htm => Q16_TheComingDarkness/31517-03.html} (52%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-04.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-05.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/Q16_TheComingDarkness.java
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31508-00.htm => Q17_LightAndDarkness/31508-00.html} (68%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31508-01.htm => Q17_LightAndDarkness/31508-01.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31508-02.htm => Q17_LightAndDarkness/31508-02.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31508-03.htm => Q17_LightAndDarkness/31508-03.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31509-00.htm => Q17_LightAndDarkness/31509-00.html} (72%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31509-01.htm => Q17_LightAndDarkness/31509-01.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31509-02.htm => Q17_LightAndDarkness/31509-02.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31509-03.htm => Q17_LightAndDarkness/31509-03.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31510-00.htm => Q17_LightAndDarkness/31510-00.html} (55%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31510-01.htm => Q17_LightAndDarkness/31510-01.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31510-02.htm => Q17_LightAndDarkness/31510-02.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31510-03.htm => Q17_LightAndDarkness/31510-03.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31511-00.htm => Q17_LightAndDarkness/31511-00.html} (63%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31511-01.htm => Q17_LightAndDarkness/31511-01.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31511-02.htm => Q17_LightAndDarkness/31511-02.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31511-03.htm => Q17_LightAndDarkness/31511-03.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness => Q17_LightAndDarkness}/31517-00.htm (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness => Q17_LightAndDarkness}/31517-01.htm (72%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31517-02.htm => Q17_LightAndDarkness/31517-02.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31517-02a.htm => Q17_LightAndDarkness/31517-02a.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31517-03.htm => Q17_LightAndDarkness/31517-03.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31517-04.htm => Q17_LightAndDarkness/31517-04.html} (100%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{17_LightAndDarkness/31517-05.htm => Q17_LightAndDarkness/31517-05.html} (100%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-06.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/Q17_LightAndDarkness.java
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{18_MeetingWithTheGoldenRam => Q18_MeetingWithTheGoldenRam}/31314-01.htm (88%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{18_MeetingWithTheGoldenRam/31314-02.htm => Q18_MeetingWithTheGoldenRam/31314-02.html} (84%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{18_MeetingWithTheGoldenRam/31314-03.htm => Q18_MeetingWithTheGoldenRam/31314-03.html} (64%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{18_MeetingWithTheGoldenRam/31314-04.htm => Q18_MeetingWithTheGoldenRam/31314-04.html} (78%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{18_MeetingWithTheGoldenRam/31315-01.htm => Q18_MeetingWithTheGoldenRam/31315-01.html} (86%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{18_MeetingWithTheGoldenRam/31315-02.htm => Q18_MeetingWithTheGoldenRam/31315-02.html} (83%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{18_MeetingWithTheGoldenRam/31315-03.htm => Q18_MeetingWithTheGoldenRam/31315-03.html} (72%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{18_MeetingWithTheGoldenRam/31555-01.htm => Q18_MeetingWithTheGoldenRam/31555-01.html} (85%)
rename L2J_DataPack_BETA/dist/game/data/scripts/quests/{18_MeetingWithTheGoldenRam/31555-02.htm => Q18_MeetingWithTheGoldenRam/31555-02.html} (70%)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/Q18_MeetingWithTheGoldenRam.java
create mode 100644 L2J_DataPack_BETA/dist/sql/game/updates/20120130update.sql
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index f38e2ef11d..2aca63a604 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -269,14 +269,14 @@ quests/7_ATripBegins/__init__.py
quests/8_AnAdventureBegins/__init__.py
quests/9_IntoTheCityOfHumans/__init__.py
quests/10_IntoTheWorld/__init__.py
-quests/11_SecretMeetingWithKetraOrcs/__init__.py
-quests/12_SecretMeetingWithVarkaSilenos/__init__.py
-quests/13_ParcelDelivery/__init__.py
-quests/14_WhereaboutsOfTheArchaeologist/__init__.py
-quests/15_SweetWhisper/__init__.py
-quests/16_TheComingDarkness/__init__.py
-quests/17_LightAndDarkness/__init__.py
-quests/18_MeetingWithTheGoldenRam/__init__.py
+quests/Q11_SecretMeetingWithKetraOrcs/Q11_SecretMeetingWithKetraOrcs.java
+quests/Q12_SecretMeetingWithVarkaSilenos/Q12_SecretMeetingWithVarkaSilenos.java
+quests/Q13_ParcelDelivery/Q13_ParcelDelivery.java
+quests/Q14_WhereaboutsOfTheArchaeologist/Q14_WhereaboutsOfTheArchaeologist.java
+quests/Q15_SweetWhispers/Q15_SweetWhispers.java
+quests/Q16_TheComingDarkness/Q16_TheComingDarkness.java
+quests/Q17_LightAndDarkness/Q17_LightAndDarkness.java
+quests/Q18_MeetingWithTheGoldenRam/Q18_MeetingWithTheGoldenRam.java
quests/Q19_GoToThePastureland/Q19_GoToThePastureland.java
quests/Q20_BringUpWithLove/Q20_BringUpWithLove.java
quests/21_HiddenTruth/__init__.py
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/__init__.py
deleted file mode 100644
index d3f90fdb07..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/__init__.py
+++ /dev/null
@@ -1,80 +0,0 @@
-#made by Emperorc
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest.jython import QuestJython as JQuest
-
-qn = "11_SecretMeetingWithKetraOrcs"
-
-#NPCs
-Cadmon = 31296
-Leon = 31256
-Wahkan = 31371
-
-#Item
-Box = 7231
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr): JQuest.__init__(self,id,name,descr)
-
- def onAdvEvent (self,event,npc, player) :
- htmltext = event
- st = player.getQuestState(qn)
- if not st : return
- if event == "31296-03.htm" :
- st.set("cond","1")
- htmltext = "31296-03.htm"
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- elif event == "31256-02.htm" :
- st.set("cond","2")
- htmltext = "31256-02.htm"
- st.giveItems(Box,1)
- st.playSound("ItemSound.quest_middle")
- elif event == "31371-02.htm" :
- htmltext = "31371-02.htm"
- st.takeItems(Box,-1)
- st.addExpAndSp(82045,6047)
- st.unset("cond")
- st.exitQuest(False)
- st.playSound("ItemSound.quest_finish")
- return htmltext
-
- def onTalk (self,npc,player):
- npcId = npc.getNpcId()
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st : return htmltext
-
- cond = st.getInt("cond")
- id = st.getState()
- if id == State.COMPLETED :
- htmltext = Quest.getAlreadyCompletedMsg(player)
- elif id == State.CREATED :
- if st.getPlayer().getLevel() >= 74 :
- htmltext = "31296-01.htm"
- else :
- htmltext = "31296-02.htm"
- st.exitQuest(1)
- elif id == State.STARTED :
- if npcId == Cadmon :
- if cond == 1 :
- htmltext = "31296-04.htm"
- elif npcId == Leon :
- if cond == 1 :
- htmltext = "31256-01.htm"
- elif cond == 2 :
- htmltext = "31256-03.htm"
- elif npcId == Wahkan and cond == 2 :
- htmltext = "31371-01.htm"
- return htmltext
-
-QUEST = Quest(11, qn, "Secret Meeting With Ketra Orcs")
-
-
-QUEST.addStartNpc(Cadmon)
-
-QUEST.addTalkId(Cadmon)
-QUEST.addTalkId(Leon)
-QUEST.addTalkId(Wahkan)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31258-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31258-03.htm
deleted file mode 100644
index 95b538a82b..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31258-03.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Trader Helmut:<br>
-What are you still doing here? Take the box of supplies to<font color="LEVEL"> Naran Ashanuk Herald of Varka</font>!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/__init__.py
deleted file mode 100644
index 3eb9920888..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/__init__.py
+++ /dev/null
@@ -1,80 +0,0 @@
-#made by Emperorc
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest.jython import QuestJython as JQuest
-
-qn = "12_SecretMeetingWithVarkaSilenos"
-
-#NPCs
-Cadmon = 31296
-Helmut = 31258
-Naran = 31378
-
-#Item
-Box = 7232
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr): JQuest.__init__(self,id,name,descr)
-
- def onAdvEvent (self,event,npc, player) :
- htmltext = event
- st = player.getQuestState(qn)
- if not st : return
- if event == "31296-03.htm" :
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- htmltext = "31296-03.htm"
- elif event == "31258-02.htm" :
- st.set("cond","2")
- htmltext = "31258-02.htm"
- st.giveItems(Box,1)
- elif event == "31378-02.htm" :
- htmltext = "31378-02.htm"
- st.takeItems(Box,-1)
- st.addExpAndSp(233125,18142)
- st.set("cond","0")
- st.exitQuest(False)
- st.playSound("ItemSound.quest_finish")
- return htmltext
-
- def onTalk (self,npc,player):
- npcId = npc.getNpcId()
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st : return htmltext
-
- cond = st.getInt("cond")
- id = st.getState()
- if id == State.COMPLETED :
- htmltext = Quest.getAlreadyCompletedMsg(player)
- elif id == State.CREATED :
- if st.getPlayer().getLevel() >= 74 :
- htmltext = "31296-01.htm"
- else :
- htmltext = "31296-02.htm"
- st.exitQuest(1)
- elif id == State.STARTED :
- if npcId == Cadmon :
- if cond == 1 :
- htmltext = "31296-04.htm"
- elif npcId == Helmut :
- if cond == 1 :
- htmltext = "31258-01.htm"
- elif cond == 2 :
- htmltext = "31258-03.htm"
- elif npcId == Naran and cond == 2 :
- htmltext = "31378-01.htm"
- return htmltext
-
-QUEST = Quest(12, qn, "Secret Meeting With Varka Silenos")
-
-
-QUEST.addStartNpc(Cadmon)
-
-QUEST.addTalkId(Cadmon)
-
-QUEST.addTalkId(Helmut)
-QUEST.addTalkId(Naran)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/13_ParcelDelivery/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/13_ParcelDelivery/__init__.py
deleted file mode 100644
index 59ae38c520..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/13_ParcelDelivery/__init__.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# Made by disKret
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest.jython import QuestJython as JQuest
-
-qn = "13_ParcelDelivery"
-
-#NPC
-FUNDIN = 31274
-VULCAN = 31539
-
-#QUEST ITEM
-PACKAGE = 7263
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = [PACKAGE]
-
- def onAdvEvent (self,event,npc, player) :
- htmltext = event
- st = player.getQuestState(qn)
- if not st : return
- cond = st.getInt("cond")
- if event == "31274-2.htm" :
- if cond == 0 :
- st.set("cond","1")
- st.setState(State.STARTED)
- st.giveItems(PACKAGE,1)
- st.playSound("ItemSound.quest_accept")
- if event == "31539-1.htm" :
- if cond == 1 and st.getQuestItemsCount(PACKAGE) == 1 :
- st.takeItems(PACKAGE,1)
- st.giveItems(57,157834)
- st.addExpAndSp(589092,58794)
- st.exitQuest(False)
- st.set("cond","0")
- st.playSound("ItemSound.quest_finish")
- else :
- htmltext = "You don't have required items"
- return htmltext
-
- def onTalk (self,npc,player):
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st : return htmltext
-
- npcId = npc.getNpcId()
- id = st.getState()
- cond = st.getInt("cond")
- if id == State.COMPLETED :
- htmltext = Quest.getAlreadyCompletedMsg(player)
- elif npcId == FUNDIN and id == State.CREATED :
- if player.getLevel() < 74 :
- htmltext = "31274-1.htm"
- st.exitQuest(1)
- else :
- htmltext = "31274-0.htm"
- elif npcId == FUNDIN and cond == 1 :
- htmltext = "31274-2.htm"
- elif npcId == VULCAN and cond == 1 and id == State.STARTED:
- htmltext = "31539-0.htm"
- return htmltext
-
-QUEST = Quest(13,qn,"Parcel Delivery")
-
-QUEST.addStartNpc(31274)
-QUEST.addTalkId(31274)
-QUEST.addTalkId(31539)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/__init__.py
deleted file mode 100644
index 694f72be12..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/__init__.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# Made by disKret
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest.jython import QuestJython as JQuest
-
-qn = "14_WhereaboutsOfTheArchaeologist"
-
-#NPC
-LIESEL = 31263
-GHOST_OF_ADVENTURER = 31538
-
-#QUEST ITEM
-LETTER = 7253
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = [LETTER]
-
- def onAdvEvent (self,event,npc, player) :
- htmltext = event
- st = player.getQuestState(qn)
- if not st : return
- cond = st.getInt("cond")
- if event == "31263-2.htm" and cond == 0 :
- st.set("cond","1")
- st.setState(State.STARTED)
- st.giveItems(LETTER,1)
- st.playSound("ItemSound.quest_accept")
- elif event == "31538-1.htm" :
- if cond == 1 and st.getQuestItemsCount(LETTER) == 1 :
- st.takeItems(LETTER,1)
- st.giveItems(57,136928)
- st.addExpAndSp(325881,32524)
- st.exitQuest(False)
- st.set("cond","0")
- st.playSound("ItemSound.quest_finish")
- else :
- htmltext = "You don't have required items"
- return htmltext
-
- def onTalk (self,npc,player):
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st : return htmltext
- npcId = npc.getNpcId()
- id = st.getState()
- cond = st.getInt("cond")
- if npcId == LIESEL and cond == 0 :
- if id == State.COMPLETED :
- htmltext = Quest.getAlreadyCompletedMsg(player)
- elif player.getLevel() < 74 :
- htmltext = "31263-1.htm"
- st.exitQuest(1)
- elif player.getLevel() >= 74 :
- htmltext = "31263-0.htm"
- elif npcId == LIESEL and cond == 1 :
- htmltext = "31263-2.htm"
- elif npcId == GHOST_OF_ADVENTURER and cond == 1 and id == State.STARTED:
- htmltext = "31538-0.htm"
- return htmltext
-
-QUEST = Quest(14,qn,"Whereabouts Of The Archaeologist")
-
-QUEST.addStartNpc(LIESEL)
-QUEST.addTalkId(LIESEL)
-QUEST.addTalkId(GHOST_OF_ADVENTURER)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31302-1a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31302-1a.htm
deleted file mode 100644
index b4e42f5027..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31302-1a.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Trader Vladimir:<br>
-Find the<font color="LEVEL"> mysterious Necromancer</font> at the entrance to the<font color="LEVEL"> Valley of Saints</font>. He'll help you test your fate.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/__init__.py
deleted file mode 100644
index c9659a9048..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/__init__.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# Made by disKret
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest.jython import QuestJython as JQuest
-
-qn = "15_SweetWhisper"
-
-#NPC
-VLADIMIR = 31302
-HIERARCH = 31517
-M_NECROMANCER = 31518
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr): JQuest.__init__(self,id,name,descr)
-
- def onAdvEvent (self,event,npc, player) :
- htmltext = event
- st = player.getQuestState(qn)
- if not st : return
- cond = st.getInt("cond")
- if event == "31302-1.htm" :
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- if event == "31518-1.htm" :
- if cond == 1 :
- st.set("cond","2")
- st.playSound("ItemSound.quest_middle")
- if event == "31517-1.htm" :
- if cond == 2 :
- st.addExpAndSp(350531,28204)
- st.unset("cond")
- st.playSound("ItemSound.quest_finish")
- st.exitQuest(False)
- return htmltext
-
- def onTalk (self,npc,player):
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st : return htmltext
-
- npcId = npc.getNpcId()
- cond = st.getInt("cond")
- id = st.getState()
- if id == State.COMPLETED :
- htmltext = Quest.getAlreadyCompletedMsg(player)
- elif id == State.CREATED :
- if player.getLevel() >= 60 :
- htmltext = "31302-0.htm"
- else:
- htmltext = "31302-0a.htm"
- st.exitQuest(1)
- elif id == State.STARTED :
- if npcId == VLADIMIR and cond == 1:
- htmltext = "31302-1a.htm"
- elif npcId == M_NECROMANCER and cond == 1 :
- htmltext = "31518-0.htm"
- elif npcId == M_NECROMANCER and cond == 2 :
- htmltext = "31518-1a.htm"
- elif npcId == HIERARCH and cond == 2 :
- htmltext = "31517-0.htm"
- return htmltext
-
-QUEST = Quest(15,qn,"Sweet Whisper")
-
-
-QUEST.addStartNpc(31302)
-QUEST.addTalkId(31302)
-
-QUEST.addTalkId(31517)
-QUEST.addTalkId(31518)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31517-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31517-0.htm
deleted file mode 100644
index 083da6f413..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31517-0.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Hierarch:<br>
-Brother, you've been with us for a long time! You've earned our trust, and therefore I belive you're ready for an important mission!<br>
-<a action="bypass -h Quest 16_TheComingDarkness 31517-1.htm">I'm ready!</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/__init__.py
deleted file mode 100644
index 6c544d90d4..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/__init__.py
+++ /dev/null
@@ -1,110 +0,0 @@
-# Made by disKret, Ancient Legion Server
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest.jython import QuestJython as JQuest
-
-qn = "16_TheComingDarkness"
-
-#NPC
-HIERARCH = 31517
-EVIL_ALTAR_1 = 31512
-EVIL_ALTAR_2 = 31513
-EVIL_ALTAR_3 = 31514
-EVIL_ALTAR_4 = 31515
-EVIL_ALTAR_5 = 31516
-
-#ITEMS
-CRYSTAL_OF_SEAL = 7167
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr): JQuest.__init__(self,id,name,descr)
-
- def onAdvEvent (self,event,npc, player) :
- htmltext = event
- st = player.getQuestState(qn)
- if not st : return
- cond = st.getInt("cond")
- if event == "31517-1.htm" :
- return htmltext
- if event == "31517-2.htm" :
- st.giveItems(CRYSTAL_OF_SEAL,5)
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- if event == "31512-1.htm" :
- if cond == 1 :
- st.takeItems(CRYSTAL_OF_SEAL,1)
- st.set("cond","2")
- st.playSound("ItemSound.quest_middle")
- if event == "31513-1.htm" :
- if cond == 2 :
- st.takeItems(CRYSTAL_OF_SEAL,1)
- st.set("cond","3")
- st.playSound("ItemSound.quest_middle")
- if event == "31514-1.htm" :
- if cond == 3 :
- st.takeItems(CRYSTAL_OF_SEAL,1)
- st.set("cond","4")
- st.playSound("ItemSound.quest_middle")
- if event == "31515-1.htm" :
- if cond == 4 :
- st.takeItems(CRYSTAL_OF_SEAL,1)
- st.set("cond","5")
- st.playSound("ItemSound.quest_middle")
- if event == "31516-1.htm" :
- if cond == 5 :
- st.takeItems(CRYSTAL_OF_SEAL,1)
- st.set("cond","6")
- st.playSound("ItemSound.quest_middle")
- return htmltext
-
- def onTalk (self,npc,player):
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st : return htmltext
-
- npcId = npc.getNpcId()
- cond = st.getInt("cond")
- id = st.getState()
- if id == State.COMPLETED :
- htmltext = Quest.getAlreadyCompletedMsg(player)
- elif id == State.CREATED and npcId == HIERARCH:
- st2 = player.getQuestState("17_LightAndDarkness")
- if st2 and st2.getState() == State.COMPLETED :
- if player.getLevel() >= 62 :
- htmltext = "31517-0.htm"
- else:
- htmltext = "<html><body>(Only characters level 62 and above are permitted to undertake this quest.) </body></html>"
- st.exitQuest(1)
- else:
- htmltext = "<html><body>Quest Light and Darkness need to be finished first.</body></html>"
- st.exitQuest(1)
- elif id == State.STARTED :
- if npcId == EVIL_ALTAR_1 and cond == 1 :
- htmltext = "31512-0.htm"
- if npcId == EVIL_ALTAR_2 and cond == 2 :
- htmltext = "31513-0.htm"
- if npcId == EVIL_ALTAR_3 and cond == 3 :
- htmltext = "31514-0.htm"
- if npcId == EVIL_ALTAR_4 and cond== 4 :
- htmltext = "31515-0.htm"
- if npcId == EVIL_ALTAR_5 and cond == 5 :
- htmltext = "31516-0.htm"
- if npcId == HIERARCH and cond == 6 :
- st.addExpAndSp(865187,69172)
- st.set("cond","0")
- st.exitQuest(False)
- st.playSound("ItemSound.quest_finish")
- htmltext = "31517-3.htm"
- return htmltext
-
-QUEST = Quest(16,qn,"The Coming Darkness")
-
-
-QUEST.addStartNpc(31517)
-QUEST.addTalkId(31517)
-
-for altars in range(31512,31517):
- QUEST.addTalkId(altars)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/__init__.py
deleted file mode 100644
index d224f4f1ac..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/__init__.py
+++ /dev/null
@@ -1,136 +0,0 @@
-# Made with contributions from :
-# disKret, Skeleton & DrLecter.
-# this script is part of the Official L2J Datapack Project.
-# Visit http://www.l2jdp.com/forum/ for more details.
-
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest.jython import QuestJython as JQuest
-
-qn = "17_LightAndDarkness"
-
-#NPC
-HIERARCH = 31517
-SAINT_ALTAR_1 = 31508
-SAINT_ALTAR_2 = 31509
-SAINT_ALTAR_3 = 31510
-SAINT_ALTAR_4 = 31511
-
-#ITEMS
-BLOOD_OF_SAINT = 7168
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr): JQuest.__init__(self,id,name,descr)
-
- def onAdvEvent (self,event,npc, player) :
- htmltext = event
- st = player.getQuestState(qn)
- if not st : return
- cond = st.getInt("cond")
- blood = st.getQuestItemsCount(BLOOD_OF_SAINT)
- if event == "31517-02.htm" :
- if st.getPlayer().getLevel() >= 61 :
- st.giveItems(BLOOD_OF_SAINT,4)
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- else :
- htmltext = "31517-02a.htm"
- st.exitQuest(1)
- if event == "31508-02.htm" and cond == 1 and blood :
- htmltext = "31508-01.htm"
- st.takeItems(BLOOD_OF_SAINT,1)
- st.set("cond","2")
- st.playSound("ItemSound.quest_middle")
- elif event == "31509-02.htm" and cond == 2 and blood :
- htmltext = "31509-01.htm"
- st.takeItems(BLOOD_OF_SAINT,1)
- st.set("cond","3")
- st.playSound("ItemSound.quest_middle")
- elif event == "31510-02.htm" and cond == 3 and blood :
- htmltext = "31510-01.htm"
- st.takeItems(BLOOD_OF_SAINT,1)
- st.set("cond","4")
- st.playSound("ItemSound.quest_middle")
- elif event == "31511-02.htm" and cond == 4 and blood :
- htmltext = "31511-01.htm"
- st.takeItems(BLOOD_OF_SAINT,1)
- st.set("cond","5")
- st.playSound("ItemSound.quest_middle")
- return htmltext
-
- def onTalk (self,npc,player):
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st : return htmltext
- npcId = npc.getNpcId()
- cond = st.getInt("cond")
- blood = st.getQuestItemsCount(BLOOD_OF_SAINT)
- id = st.getState()
- if id == State.COMPLETED :
- htmltext = Quest.getAlreadyCompletedMsg(player)
- if id == State.CREATED :
- st2 = player.getQuestState("15_SweetWhisper")
- if st2 and st2.getState() == State.COMPLETED:
- htmltext = "31517-00.htm"
- else :
- htmltext = "<html><body>Quest Sweet Whisper need to be finished first.</body></html>"
- elif id == State.STARTED :
- if npcId == HIERARCH :
- if cond < 5 :
- if blood == 5 :
- htmltext = "31517-04.htm"
- else :
- htmltext = "31517-05.htm"
- st.exitQuest(1)
- st.playSound("ItemSound.quest_giveup")
- else :
- st.addExpAndSp(697040,54887)
- st.unset("cond")
- st.exitQuest(False)
- st.playSound("ItemSound.quest_finish")
- htmltext = "31517-03.htm"
- elif npcId == SAINT_ALTAR_1 :
- if cond == 1 :
- if blood :
- htmltext = "31508-00.htm"
- else :
- htmltext = "31508-02.htm"
- elif cond > 1 :
- htmltext = "31508-03.htm"
- elif npcId == SAINT_ALTAR_2 :
- if cond == 2 :
- if blood :
- htmltext = "31509-00.htm"
- else :
- htmltext = "31509-02.htm"
- elif cond > 2 :
- htmltext = "31509-03.htm"
- elif npcId == SAINT_ALTAR_3 :
- if cond == 3 :
- if blood :
- htmltext = "31510-00.htm"
- else :
- htmltext = "31510-02.htm"
- elif cond > 3 :
- htmltext = "31510-03.htm"
- elif npcId == SAINT_ALTAR_4 :
- if cond == 4 :
- if blood :
- htmltext = "31511-00.htm"
- else :
- htmltext = "31511-02.htm"
- elif cond > 4 :
- htmltext = "31511-03.htm"
- return htmltext
-
-QUEST = Quest(17,qn,"Light and Darkness")
-
-
-QUEST.addStartNpc(HIERARCH)
-QUEST.addTalkId(HIERARCH)
-
-for altars in range(31508,31512):
- QUEST.addTalkId(altars)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/__init__.py
deleted file mode 100644
index e773a7a4e9..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/__init__.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# Contributed by t0rm3nt0r to the Official L2J Datapack Project.
-# With some minor cleanup by DrLecter.
-# Visit http://www.l2jdp.com/forum/ for more details.
-
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest.jython import QuestJython as JQuest
-
-qn = "18_MeetingWithTheGoldenRam"
-
-DONAL = 31314
-DAISY = 31315
-ABERCROMBIE = 31555
-BOX = 7245
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr): JQuest.__init__(self,id,name,descr)
-
- def onAdvEvent (self,event,npc, player) :
- htmltext = event
- st = player.getQuestState(qn)
- if not st : return
- if event == "31314-03.htm" :
- if st.getPlayer().getLevel() >= 66 :
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- else :
- htmltext = "31314-02.htm"
- st.exitQuest(1)
- elif event == "31315-02.htm" :
- st.set("cond","2")
- htmltext = "31315-02.htm"
- st.giveItems(BOX,1)
- elif event == "31555-02.htm" :
- st.giveItems(57,40000)
- st.takeItems(BOX,-1)
- st.addExpAndSp(126668,11731)
- st.unset("cond")
- st.playSound("ItemSound.quest_finish")
- st.exitQuest(False)
- return htmltext
-
- def onTalk (self,npc,player):
- npcId = npc.getNpcId()
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st : return htmltext
- id = st.getState()
- cond = st.getInt("cond")
- if id == State.COMPLETED :
- htmltext = Quest.getAlreadyCompletedMsg(player)
-
- elif id == State.CREATED and npcId == DONAL :
- htmltext = "31314-01.htm"
- elif id == State.STARTED :
- if npcId == DONAL :
- htmltext = "31314-04.htm"
- elif npcId == DAISY :
- if cond < 2 :
- htmltext = "31315-01.htm"
- else :
- htmltext = "31315-03.htm"
- elif npcId == ABERCROMBIE and cond == 2 and st.getQuestItemsCount(BOX):
- htmltext = "31555-01.htm"
- return htmltext
-
-QUEST = Quest(18, qn, "Meeting With The Golden Ram")
-
-
-QUEST.addStartNpc(DONAL)
-
-QUEST.addTalkId(DONAL)
-QUEST.addTalkId(DAISY)
-QUEST.addTalkId(ABERCROMBIE)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31256-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31256-01.html
similarity index 95%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31256-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31256-01.html
index 9bdb585c14..f1ebf01b11 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31256-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31256-01.html
@@ -1,5 +1,5 @@
<html><body>Trader Leon:<br>
All right. Guard Cadmon sent you here, didn't he? I'm glad you made it here. A number of young men have tried to come here, but they all ran away even before they reached the Orc barracks. I've sustained a great loss.<br>
As you know, the Ketra Orcs are the most daring and ferocious tribe. They never lag behind in terms of body structure or strength. So those who are weak run away at the sight of those orcs, causing me a great deal of trouble. But since Cadmon sent you here and you seem to possess great skills, I guess I don't have to worry about that. The task is simple. Take this box of supplies to the Ketra Orc outpost and deliver them to<font color="LEVEL"> Messenger Wahkan</font>. It won't be difficult to find Wahkan since he's staying in the base center. Although it may be a little difficult to enter the base...<br>
-<a action="bypass -h Quest 11_SecretMeetingWithKetraOrcs 31256-02.htm">"OK. Entrust me with the task."</a>
+<a action="bypass -h Quest 11_SecretMeetingWithKetraOrcs 31256-02.html">"OK. Entrust me with the task."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31256-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31256-02.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31256-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31256-02.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31256-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31256-03.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31256-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31256-03.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31296-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31296-01.htm
similarity index 92%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31296-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31296-01.htm
index 4b8f0127d2..57965c8f86 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31296-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31296-01.htm
@@ -1,4 +1,4 @@
<html><body>Guard Cadmon:<br>
Are you interested in the Ketra Orcs, stranger? Well, if you are, I can tell you an interesting story. Right now, the Ketra Orcs are hiring mercenaries! It's a great opportunity to get into their outpost under the pretext of delivering military supplies! Are you interested?<br>
-<a action="bypass -h Quest 11_SecretMeetingWithKetraOrcs 31296-03.htm">"I'm interested!"</a>
+<a action="bypass -h Quest 11_SecretMeetingWithKetraOrcs 31296-03.html">"I'm interested!"</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31296-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31296-02.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31296-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31296-02.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31296-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31296-03.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31296-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31296-03.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31296-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31296-04.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31296-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31296-04.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31371-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31371-01.html
similarity index 77%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31371-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31371-01.html
index b286e531ac..314b147313 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31371-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31371-01.html
@@ -1,4 +1,4 @@
<html><body>Ketra's Messenger Wahkan:<br>
What brings you to the land of the Ketra, stranger?<br>
-<a action="bypass -h Quest 11_SecretMeetingWithKetraOrcs 31371-02.htm">"Here are some military supplies."</a>
+<a action="bypass -h Quest 11_SecretMeetingWithKetraOrcs 31371-02.html">"Here are some military supplies."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31371-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31371-02.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/11_SecretMeetingWithKetraOrcs/31371-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31371-02.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31371-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31371-03.html
new file mode 100644
index 0000000000..570ea89509
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/31371-03.html
@@ -0,0 +1,3 @@
+<html><body>Ketra's Messenger Wahkan:<br>
+You don't have required items.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/Q11_SecretMeetingWithKetraOrcs.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/Q11_SecretMeetingWithKetraOrcs.java
new file mode 100644
index 0000000000..fbb6921873
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/Q11_SecretMeetingWithKetraOrcs.java
@@ -0,0 +1,147 @@
+/*
+ * This program 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.
+ *
+ * This program 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.Q11_SecretMeetingWithKetraOrcs;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+
+/**
+ * Secret Meeting With Ketra Orcs (11).<br>
+ * Original Jython script by Emperorc.
+ * @author nonom
+ */
+public class Q11_SecretMeetingWithKetraOrcs extends Quest
+{
+ private static final String qn = "11_SecretMeetingWithKetraOrcs";
+
+ // NPCs
+ private static final int CADMON = 31296;
+ private static final int LEON = 31256;
+ private static final int WAHKAN = 31371;
+
+ // Items
+ private static final int BOX = 7231;
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = event;
+ final QuestState st = player.getQuestState(qn);
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ final int cond = st.getInt("cond");
+ switch (event)
+ {
+ case "31296-03.html":
+ st.set("cond", "1");
+ st.setState(State.STARTED);
+ st.playSound("ItemSound.quest_accept");
+ break;
+ case "31256-02.html":
+ if (cond == 1)
+ {
+ st.set("cond", "2");
+ st.giveItems(BOX, 1);
+ st.playSound("ItemSound.quest_middle");
+ }
+ break;
+ case "31371-02.html":
+ if ((cond == 2) && (st.hasQuestItems(BOX)))
+ {
+ st.takeItems(BOX, -1);
+ st.addExpAndSp(233125, 18142);
+ st.exitQuest(false);
+ st.playSound("ItemSound.quest_finish");
+ }
+ else
+ {
+ htmltext = "31371-03.html";
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = getNoQuestMsg(player);
+ QuestState st = player.getQuestState(qn);
+
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ int cond = st.getInt("cond");
+ int npcId = npc.getNpcId();
+
+ switch (st.getState())
+ {
+ case State.COMPLETED:
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ case State.CREATED:
+ if (npcId == CADMON)
+ {
+ htmltext = (player.getLevel() >= 74) ? "31296-01.htm" : "31296-02.html";
+ }
+ break;
+ case State.STARTED:
+ if ((npcId == CADMON) && (cond == 1))
+ {
+ htmltext = "31296-04.html";
+ }
+ else if (npcId == LEON)
+ {
+ if (cond == 1)
+ {
+ htmltext = "31256-01.html";
+
+ }
+ else if (cond == 2)
+ {
+ htmltext = "31256-03.html";
+ }
+ }
+ else if ((npcId == WAHKAN) && (cond == 2))
+ {
+ htmltext = "31371-01.html";
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ public Q11_SecretMeetingWithKetraOrcs(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+
+ addStartNpc(CADMON);
+
+ addTalkId(CADMON, LEON, WAHKAN);
+ }
+
+ public static void main(String[] args)
+ {
+ new Q11_SecretMeetingWithKetraOrcs(11, qn, "Secret Meeting With Ketra Orcs");
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31258-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31258-01.html
similarity index 91%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31258-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31258-01.html
index 37fcfee650..6c4bc74ef6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31258-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31258-01.html
@@ -2,5 +2,5 @@
Did Guard Cadmon send you? All right. I guess you are good enough.<br>
Bear in mind that the Varka Silenos are different from other Silenos. They may look alike, but the Varka Silenos have traditionally been fearless soldiers. They are completely different from other Silenos who are engaged in stock farming. They are very particular about manners. You should try not to offend them.<br>
Okay, here's the task. You need to take this box of supplies to the<font color="LEVEL"> Varka Silenos base</font>. Sounds simple, right? Even a three year old can do this.<br>
-<a action="bypass -h Quest 12_SecretMeetingWithVarkaSilenos 31258-02.htm">"All right. Entrust me with the task."</a>
+<a action="bypass -h Quest 12_SecretMeetingWithVarkaSilenos 31258-02.html">"All right. Entrust me with the task."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31258-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31258-02.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31258-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31258-02.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31258-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31258-03.html
new file mode 100644
index 0000000000..447dc00d76
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31258-03.html
@@ -0,0 +1,3 @@
+<html><body>Trader Helmut:<br>
+What are you still doing here? Take the box of supplies to <font color="LEVEL">Naran Ashanuk Herald of Varka</font>!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31296-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31296-01.htm
similarity index 91%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31296-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31296-01.htm
index 5f6e4bc038..0898aaed95 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31296-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31296-01.htm
@@ -1,4 +1,4 @@
<html><body>Guard Cadmon:<br>
Are you interested in the Varka Silenos, stranger? Well, if you are, I know an interesting story. They've been hiring mercenaries lately! It's a great opportunity to gain access to their barracks on the pretext of smuggling weapons in!<br>
-<a action="bypass -h Quest 12_SecretMeetingWithVarkaSilenos 31296-03.htm">"I'll do it."</a>
+<a action="bypass -h Quest 12_SecretMeetingWithVarkaSilenos 31296-03.html">"I'll do it."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31296-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31296-02.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31296-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31296-02.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31296-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31296-03.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31296-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31296-03.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31296-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31296-04.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31296-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31296-04.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31378-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31378-01.html
similarity index 75%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31378-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31378-01.html
index db8a970767..dff808954e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31378-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31378-01.html
@@ -1,4 +1,4 @@
<html><body>Varka's Messenger Naran Ashanuk:<br>
What brings you to this land of the Varka, traveler of Zephyr Winds?<br>
-<a action="bypass -h Quest 12_SecretMeetingWithVarkaSilenos 31378-02.htm">"Hand over Helmut's chest of military supplies."</a>
+<a action="bypass -h Quest 12_SecretMeetingWithVarkaSilenos 31378-02.html">"Hand over Helmut's chest of military supplies."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31378-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31378-02.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/12_SecretMeetingWithVarkaSilenos/31378-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31378-02.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31378-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31378-03.html
new file mode 100644
index 0000000000..e085000b26
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/31378-03.html
@@ -0,0 +1,3 @@
+<html><body>Varka's Messenger Naran Ashanuk:<br>
+You don't have required items.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/Q12_SecretMeetingWithVarkaSilenos.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/Q12_SecretMeetingWithVarkaSilenos.java
new file mode 100644
index 0000000000..2f2c0f4ae2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q12_SecretMeetingWithVarkaSilenos/Q12_SecretMeetingWithVarkaSilenos.java
@@ -0,0 +1,144 @@
+/*
+ * This program 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.
+ *
+ * This program 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.Q12_SecretMeetingWithVarkaSilenos;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+
+/**
+ * Secret Meeting With Varka Silenos (12).<br>
+ * Original Jython script by Emperorc.
+ * @author nonom
+ */
+public class Q12_SecretMeetingWithVarkaSilenos extends Quest
+{
+ private static final String qn = "12_SecretMeetingWithVarkaSilenos";
+
+ // NPCs
+ private static final int CADMON = 31296;
+ private static final int HELMUT = 31258;
+ private static final int NARAN = 31378;
+
+ // Items
+ private static final int BOX = 7232;
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = event;
+ final QuestState st = player.getQuestState(qn);
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ final int cond = st.getInt("cond");
+ switch (event)
+ {
+ case "31296-03.html":
+ st.set("cond", "1");
+ st.setState(State.STARTED);
+ st.playSound("ItemSound.quest_accept");
+ break;
+ case "31258-02.html":
+ if (cond == 1)
+ {
+ st.set("cond", "2");
+ st.giveItems(BOX, 1);
+ st.playSound("ItemSound.quest_middle");
+ }
+ break;
+ case "31378-02.html":
+ if ((cond == 2) && (st.hasQuestItems(BOX)))
+ {
+ st.takeItems(BOX, -1);
+ st.addExpAndSp(233125, 18142);
+ st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
+ }
+ else
+ {
+ htmltext = "31378-03.html";
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = getNoQuestMsg(player);
+ final QuestState st = player.getQuestState(qn);
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ final int npcId = npc.getNpcId();
+ switch (st.getState())
+ {
+ case State.COMPLETED:
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ case State.CREATED:
+ if (npcId == CADMON)
+ {
+ htmltext = (player.getLevel() >= 74) ? "31296-01.htm" : "31296-02.html";
+ }
+ break;
+ case State.STARTED:
+ final int cond = st.getInt("cond");
+ if ((npcId == CADMON) && (cond == 1))
+ {
+ htmltext = "31296-04.html";
+ }
+ else if (npcId == HELMUT)
+ {
+ if (cond == 1)
+ {
+ htmltext = "31258-01.html";
+ }
+ else if (cond == 2)
+ {
+ htmltext = "31258-03.html";
+ }
+ }
+ else if ((npcId == NARAN) && (cond == 2))
+ {
+ htmltext = "31378-01.html";
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ public Q12_SecretMeetingWithVarkaSilenos(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+
+ addStartNpc(CADMON);
+
+ addTalkId(CADMON, HELMUT, NARAN);
+ }
+
+ public static void main(String[] args)
+ {
+ new Q12_SecretMeetingWithVarkaSilenos(12, qn, "Secret Meeting With Varka Silenos");
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/13_ParcelDelivery/31274-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/31274-00.htm
similarity index 66%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/13_ParcelDelivery/31274-0.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/31274-00.htm
index 92b82b6d02..47b358c65c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/13_ParcelDelivery/31274-0.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/31274-00.htm
@@ -1,5 +1,5 @@
<html><body>Mineral Trader Fundin:<br>
I have an urgent delivery to the Gods' Cauldron area!<br>
Would you deliver it for me?<br>
-<a action="bypass -h Quest 13_ParcelDelivery 31274-2.htm">Sure!</a>
+<a action="bypass -h Quest 13_ParcelDelivery 31274-02.html">Sure!</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/13_ParcelDelivery/31274-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/31274-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/13_ParcelDelivery/31274-1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/31274-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/13_ParcelDelivery/31274-2.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/31274-02.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/13_ParcelDelivery/31274-2.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/31274-02.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/13_ParcelDelivery/31539-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/31539-00.html
similarity index 66%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/13_ParcelDelivery/31539-0.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/31539-00.html
index 5f25a4e179..9fa32bcbfe 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/13_ParcelDelivery/31539-0.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/31539-00.html
@@ -1,5 +1,5 @@
<html><body>Flame Blacksmith Vulcan:<br>
Did Fundin send you? A little late, but at least you didn't break it.<br>
Let me have it.<br>
-<a action="bypass -h Quest 13_ParcelDelivery 31539-1.htm">Here.</a>
+<a action="bypass -h Quest 13_ParcelDelivery 31539-01.html">Here.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/13_ParcelDelivery/31539-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/31539-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/13_ParcelDelivery/31539-1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/31539-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/31539-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/31539-02.html
new file mode 100644
index 0000000000..0999538c3f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/31539-02.html
@@ -0,0 +1,3 @@
+<html><body>Flame Blacksmith Vulcan:<br>
+You don't have required items.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/Q13_ParcelDelivery.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/Q13_ParcelDelivery.java
new file mode 100644
index 0000000000..5f7f7ba726
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/Q13_ParcelDelivery.java
@@ -0,0 +1,134 @@
+/*
+ * This program 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.
+ *
+ * This program 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.Q13_ParcelDelivery;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+
+/**
+ * Parcel Delivery (13).<br>
+ * Original Jython script by Emperorc.
+ * @author nonom
+ */
+public class Q13_ParcelDelivery extends Quest
+{
+ private static final String qn = "13_ParcelDelivery";
+
+ // NPCs
+ private static final int FUNDIN = 31274;
+ private static final int VULCAN = 31539;
+
+ // Items
+ private static final int PACKAGE = 7263;
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = event;
+ final QuestState st = player.getQuestState(qn);
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ switch (event)
+ {
+ case "31274-02.html":
+ st.set("cond", "1");
+ st.giveItems(PACKAGE, 1);
+ st.setState(State.STARTED);
+ st.playSound("ItemSound.quest_accept");
+ break;
+ case "31539-01.html":
+ if ((st.getInt("cond") == 1) && (st.hasQuestItems(PACKAGE)))
+ {
+ st.takeItems(PACKAGE, -1);
+ st.giveItems(57, 157834);
+ st.addExpAndSp(589092, 58794);
+ st.exitQuest(false);
+ st.playSound("ItemSound.quest_finish");
+ }
+ else
+ {
+ htmltext = "31539-02.html";
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = getNoQuestMsg(player);
+ final QuestState st = player.getQuestState(qn);
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ final int npcId = npc.getNpcId();
+ switch (st.getState())
+ {
+ case State.COMPLETED:
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ case State.CREATED:
+ if (npcId == FUNDIN)
+ {
+ htmltext = (player.getLevel() >= 74) ? "31274-00.htm" : "31274-01.html";
+ }
+ break;
+ case State.STARTED:
+ final int cond = st.getInt("cond");
+ if (cond == 1)
+ {
+ switch (npcId)
+ {
+ case FUNDIN:
+ htmltext = "31274-02.html";
+ break;
+ case VULCAN:
+ htmltext = "31539-00.html";
+ break;
+ }
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ public Q13_ParcelDelivery(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+
+ addStartNpc(FUNDIN);
+
+ addTalkId(FUNDIN, VULCAN);
+
+ questItemIds = new int[]
+ {
+ PACKAGE
+ };
+ }
+
+ public static void main(String[] args)
+ {
+ new Q13_ParcelDelivery(13, qn, "Parcel Delivery");
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/31263-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/31263-00.htm
similarity index 91%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/31263-0.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/31263-00.htm
index d44dbefd3f..ecaec0800c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/31263-0.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/31263-00.htm
@@ -1,5 +1,5 @@
<html><body>Trader Liesel:<br>
My friend left home to study archaeology a couple of years ago. His mother was just overcome by disease.<br>
Could you deliver her last letter to him?<br>
-<a action="bypass -h Quest 14_WhereaboutsOfTheArchaeologist 31263-2.htm">Yes</a>
+<a action="bypass -h Quest 14_WhereaboutsOfTheArchaeologist 31263-02.html">Yes</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/31263-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/31263-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/31263-1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/31263-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/31263-2.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/31263-02.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/31263-2.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/31263-02.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/31538-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/31538-00.html
similarity index 88%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/31538-0.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/31538-00.html
index 17e5a5b296..9cc138af2b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/31538-0.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/31538-00.html
@@ -1,5 +1,5 @@
<html><body>Ghost of Adventurer:<br>
Huh? You were asked to give me this letter? Who writes a letter to a dead person? Hmm...Let me see...<br>
Oh, it's from my mother! It's been so long since I've seen her! How is she?<br>
-<a action="bypass -h Quest 14_WhereaboutsOfTheArchaeologist 31538-1.htm">Your mother is dead.</a>
+<a action="bypass -h Quest 14_WhereaboutsOfTheArchaeologist 31538-01.html">Your mother is dead.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/31538-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/31538-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/14_WhereaboutsOfTheArchaeologist/31538-1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/31538-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/31538-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/31538-02.html
new file mode 100644
index 0000000000..2252a8bc5f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/31538-02.html
@@ -0,0 +1,3 @@
+<html><body>Ghost of Adventurer:<br>
+You don't have the required items.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/Q14_WhereaboutsOfTheArchaeologist.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/Q14_WhereaboutsOfTheArchaeologist.java
new file mode 100644
index 0000000000..21bf744bcb
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q14_WhereaboutsOfTheArchaeologist/Q14_WhereaboutsOfTheArchaeologist.java
@@ -0,0 +1,128 @@
+/*
+ * This program 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.
+ *
+ * This program 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.Q14_WhereaboutsOfTheArchaeologist;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+
+/**
+ * Where abouts Of The Archaeologist (14).<br>
+ * Original Jython script by disKret.
+ * @author nonom
+ */
+public class Q14_WhereaboutsOfTheArchaeologist extends Quest
+{
+ private static final String qn = "14_WhereaboutsOfTheArchaeologist";
+
+ // NPCs
+ private static final int LIESEL = 31263;
+ private static final int GHOST_OF_ADVENTURER = 31538;
+
+ // Items
+ private static final int LETTER = 7253;
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = event;
+ final QuestState st = player.getQuestState(qn);
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ switch (event)
+ {
+ case "31263-02.html":
+ st.set("cond", "1");
+ st.setState(State.STARTED);
+ st.giveItems(LETTER, 1);
+ st.playSound("ItemSound.quest_accept");
+ break;
+ case "31538-01.html":
+ if ((st.getInt("cond") == 1) && st.hasQuestItems(LETTER))
+ {
+ st.takeItems(LETTER, -1);
+ st.giveItems(57, 136928);
+ st.addExpAndSp(325881, 32524);
+ st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
+ }
+ else
+ {
+ htmltext = "31538-02.html";
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = getNoQuestMsg(player);
+ final QuestState st = player.getQuestState(qn);
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ final int npcId = npc.getNpcId();
+ switch (st.getState())
+ {
+ case State.COMPLETED:
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ case State.CREATED:
+ if (npcId == LIESEL)
+ {
+ htmltext = (player.getLevel() < 74) ? "31263-01.html" : "31263-00.htm";
+ }
+ break;
+ case State.STARTED:
+ if (st.getInt("cond") == 1)
+ {
+ switch (npcId)
+ {
+ case LIESEL:
+ htmltext = "31263-02.html";
+ break;
+ case GHOST_OF_ADVENTURER:
+ htmltext = "31538-00.html";
+ break;
+ }
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ public Q14_WhereaboutsOfTheArchaeologist(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+
+ addStartNpc(LIESEL);
+ addTalkId(LIESEL);
+ addTalkId(GHOST_OF_ADVENTURER);
+ }
+
+ public static void main(String[] args)
+ {
+ new Q14_WhereaboutsOfTheArchaeologist(14, qn, "Whereabouts Of The Archaeologist");
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31302-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31302-00.htm
similarity index 66%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31302-0.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31302-00.htm
index 36d2922154..d79923918e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31302-0.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31302-00.htm
@@ -1,4 +1,4 @@
<html><body>Trader Vladimir:<br>
The world is very unsettled these days. Would you be interested in a unique kind of power?<br>
-<a action="bypass -h Quest 15_SweetWhisper 31302-1.htm">Quest</a>
+<a action="bypass -h Quest 15_SweetWhispers 31302-01.html">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31302-0a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31302-00a.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31302-0a.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31302-00a.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31302-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31302-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31302-1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31302-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31302-1a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31302-1a.html
new file mode 100644
index 0000000000..817a548200
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31302-1a.html
@@ -0,0 +1,3 @@
+<html><body>Trader Vladimir:<br>
+Find the <font color="LEVEL">mysterious Necromancer</font> at the entrance to the <font color="LEVEL">Valley of Saints</font>. He'll help you test your fate.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31517-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31517-00.html
similarity index 55%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31517-0.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31517-00.html
index bafdda1954..300977d08b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31517-0.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31517-00.html
@@ -1,4 +1,4 @@
<html><body>Hierarch:<br>
What are you doing here? We don't let just anybody in here!<br>
-<a action="bypass -h Quest 15_SweetWhisper 31517-1.htm">Vladimir sent me.</a>
+<a action="bypass -h Quest 15_SweetWhispers 31517-01.html">Vladimir sent me.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31517-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31517-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31517-1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31517-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31518-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31518-00.html
similarity index 55%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31518-0.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31518-00.html
index 276cb3f733..fdbd5f96ef 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31518-0.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31518-00.html
@@ -1,4 +1,4 @@
<html><body>Mysterious Necromancer:<br>
What business do you have here? What do you want from me?<br>
-<a action="bypass -h Quest 15_SweetWhisper 31518-1.htm">I want to change my ways.</a>
+<a action="bypass -h Quest 15_SweetWhispers 31518-01.html">I want to change my ways.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31518-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31518-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31518-1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31518-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31518-1a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31518-01a.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/15_SweetWhisper/31518-1a.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/31518-01a.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/Q15_SweetWhispers.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/Q15_SweetWhispers.java
new file mode 100644
index 0000000000..38796816e9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q15_SweetWhispers/Q15_SweetWhispers.java
@@ -0,0 +1,142 @@
+/*
+ * This program 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.
+ *
+ * This program 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.Q15_SweetWhispers;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+
+/**
+ * Sweet Whisper (15).<br>
+ * Original jython script by disKret.
+ * @author nonom
+ */
+public class Q15_SweetWhispers extends Quest
+{
+ private static final String qn = "15_SweetWhispers";
+
+ // NPCs
+ private static final int VLADIMIR = 31302;
+ private static final int HIERARCH = 31517;
+ private static final int M_NECROMANCER = 31518;
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = event;
+ final QuestState st = player.getQuestState(qn);
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ final int cond = st.getInt("cond");
+ switch (event)
+ {
+ case "31302-01.html":
+ st.set("cond", "1");
+ st.setState(State.STARTED);
+ st.playSound("ItemSound.quest_accept");
+ break;
+ case "31518-01.html":
+ if (cond == 1)
+ {
+ st.set("cond", "2");
+ st.playSound("ItemSound.quest_middle");
+ }
+ break;
+ case "31517-01.html":
+ if (cond == 2)
+ {
+ st.addExpAndSp(350531, 28204);
+ st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = getNoQuestMsg(player);
+ final QuestState st = player.getQuestState(qn);
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ final int npcId = npc.getNpcId();
+ switch (st.getState())
+ {
+ case State.COMPLETED:
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ case State.CREATED:
+ if (npcId == VLADIMIR)
+ {
+ htmltext = (player.getLevel() >= 60) ? "31302-00.htm" : "31302-00a.html";
+ }
+ break;
+ case State.STARTED:
+ final int cond = st.getInt("cond");
+ switch (npcId)
+ {
+ case VLADIMIR:
+ if (cond == 1)
+ {
+ htmltext = "31302-01a.html";
+ }
+ break;
+ case M_NECROMANCER:
+ switch (cond)
+ {
+ case 1:
+ htmltext = "31518-00.html";
+ break;
+ case 2:
+ htmltext = "31518-01a.html";
+ break;
+ }
+ break;
+ case HIERARCH:
+ if (cond == 2)
+ {
+ htmltext = "31517-00.html";
+ }
+ break;
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ public Q15_SweetWhispers(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+
+ addStartNpc(VLADIMIR);
+
+ addTalkId(VLADIMIR, HIERARCH, M_NECROMANCER);
+ }
+
+ public static void main(String[] args)
+ {
+ new Q15_SweetWhispers(15, qn, "Sweet Whispers");
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31512-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31512-00.html
similarity index 54%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31512-0.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31512-00.html
index 8d983af6d2..e0174e510c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31512-0.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31512-00.html
@@ -1,4 +1,4 @@
<html><body>Evil Altar:<br>
Upon close examination, you discover a place under the altar where the crystal will easily fit.<br>
-<a action="bypass -h Quest 16_TheComingDarkness 31512-1.htm">Place the crystal in the space under the altar.</a>
+<a action="bypass -h Quest 16_TheComingDarkness 31512-01.html">Place the crystal in the space under the altar.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31512-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31512-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31512-1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31512-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31513-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31513-00.html
similarity index 53%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31513-0.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31513-00.html
index 2bcc25880a..805b23eda4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31513-0.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31513-00.html
@@ -1,4 +1,4 @@
<html><body>Evil Altar:<br>
As with the previous altar, there is a space underneath where the crystal will easily fit.<br>
-<a action="bypass -h Quest 16_TheComingDarkness 31513-1.htm">Place the crystal in the space under the altar.</a>
+<a action="bypass -h Quest 16_TheComingDarkness 31513-01.html">Place the crystal in the space under the altar.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31513-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31513-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31513-1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31513-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31516-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31514-00.html
similarity index 54%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31516-0.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31514-00.html
index 6a4fa8cdb7..2453c97c9d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31516-0.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31514-00.html
@@ -1,4 +1,4 @@
<html><body>Evil Altar:<br>
Upon close examination, you discover a place under the altar where the crystal will easily fit.<br>
-<a action="bypass -h Quest 16_TheComingDarkness 31516-1.htm">Place the crystal in the space under the altar.</a>
+<a action="bypass -h Quest 16_TheComingDarkness 31514-01.html">Place the crystal in the space under the altar.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31514-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31514-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31514-1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31514-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31514-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31515-00.html
similarity index 54%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31514-0.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31515-00.html
index 8a77e55f2c..ee4297e02e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31514-0.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31515-00.html
@@ -1,4 +1,4 @@
<html><body>Evil Altar:<br>
Upon close examination, you discover a place under the altar where the crystal will easily fit.<br>
-<a action="bypass -h Quest 16_TheComingDarkness 31514-1.htm">Place the crystal in the space under the altar.</a>
+<a action="bypass -h Quest 16_TheComingDarkness 31515-01.html">Place the crystal in the space under the altar.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31515-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31515-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31515-1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31515-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31515-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31516-00.html
similarity index 54%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31515-0.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31516-00.html
index 62e63d124a..48856abd57 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31515-0.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31516-00.html
@@ -1,4 +1,4 @@
<html><body>Evil Altar:<br>
Upon close examination, you discover a place under the altar where the crystal will easily fit.<br>
-<a action="bypass -h Quest 16_TheComingDarkness 31515-1.htm">Place the crystal in the space under the altar.</a>
+<a action="bypass -h Quest 16_TheComingDarkness 31516-01.html">Place the crystal in the space under the altar.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31516-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31516-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31516-1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31516-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-00.htm
new file mode 100644
index 0000000000..e1841736fd
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-00.htm
@@ -0,0 +1,4 @@
+<html><body>Hierarch:<br>
+Brother, you've been with us for a long time! You've earned our trust, and therefore I believe you're ready for an important mission!<br>
+<a action="bypass -h Quest 16_TheComingDarkness 31517-01.htm">"I'm ready!"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31517-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-01.htm
similarity index 71%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31517-1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-01.htm
index 056c28942a..7e0cbc7df8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31517-1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-01.htm
@@ -1,4 +1,4 @@
<html><body>Hierarch:<br>
You're very well prepared! I wish all of us could be as well prepared as you! You've chosen a path that holds many trials, one that your brothers have traveled before you! Do you have the faith you'll need to complete your journey?<br>
-<a action="bypass -h Quest 16_TheComingDarkness 31517-2.htm">I have enough faith.</a>
-</body></html>
\ No newline at end of file
+<a action="bypass -h Quest 16_TheComingDarkness 31517-02.htm">"I have enough faith."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31517-2.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-02.htm
similarity index 86%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31517-2.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-02.htm
index e099ab5af1..79ac9694cc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31517-2.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-02.htm
@@ -1,4 +1,4 @@
<html><body>Hierarch:<br>
Very well. Based on the trust we have for you, brother, I'll give you a mission. Use these five crystals of binding to break open the seals that have been placed throughout this region. Watch the altar carefully; you'll discover how to use these crystals. I'll wait here until you break all the seals and return.<br>
-First, you must go to the altar near the entrance of the Valley of Saint. Your mission begins there. Good luck!
-</body></html>
\ No newline at end of file
+First, you must go to the altar near the entrance of the Valley of Saints. Your mission begins there. Good luck!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-02a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-02a.html
new file mode 100644
index 0000000000..10b2c06947
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-02a.html
@@ -0,0 +1,3 @@
+<html><body>Hierarch:<br>
+You haven't finished your job yet! Come back when you've broken the seal. I'll be waiting.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31517-3.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-03.html
similarity index 52%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31517-3.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-03.html
index 28f4872b95..293f223c7c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/16_TheComingDarkness/31517-3.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-03.html
@@ -1,3 +1,3 @@
<html><body>Hierarch:<br>
-Yoy've done well! Welcome to the brotherhood! You're now a member of the Benandanti Cartel! I'll see that you're well-rewarded!
-</body></html>
\ No newline at end of file
+You've done well! Welcome to the brotherhood! You're now a member of the Benandanti Cartel! I'll see that you're well-rewarded!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-04.html
new file mode 100644
index 0000000000..d2f5a62ba2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-04.html
@@ -0,0 +1,3 @@
+<html><body>Hierarch:<br>
+Quest Light and Darkness need to be finished first.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-05.html
new file mode 100644
index 0000000000..6cacae25dd
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/31517-05.html
@@ -0,0 +1,4 @@
+<html><body>Hierarch:<br>
+We've spent much time together, dear brother, but I regret to tell you that you're not yet ready! Try again when your faith and conviction are more firmly established.<br>
+(Only characters of level 62 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/Q16_TheComingDarkness/Q16_TheComingDarkness.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/Q16_TheComingDarkness.java
new file mode 100644
index 0000000000..4a02e90977
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q16_TheComingDarkness/Q16_TheComingDarkness.java
@@ -0,0 +1,152 @@
+/*
+ * This program 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.
+ *
+ * This program 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.Q16_TheComingDarkness;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+
+/**
+ * The Coming Darkness (16).<br>
+ * Original jython script by disKret.<br>
+ * TODO: Zoey76: This quest is still not retail like, Altars AI is incomplete.
+ * @author nonom
+ */
+public class Q16_TheComingDarkness extends Quest
+{
+ private static final String qn = "16_TheComingDarkness";
+
+ // NPCs
+ private static final int HIERARCH = 31517;
+ private static final int EVIL_ALTAR_1 = 31512;
+ private static final int EVIL_ALTAR_2 = 31513;
+ private static final int EVIL_ALTAR_3 = 31514;
+ private static final int EVIL_ALTAR_4 = 31515;
+ private static final int EVIL_ALTAR_5 = 31516;
+
+ // Items
+ private static final int CRYSTAL_OF_SEAL = 7167;
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = event;
+ final QuestState st = player.getQuestState(qn);
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ final int cond = st.getInt("cond");
+ switch (event)
+ {
+ case "31517-02.htm":
+ st.giveItems(CRYSTAL_OF_SEAL, 5);
+ st.set("cond", "1");
+ st.setState(State.STARTED);
+ st.playSound("ItemSound.quest_accept");
+ break;
+ case "31512-01.html":
+ case "31513-01.html":
+ case "31514-01.html":
+ case "31515-01.html":
+ case "31516-01.html":
+ final int npcId = Integer.parseInt(event.replace("-01.html", ""));
+ if ((cond == (npcId - 31511)) && st.hasQuestItems(CRYSTAL_OF_SEAL))
+ {
+ st.takeItems(CRYSTAL_OF_SEAL, 1);
+ st.set("cond", String.valueOf(cond + 1));
+ st.playSound("ItemSound.quest_middle");
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = getNoQuestMsg(player);
+ final QuestState st = player.getQuestState(qn);
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ final QuestState st2 = player.getQuestState("17_LightAndDarkness");
+ if ((st2 != null) && !st2.isCompleted())
+ {
+ return "31517-04.html";
+ }
+
+ switch (st.getState())
+ {
+ case State.COMPLETED:
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ case State.CREATED:
+ htmltext = (player.getLevel() >= 62) ? "31517-00.htm" : "31517-05.html";
+ break;
+ case State.STARTED:
+ final int npcId = npc.getNpcId();
+ final int cond = st.getInt("cond");
+ if (npcId == HIERARCH)
+ {
+ if (cond == 6)
+ {
+ htmltext = "31517-03.html";
+ st.addExpAndSp(865187, 69172);
+ st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
+ }
+ else
+ {
+ htmltext = "31517-02a.html";
+ }
+ }
+ else if ((npcId - 31511) == cond)
+ {
+ htmltext = npcId + "-00.html";
+ }
+ else
+ {
+ htmltext = npcId + "-01.html";
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ public Q16_TheComingDarkness(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+
+ addStartNpc(HIERARCH);
+
+ addTalkId(HIERARCH, EVIL_ALTAR_1, EVIL_ALTAR_2, EVIL_ALTAR_3, EVIL_ALTAR_4, EVIL_ALTAR_5);
+
+ questItemIds = new int[]
+ {
+ CRYSTAL_OF_SEAL
+ };
+ }
+
+ public static void main(String[] args)
+ {
+ new Q16_TheComingDarkness(16, qn, "The Coming Darkness");
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31508-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31508-00.html
similarity index 68%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31508-00.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31508-00.html
index 3aeb62d57a..08cd3e31a2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31508-00.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31508-00.html
@@ -1,4 +1,4 @@
<html><body>Altar of Saints:<br>
The first Altar of Saints has a desolate atmosphere. You know that you need to sprinkle the Blood of Saint here, but you feel apprehensive. You begin to feel faint...<br>
-<a action="bypass -h Quest 17_LightAndDarkness 31508-02.htm">Sprinkle the Blood of Saint.</a>
+<a action="bypass -h Quest 17_LightAndDarkness 31508-02.html">Sprinkle the Blood of Saint.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31508-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31508-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31508-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31508-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31508-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31508-02.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31508-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31508-02.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31508-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31508-03.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31508-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31508-03.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31509-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31509-00.html
similarity index 72%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31509-00.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31509-00.html
index 9bc427981f..1146eb4673 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31509-00.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31509-00.html
@@ -1,4 +1,4 @@
<html><body>Altar of Saints:<br>
The second Altar of Saints. The atmosphere is similar to that of the previous altar. You know that you should sprinkle the Blood of Saint here as you were told, but you're hesitant... You begin to feel faint...<br>
-<a action="bypass -h Quest 17_LightAndDarkness 31509-02.htm">Sprinkle the Blood of Saint.</a>
+<a action="bypass -h Quest 17_LightAndDarkness 31509-02.html">Sprinkle the Blood of Saint.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31509-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31509-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31509-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31509-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31509-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31509-02.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31509-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31509-02.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31509-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31509-03.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31509-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31509-03.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31510-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31510-00.html
similarity index 55%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31510-00.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31510-00.html
index 4555c3723b..318a635c34 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31510-00.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31510-00.html
@@ -1,4 +1,4 @@
<html><body>Saint Altar:<br>
At last, the third Altar of Saints! No less forbidding than the first two!<br>
-<a action="bypass -h Quest 17_LightAndDarkness 31510-02.htm">Sprinkle the Blood of Saint.</a>
+<a action="bypass -h Quest 17_LightAndDarkness 31510-02.html">Sprinkle the Blood of Saint.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31510-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31510-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31510-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31510-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31510-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31510-02.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31510-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31510-02.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31510-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31510-03.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31510-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31510-03.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31511-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31511-00.html
similarity index 63%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31511-00.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31511-00.html
index a05eceb3d8..61bc307502 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31511-00.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31511-00.html
@@ -1,4 +1,4 @@
<html><body>Saint Altar:<br>
The last Altar of Saints looks the same as the others. You're starting to feel more comfortable. That could be good or bad!<br>
-<a action="bypass -h Quest 17_LightAndDarkness 31511-02.htm">Sprinkle the Blood of Saint.</a>
+<a action="bypass -h Quest 17_LightAndDarkness 31511-02.html">Sprinkle the Blood of Saint.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31511-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31511-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31511-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31511-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31511-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31511-02.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31511-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31511-02.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31511-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31511-03.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31511-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31511-03.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31517-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-00.htm
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31517-00.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-00.htm
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31517-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-01.htm
similarity index 72%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31517-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-01.htm
index 903abf4aed..69d4e5be22 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31517-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-01.htm
@@ -1,4 +1,4 @@
<html><body>Hierarch:<br>
Before I tell you, I need to ask you something. How strong is your faith in the work that we do? Are you certain that you can persevere no matter what happens while carrying out this mission?<br>
-<a action="bypass -h Quest 17_LightAndDarkness 31517-02.htm">"I will persevere"</a>
+<a action="bypass -h Quest 17_LightAndDarkness 31517-02.html">"I will persevere"</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31517-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-02.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31517-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-02.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31517-02a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-02a.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31517-02a.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-02a.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31517-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-03.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31517-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-03.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31517-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-04.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31517-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-04.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31517-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-05.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/17_LightAndDarkness/31517-05.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-05.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-06.html
new file mode 100644
index 0000000000..9944d23506
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/31517-06.html
@@ -0,0 +1,3 @@
+<html><body>Heirarch:<br>
+Quest Sweet Whispers need to be finished first.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/Q17_LightAndDarkness.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/Q17_LightAndDarkness.java
new file mode 100644
index 0000000000..6c1fb7e2bf
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q17_LightAndDarkness/Q17_LightAndDarkness.java
@@ -0,0 +1,156 @@
+/*
+ * This program 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.
+ *
+ * This program 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.Q17_LightAndDarkness;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+
+/**
+ * Light And Darkness (17).<br>
+ * Original jython script by disKret, Skeleton & DrLecter.
+ * @author nonom
+ */
+public class Q17_LightAndDarkness extends Quest
+{
+ private static final String qn = "17_LightAndDarkness";
+
+ // NPCs
+ private static final int HIERARCH = 31517;
+ private static final int SAINT_ALTAR_1 = 31508;
+ private static final int SAINT_ALTAR_2 = 31509;
+ private static final int SAINT_ALTAR_3 = 31510;
+ private static final int SAINT_ALTAR_4 = 31511;
+
+ // Items
+ private static final int BLOOD_OF_SAINT = 7168;
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = event;
+ final QuestState st = player.getQuestState(qn);
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ switch (event)
+ {
+
+ case "31517-02.html":
+ if (player.getLevel() >= 61)
+ {
+ st.giveItems(BLOOD_OF_SAINT, 4);
+ st.set("cond", "1");
+ st.setState(State.STARTED);
+ st.playSound("ItemSound.quest_accept");
+ }
+ else
+ {
+ htmltext = "31517-02a.html";
+ }
+ break;
+ case "31508-02.html":
+ case "31509-02.html":
+ case "31510-02.html":
+ case "31511-02.html":
+ final int cond = st.getInt("cond");
+ final int npcId = Integer.parseInt(event.replace("-02.html", ""));
+ if ((cond == (npcId - 31507)) && st.hasQuestItems(BLOOD_OF_SAINT))
+ {
+ htmltext = npcId + "-01.html";
+ st.takeItems(BLOOD_OF_SAINT, 1);
+ st.set("cond", String.valueOf(cond + 1));
+ st.playSound("ItemSound.quest_middle");
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = getNoQuestMsg(player);
+ final QuestState st = player.getQuestState(qn);
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ switch (st.getState())
+ {
+ case State.COMPLETED:
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ case State.CREATED:
+ final QuestState st2 = player.getQuestState("15_SweetWhispers");
+ htmltext = ((st2 != null) && (st2.isCompleted())) ? "31517-00.htm" : "31517-06.html";
+ break;
+ case State.STARTED:
+ final long blood = st.getQuestItemsCount(BLOOD_OF_SAINT);
+ final int cond = st.getInt("cond");
+ final int npcId = npc.getNpcId();
+ switch (npcId)
+ {
+ case HIERARCH:
+ if (cond < 5)
+ {
+ htmltext = (blood >= 5) ? "31517-05.html" : "31517-04.html";
+ }
+ else
+ {
+ htmltext = "31517-03.html";
+ st.addExpAndSp(697040, 54887);
+ st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
+ }
+ break;
+ case SAINT_ALTAR_1:
+ case SAINT_ALTAR_2:
+ case SAINT_ALTAR_3:
+ case SAINT_ALTAR_4:
+ if ((npcId - 31507) == cond)
+ {
+ htmltext = npcId + ((blood > 0) ? "-00.html" : "-02.html");
+ }
+ else if (cond > (npcId - 31507))
+ {
+ htmltext = npcId + "-03.html";
+ }
+ break;
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ public Q17_LightAndDarkness(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+
+ addStartNpc(HIERARCH);
+
+ addTalkId(HIERARCH, SAINT_ALTAR_1, SAINT_ALTAR_2, SAINT_ALTAR_3, SAINT_ALTAR_4);
+ }
+
+ public static void main(String[] args)
+ {
+ new Q17_LightAndDarkness(17, qn, "Light and Darkness");
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31314-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31314-01.htm
similarity index 88%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31314-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31314-01.htm
index 0fe2a38be1..e74789e1a0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31314-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31314-01.htm
@@ -1,4 +1,4 @@
<html><body>Warehouse Chief Donal:<br>
The Golden Ram Mercenary Force are in the the Swamp of Screams fighting stakatos. I'm looking for someone to deliver war supplies, are you interested?<br>
-<a action="bypass -h Quest 18_MeetingWithTheGoldenRam 31314-03.htm">Say you are interested.</a>
+<a action="bypass -h Quest 18_MeetingWithTheGoldenRam 31314-03.html">Say you are interested.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31314-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31314-02.html
similarity index 84%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31314-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31314-02.html
index b83c25bb6a..c967a3190b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31314-02.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31314-02.html
@@ -1,3 +1,4 @@
<html><body>Warehouse Chief Donal:<br>
This is too difficult for you.<br>
-(This quest may be undertaken only by characters of level 66 or above.)</body></html>
\ No newline at end of file
+(This quest may be undertaken only by characters of level 66 or above.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31314-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31314-03.html
similarity index 64%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31314-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31314-03.html
index 02efa1e457..50dbac6569 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31314-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31314-03.html
@@ -1,2 +1,3 @@
<html><body>Warehouse Chief Donal:<br>
-Get the supplies from my niece Daisy. I heard the Golden Ram might be recruiting if you are interested.</body></html>
\ No newline at end of file
+Get the supplies from my niece Daisy. I heard the Golden Ram might be recruiting if you are interested.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31314-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31314-04.html
similarity index 78%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31314-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31314-04.html
index b95f05b135..d76dfcf133 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31314-04.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31314-04.html
@@ -1,2 +1,3 @@
<html><body>Warehouse Chief Donal:<br>
-Get the supplies from my niece Daisy and take them to the Swamp of Screams.</body></html>
\ No newline at end of file
+Get the supplies from my niece Daisy and take them to the Swamp of Screams.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31315-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31315-01.html
similarity index 86%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31315-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31315-01.html
index 4da4b431ce..309510a815 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31315-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31315-01.html
@@ -1,4 +1,4 @@
<html><body> Warehouse Freightman Daisy:<br>
Uncle Donal sent you? Here's the box! Heavy, isn't it? Deliver it quickly before the winter comes!<br>
-<a action="bypass -h Quest 18_MeetingWithTheGoldenRam 31315-02.htm">"You can count on me."</a>
+<a action="bypass -h Quest 18_MeetingWithTheGoldenRam 31315-02.html">"You can count on me."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31315-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31315-02.html
similarity index 83%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31315-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31315-02.html
index 571da21d7b..5a0541218c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31315-02.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31315-02.html
@@ -1,3 +1,4 @@
<html><body>Warehouse Freightman Daisy:<br>
Take it to the mercenary forces temporary outpost in the east part of the Swamp of Screams. I'll mark it on your Map. Speak with Mercenary Supplier Abercrombie.<br>
-Thanks, and be careful!</body></html>
\ No newline at end of file
+Thanks, and be careful!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31315-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31315-03.html
similarity index 72%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31315-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31315-03.html
index d4438cbfbc..eddca8988c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31315-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31315-03.html
@@ -1,2 +1,3 @@
<html><body>Warehouse Freightman Daisy:<br>
-Hurry and deliver the box to Mercenary Supplier Abercrombie! I marked the Map, didn't I?</body></html>
\ No newline at end of file
+Hurry and deliver the box to Mercenary Supplier Abercrombie! I marked the Map, didn't I?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31555-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31555-01.html
similarity index 85%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31555-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31555-01.html
index cc07d04218..77f6a87ac0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31555-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31555-01.html
@@ -1,4 +1,4 @@
<html><body>Mercenary Supplier Abercrombie:<br>
Are these the supplies from Daisy?<br>
-<a action="bypass -h Quest 18_MeetingWithTheGoldenRam 31555-02.htm">"Here's the box."</a>
+<a action="bypass -h Quest 18_MeetingWithTheGoldenRam 31555-02.html">"Here's the box."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31555-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31555-02.html
similarity index 70%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31555-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31555-02.html
index 897d94b0c3..66dea977c8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/18_MeetingWithTheGoldenRam/31555-02.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/31555-02.html
@@ -1,2 +1,3 @@
<html><body>Mercenary Supplier Abercrombie:<br>
-Hey, ale and mutton pie! You want a drink? What do you think of mercenary life? We're recruiting!</body></html>
\ No newline at end of file
+Hey, ale and mutton pie! You want a drink? What do you think of mercenary life? We're recruiting!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/Q18_MeetingWithTheGoldenRam.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/Q18_MeetingWithTheGoldenRam.java
new file mode 100644
index 0000000000..381167cf9c
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q18_MeetingWithTheGoldenRam/Q18_MeetingWithTheGoldenRam.java
@@ -0,0 +1,136 @@
+/*
+ * This program 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.
+ *
+ * This program 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.Q18_MeetingWithTheGoldenRam;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+
+/**
+ * Meeting With The Golden Ram (18).<br>
+ * Original jython script by disKret.
+ * @author nonom
+ */
+public class Q18_MeetingWithTheGoldenRam extends Quest
+{
+ private static final String qn = "18_MeetingWithTheGoldenRam";
+
+ // NPCs
+ private static final int DONAL = 31314;
+ private static final int DAISY = 31315;
+ private static final int ABERCROMBIE = 31555;
+
+ // Items
+ private static final int BOX = 7245;
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = getNoQuestMsg(player);
+ final QuestState st = player.getQuestState(qn);
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ final int npcId = npc.getNpcId();
+ switch (st.getState())
+ {
+ case State.COMPLETED:
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ case State.CREATED:
+ if (npcId == DONAL)
+ {
+ htmltext = "31314-01.htm";
+ }
+ break;
+ case State.STARTED:
+ final int cond = st.getInt("cond");
+ if (npcId == DONAL)
+ {
+ htmltext = "31314-04.html";
+ }
+ else if (npcId == DAISY)
+ {
+ htmltext = (cond < 2) ? "31315-01.html" : "31315-03.html";
+ }
+ else if ((npcId == ABERCROMBIE) && (cond == 2) && st.hasQuestItems(BOX))
+ {
+ htmltext = "31555-01.html";
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = event;
+ final QuestState st = player.getQuestState(qn);
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ switch (event)
+ {
+ case "31314-03.html":
+ if (player.getLevel() >= 66)
+ {
+ st.set("cond", "1");
+ st.setState(State.STARTED);
+ st.playSound("ItemSound.quest_accept");
+ }
+ else
+ {
+ htmltext = "31314-02.html";
+ }
+ break;
+ case "31315-02.html":
+ st.set("cond", "2");
+ st.giveItems(BOX, 1);
+ break;
+ case "31555-02.html":
+ if (st.hasQuestItems(BOX))
+ {
+ st.giveAdena(40000, false);
+ st.takeItems(BOX, -1);
+ st.addExpAndSp(126668, 11731);
+ st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ public Q18_MeetingWithTheGoldenRam(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+
+ addStartNpc(DONAL);
+
+ addTalkId(DONAL, DAISY, ABERCROMBIE);
+ }
+
+ public static void main(String[] args)
+ {
+ new Q18_MeetingWithTheGoldenRam(18, qn, "Meeting With The Golden Ram");
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/20120130update.sql b/L2J_DataPack_BETA/dist/sql/game/updates/20120130update.sql
new file mode 100644
index 0000000000..0aa69e5ca3
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/20120130update.sql
@@ -0,0 +1,2 @@
+UPDATE `character_quests` SET `name` = '15_SweetWhispers' WHERE `name` = '15_SweetWhisper';
+UPDATE `character_quests` SET `name` = '18_MeetingWithTheGoldenRam' WHERE `name` = '18_MeetingWithGoldenRam';
\ No newline at end of file
--
GitLab