From dfa34ffae43bf06d23b0e026075267b1102e377e Mon Sep 17 00:00:00 2001
From: Adry85 <adrya85@hotmail.it>
Date: Fri, 14 Jul 2017 22:18:23 +0200
Subject: [PATCH] Missing quest Seven Signs, Solina's Tomb (10295)
---
dist/game/data/doors.xml | 43 +-
dist/game/data/html/default/32792.htm | 5 +
dist/game/data/html/default/32793.htm | 2 +-
dist/game/data/html/default/32794.htm | 4 +
dist/game/data/html/default/32795.htm | 4 +
dist/game/data/html/default/32796.htm | 4 +
dist/game/data/html/default/32797.htm | 2 +-
dist/game/data/html/default/32837.htm | 4 +
dist/game/data/html/default/32838.htm | 4 +
dist/game/data/html/default/32839.htm | 4 +
dist/game/data/html/default/32840.htm | 4 +
dist/game/data/html/default/32841.htm | 4 +
dist/game/data/html/default/32842.htm | 4 +
dist/game/data/html/default/32843.htm | 4 +
dist/game/data/html/default/32844.htm | 4 +
dist/game/data/html/default/32857.htm | 4 +
dist/game/data/html/default/32858.htm | 4 +
dist/game/data/html/default/32859.htm | 4 +
dist/game/data/html/default/32860.htm | 4 +
.../data/instances/MonasteryOfSilence.xml | 127 +++-
.../instances/MonasteryOfSilence1/32792.html | 5 -
.../instances/MonasteryOfSilence1/32817.html | 2 +-
.../instances/MonasteryOfSilence1/32818.html | 2 +-
.../MonasteryOfSilence1/32843-01.html | 5 +
.../MonasteryOfSilence1.java | 478 ++++++++++++---
.../32787-01.html | 3 +
.../32787-02.html | 3 +
.../32787-03.html | 3 +
.../32787-04.html | 3 +
.../32787-05.html | 4 +
.../32792-01.htm | 4 +
.../32792-02.htm | 6 +
.../32792-03.htm | 3 +
.../32792-04.htm | 4 +
.../32792-05.htm | 3 +
.../32792-06.htm | 3 +
.../32792-07.html | 4 +
.../32792-08.html | 4 +
.../32792-09.html | 4 +
.../32792-10.html | 3 +
.../32792-11.html | 5 +
.../32792-12.html | 4 +
.../32793-01.html | 4 +
.../32793-02.html | 4 +
.../32793-03.html | 4 +
.../32793-04.html | 4 +
.../32793-05.html | 4 +
.../32793-06.html | 5 +
.../32793-07.html | 4 +
.../32793-08.html | 5 +
.../32793-09.html | 4 +
.../32793-10.html | 4 +
.../32793-11.html | 5 +
.../32794-01.html | 4 +
.../32794-02.html | 3 +
.../32794-03.html | 3 +
.../32795-01.html | 3 +
.../32795-02.html | 3 +
.../32796-01.html | 3 +
.../32796-02.html | 3 +
.../32797-01.html | 3 +
.../32797-02.html | 3 +
.../32837-01.html | 5 +
.../32837-02.html | 4 +
.../32837-03.html | 4 +
.../32838-01.html | 4 +
.../32838-02.html | 4 +
.../32838-03.html | 3 +
.../32839-01.html | 4 +
.../32839-02.html | 4 +
.../32839-03.html | 3 +
.../32840-01.html | 4 +
.../32840-02.html | 4 +
.../32840-03.html | 3 +
.../32841-01.html | 4 +
.../32841-02.html | 4 +
.../32841-03.html | 3 +
.../32842-01.html | 4 +
.../32843-01.html | 5 +
.../32843-02.html | 3 +
.../32844-01.html | 4 +
.../32857-01.html | 4 +
.../32857-02.html | 3 +
.../32857-03.html | 3 +
.../32858-01.html | 4 +
.../32858-02.html | 3 +
.../32858-03.html | 3 +
.../32859-01.html | 4 +
.../32859-02.html | 3 +
.../32859-03.html | 3 +
.../32860-01.html | 4 +
.../32860-02.html | 3 +
.../32860-03.html | 3 +
.../Q10295_Seven_Signs_Solinas_Tomb.java | 561 ++++++++++++++++++
.../scripts/quests/QuestMasterHandler.java | 2 +
dist/game/data/stats/items/17200-17299.xml | 25 +
dist/game/data/stats/npcs/18900-18999.xml | 284 ++++++---
dist/game/data/stats/npcs/27400-27499.xml | 289 +++++----
dist/game/data/stats/npcs/32700-32799.xml | 8 +-
dist/sql/game/spawnlist.sql | 2 +-
100 files changed, 1834 insertions(+), 319 deletions(-)
create mode 100644 dist/game/data/html/default/32792.htm
create mode 100644 dist/game/data/html/default/32794.htm
create mode 100644 dist/game/data/html/default/32795.htm
create mode 100644 dist/game/data/html/default/32796.htm
create mode 100644 dist/game/data/html/default/32837.htm
create mode 100644 dist/game/data/html/default/32838.htm
create mode 100644 dist/game/data/html/default/32839.htm
create mode 100644 dist/game/data/html/default/32840.htm
create mode 100644 dist/game/data/html/default/32841.htm
create mode 100644 dist/game/data/html/default/32842.htm
create mode 100644 dist/game/data/html/default/32843.htm
create mode 100644 dist/game/data/html/default/32844.htm
create mode 100644 dist/game/data/html/default/32857.htm
create mode 100644 dist/game/data/html/default/32858.htm
create mode 100644 dist/game/data/html/default/32859.htm
create mode 100644 dist/game/data/html/default/32860.htm
delete mode 100644 dist/game/data/scripts/instances/MonasteryOfSilence1/32792.html
create mode 100644 dist/game/data/scripts/instances/MonasteryOfSilence1/32843-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-02.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-03.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-04.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-05.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-01.htm
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-02.htm
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-03.htm
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-04.htm
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-05.htm
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-06.htm
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-07.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-08.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-09.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-10.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-11.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-12.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-02.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-03.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-04.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-05.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-06.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-07.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-08.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-09.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-10.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-11.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32794-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32794-02.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32794-03.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32795-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32795-02.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32796-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32796-02.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32797-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32797-02.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32837-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32837-02.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32837-03.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32838-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32838-02.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32838-03.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32839-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32839-02.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32839-03.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32840-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32840-02.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32840-03.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32841-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32841-02.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32841-03.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32842-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32843-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32843-02.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32844-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32857-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32857-02.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32857-03.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32858-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32858-02.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32858-03.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32859-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32859-02.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32859-03.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32860-01.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32860-02.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32860-03.html
create mode 100644 dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/Q10295_Seven_Signs_Solinas_Tomb.java
diff --git a/dist/game/data/doors.xml b/dist/game/data/doors.xml
index 6895b2a1c2..02f61f5932 100644
--- a/dist/game/data/doors.xml
+++ b/dist/game/data/doors.xml
@@ -797,28 +797,27 @@
<door id="20260004" name="base_tower_room02" open_method="0" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="18054;277478;-9557" node1="18049,277381" node2="18063,277381" node3="18063,277577" node4="18049,277577" nodeZ="-9727" group="base_tower_room" default_status="open" targetable="false" />
<door id="20260005" name="base_tower_blood01" open_method="0" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="19847;280141;-9564" node1="19744,280132" node2="19950,280132" node3="19951,280146" node4="19744,280145" nodeZ="-9732" default_status="open" targetable="false" />
<door id="20260006" name="base_tower_destruction" open_method="4" level="3" close_time="30" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="16977;280541;-9564" node1="16972,280444" node2="16986,280444" node3="16986,280640" node4="16972,280640" nodeZ="-9734" default_status="close" targetable="true" />
- <!-- NOTE: 21100001-21100104 are new H5 Doors and stats are unconfirmed -->
- <door id="21100001" name="Seal_of_the_Saintess_Gate_1" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="45396;-250859;-6792" node1="45531,-250881" node2="45531,-250833" node3="45262,-250834" node4="45262,-250882" nodeZ="-6792" default_status="close" targetable="true" />
- <door id="21100002" name="Seal_of_the_Saintess_Gate_2" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="44709;-250592;-6793" node1="44690,-250457" node2="44687,-250723" node3="44728,-250724" node4="44725,-250459" nodeZ="-6793" default_status="close" targetable="true" />
- <door id="21100003" name="Seal_of_the_Saintess_Gate_3" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="45396;-250147;-6791" node1="45511,-250162" node2="45510,-250133" node3="45281,-250133" node4="45281,-250158" nodeZ="-6791" default_status="close" targetable="true" />
- <door id="21100004" name="Seal_of_the_Saintess_Gate_4" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="46072;-250593;-6793" node1="46053,-250458" node2="46050,-250724" node3="46091,-250725" node4="46088,-250460" nodeZ="-6793" default_status="close" targetable="true" />
- <door id="21100005" name="Seal_of_the_Saintess_Gate_5" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="46353;-250317;-6793" node1="46216,-250335" node2="46489,-250335" node3="46487,-250297" node4="46213,-250299" nodeZ="-6793" default_status="close" targetable="true" />
- <door id="21100006" name="Seal_of_the_Saintess_Gate_6" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="46621;-249636;-6792" node1="46649,-249504" node2="46595,-249503" node3="46596,-249765" node4="46646,-249766" nodeZ="-6792" default_status="close" targetable="true" />
- <door id="21100007" name="Seal_of_the_Saintess_Gate_7" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="46354;-248962;-6793" node1="46217,-248980" node2="46490,-248980" node3="46488,-248942" node4="46214,-248944" nodeZ="-6793" default_status="close" targetable="true" />
- <door id="21100008" name="Seal_of_the_Saintess_Gate_8" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="45917;-249636;-6791" node1="45932,-249522" node2="45900,-249523" node3="45902,-249750" node4="45930,-249748" nodeZ="-6791" default_status="close" targetable="true" />
- <door id="21100009" name="Seal_of_the_Saintess_Gate_9" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="46076;-248686;-6793" node1="46057,-248551" node2="46054,-248817" node3="46095,-248818" node4="46092,-248553" nodeZ="-6793" default_status="close" targetable="true" />
- <door id="21100010" name="Seal_of_the_Saintess_Gate_10" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="45396;-248419;-6792" node1="45258,-248395" node2="45262,-248442" node3="45533,-248444" node4="45532,-248393" nodeZ="-6792" default_status="close" targetable="true" />
- <door id="21100011" name="Seal_of_the_Saintess_Gate_11" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="44713;-248685;-6793" node1="44694,-248550" node2="44691,-248816" node3="44732,-248817" node4="44729,-248552" nodeZ="-6793" default_status="close" targetable="true" />
- <door id="21100012" name="Seal_of_the_Saintess_Gate_12" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="45396;-249135;-6791" node1="45511,-249150" node2="45510,-249121" node3="45281,-249121" node4="45281,-249146" nodeZ="-6791" default_status="close" targetable="true" />
- <door id="21100013" name="Seal_of_the_Saintess_Gate_13" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="44435;-248961;-6793" node1="44298,-248979" node2="44571,-248979" node3="44569,-248941" node4="44295,-248943" nodeZ="-6793" default_status="close" targetable="true" />
- <door id="21100014" name="Seal_of_the_Saintess_Gate_14" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="44167;-249636;-6792" node1="44140,-249766" node2="44194,-249766" node3="44196,-249502" node4="44140,-249504" nodeZ="-6792" default_status="close" targetable="true" />
- <door id="21100015" name="Seal_of_the_Saintess_Gate_15" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="44434;-250314;-6793" node1="44297,-250332" node2="44570,-250332" node3="44568,-250294" node4="44294,-250296" nodeZ="-6793" default_status="close" targetable="true" />
- <door id="21100016" name="Seal_of_the_Saintess_Gate_16" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="44886;-249636;-6791" node1="44901,-249522" node2="44869,-249523" node3="44871,-249750" node4="44899,-249748" nodeZ="-6791" default_status="close" targetable="true" />
- <door id="21100018" name="Seal_of_the_Saintess_Gate_18" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="56082;-251867;-6794" node1="55926,-251890" node2="56233,-251891" node3="56231,-251841" node4="55928,-251838" nodeZ="-6794" default_status="close" targetable="true" />
- <door id="21100101" name="Seal_of_the_Saintess_Gate_101" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="55598;-252782;-6795" node1="55582,-252661" node2="55579,-252904" node3="55617,-252904" node4="55612,-252662" nodeZ="-6795" default_status="close" targetable="true" />
- <door id="21100102" name="Seal_of_the_Saintess_Gate_102" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="55598;-252163;-6795" node1="55582,-252042" node2="55579,-252285" node3="55617,-252285" node4="55612,-252043" nodeZ="-6795" default_status="close" targetable="true" />
- <door id="21100103" name="Seal_of_the_Saintess_Gate_103" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="56566;-252164;-6795" node1="56550,-252043" node2="56547,-252286" node3="56585,-252286" node4="56580,-252044" nodeZ="-6795" default_status="close" targetable="true" />
- <door id="21100104" name="Seal_of_the_Saintess_Gate_104" open_method="8" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="56566;-252782;-6795" node1="56550,-252661" node2="56547,-252904" node3="56585,-252904" node4="56580,-252662" nodeZ="-6795" default_status="close" targetable="true" />
+ <door id="21100001" name="ssq2_theme_hidden_door_2" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="45396;-250859;-6792" node1="45530,-250880" node2="45530,-250834" node3="45262,-250834" node4="45263,-250882" nodeZ="-6792" default_status="close" />
+ <door id="21100002" name="ssq2_theme_11_door_1" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="44709;-250592;-6793" node1="44690,-250458" node2="44688,-250723" node3="44727,-250723" node4="44725,-250459" nodeZ="-6793" default_status="close" />
+ <door id="21100003" name="ssq2_theme_c_door_1" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="45395;-250146;-6791" node1="45510,-250161" node2="45508,-250133" node3="45280,-250133" node4="45281,-250157" nodeZ="-6791" default_status="close" />
+ <door id="21100004" name="ssq2_theme_1_door_2" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="56566;-252782;-6795" node1="56550,-252661" node2="56547,-252903" node3="56584,-252903" node4="56580,-252662" nodeZ="-6795" default_status="close" />
+ <door id="21100005" name="ssq2_theme_1_door_1" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="46353;-250317;-6793" node1="46216,-250335" node2="46489,-250335" node3="46487,-250297" node4="46214,-250299" nodeZ="-6793" default_status="close" />
+ <door id="21100006" name="ssq2_theme_hidden_door_3" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="46621;-249636;-6792" node1="46649,-249505" node2="46595,-249503" node3="46596,-249765" node4="46646,-249765" nodeZ="-6792" default_status="close" />
+ <door id="21100007" name="ssq2_theme_5_door_2" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="46354;-248962;-6793" node1="46217,-248980" node2="46490,-248980" node3="46488,-248942" node4="46215,-248944" nodeZ="-6793" default_status="close" />
+ <door id="21100008" name="ssq2_theme_c_door_2" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="45916;-249636;-6791" node1="45930,-249522" node2="45900,-249523" node3="45902,-249749" node4="45929,-249747" nodeZ="-6791" default_status="close" />
+ <door id="21100009" name="ssq2_theme_5_door_1" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="46076;-248686;-6793" node1="46057,-248552" node2="46055,-248817" node3="46094,-248817" node4="46092,-248553" nodeZ="-6793" default_status="close" />
+ <door id="21100010" name="ssq2_theme_hidden_door_4" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="45396;-248419;-6792" node1="45258,-248395" node2="45263,-248442" node3="45533,-248443" node4="45532,-248393" nodeZ="-6792" default_status="close" />
+ <door id="21100011" name="ssq2_theme_7_door_2" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="44713;-248685;-6793" node1="44694,-248551" node2="44692,-248816" node3="44731,-248816" node4="44729,-248552" nodeZ="-6793" default_status="close" />
+ <door id="21100012" name="ssq2_theme_c_door_3" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="45395;-249134;-6791" node1="45510,-249149" node2="45508,-249121" node3="45280,-249121" node4="45281,-249145" nodeZ="-6791" default_status="close" />
+ <door id="21100013" name="ssq2_theme_7_door_1" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="44435;-248961;-6793" node1="44298,-248979" node2="44571,-248979" node3="44569,-248941" node4="44296,-248943" nodeZ="-6793" default_status="close" />
+ <door id="21100014" name="ssq2_theme_hidden_door_1" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="44167;-249636;-6792" node1="44141,-249766" node2="44194,-249765" node3="44196,-249502" node4="44140,-249505" nodeZ="-6792" default_status="close" />
+ <door id="21100015" name="ssq2_theme_11_door_2" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="44434;-250314;-6793" node1="44297,-250332" node2="44570,-250332" node3="44568,-250294" node4="44295,-250296" nodeZ="-6793" default_status="close" />
+ <door id="21100016" name="ssq2_theme_c_door_4" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="44885;-249636;-6791" node1="44899,-249522" node2="44869,-249523" node3="44871,-249749" node4="44898,-249747" nodeZ="-6791" default_status="close" />
+ <door id="21100018" name="ssq2_tomb_r_door_1" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="56082;-251866;-6794" node1="55927,-251888" node2="56232,-251890" node3="56230,-251841" node4="55928,-251837" nodeZ="-6794" default_status="close" />
+ <door id="21100101" name="ssq2_tomb_door_4" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="55598;-252782;-6795" node1="55582,-252661" node2="55579,-252903" node3="55616,-252903" node4="55612,-252662" nodeZ="-6795" default_status="close" />
+ <door id="21100102" name="ssq2_tomb_door_3" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="55598;-252163;-6795" node1="55582,-252042" node2="55579,-252284" node3="55616,-252284" node4="55612,-252043" nodeZ="-6795" default_status="close" />
+ <door id="21100103" name="ssq2_tomb_door_2" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="56566;-252164;-6795" node1="56550,-252043" node2="56547,-252285" node3="56584,-252285" node4="56580,-252044" nodeZ="-6795" default_status="close" />
+ <door id="21100104" name="ssq2_tomb_door_1" open_method="0" height="150" hp_showable="false" basePDef="100000" pos="56566;-252782;-6795" node1="56550,-252661" node2="56547,-252903" node3="56584,-252903" node4="56580,-252662" nodeZ="-6795" default_status="close" />
<door id="21150001" name="Farm_004" open_method="0" height="450" baseHpMax="316500" hp_showable="false" basePDef="644" baseMDef="518" pos="59980;-94117;-1305" node1="59945,-94173" node2="59954,-94177" node3="59985,-94118" node4="59976,-94114" nodeZ="-1382" />
<door id="21150002" name="Farm_003" open_method="0" height="450" baseHpMax="316500" hp_showable="false" basePDef="644" baseMDef="518" pos="59922;-94226;-1304" node1="59917,-94226" node2="59924,-94230" node3="59956,-94170" node4="59949,-94165" nodeZ="-1382" />
<door id="21150003" name="Farm_001" open_method="0" height="450" baseHpMax="316500" hp_showable="false" basePDef="644" baseMDef="518" pos="55334;-93268;-1267" node1="55334,-93274" node2="55338,-93272" node3="55300,-93144" node4="55295,-93146" nodeZ="-1395" />
diff --git a/dist/game/data/html/default/32792.htm b/dist/game/data/html/default/32792.htm
new file mode 100644
index 0000000000..0d452ff590
--- /dev/null
+++ b/dist/game/data/html/default/32792.htm
@@ -0,0 +1,5 @@
+<html><html>Eris' Evil Thoughts:<br>
+Finally we meet, Successors of Fate. At last, this endless cycle may be given a chance to end.<br>
+<a action="bypass -h Quest MonasteryOfSilence1 EXIT">"I'd like to go outside."</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/default/32793.htm b/dist/game/data/html/default/32793.htm
index ca0659f17a..22f9f9990c 100644
--- a/dist/game/data/html/default/32793.htm
+++ b/dist/game/data/html/default/32793.htm
@@ -1,4 +1,4 @@
-<html><body>Elmore-Aden's Saintess Solina:<br>
+<html><body>Elmoreden's Saintess Solina:<br>
For an eternity, I've been waiting for you.<br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/default/32794.htm b/dist/game/data/html/default/32794.htm
new file mode 100644
index 0000000000..ab7783bb04
--- /dev/null
+++ b/dist/game/data/html/default/32794.htm
@@ -0,0 +1,4 @@
+<html><body>Elmoreden's Saintess Solina:<br>
+I am Solina!<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/default/32795.htm b/dist/game/data/html/default/32795.htm
new file mode 100644
index 0000000000..e42a4a0742
--- /dev/null
+++ b/dist/game/data/html/default/32795.htm
@@ -0,0 +1,4 @@
+<html><body>Solina's Disciple Eris:<br>
+I am Eris!!<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/default/32796.htm b/dist/game/data/html/default/32796.htm
new file mode 100644
index 0000000000..8460138fad
--- /dev/null
+++ b/dist/game/data/html/default/32796.htm
@@ -0,0 +1,4 @@
+<html><body>Priest of Splendor Anais:<br>
+I am Anais!!!!<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/default/32797.htm b/dist/game/data/html/default/32797.htm
index c6d51ea065..c8e7bd21bd 100644
--- a/dist/game/data/html/default/32797.htm
+++ b/dist/game/data/html/default/32797.htm
@@ -1,4 +1,4 @@
<html><body>Jude van Etina:<br>
-What we need now is silence, I care not for any truth or confession.<br>
+What we need now is silence, I care not for any truth nor confession.<br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/default/32837.htm b/dist/game/data/html/default/32837.htm
new file mode 100644
index 0000000000..6a96ee17e5
--- /dev/null
+++ b/dist/game/data/html/default/32837.htm
@@ -0,0 +1,4 @@
+<html><body>
+You hear a low vibrating sound from the giant Teleport Control Device.<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/default/32838.htm b/dist/game/data/html/default/32838.htm
new file mode 100644
index 0000000000..e4bdab2c92
--- /dev/null
+++ b/dist/game/data/html/default/32838.htm
@@ -0,0 +1,4 @@
+<html><body>
+There's a book shaped hole in the giant Barrier Device.<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/default/32839.htm b/dist/game/data/html/default/32839.htm
new file mode 100644
index 0000000000..4eed01ed43
--- /dev/null
+++ b/dist/game/data/html/default/32839.htm
@@ -0,0 +1,4 @@
+<html><body>
+There's a shield-shaped hole in the giant Barrier Device.<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/default/32840.htm b/dist/game/data/html/default/32840.htm
new file mode 100644
index 0000000000..20bd588003
--- /dev/null
+++ b/dist/game/data/html/default/32840.htm
@@ -0,0 +1,4 @@
+<html><body>
+There's a small hole in the giant Barrier Device. It looks like you can place a sword shaped relic in there.<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/default/32841.htm b/dist/game/data/html/default/32841.htm
new file mode 100644
index 0000000000..61f772b5c3
--- /dev/null
+++ b/dist/game/data/html/default/32841.htm
@@ -0,0 +1,4 @@
+<html><body>
+There's a cain shaped hole in the giant Barrier Device. It looks like you can put a cain relic in here to activate it.<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/default/32842.htm b/dist/game/data/html/default/32842.htm
new file mode 100644
index 0000000000..1c9950a39c
--- /dev/null
+++ b/dist/game/data/html/default/32842.htm
@@ -0,0 +1,4 @@
+<html><body>Teleport Control Device:<br>
+Only Solina's disciples may enter.<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/default/32843.htm b/dist/game/data/html/default/32843.htm
new file mode 100644
index 0000000000..ec0e9b2355
--- /dev/null
+++ b/dist/game/data/html/default/32843.htm
@@ -0,0 +1,4 @@
+<html><body>
+This is a lavishly decorated tomb.<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/default/32844.htm b/dist/game/data/html/default/32844.htm
new file mode 100644
index 0000000000..88544ca067
--- /dev/null
+++ b/dist/game/data/html/default/32844.htm
@@ -0,0 +1,4 @@
+<html><body>
+The Teleport Control Device gives off a subtle and mysterious light.<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/default/32857.htm b/dist/game/data/html/default/32857.htm
new file mode 100644
index 0000000000..3338364cd6
--- /dev/null
+++ b/dist/game/data/html/default/32857.htm
@@ -0,0 +1,4 @@
+<html><body>
+A sacred object, shaped like a huge staff, floats effortlessly above the altar.<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/default/32858.htm b/dist/game/data/html/default/32858.htm
new file mode 100644
index 0000000000..f8428c16c2
--- /dev/null
+++ b/dist/game/data/html/default/32858.htm
@@ -0,0 +1,4 @@
+<html><body>
+A sacred object shaped like a large sword hovers gently above the altar.<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/default/32859.htm b/dist/game/data/html/default/32859.htm
new file mode 100644
index 0000000000..561252e9e1
--- /dev/null
+++ b/dist/game/data/html/default/32859.htm
@@ -0,0 +1,4 @@
+<html><body>
+There's a large book-looking relic floating in the air above the altar.<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/html/default/32860.htm b/dist/game/data/html/default/32860.htm
new file mode 100644
index 0000000000..036d86db41
--- /dev/null
+++ b/dist/game/data/html/default/32860.htm
@@ -0,0 +1,4 @@
+<html><body>
+A sacred object in the shape of a huge shield floats above the altar, slowly rotating.<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/instances/MonasteryOfSilence.xml b/dist/game/data/instances/MonasteryOfSilence.xml
index 0846738d61..e777a599c1 100644
--- a/dist/game/data/instances/MonasteryOfSilence.xml
+++ b/dist/game/data/instances/MonasteryOfSilence.xml
@@ -1,24 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<instance name="Monastery Of Silence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
- <activityTime val="30" />
+ <activityTime val="60" />
<allowSummon val="false" />
<emptyDestroyTime val="1" />
<exitPoint x="115983" y="-87351" z="-3397" />
<removeBuffs type="ALL" />
+ <doorlist>
+ <door doorId="21100001" />
+ <door doorId="21100002" />
+ <door doorId="21100003" />
+ <door doorId="21100004" />
+ <door doorId="21100005" />
+ <door doorId="21100006" />
+ <door doorId="21100007" />
+ <door doorId="21100008" />
+ <door doorId="21100009" />
+ <door doorId="21100010" />
+ <door doorId="21100011" />
+ <door doorId="21100012" />
+ <door doorId="21100013" />
+ <door doorId="21100014" />
+ <door doorId="21100015" />
+ <door doorId="21100016" />
+ <door doorId="21100018" />
+ <door doorId="21100101" />
+ <door doorId="21100102" />
+ <door doorId="21100103" />
+ <door doorId="21100104" />
+ </doorlist>
<spawnlist>
<group name="general">
<!-- Eris's Evil Thoughts -->
- <spawn npcId="32792" x="120881" y="-86496" z="-3392" heading="49080" respawn="0" />
+ <spawn npcId="32792" x="120881" y="-86496" z="-3399" heading="-16456" respawn="0" />
<!-- Relic Guardian -->
<spawn npcId="32803" x="85792" y="-249624" z="-8296" heading="0" respawn="0" />
<!-- Teleport Control Device -->
- <spawn npcId="32817" x="86674" y="-249624" z="-8296" heading="32960" respawn="0" />
- <spawn npcId="32818" x="84909" y="-249625" z="-8296" heading="0" respawn="0" />
- <spawn npcId="32819" x="85792" y="-250512" z="-8296" heading="16400" respawn="0" />
- <spawn npcId="32820" x="85792" y="-248739" z="-8296" heading="49212" respawn="0" />
+ <spawn npcId="32817" x="86674" y="-249624" z="-8308" heading="-32576" respawn="0" />
+ <spawn npcId="32818" x="84909" y="-249625" z="-8311" heading="0" respawn="0" />
+ <spawn npcId="32819" x="85792" y="-250512" z="-8310" heading="16400" respawn="0" />
+ <spawn npcId="32820" x="85792" y="-248739" z="-8308" heading="-16324" respawn="0" />
<!-- Relic Watcher -->
<spawn npcId="32804" x="88672" y="-249625" z="-8296" heading="32592" respawn="0" />
- <spawn npcId="32805" x="82528" y="-249616" z="-8296" heading="0" respawn="0" />
+ <spawn npcId="32805" x="82528" y="-249616" z="-8304" heading="0" respawn="0" />
<spawn npcId="32806" x="85788" y="-252497" z="-8296" heading="16852" respawn="0" />
<spawn npcId="32807" x="85790" y="-246730" z="-8296" heading="48120" respawn="0" />
<!-- Reading Desk -->
@@ -38,6 +61,96 @@
<spawn npcId="32834" x="86888" y="-246734" z="-8320" heading="0" respawn="0" />
<spawn npcId="32835" x="85793" y="-245640" z="-8320" heading="0" respawn="0" />
<spawn npcId="32836" x="84705" y="-246730" z="-8320" heading="0" respawn="0" />
+ <!-- Q10295 -->
+ <!-- Altar of Hallows -->
+ <spawn npcId="32857" x="44123" y="-248367" z="-6715" heading="0" respawn="0" />
+ <spawn npcId="32858" x="46672" y="-248368" z="-6724" heading="0" respawn="0" />
+ <spawn npcId="32859" x="44114" y="-250912" z="-6718" heading="0" respawn="0" />
+ <spawn npcId="32860" x="46672" y="-250915" z="-6722" heading="0" respawn="0" />
+ <!-- Teleport Control Device -->
+ <spawn npcId="32837" x="45398" y="-249639" z="-6694" heading="0" respawn="0" />
+ <spawn npcId="32842" x="56080" y="-251648" z="-6768" heading="0" respawn="0" />
+ <spawn npcId="32844" x="56080" y="-253232" z="-6768" heading="0" respawn="0" />
+ <!-- Tomb of the Saintess -->
+ <spawn npcId="32843" x="56116" y="-252480" z="-6730" heading="0" respawn="0" />
+ <!-- Solina's Evil Thoughts -->
+ <spawn npcId="32793" x="56097" y="-250576" z="-6757" heading="0" respawn="0" />
+ <!-- Jude van Etina -->
+ <spawn npcId="32797" x="56347" y="-239448" z="-7228" heading="6992" respawn="0" />
+ <!-- Anais -->
+ <spawn npcId="32796" x="56495" y="-239445" z="-7216" heading="31196" respawn="0" />
+ <!-- Solina -->
+ <spawn npcId="32794" x="56430" y="-239226" z="-7232" heading="-15832" respawn="0" />
+ <!-- Eris -->
+ <spawn npcId="32795" x="56379" y="-239233" z="-7232" heading="-5760" respawn="0" />
+ <!-- Powerful Device -->
+ <spawn npcId="32838" x="45413" y="-251556" z="-6734" heading="0" respawn="0" />
+ <spawn npcId="32839" x="47333" y="-249648" z="-6687" heading="0" respawn="0" />
+ <spawn npcId="32840" x="45392" y="-247720" z="-6680" heading="0" respawn="0" />
+ <spawn npcId="32841" x="43472" y="-249632" z="-6710" heading="0" respawn="0" />
+ <!-- Monsters -->
+ <spawn npcId="27417" x="43778" y="-248710" z="-6799" heading="-6599" respawn="0" />
+ <spawn npcId="27407" x="44367" y="-248710" z="-6799" heading="-6599" respawn="0" />
+ <spawn npcId="27414" x="44510" y="-248433" z="-6799" heading="-6599" respawn="0" />
+ <spawn npcId="27414" x="43780" y="-248436" z="-6799" heading="-6599" respawn="0" />
+ <spawn npcId="27405" x="43731" y="-248246" z="-6802" heading="-6602" respawn="0" />
+ <spawn npcId="27407" x="44531" y="-248246" z="-6802" heading="-6602" respawn="0" />
+ <spawn npcId="27414" x="44529" y="-248046" z="-6802" heading="-6602" respawn="0" />
+ <spawn npcId="27414" x="43739" y="-248046" z="-6802" heading="-6602" respawn="0" />
+ <spawn npcId="27420" x="46340" y="-248694" z="-6789" heading="-6589" respawn="0" />
+ <spawn npcId="27410" x="46929" y="-248694" z="-6789" heading="-6589" respawn="0" />
+ <spawn npcId="27410" x="47072" y="-248417" z="-6789" heading="-6589" respawn="0" />
+ <spawn npcId="27410" x="46342" y="-248420" z="-6789" heading="-6589" respawn="0" />
+ <spawn npcId="27420" x="46293" y="-248230" z="-6792" heading="-6592" respawn="0" />
+ <spawn npcId="27410" x="47093" y="-248230" z="-6792" heading="-6592" respawn="0" />
+ <spawn npcId="27410" x="47091" y="-248030" z="-6792" heading="-6592" respawn="0" />
+ <spawn npcId="27410" x="46301" y="-248030" z="-6792" heading="-6592" respawn="0" />
+ <spawn npcId="27417" x="46332" y="-251293" z="-6797" heading="-6597" respawn="0" />
+ <spawn npcId="27418" x="46921" y="-251293" z="-6797" heading="-6597" respawn="0" />
+ <spawn npcId="27417" x="47064" y="-251016" z="-6797" heading="-6597" respawn="0" />
+ <spawn npcId="27418" x="46334" y="-251019" z="-6797" heading="-6597" respawn="0" />
+ <spawn npcId="27417" x="46285" y="-250829" z="-6800" heading="-6600" respawn="0" />
+ <spawn npcId="27418" x="47085" y="-250829" z="-6800" heading="-6600" respawn="0" />
+ <spawn npcId="27417" x="47083" y="-250629" z="-6800" heading="-6600" respawn="0" />
+ <spawn npcId="27418" x="46293" y="-250629" z="-6800" heading="-6600" respawn="0" />
+ <spawn npcId="27405" x="43801" y="-251290" z="-6791" heading="-6591" respawn="0" />
+ <spawn npcId="27407" x="44390" y="-251290" z="-6791" heading="-6591" respawn="0" />
+ <spawn npcId="27414" x="44533" y="-251013" z="-6791" heading="-6591" respawn="0" />
+ <spawn npcId="27414" x="43803" y="-251016" z="-6791" heading="-6591" respawn="0" />
+ <spawn npcId="27405" x="43754" y="-250826" z="-6798" heading="-6598" respawn="0" />
+ <spawn npcId="27407" x="44554" y="-250826" z="-6798" heading="-6598" respawn="0" />
+ <spawn npcId="27414" x="44552" y="-250626" z="-6798" heading="-6598" respawn="0" />
+ <spawn npcId="27414" x="43762" y="-250626" z="-6798" heading="-6598" respawn="0" />
+ <spawn npcId="27412" x="45473" y="-248033" z="-6794" heading="-6594" respawn="0" />
+ <spawn npcId="27413" x="45673" y="-248033" z="-6794" heading="-6594" respawn="0" />
+ <spawn npcId="27412" x="45459" y="-247622" z="-6794" heading="-6594" respawn="0" />
+ <spawn npcId="27413" x="45659" y="-247622" z="-6794" heading="-6594" respawn="0" />
+ <spawn npcId="27412" x="45095" y="-247619" z="-6794" heading="-6594" respawn="0" />
+ <spawn npcId="27413" x="45295" y="-247619" z="-6794" heading="-6594" respawn="0" />
+ <spawn npcId="27412" x="45083" y="-248026" z="-6794" heading="-6594" respawn="0" />
+ <spawn npcId="27413" x="45283" y="-248026" z="-6794" heading="-6594" respawn="0" />
+ <spawn npcId="27412" x="47442" y="-249940" z="-6790" heading="-6590" respawn="0" />
+ <spawn npcId="27413" x="47642" y="-249940" z="-6790" heading="-6590" respawn="0" />
+ <spawn npcId="27412" x="47428" y="-249529" z="-6790" heading="-6590" respawn="0" />
+ <spawn npcId="27413" x="47628" y="-249529" z="-6790" heading="-6590" respawn="0" />
+ <spawn npcId="27412" x="47064" y="-249526" z="-6790" heading="-6590" respawn="0" />
+ <spawn npcId="27413" x="47264" y="-249526" z="-6790" heading="-6590" respawn="0" />
+ <spawn npcId="27412" x="47052" y="-249933" z="-6790" heading="-6590" respawn="0" />
+ <spawn npcId="27413" x="47252" y="-249933" z="-6790" heading="-6590" respawn="0" />
+ <spawn npcId="27412" x="45488" y="-251880" z="-6793" heading="-6593" respawn="0" />
+ <spawn npcId="27413" x="45688" y="-251880" z="-6793" heading="-6593" respawn="0" />
+ <spawn npcId="27412" x="45474" y="-251469" z="-6793" heading="-6593" respawn="0" />
+ <spawn npcId="27413" x="45674" y="-251469" z="-6793" heading="-6593" respawn="0" />
+ <spawn npcId="27412" x="45110" y="-251466" z="-6793" heading="-6593" respawn="0" />
+ <spawn npcId="27413" x="45310" y="-251466" z="-6793" heading="-6593" respawn="0" />
+ <spawn npcId="27412" x="43544" y="-249975" z="-6792" heading="-6592" respawn="0" />
+ <spawn npcId="27413" x="43744" y="-249975" z="-6792" heading="-6592" respawn="0" />
+ <spawn npcId="27412" x="43530" y="-249564" z="-6792" heading="-6592" respawn="0" />
+ <spawn npcId="27413" x="43730" y="-249564" z="-6792" heading="-6592" respawn="0" />
+ <spawn npcId="27412" x="43166" y="-249561" z="-6792" heading="-6592" respawn="0" />
+ <spawn npcId="27413" x="43366" y="-249561" z="-6792" heading="-6592" respawn="0" />
+ <spawn npcId="27412" x="43154" y="-249968" z="-6792" heading="-6592" respawn="0" />
+ <spawn npcId="27413" x="43354" y="-249968" z="-6792" heading="-6592" respawn="0" />
</group>
</spawnlist>
</instance>
\ No newline at end of file
diff --git a/dist/game/data/scripts/instances/MonasteryOfSilence1/32792.html b/dist/game/data/scripts/instances/MonasteryOfSilence1/32792.html
deleted file mode 100644
index be90142e8b..0000000000
--- a/dist/game/data/scripts/instances/MonasteryOfSilence1/32792.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><html>Sister of Silence Eris:<br>
-Finally we meet, Successors of Fate. In the end, the endless Bridle of Eternity will be back where it belongs.<br>
-<a action="bypass -h Quest MonasteryOfSilence1 EXIT">"I'd like to go outside."</a><br>
-<a action="bypass -h npc_%objectId%_Quest">Quest</a>
-</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/instances/MonasteryOfSilence1/32817.html b/dist/game/data/scripts/instances/MonasteryOfSilence1/32817.html
index 49a2fc8425..a86ee0c413 100644
--- a/dist/game/data/scripts/instances/MonasteryOfSilence1/32817.html
+++ b/dist/game/data/scripts/instances/MonasteryOfSilence1/32817.html
@@ -1,3 +1,3 @@
-<html><body>Teleportation Device: Move to East Watcher's Room.<br><br>
+<html><body>Teleportation Device: Move to East Watcher's Room.<br>
<a action="bypass -h Quest MonasteryOfSilence1 EAST">Move to East Watcher's Room</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/instances/MonasteryOfSilence1/32818.html b/dist/game/data/scripts/instances/MonasteryOfSilence1/32818.html
index 16d6ccd9f4..b7f8a011ea 100644
--- a/dist/game/data/scripts/instances/MonasteryOfSilence1/32818.html
+++ b/dist/game/data/scripts/instances/MonasteryOfSilence1/32818.html
@@ -1,3 +1,3 @@
-<html><body>Teleportation Device: Move to West Watcher's Room.<br><br>
+<html><body>Teleportation Device: Move to West Watcher's Room.<br>
<a action="bypass -h Quest MonasteryOfSilence1 WEST">Move to West Watcher's Room</a>
</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/instances/MonasteryOfSilence1/32843-01.html b/dist/game/data/scripts/instances/MonasteryOfSilence1/32843-01.html
new file mode 100644
index 0000000000..567a61bd90
--- /dev/null
+++ b/dist/game/data/scripts/instances/MonasteryOfSilence1/32843-01.html
@@ -0,0 +1,5 @@
+<html><body>Tomb of Saintess:<br>
+You look at the tomb, and see these words.<br>
+"For the Saintess Solina, who devoted all her life to serve Einhasad and the Elmoreden Kingdom...to be remembered forever by those she saved and those who loved her...may punishing find the feet of those who ignored Solina's teachings."<br>
+This is not Solina's real tomb.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java b/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java
index 6b0cb6c03b..2c7b277b1a 100644
--- a/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java
+++ b/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2016 L2J DataPack
+ * Copyright (C) 2004-2017 L2J DataPack
*
* This file is part of L2J DataPack.
*
@@ -18,16 +18,21 @@
*/
package instances.MonasteryOfSilence1;
+import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.instancemanager.InstanceManager;
import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
+import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import instances.AbstractInstance;
+import quests.Q10294_SevenSignsToTheMonasteryOfSilence.Q10294_SevenSignsToTheMonasteryOfSilence;
+import quests.Q10295_Seven_Signs_Solinas_Tomb.Q10295_Seven_Signs_Solinas_Tomb;
/**
* Monastery of Silence instance zone.
@@ -38,6 +43,8 @@ public final class MonasteryOfSilence1 extends AbstractInstance
protected static final class MoSWorld extends InstanceWorld
{
protected L2Npc elcadia = null;
+ protected int deadTombGuardianCount = 0;
+ protected int deadSolinaGuardianCount = 0;
}
// NPCs
@@ -53,6 +60,23 @@ public final class MonasteryOfSilence1 extends AbstractInstance
private static final int TELEPORT_CONTROL_DEVICE2 = 32818;
private static final int TELEPORT_CONTROL_DEVICE3 = 32819;
private static final int TELEPORT_CONTROL_DEVICE4 = 32820;
+ private static final int TOMB_OF_THE_SAINTESS = 32843;
+ // Monsters
+ private static final int TRAINEE_OF_REST = 27403;
+ private static final int SUPPLICANT_OF_REST = 27404;
+ private static final int SOLINAS_GUARDIAN_1 = 18952;
+ private static final int SOLINAS_GUARDIAN_2 = 18953;
+ private static final int SOLINAS_GUARDIAN_3 = 18954;
+ private static final int SOLINAS_GUARDIAN_4 = 18955;
+ private static final int GUARDIAN_OF_THE_TOMB_1 = 18956;
+ private static final int GUARDIAN_OF_THE_TOMB_2 = 18957;
+ private static final int GUARDIAN_OF_THE_TOMB_3 = 18958;
+ private static final int GUARDIAN_OF_THE_TOMB_4 = 18959;
+ // Items
+ private static final int SCROLL_OF_ABSTINENCE = 17228;
+ private static final int SHIELD_OF_SACRIFICE = 17229;
+ private static final int SWORD_OF_HOLY_SPIRIT = 17230;
+ private static final int STAFF_OF_BLESSING = 17231;
// Skills
private static final SkillHolder[] BUFFS =
{
@@ -61,7 +85,7 @@ public final class MonasteryOfSilence1 extends AbstractInstance
new SkillHolder(6730), // Greater Battle Heal of Elcadia
};
// Locations
- private static final Location START_LOC = new Location(120710, -86971, -3392);
+ private static final Location START_LOC = new Location(120717, -86879, -3424);
private static final Location EXIT_LOC = new Location(115983, -87351, -3397, 0, 0);
private static final Location CENTRAL_ROOM_LOC = new Location(85794, -249788, -8320);
private static final Location SOUTH_WATCHERS_ROOM_LOC = new Location(85798, -246566, -8320);
@@ -69,20 +93,98 @@ public final class MonasteryOfSilence1 extends AbstractInstance
private static final Location EAST_WATCHERS_ROOM_LOC = new Location(88665, -249784, -8320);
private static final Location NORTH_WATCHERS_ROOM_LOC = new Location(85792, -252336, -8320);
private static final Location BACK_LOC = new Location(120710, -86971, -3392);
+ private static final Location START_LOC_Q10295 = new Location(45545, -249423, -6788);
+ private static final Location CASKET_ROOM_LOC = new Location(56033, -252944, -6792);
+ private static final Location SOLINAS_RESTING_PLACE_LOC = new Location(55955, -250394, -6792);
+ private static final Location DIRECTORS_ROOM_LOC = new Location(120717, -86879, -3424);
+ private static final Location GUARDIAN_OF_THE_TOMB_1_LOC = new Location(55498, -252781, -6752, 0);
+ private static final Location GUARDIAN_OF_THE_TOMB_2_LOC = new Location(55520, -252160, -6752, 0);
+ private static final Location GUARDIAN_OF_THE_TOMB_3_LOC = new Location(56635, -252776, -6752, -32180);
+ private static final Location GUARDIAN_OF_THE_TOMB_4_LOC = new Location(56672, -252156, -6754, 32252);
+ private static final Location SOLINAS_GUARDIAN_1_LOC = new Location(45399, -253051, -6765, 16584);
+ private static final Location SOLINAS_GUARDIAN_2_LOC = new Location(48736, -249632, -6768, -32628);
+ private static final Location SOLINAS_GUARDIAN_3_LOC = new Location(45392, -246303, -6768, -16268);
+ private static final Location SOLINAS_GUARDIAN_4_LOC = new Location(42016, -249648, -6764, 0);
+ private static final Location[] SLAVE_SPAWN_1_LOC =
+ {
+ new Location(55680, -252832, -6752),
+ new Location(55825, -252792, -6752),
+ new Location(55687, -252718, -6752),
+ new Location(55824, -252679, -6752),
+ };
+ private static final Location[] SLAVE_SPAWN_2_LOC =
+ {
+ new Location(55672, -252099, -6751),
+ new Location(55810, -252262, -6752),
+ new Location(55824, -252112, -6752),
+ new Location(55669, -252227, -6752),
+ };
+ private static final Location[] SLAVE_SPAWN_3_LOC =
+ {
+ new Location(56480, -252833, -6751),
+ new Location(56481, -252725, -6752),
+ new Location(56368, -252787, -6752),
+ new Location(56368, -252669, -6752),
+ };
+ private static final Location[] SLAVE_SPAWN_4_LOC =
+ {
+ new Location(56463, -252225, -6751),
+ new Location(56469, -252108, -6752),
+ new Location(56336, -252168, -6752),
+ new Location(56336, -252288, -6752),
+ };
// NpcString
- private static final NpcStringId[] ELCADIA_DIALOGS =
+ private static final NpcStringId[] ELCADIA_DIALOGS_Q010294 =
{
- NpcStringId.IT_SEEMS_THAT_YOU_CANNOT_REMEMBER_TO_THE_ROOM_OF_THE_WATCHER_WHO_FOUND_THE_BOOK,
NpcStringId.WE_MUST_SEARCH_HIGH_AND_LOW_IN_EVERY_ROOM_FOR_THE_READING_DESK_THAT_CONTAINS_THE_BOOK_WE_SEEK,
- NpcStringId.REMEMBER_THE_CONTENT_OF_THE_BOOKS_THAT_YOU_FOUND_YOU_CANT_TAKE_THEM_OUT_WITH_YOU
+ NpcStringId.REMEMBER_THE_CONTENT_OF_THE_BOOKS_THAT_YOU_FOUND_YOU_CANT_TAKE_THEM_OUT_WITH_YOU,
+ NpcStringId.IT_SEEMS_THAT_YOU_CANNOT_REMEMBER_TO_THE_ROOM_OF_THE_WATCHER_WHO_FOUND_THE_BOOK
+ };
+
+ private static final NpcStringId[] ELCADIA_DIALOGS_Q010295 =
+ {
+ NpcStringId.THE_GUARDIAN_OF_THE_SEAL_DOESNT_SEEM_TO_GET_INJURED_AT_ALL_UNTIL_THE_BARRIER_IS_DESTROYED,
+ NpcStringId.THE_DEVICE_LOCATED_IN_THE_ROOM_IN_FRONT_OF_THE_GUARDIAN_OF_THE_SEAL_IS_DEFINITELY_THE_BARRIER_THAT_CONTROLS_THE_GUARDIANS_POWER,
+ NpcStringId.TO_REMOVE_THE_BARRIER_YOU_MUST_FIND_THE_RELICS_THAT_FIT_THE_BARRIER_AND_ACTIVATE_THE_DEVICE
};
// Misc
private static final int TEMPLATE_ID = 151;
+ // Doors
+ private static final int TOMB_DOOR = 21100018;
+ private static final int[] DOORS =
+ {
+ 21100014,
+ 21100001,
+ 21100006,
+ 21100010,
+ 21100003,
+ 21100008,
+ 21100012,
+ 21100016,
+ 21100002,
+ 21100015,
+ 21100005,
+ 21100004,
+ 21100009,
+ 21100007,
+ 21100013,
+ 21100011
+ };
+
+ private static final int[] FAKE_TOMB_DOORS =
+ {
+ 21100101,
+ 21100102,
+ 21100103,
+ 21100104
+ };
public MonasteryOfSilence1()
{
super(MonasteryOfSilence1.class.getSimpleName());
- addFirstTalkId(TELEPORT_CONTROL_DEVICE1, TELEPORT_CONTROL_DEVICE2, TELEPORT_CONTROL_DEVICE3, TELEPORT_CONTROL_DEVICE4, ERIS_EVIL_THOUGHTS);
+ addFirstTalkId(TELEPORT_CONTROL_DEVICE1, TELEPORT_CONTROL_DEVICE2, TELEPORT_CONTROL_DEVICE3, TELEPORT_CONTROL_DEVICE4);
+ addKillId(SOLINAS_GUARDIAN_1, SOLINAS_GUARDIAN_2, SOLINAS_GUARDIAN_3, SOLINAS_GUARDIAN_4, GUARDIAN_OF_THE_TOMB_1, GUARDIAN_OF_THE_TOMB_2, GUARDIAN_OF_THE_TOMB_3, GUARDIAN_OF_THE_TOMB_4);
+ addSpawnId(ERIS_EVIL_THOUGHTS, TOMB_OF_THE_SAINTESS);
addStartNpc(ODD_GLOBE, TELEPORT_CONTROL_DEVICE1, TELEPORT_CONTROL_DEVICE2, TELEPORT_CONTROL_DEVICE3, TELEPORT_CONTROL_DEVICE4, ERIS_EVIL_THOUGHTS);
addTalkId(ODD_GLOBE, ERIS_EVIL_THOUGHTS, RELIC_GUARDIAN, RELIC_WATCHER1, RELIC_WATCHER2, RELIC_WATCHER3, RELIC_WATCHER4, TELEPORT_CONTROL_DEVICE1, TELEPORT_CONTROL_DEVICE2, TELEPORT_CONTROL_DEVICE3, TELEPORT_CONTROL_DEVICE4, ERIS_EVIL_THOUGHTS);
}
@@ -101,89 +203,306 @@ public final class MonasteryOfSilence1 extends AbstractInstance
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
- final InstanceWorld tmpworld = InstanceManager.getInstance().getPlayerWorld(player);
- if (!(tmpworld instanceof MoSWorld))
- {
- return null;
- }
-
- final MoSWorld world = (MoSWorld) tmpworld;
- switch (event)
+ final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId());
+ if (tmpworld instanceof MoSWorld)
{
- case "TELE2":
- {
- teleportPlayer(player, CENTRAL_ROOM_LOC, world.getInstanceId());
- world.elcadia.teleToLocation(CENTRAL_ROOM_LOC, 0, world.getInstanceId());
- startQuestTimer("START_MOVIE", 2000, npc, player);
- break;
- }
- case "EXIT":
- {
- cancelQuestTimer("FOLLOW", npc, player);
- teleportPlayer(player, EXIT_LOC, 0);
- world.elcadia.deleteMe();
- break;
- }
- case "START_MOVIE":
- {
- player.showQuestMovie(24);
- break;
- }
- case "BACK":
+ final MoSWorld world = (MoSWorld) tmpworld;
+ switch (event)
{
- teleportPlayer(player, BACK_LOC, world.getInstanceId());
- world.elcadia.teleToLocation(BACK_LOC, 0, world.getInstanceId());
- break;
- }
- case "EAST":
- {
- teleportPlayer(player, EAST_WATCHERS_ROOM_LOC, world.getInstanceId());
- world.elcadia.teleToLocation(EAST_WATCHERS_ROOM_LOC, 0, world.getInstanceId());
- break;
- }
- case "WEST":
- {
- teleportPlayer(player, WEST_WATCHERS_ROOM_LOC, world.getInstanceId());
- world.elcadia.teleToLocation(WEST_WATCHERS_ROOM_LOC, 0, world.getInstanceId());
- break;
- }
- case "NORTH":
- {
- teleportPlayer(player, NORTH_WATCHERS_ROOM_LOC, world.getInstanceId());
- world.elcadia.teleToLocation(NORTH_WATCHERS_ROOM_LOC, 0, world.getInstanceId());
- break;
+ case "TELE2":
+ {
+ teleportPlayer(player, CENTRAL_ROOM_LOC, world.getInstanceId());
+ world.elcadia.teleToLocation(CENTRAL_ROOM_LOC, world.getInstanceId(), 0);
+ startQuestTimer("START_MOVIE", 2000, npc, player);
+ break;
+ }
+ case "EXIT":
+ {
+ cancelQuestTimer("FOLLOW", npc, player);
+ cancelQuestTimer("DIALOG", npc, player);
+ teleportPlayer(player, EXIT_LOC, 0);
+ world.elcadia.deleteMe();
+ break;
+ }
+ case "START_MOVIE":
+ {
+ player.showQuestMovie(24);
+ break;
+ }
+ case "BACK":
+ {
+ teleportPlayer(player, BACK_LOC, world.getInstanceId());
+ world.elcadia.teleToLocation(BACK_LOC, world.getInstanceId(), 0);
+ break;
+ }
+ case "EAST":
+ {
+ teleportPlayer(player, EAST_WATCHERS_ROOM_LOC, world.getInstanceId());
+ world.elcadia.teleToLocation(EAST_WATCHERS_ROOM_LOC, world.getInstanceId(), 0);
+ break;
+ }
+ case "WEST":
+ {
+ teleportPlayer(player, WEST_WATCHERS_ROOM_LOC, world.getInstanceId());
+ world.elcadia.teleToLocation(WEST_WATCHERS_ROOM_LOC, world.getInstanceId(), 0);
+ break;
+ }
+ case "NORTH":
+ {
+ teleportPlayer(player, NORTH_WATCHERS_ROOM_LOC, world.getInstanceId());
+ world.elcadia.teleToLocation(NORTH_WATCHERS_ROOM_LOC, world.getInstanceId(), 0);
+ break;
+ }
+ case "SOUTH":
+ {
+ teleportPlayer(player, SOUTH_WATCHERS_ROOM_LOC, world.getInstanceId());
+ world.elcadia.teleToLocation(SOUTH_WATCHERS_ROOM_LOC, world.getInstanceId(), 0);
+ break;
+ }
+ case "CENTER":
+ {
+ teleportPlayer(player, CENTRAL_ROOM_LOC, world.getInstanceId());
+ world.elcadia.teleToLocation(CENTRAL_ROOM_LOC, world.getInstanceId(), 0);
+ break;
+ }
+ case "FOLLOW":
+ {
+ npc.setIsRunning(true);
+ npc.getAI().startFollow(player);
+ if (player.isInCombat())
+ {
+ npc.doCast(BUFFS[getRandom(BUFFS.length)]);
+ }
+ startQuestTimer("FOLLOW", 5000, npc, player);
+ break;
+ }
+ case "DIALOG":
+ {
+ final QuestState st_Q10294 = player.getQuestState(Q10294_SevenSignsToTheMonasteryOfSilence.class.getSimpleName());
+ final QuestState st_Q10295 = player.getQuestState(Q10295_Seven_Signs_Solinas_Tomb.class.getSimpleName());
+ if ((st_Q10294 != null) && st_Q10294.isStarted())
+ {
+ broadcastNpcSay(npc, Say2.NPC_ALL, ELCADIA_DIALOGS_Q010294[getRandom(ELCADIA_DIALOGS_Q010294.length)]);
+ }
+
+ if ((st_Q10295 != null) && st_Q10295.isMemoState(1))
+ {
+ broadcastNpcSay(npc, Say2.NPC_ALL, ELCADIA_DIALOGS_Q010295[getRandom(ELCADIA_DIALOGS_Q010295.length)]);
+ }
+ startQuestTimer("DIALOG", 10000, npc, player);
+ break;
+ }
+ case "ENTER_Q10295":
+ {
+ teleportPlayer(player, START_LOC_Q10295, world.getInstanceId());
+ world.elcadia.teleToLocation(START_LOC_Q10295, world.getInstanceId(), 0);
+ startQuestTimer("START_MOVIE_Q10295", 2000, npc, player);
+ break;
+ }
+ case "START_MOVIE_Q10295":
+ {
+ player.showQuestMovie(26);
+ break;
+ }
+ case "CASKET_ROOM":
+ {
+ teleportPlayer(player, CASKET_ROOM_LOC, world.getInstanceId());
+ world.elcadia.teleToLocation(CASKET_ROOM_LOC, world.getInstanceId(), 0);
+ break;
+ }
+ case "SOLINAS_RESTING_PLACE":
+ {
+ teleportPlayer(player, SOLINAS_RESTING_PLACE_LOC, world.getInstanceId());
+ world.elcadia.teleToLocation(SOLINAS_RESTING_PLACE_LOC, world.getInstanceId(), 0);
+ break;
+ }
+ case "ERIS_OFFICE":
+ {
+ teleportPlayer(player, START_LOC, world.getInstanceId());
+ world.elcadia.teleToLocation(START_LOC, world.getInstanceId(), 0);
+ break;
+ }
+ case "OPEN_DOORS":
+ {
+ for (int doorId : DOORS)
+ {
+ openDoor(doorId, world.getInstanceId());
+ }
+ break;
+ }
+ case "DIRECTORS_ROOM":
+ {
+ teleportPlayer(player, DIRECTORS_ROOM_LOC, world.getInstanceId());
+ world.elcadia.teleToLocation(DIRECTORS_ROOM_LOC, world.getInstanceId(), 0);
+ break;
+ }
+ case "USE_SCROLL":
+ {
+ // TODO (Adry_85): Missing area debuff
+ if (hasQuestItems(player, SCROLL_OF_ABSTINENCE))
+ {
+ takeItems(player, SCROLL_OF_ABSTINENCE, 1);
+ addSpawn(SOLINAS_GUARDIAN_1, SOLINAS_GUARDIAN_1_LOC, false, 0, false, world.getInstanceId());
+ }
+ break;
+ }
+ case "USE_SHIELD":
+ {
+ // TODO (Adry_85): Missing area debuff
+ if (hasQuestItems(player, SHIELD_OF_SACRIFICE))
+ {
+ takeItems(player, SHIELD_OF_SACRIFICE, 1);
+ addSpawn(SOLINAS_GUARDIAN_2, SOLINAS_GUARDIAN_2_LOC, false, 0, false, world.getInstanceId());
+ }
+ break;
+ }
+ case "USE_SWORD":
+ {
+ // TODO (Adry_85): Missing area debuff
+ if (hasQuestItems(player, SWORD_OF_HOLY_SPIRIT))
+ {
+ takeItems(player, SWORD_OF_HOLY_SPIRIT, 1);
+ addSpawn(SOLINAS_GUARDIAN_3, SOLINAS_GUARDIAN_3_LOC, false, 0, false, world.getInstanceId());
+ }
+ break;
+ }
+ case "USE_STAFF":
+ {
+ // TODO (Adry_85): Missing area debuff
+ if (hasQuestItems(player, STAFF_OF_BLESSING))
+ {
+ takeItems(player, STAFF_OF_BLESSING, 1);
+ addSpawn(SOLINAS_GUARDIAN_4, SOLINAS_GUARDIAN_4_LOC, false, 0, false, world.getInstanceId());
+ }
+ break;
+ }
+ case "CLOSE_TOMB_DOORS":
+ {
+ for (int doorId : FAKE_TOMB_DOORS)
+ {
+ closeDoor(doorId, world.getInstanceId());
+ }
+ break;
+ }
+ case "TOMB_GUARDIAN_SPAWN":
+ {
+ for (int doorId : FAKE_TOMB_DOORS)
+ {
+ openDoor(doorId, world.getInstanceId());
+ }
+
+ addSpawn(GUARDIAN_OF_THE_TOMB_1, GUARDIAN_OF_THE_TOMB_1_LOC, false, 0, false, world.getInstanceId());
+
+ for (Location LOC : SLAVE_SPAWN_1_LOC)
+ {
+ L2Attackable mob = (L2Attackable) addSpawn(TRAINEE_OF_REST, LOC, false, 0, false, world.getInstanceId());
+ mob.setIsRunning(true);
+ mob.addDamageHate(player, 0, 999);
+ mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
+ }
+
+ addSpawn(GUARDIAN_OF_THE_TOMB_2, GUARDIAN_OF_THE_TOMB_2_LOC, false, 0, false, world.getInstanceId());
+
+ for (Location LOC : SLAVE_SPAWN_2_LOC)
+ {
+ L2Attackable mob = (L2Attackable) addSpawn(TRAINEE_OF_REST, LOC, false, 0, false, world.getInstanceId());
+ mob.setIsRunning(true);
+ mob.addDamageHate(player, 0, 999);
+ mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
+ }
+
+ addSpawn(GUARDIAN_OF_THE_TOMB_3, GUARDIAN_OF_THE_TOMB_3_LOC, false, 0, false, world.getInstanceId());
+
+ for (Location LOC : SLAVE_SPAWN_3_LOC)
+ {
+ L2Attackable mob = (L2Attackable) addSpawn(SUPPLICANT_OF_REST, LOC, false, 0, false, world.getInstanceId());
+ mob.setIsRunning(true);
+ mob.addDamageHate(player, 0, 999);
+ mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
+ }
+
+ addSpawn(GUARDIAN_OF_THE_TOMB_4, GUARDIAN_OF_THE_TOMB_4_LOC, false, 0, false, world.getInstanceId());
+
+ for (Location LOC : SLAVE_SPAWN_4_LOC)
+ {
+ L2Attackable mob = (L2Attackable) addSpawn(SUPPLICANT_OF_REST, LOC, false, 0, false, world.getInstanceId());
+ mob.setIsRunning(true);
+ mob.addDamageHate(player, 0, 999);
+ mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
+ }
+ return "32843-01.html";
+ }
}
- case "SOUTH":
+ }
+ return super.onAdvEvent(event, npc, player);
+ }
+
+ @Override
+ public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
+ {
+ InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId());
+ if (tmpworld instanceof MoSWorld)
+ {
+ MoSWorld world = (MoSWorld) tmpworld;
+ switch (npc.getId())
{
- teleportPlayer(player, SOUTH_WATCHERS_ROOM_LOC, world.getInstanceId());
- world.elcadia.teleToLocation(SOUTH_WATCHERS_ROOM_LOC, 0, world.getInstanceId());
- break;
+ case GUARDIAN_OF_THE_TOMB_1:
+ case GUARDIAN_OF_THE_TOMB_2:
+ case GUARDIAN_OF_THE_TOMB_3:
+ case GUARDIAN_OF_THE_TOMB_4:
+ {
+ world.deadTombGuardianCount++;
+ if (world.deadTombGuardianCount == 4)
+ {
+ openDoor(TOMB_DOOR, world.getInstanceId());
+ final QuestState st = player.getQuestState(Q10295_Seven_Signs_Solinas_Tomb.class.getSimpleName());
+ if ((st != null) && st.isMemoState(2))
+ {
+ st.setMemoState(3);
+ }
+ }
+ break;
+ }
+ case SOLINAS_GUARDIAN_1:
+ case SOLINAS_GUARDIAN_2:
+ case SOLINAS_GUARDIAN_3:
+ case SOLINAS_GUARDIAN_4:
+ {
+ world.deadSolinaGuardianCount++;
+ if (world.deadSolinaGuardianCount == 4)
+ {
+ player.showQuestMovie(27);
+ final QuestState st = player.getQuestState(Q10295_Seven_Signs_Solinas_Tomb.class.getSimpleName());
+ if ((st != null) && st.isMemoState(1))
+ {
+ st.setMemoState(2);
+ }
+ }
+ break;
+ }
}
- case "CENTER":
+
+ }
+ return null;
+ }
+
+ @Override
+ public String onSpawn(L2Npc npc)
+ {
+ switch (npc.getId())
+ {
+ case ERIS_EVIL_THOUGHTS:
{
- teleportPlayer(player, CENTRAL_ROOM_LOC, world.getInstanceId());
- world.elcadia.teleToLocation(CENTRAL_ROOM_LOC, 0, world.getInstanceId());
+ startQuestTimer("OPEN_DOORS", 1000, npc, null);
break;
}
- case "FOLLOW":
+ case TOMB_OF_THE_SAINTESS:
{
- npc.setIsRunning(true);
- npc.getAI().startFollow(player);
- if (player.isInCombat())
- {
- broadcastNpcSay(npc, Say2.NPC_ALL, NpcStringId.YOUR_WORK_HERE_IS_DONE_SO_RETURN_TO_THE_CENTRAL_GUARDIAN);
- npc.setTarget(player);
- npc.doCast(BUFFS[getRandom(BUFFS.length)]);
- }
- else
- {
- broadcastNpcSay(npc, Say2.NPC_ALL, ELCADIA_DIALOGS[getRandom(ELCADIA_DIALOGS.length)]);
- }
- startQuestTimer("FOLLOW", 10000, npc, player);
+ startQuestTimer("CLOSE_TOMB_DOORS", 1000, npc, null);
break;
}
}
- return super.onAdvEvent(event, npc, player);
+ return super.onSpawn(npc);
}
@Override
@@ -202,7 +521,8 @@ public final class MonasteryOfSilence1 extends AbstractInstance
{
world.elcadia.deleteMe();
}
- world.elcadia = addSpawn(ELCADIA_INSTANCE, player.getX(), player.getY(), player.getZ(), 0, false, 0, false, player.getInstanceId());
- startQuestTimer("FOLLOW", 3000, world.elcadia, player);
+ world.elcadia = addSpawn(ELCADIA_INSTANCE, player.getX(), player.getY(), player.getZ(), 0, false, 0, false, world.getInstanceId());
+ startQuestTimer("FOLLOW", 5000, world.elcadia, player);
+ startQuestTimer("DIALOG", 10000, world.elcadia, player);
}
}
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-01.html
new file mode 100644
index 0000000000..0f067b7d98
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-01.html
@@ -0,0 +1,3 @@
+<html><body>Abyssal Saintess Elcadia:<br>
+I think Eris wanted to tell us more. Let's go back and find her.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-02.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-02.html
new file mode 100644
index 0000000000..a900e5e891
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-02.html
@@ -0,0 +1,3 @@
+<html><body>Abyssal Saintess Elcadia:<br>
+Hmm... The seal of Saintess... Is there no other way to approach to the truth of Embryo? Let's listen carefully what Eris is saying.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-03.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-03.html
new file mode 100644
index 0000000000..78a3c7cbbf
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-03.html
@@ -0,0 +1,3 @@
+<html><body>Abyssal Saintess Elcadia:<br>
+Well, the devices in this room have been removed. Let's go back to the central Gatemaster and see if we can go to Solina's casket room.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-04.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-04.html
new file mode 100644
index 0000000000..84a525b24f
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-04.html
@@ -0,0 +1,3 @@
+<html><body>Abyssal Saintess Elcadia:<br>
+We must find Solina's true casket. A Saintess such as Solina wouldn't be buried in this vanity drenched grave. If we find her real casket room, we also find the information for Embryo we seek.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-05.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-05.html
new file mode 100644
index 0000000000..8a82d8fb91
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32787-05.html
@@ -0,0 +1,4 @@
+<html><body>Abyssal Saintess Elcadia:<br>
+It seems like Solina's old story ends here. Such is life.<br>
+<a action="bypass -h Quest MonasteryOfSilence1 SOLINAS_RESTING_PLACE">"Okay. I will go back to Solina's casket room."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-01.htm b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-01.htm
new file mode 100644
index 0000000000..62e012b9ea
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-01.htm
@@ -0,0 +1,4 @@
+<html><body>Eris' Evil Thoughts:<br>
+Now, you will meet Solina alone. The truth you seek is best learned in person. Have your audience with Solina, and you will learn what you need to know.<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32792-02.htm">"Okay. I am ready."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-02.htm b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-02.htm
new file mode 100644
index 0000000000..8852fef7a5
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-02.htm
@@ -0,0 +1,6 @@
+<html><body>Eris' Evil Thoughts:<br>
+The Seal of the Saintess, protecting Solina's casket room, consists of 4 Guardians and 4 Powerful Devices. The Guardians, endowed with power from the Powerful Devices, can withstand attacks long as their Powerful Devices run. In order to defeat them, you have to weaken the power of the Guardians by destroying the four Powerful Devices. It sounds impossible, but there is no other way to meet Solina.<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32792-03.htm">"Let me in."</a><br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32792-04.htm">"Tell me more about the Seal of the Saintess."</a><br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32792-06.htm">"Uh... Maybe I'm not quite ready yet."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-03.htm b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-03.htm
new file mode 100644
index 0000000000..16f636cf26
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-03.htm
@@ -0,0 +1,3 @@
+<html><body>Eris' Evil Thoughts:<br>
+The device was invented by Solina's three closest disciples, Kaerun, Anais, and myself. The Guardians protecting this place cannot be defeated without first removing the seals. I wish I could go and help you, but I cannot leave. However, when you're ready, I will send you to the Seal of the Saintess.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-04.htm b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-04.htm
new file mode 100644
index 0000000000..8760c556f7
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-04.htm
@@ -0,0 +1,4 @@
+<html><body>Eris' Evil Thoughts:<br>
+Anybody who goes in the Casket Room is considered an intruder. Only three of her disciples, Eris, Kaerun, and Anais, the inventors of the seal devices, are permitted. I cannot directly help you because I can't leave here. Thus, there is no way in except to destroy the seals. Unfortunately, the seals are protected by the four Guardians of Relics...<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32792-05.htm">"How can I defeat them?"</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-05.htm b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-05.htm
new file mode 100644
index 0000000000..95e65d0cb2
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-05.htm
@@ -0,0 +1,3 @@
+<html><body>Eris' Evil Thoughts:<br>
+The Guardians of Relics protect four special seals. The power from Solina's treasures in these seals give the Guardians eternal life. Their immortality is linked to the seals. We must remove them and then destroy the Guardians!
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-06.htm b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-06.htm
new file mode 100644
index 0000000000..64714d74a6
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-06.htm
@@ -0,0 +1,3 @@
+<html><body>Eris' Evil Thoughts:<br>
+When you're done getting ready, let me know.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-07.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-07.html
new file mode 100644
index 0000000000..ed8f2db1b6
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-07.html
@@ -0,0 +1,4 @@
+<html><body>Eris' Evil Thoughts:<br>
+Now, you have to get ready for the other things you need to do.<br>
+(You have already completed this quest.)
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-08.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-08.html
new file mode 100644
index 0000000000..ce49672c0d
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-08.html
@@ -0,0 +1,4 @@
+<html><body>Eris' Evil Thoughts:<br>
+You must be truly skilled to defeat the Guardians of Relics... I'm impressed! Now go inside the Seal of the Saintess and find your way to Solina's casket room. Use the central teleport device. To see the Holy Treasure of Solina, you will have to battle the Last Guardians, the protectors of Solina's tomb. This is the final test before the you discover the answers you seek. Everything you've done comes down to this. Good luck...<br>
+<a action="bypass -h Quest MonasteryOfSilence1 CASKET_ROOM">"Thanks. I am going back to the Casket Room of the Saintess."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-09.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-09.html
new file mode 100644
index 0000000000..1231fa3756
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-09.html
@@ -0,0 +1,4 @@
+<html><body>Eris' Evil Thoughts:<br>
+Weren't you meeting with Solina? Don't turn back now, meet Solina and listen to her story again.<br>
+<a action="bypass -h Quest MonasteryOfSilence1 SOLINAS_RESTING_PLACE">"I want to go back inside Solina's resting place."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-10.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-10.html
new file mode 100644
index 0000000000..a3cf60fa11
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-10.html
@@ -0,0 +1,3 @@
+<html><body>Eris' Evil Thoughts:<br>
+I'm sorry, but you're different than when we talked the first time. You must return to your original form to continue our conversation. (You cannot complete the quest while in a subclass condition)
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-11.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-11.html
new file mode 100644
index 0000000000..31c4ab7170
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-11.html
@@ -0,0 +1,5 @@
+<html><body>Eris' Evil Thoughts:<br>
+You met Solina? At long last her soul can rest, and so can mine.<br>
+But for you, this is just the beginning. You know the truth about Embryo and of the seven seals, and you must stop them.<br>
+There is one last way I can help you, but first please accept this reward for putting Solina's great spirit to rest.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-12.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-12.html
new file mode 100644
index 0000000000..3f9a33e9b9
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32792-12.html
@@ -0,0 +1,4 @@
+<html><body>Eris' Evil Thoughts:<br>
+I can transport you whenever you are ready. Let me say this one last time, you have to remove the seals from the Powerful Devices protected by Guardians in order to defeat the Guardians. Now, are you ready to enter?<br>
+<a action="bypass -h Quest MonasteryOfSilence1 ENTER_Q10295">"Yes!"</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-01.html
new file mode 100644
index 0000000000..5e10a10903
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-01.html
@@ -0,0 +1,4 @@
+<html><body>Elmoreden's Saintess Solina:<br>
+Ah, at last... We finally meet. I have waited for you for a very long time. You are foretold in Einhasad's prophecy, did you know that? I'm grateful for you, I imagine your journey here must have been difficult. I too am tired. My soul longs for peace, but I cannot be at peace until I speak to you that which will save the world.<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32793-02.html">"Are you Elmoreden's Saintess Solina?"</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-02.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-02.html
new file mode 100644
index 0000000000..221aa549e6
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-02.html
@@ -0,0 +1,4 @@
+<html><body>Elmoreden's Saintess Solina:<br>
+Solina... Yes, I am Solina. You realize, no doubt, that Eris and I are simply images of thoughts, waiting for the people of Trust...<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32793-03.html">"People of Trust?"</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-03.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-03.html
new file mode 100644
index 0000000000..1b416e1724
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-03.html
@@ -0,0 +1,4 @@
+<html><body>Elmoreden's Saintess Solina:<br>
+I see... You didn't know your fate? Well, there are few who do. Hm... A girl with eyes closed... This must be the will of the goddess and of heaven. Eris and I will tell you what you want to know. Your path will be known to you then.<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32793-04.html">"We came here to learn the true identity of Embryo."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-04.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-04.html
new file mode 100644
index 0000000000..f474996526
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-04.html
@@ -0,0 +1,4 @@
+<html><body>Elmoreden's Saintess Solina:<br>
+Embryo... To know about Embryo, we need to start with my story. The birth of Embryo started because of me.<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32793-05.html">"Please tell me about your story, Solina."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-05.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-05.html
new file mode 100644
index 0000000000..ae9f956a81
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-05.html
@@ -0,0 +1,4 @@
+<html><body>Elmoreden's Saintess Solina:<br>
+The story is... It is what it is. Embryo... Embryo is a dark, evil group whose sole purpose is to acquire enough power to control the world. Their history is traced back for centuries... Embryo's beginning was born with my death.<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32793-06.html">"Please tell me about your story, Solina."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-06.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-06.html
new file mode 100644
index 0000000000..cbedc305fb
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-06.html
@@ -0,0 +1,5 @@
+<html><body>Elmoreden's Saintess Solina:<br>
+Jude van Etina betrayed me and my disciples, he stole some of my powers. Many holy objects were taken. Fortunately, the most important holy object, the grail, was protected by Anais' last minute thinking...<br>
+Etina established an organization to continue his mission in case he died prematurely, that organization is Embryo. They hid in the shadows to acquire the power of the Seven Seals of Emperor that was promised by Einhasad.<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32793-07.html">"Tell me about the relationship between the Seven Seals and Embryo."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-07.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-07.html
new file mode 100644
index 0000000000..a3234af75b
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-07.html
@@ -0,0 +1,4 @@
+<html><body>Elmoreden's Saintess Solina:<br>
+I am trapped here, a phantom of thoughts from lifetimes ago. But I have learned that the Seven Seals, filled with the blood of our imperial family, are being unearthed. What's more, Shilen's dark face shows itself. This, friend, is no coincidence. I am certain that Judith and his group are involved. If you fail to stop them, if you fail to protect the Seven Seals, Shilen will plague our world. Shilen is a hurricane, an unstoppable merchant of evil, and will bring devastation unlike any the world has ever seen.<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32793-08.html">"What do we have to do?"</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-08.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-08.html
new file mode 100644
index 0000000000..4c9b55b5c9
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-08.html
@@ -0,0 +1,5 @@
+<html><body>Elmoreden's Saintess Solina:<br>
+Now you know the truth. Now you know how important it is that you enlist everyone you can and warn people about the dangers of the Seven Seals. You know how important it is that Embryo is eliminated. You're arrival was foretold by the goddess long ago.<br>
+Listen to what I tell you. You don't have time! Return to Eris and tell her everything. Save the world from Embryo.<br>
+<a action="bypass -h Quest MonasteryOfSilence1 ERIS_OFFICE">"I want to go back to Eris' Office."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-09.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-09.html
new file mode 100644
index 0000000000..3500557e6a
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-09.html
@@ -0,0 +1,4 @@
+<html><body>Elmoreden's Saintess Solina:<br>
+Embryo... To know about Embryo, we need to start elsewhere. The unfortunate birth of Embryo started because of me.<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32793-05.html">"What do you have to do with Embryo?"</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-10.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-10.html
new file mode 100644
index 0000000000..a3234af75b
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-10.html
@@ -0,0 +1,4 @@
+<html><body>Elmoreden's Saintess Solina:<br>
+I am trapped here, a phantom of thoughts from lifetimes ago. But I have learned that the Seven Seals, filled with the blood of our imperial family, are being unearthed. What's more, Shilen's dark face shows itself. This, friend, is no coincidence. I am certain that Judith and his group are involved. If you fail to stop them, if you fail to protect the Seven Seals, Shilen will plague our world. Shilen is a hurricane, an unstoppable merchant of evil, and will bring devastation unlike any the world has ever seen.<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32793-08.html">"What do we have to do?"</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-11.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-11.html
new file mode 100644
index 0000000000..70d602f3a0
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32793-11.html
@@ -0,0 +1,5 @@
+<html><body>Elmoreden's Saintess Solina:<br>
+Now that you know the truth, you must warn people of the dangers of the Seven Seals. Embryo must be eliminated, before they absorb the power within the seals. You are the one the goddess designated.<br>
+This is a lot, I know, but you don't have time to dwell on this. You must return to Eris and tell her everything I've said. You can save the world from Embryo, but you must hurry before it's too late.<br>
+<a action="bypass -h Quest MonasteryOfSilence1 ERIS_OFFICE">"I want to go back to Eris' Office."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32794-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32794-01.html
new file mode 100644
index 0000000000..e93665bf1f
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32794-01.html
@@ -0,0 +1,4 @@
+<html><body>Elmoreden's Saintess Solina:<br>
+I'd really like a toggle camera!! This place is ripe for toggle camera presentation.<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32794-02.html">"Give me a flag so I can proceed."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32794-02.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32794-02.html
new file mode 100644
index 0000000000..3c7839386b
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32794-02.html
@@ -0,0 +1,3 @@
+<html><body>Elmoreden's Saintess Solina:<br>
+You are incredible! Excellent work!
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32794-03.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32794-03.html
new file mode 100644
index 0000000000..b330cf558d
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32794-03.html
@@ -0,0 +1,3 @@
+<html><body>Elmoreden's Saintess Solina:<br>
+Please try again, when you are ready.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32795-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32795-01.html
new file mode 100644
index 0000000000..3419478774
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32795-01.html
@@ -0,0 +1,3 @@
+<html><body>Sister of Silence Eris:<br>
+I need a toggle camera!! This is a place where a toggle camera presentation is inserted. What?
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32795-02.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32795-02.html
new file mode 100644
index 0000000000..32dae24e29
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32795-02.html
@@ -0,0 +1,3 @@
+<html><body>Sister of Silence Eris:<br>
+Very well, go back and do the test.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32796-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32796-01.html
new file mode 100644
index 0000000000..386bd541f8
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32796-01.html
@@ -0,0 +1,3 @@
+<html><body>Priest of Splendor Anays:<br>
+I need a toggle camera!! This is where a toggle camera would come in handy!
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32796-02.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32796-02.html
new file mode 100644
index 0000000000..1015c00bd2
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32796-02.html
@@ -0,0 +1,3 @@
+<html><body>Priest of Splendor Anays:<br>
+Now return and do the test.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32797-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32797-01.html
new file mode 100644
index 0000000000..1c704dcd36
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32797-01.html
@@ -0,0 +1,3 @@
+<html><body>Jude van Etina:<br>
+I need a toggle camera!! This place is great for toggle camera presentation.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32797-02.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32797-02.html
new file mode 100644
index 0000000000..b07380bea4
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32797-02.html
@@ -0,0 +1,3 @@
+<html><body>Jude van Etina:<br>
+Please return and complete the test.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32837-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32837-01.html
new file mode 100644
index 0000000000..2f030886e8
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32837-01.html
@@ -0,0 +1,5 @@
+<html><body>Teleport Control Device:<br>
+Loyal disciple of Solina, the seal has been completely eliminated. Are you ready to enter Solina's Room?<br>
+<a action="bypass -h Quest MonasteryOfSilence1 DIRECTORS_ROOM">"I want to go to the director's room."</a><br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32837-02.html">"Yes!"</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32837-02.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32837-02.html
new file mode 100644
index 0000000000..3757ec12ca
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32837-02.html
@@ -0,0 +1,4 @@
+<html><body>Teleport Control Device:<br>
+Loyal disciple of Solina, if you do not have permission to enter, you will be attacked by the Guardians of the Tomb. I'll ask you one last time. Do you have permission to face Solina?<br>
+<a action="bypass -h Quest MonasteryOfSilence1 CASKET_ROOM">"Absolutely!"</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32837-03.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32837-03.html
new file mode 100644
index 0000000000..8113ba6a04
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32837-03.html
@@ -0,0 +1,4 @@
+<html><body>Teleport Control Device:<br>
+Solina's hall can only be entered by the seven disciples who have permission to enter. Without the Guardians of Seal's permission, you may not enter.<br>
+<a action="bypass -h Quest MonasteryOfSilence1 DIRECTORS_ROOM">"I want to go to the director's room."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32838-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32838-01.html
new file mode 100644
index 0000000000..8a05a1a8b4
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32838-01.html
@@ -0,0 +1,4 @@
+<html><body>
+The giant Barrier Device begins to turn. There's a hole that looks like a book, maybe you can put something in there...<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32838-02.html">Use the book shaped relic</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32838-02.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32838-02.html
new file mode 100644
index 0000000000..1dd6a18509
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32838-02.html
@@ -0,0 +1,4 @@
+<html><body>
+There's big hole in a shape of a book in the bottom of this Barrier Device. I have something that looks like a book. Maybe think this can affect the activation of the Barrier Device!<br>
+<a action="bypass -h Quest MonasteryOfSilence1 USE_SCROLL">Use it</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32838-03.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32838-03.html
new file mode 100644
index 0000000000..a03cd848b9
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32838-03.html
@@ -0,0 +1,3 @@
+<html><body>
+There's nothing that I have that can be put in there.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32839-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32839-01.html
new file mode 100644
index 0000000000..0e56ce2c9d
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32839-01.html
@@ -0,0 +1,4 @@
+<html><body>
+The giant Barrier Device begins to slowly turn. There's a hole that looks like a shield at the bottom of the device... maybe you can place a shield-shaped relic in there...<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32839-02.html">"Maybe I can..."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32839-02.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32839-02.html
new file mode 100644
index 0000000000..fb7d92bb79
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32839-02.html
@@ -0,0 +1,4 @@
+<html><body>
+There's big hole in a shape of a shield at the bottom of this Barrier Device. I have something that looks like a shield... maybe I can activate the Barrier Device with it.<br>
+<a action="bypass -h Quest MonasteryOfSilence1 USE_SHIELD">Use it</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32839-03.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32839-03.html
new file mode 100644
index 0000000000..a03cd848b9
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32839-03.html
@@ -0,0 +1,3 @@
+<html><body>
+There's nothing that I have that can be put in there.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32840-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32840-01.html
new file mode 100644
index 0000000000..d5530a97db
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32840-01.html
@@ -0,0 +1,4 @@
+<html><body>
+The giant Barrier Device begins to turn. There's a hole at the bottom of the device, maybe you can try inserting the sword relic in there.<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32840-02.html">"Here we go..."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32840-02.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32840-02.html
new file mode 100644
index 0000000000..77005fef17
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32840-02.html
@@ -0,0 +1,4 @@
+<html><body>
+There's a sword shaped hole in the bottom of the Barrier Device. I have a relic that looks like it might fit....<br>
+<a action="bypass -h Quest MonasteryOfSilence1 USE_SWORD">Use it</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32840-03.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32840-03.html
new file mode 100644
index 0000000000..7967bbec69
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32840-03.html
@@ -0,0 +1,3 @@
+<html><body>
+There's nothing I have that can be put in there.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32841-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32841-01.html
new file mode 100644
index 0000000000..dced824217
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32841-01.html
@@ -0,0 +1,4 @@
+<html><body>
+The giant Barrier Device begins to turn. There's a hole shaped like a cain, maybe that cain relic would be of use here.<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32841-02.html">"I'll give it a go."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32841-02.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32841-02.html
new file mode 100644
index 0000000000..7d459258a8
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32841-02.html
@@ -0,0 +1,4 @@
+<html><body>
+There's a hole in the bottom of the Barrier Device. You have something that looks like a cain. Maybe you should try using it.<br>
+<a action="bypass -h Quest MonasteryOfSilence1 USE_STAFF">Use it</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32841-03.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32841-03.html
new file mode 100644
index 0000000000..7967bbec69
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32841-03.html
@@ -0,0 +1,3 @@
+<html><body>
+There's nothing I have that can be put in there.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32842-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32842-01.html
new file mode 100644
index 0000000000..e481dc4506
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32842-01.html
@@ -0,0 +1,4 @@
+<html><body>Teleport Control Device:<br>
+This is Solina's final resting place. Would you like to move there?<br>
+<a action="bypass -h Quest MonasteryOfSilence1 SOLINAS_RESTING_PLACE">"Yes!"</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32843-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32843-01.html
new file mode 100644
index 0000000000..dd776f0a0d
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32843-01.html
@@ -0,0 +1,5 @@
+<html><body>Tomb of the Saintess:<br>
+You look at the tomb, and see these words.<br>
+"For the Saintess Solina, who devoted all her life to serve Einhasad and the Elmoreden Kingdom...to be remembered forever by those she saved and those who loved her...may punishing find the feet of those who ignored Solina's teachings."<br>
+<a action="bypass -h Quest MonasteryOfSilence1 TOMB_GUARDIAN_SPAWN">Open the tomb and investigate</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32843-02.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32843-02.html
new file mode 100644
index 0000000000..a73eaa278a
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32843-02.html
@@ -0,0 +1,3 @@
+<html><body>Tomb of Saintess:<br>
+The guardians defending the tomb disappear, and the stone wall on the other side begins to move.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32844-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32844-01.html
new file mode 100644
index 0000000000..56bb774781
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32844-01.html
@@ -0,0 +1,4 @@
+<html><body>Teleport Control Device:<br>
+This is Solina's room. You can move to Director's room from here.<br>
+<a action="bypass -h Quest MonasteryOfSilence1 ERIS_OFFICE">"Thanks. I am heading there."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32857-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32857-01.html
new file mode 100644
index 0000000000..e2da7dd73f
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32857-01.html
@@ -0,0 +1,4 @@
+<html><body>
+A sacred object, shaped like a huge staff, hovers gently above the altar. Its power can be felt simply by looking at it.<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32857-02.html">Take the staff</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32857-02.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32857-02.html
new file mode 100644
index 0000000000..52206e3cd7
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32857-02.html
@@ -0,0 +1,3 @@
+<html><body>
+You already possess the sacred object taken from this altar. Let's have a look at the inventory.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32857-03.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32857-03.html
new file mode 100644
index 0000000000..13c0889fff
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32857-03.html
@@ -0,0 +1,3 @@
+<html><body>
+The sacred object shaped as a huge staff floats away from the altar towards you. Its blinding light forces you to look away. When you finally look at it, you see it matches the groove seen on the Powerful Device.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32858-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32858-01.html
new file mode 100644
index 0000000000..38eb517450
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32858-01.html
@@ -0,0 +1,4 @@
+<html><body>
+A sacred object shaped like a huge sword floats above the altar, rotating from an unseen force. It shimmers with elegance.<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32858-02.html">Take the sword</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32858-02.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32858-02.html
new file mode 100644
index 0000000000..abdf1db4e6
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32858-02.html
@@ -0,0 +1,3 @@
+<html><body>
+You already possess the sacred object from this altar. Let's look at the inventory.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32858-03.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32858-03.html
new file mode 100644
index 0000000000..dbf1dbd577
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32858-03.html
@@ -0,0 +1,3 @@
+<html><body>
+The sacred object, shaped like a giant's sword, is taken from the altar. It's difficult to open your eyes, but when you do you realize it matches the groove seen on the Powerful Device.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32859-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32859-01.html
new file mode 100644
index 0000000000..23f0f2738b
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32859-01.html
@@ -0,0 +1,4 @@
+<html><body>
+There's a large book-shaped relic floating in the air. It looks valuable.<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32859-02.html">"I'll have that."</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32859-02.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32859-02.html
new file mode 100644
index 0000000000..98f355589f
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32859-02.html
@@ -0,0 +1,3 @@
+<html><body>
+You already have the relic - check your inventory.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32859-03.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32859-03.html
new file mode 100644
index 0000000000..b4b7b59c65
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32859-03.html
@@ -0,0 +1,3 @@
+<html><body>
+There's a large relic that looks like a book off the altar. A blinding light comes from the relic, and only after your eyes adjust are you able to look at the thing... Looking at it closely, it seems to match the shape of the hole you saw in the Barrier Device!
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32860-01.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32860-01.html
new file mode 100644
index 0000000000..e5026dfbaa
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32860-01.html
@@ -0,0 +1,4 @@
+<html><body>
+A sacred object shaped like a huge shield is floating above the altar. It tingles with an aura of power just by looking at it.<br>
+<a action="bypass -h Quest Q10295_Seven_Signs_Solinas_Tomb 32860-02.html">Take the shield</a>
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32860-02.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32860-02.html
new file mode 100644
index 0000000000..d9c65c2053
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32860-02.html
@@ -0,0 +1,3 @@
+<html><body>
+You already possess the sacred object. Let's take a look at the inventory.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32860-03.html b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32860-03.html
new file mode 100644
index 0000000000..4867df2e6a
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/32860-03.html
@@ -0,0 +1,3 @@
+<html><body>
+The object shaped like a huge shield is lifted and taken from the altar. Intense light beams from the sacred object, squinting you see that it matches the grooves on the Powerful Device.
+</body></html>
\ No newline at end of file
diff --git a/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/Q10295_Seven_Signs_Solinas_Tomb.java b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/Q10295_Seven_Signs_Solinas_Tomb.java
new file mode 100644
index 0000000000..0d447938b6
--- /dev/null
+++ b/dist/game/data/scripts/quests/Q10295_Seven_Signs_Solinas_Tomb/Q10295_Seven_Signs_Solinas_Tomb.java
@@ -0,0 +1,561 @@
+/*
+ * Copyright (C) 2004-2017 L2J DataPack
+ *
+ * This file is part of L2J DataPack.
+ *
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q10295_Seven_Signs_Solinas_Tomb;
+
+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 quests.Q10294_SevenSignsToTheMonasteryOfSilence.Q10294_SevenSignsToTheMonasteryOfSilence;
+
+/**
+ * Seven Signs, Solina's Tomb (10295)
+ * @author Adry_85
+ * @since 2.6.0.0
+ */
+public final class Q10295_Seven_Signs_Solinas_Tomb extends Quest
+{
+ // NPCs
+ private static final int ELCADIA = 32787;
+ private static final int ERISS_EVIL_THOUGHTS = 32792;
+ private static final int SOLINAS_EVIL_THOUGHTS = 32793;
+ private static final int SOLINA = 32794;
+ private static final int ERIS = 32795;
+ private static final int ANAIS = 32796;
+ private static final int JUDE_VAN_ETINA = 32797;
+ private static final int TELEPORT_CONTROL_DEVICE_1 = 32837;
+ private static final int POWERFUL_DEVICE_1 = 32838;
+ private static final int POWERFUL_DEVICE_2 = 32839;
+ private static final int POWERFUL_DEVICE_3 = 32840;
+ private static final int POWERFUL_DEVICE_4 = 32841;
+ private static final int TELEPORT_CONTROL_DEVICE_2 = 32842;
+ private static final int TOMB_OF_THE_SAINTESS = 32843;
+ private static final int TELEPORT_CONTROL_DEVICE_3 = 32844;
+ private static final int ALTAR_OF_HALLOWS_1 = 32857;
+ private static final int ALTAR_OF_HALLOWS_2 = 32858;
+ private static final int ALTAR_OF_HALLOWS_3 = 32859;
+ private static final int ALTAR_OF_HALLOWS_4 = 32860;
+ // Items
+ private static final int SCROLL_OF_ABSTINENCE = 17228;
+ private static final int SHIELD_OF_SACRIFICE = 17229;
+ private static final int SWORD_OF_HOLY_SPIRIT = 17230;
+ private static final int STAFF_OF_BLESSING = 17231;
+ // Misc
+ private static final int MIN_LEVEL = 81;
+
+ public Q10295_Seven_Signs_Solinas_Tomb()
+ {
+ super(10295, Q10295_Seven_Signs_Solinas_Tomb.class.getSimpleName(), "Seven Signs, Solina's Tomb");
+ addStartNpc(ERISS_EVIL_THOUGHTS);
+ addTalkId(ERISS_EVIL_THOUGHTS, SOLINAS_EVIL_THOUGHTS, SOLINA, ERIS, ANAIS, JUDE_VAN_ETINA, TELEPORT_CONTROL_DEVICE_1, POWERFUL_DEVICE_1, POWERFUL_DEVICE_2, POWERFUL_DEVICE_3, POWERFUL_DEVICE_4, TELEPORT_CONTROL_DEVICE_2, TOMB_OF_THE_SAINTESS, TELEPORT_CONTROL_DEVICE_3, ALTAR_OF_HALLOWS_1, ALTAR_OF_HALLOWS_2, ALTAR_OF_HALLOWS_3, ALTAR_OF_HALLOWS_4, ELCADIA);
+ registerQuestItems(SCROLL_OF_ABSTINENCE, SHIELD_OF_SACRIFICE, SWORD_OF_HOLY_SPIRIT, STAFF_OF_BLESSING);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState st = getQuestState(player, false);
+ if (st == null)
+ {
+ return null;
+ }
+
+ String htmltext = null;
+ switch (event)
+ {
+ case "32792-02.htm":
+ case "32792-04.htm":
+ case "32792-05.htm":
+ case "32792-06.htm":
+ case "32793-06.html":
+ {
+ htmltext = event;
+ break;
+ }
+ case "32792-03.htm":
+ {
+ st.startQuest();
+ st.setMemoState(1);
+ htmltext = event;
+ break;
+ }
+ case "32793-02.html":
+ case "32793-03.html":
+ {
+ if (st.isMemoState(3))
+ {
+ htmltext = event;
+ }
+ break;
+ }
+ case "32793-04.html":
+ {
+ if (st.isMemoState(3))
+ {
+ st.setMemoState(4);
+ st.setCond(2, true);
+ htmltext = event;
+ }
+ break;
+ }
+ case "32793-05.html":
+ case "32794-02.html":
+ {
+ if (st.isMemoState(4))
+ {
+ st.setMemoState(5);
+ htmltext = event;
+ }
+ break;
+ }
+ case "32793-07.html":
+ {
+ if (st.isMemoState(5))
+ {
+ htmltext = event;
+ }
+ break;
+ }
+ case "32793-08.html":
+ {
+ if (st.isMemoState(5))
+ {
+ st.setMemoState(6);
+ st.setCond(3, true);
+ htmltext = event;
+ }
+ break;
+ }
+ case "32837-02.html":
+ {
+ if (st.getMemoState() > 1)
+ {
+ takeItems(player, -1, SCROLL_OF_ABSTINENCE, SHIELD_OF_SACRIFICE, SWORD_OF_HOLY_SPIRIT, STAFF_OF_BLESSING);
+ htmltext = event;
+ }
+ break;
+ }
+ case "32838-02.html":
+ {
+ if (st.isMemoState(1))
+ {
+ if (hasQuestItems(player, SCROLL_OF_ABSTINENCE))
+ {
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = "32838-03.html";
+ }
+ }
+ break;
+ }
+ case "32839-02.html":
+ {
+ if (st.isMemoState(1))
+ {
+ if (hasQuestItems(player, SHIELD_OF_SACRIFICE))
+ {
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = "32839-03.html";
+ }
+ }
+ break;
+ }
+ case "32840-02.html":
+ {
+ if (st.isMemoState(1))
+ {
+ if (hasQuestItems(player, SWORD_OF_HOLY_SPIRIT))
+ {
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = "32840-03.html";
+ }
+ }
+ break;
+ }
+ case "32841-02.html":
+ {
+ if (st.isMemoState(1))
+ {
+ if (hasQuestItems(player, STAFF_OF_BLESSING))
+ {
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = "32841-03.html";
+ }
+ }
+ break;
+ }
+ case "32857-02.html":
+ {
+ if (st.isMemoState(1))
+ {
+ if (hasQuestItems(player, STAFF_OF_BLESSING))
+ {
+ htmltext = event;
+ }
+ else
+ {
+ giveItems(player, STAFF_OF_BLESSING, 1);
+ htmltext = "32857-03.html";
+ }
+ }
+ break;
+ }
+ case "32858-02.html":
+ {
+ if (st.isMemoState(1))
+ {
+ if (hasQuestItems(player, SWORD_OF_HOLY_SPIRIT))
+ {
+ htmltext = event;
+ }
+ else
+ {
+ giveItems(player, SWORD_OF_HOLY_SPIRIT, 1);
+ htmltext = "32858-03.html";
+ }
+ }
+ break;
+ }
+ case "32859-02.html":
+ {
+ if (st.isMemoState(1))
+ {
+ if (hasQuestItems(player, SCROLL_OF_ABSTINENCE))
+ {
+ htmltext = event;
+ }
+ else
+ {
+ giveItems(player, SCROLL_OF_ABSTINENCE, 1);
+ htmltext = "32859-03.html";
+ }
+ }
+ break;
+ }
+ case "32860-02.html":
+ {
+ if (st.isMemoState(1))
+ {
+ if (hasQuestItems(player, SHIELD_OF_SACRIFICE))
+ {
+ htmltext = event;
+ }
+ else
+ {
+ giveItems(player, SHIELD_OF_SACRIFICE, 1);
+ htmltext = "32860-03.html";
+ }
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ final QuestState st = getQuestState(player, true);
+ String htmltext = getNoQuestMsg(player);
+ if (st.isCompleted())
+ {
+ if (npc.getId() == ERISS_EVIL_THOUGHTS)
+ {
+ htmltext = "32792-07.html";
+ }
+ }
+ else if (st.isCreated())
+ {
+ final QuestState st1 = player.getQuestState(Q10294_SevenSignsToTheMonasteryOfSilence.class.getSimpleName());
+ if ((player.getLevel() >= MIN_LEVEL) && (st1 != null) && (st1.isCompleted()))
+ {
+ htmltext = "32792-01.htm";
+ }
+ }
+ else if (st.isStarted())
+ {
+ switch (npc.getId())
+ {
+ case ERISS_EVIL_THOUGHTS:
+ {
+ final int memoState = st.getMemoState();
+ if (memoState == 1)
+ {
+ htmltext = "32792-12.html";
+ }
+ else if (memoState == 2)
+ {
+ htmltext = "32792-08.html";
+ }
+ else if ((memoState > 2) && (memoState < 6))
+ {
+ htmltext = "32792-09.html";
+ }
+ else if (memoState == 6)
+ {
+ if (player.isSubClassActive())
+ {
+ htmltext = "32792-10.html";
+ }
+ else
+ {
+ addExpAndSp(player, 125000000, 12500000);
+ st.exitQuest(false, true);
+ htmltext = "32792-11.html";
+ }
+ }
+ break;
+ }
+ case SOLINAS_EVIL_THOUGHTS:
+ {
+ switch (st.getMemoState())
+ {
+ case 3:
+ {
+ htmltext = "32793-01.html";
+ break;
+ }
+ case 4:
+ {
+ htmltext = "32793-09.html";
+ break;
+ }
+ case 5:
+ {
+ htmltext = "32793-10.html";
+ break;
+ }
+ case 6:
+ {
+ htmltext = "32793-11.html";
+ break;
+ }
+ }
+ break;
+ }
+ case SOLINA:
+ {
+ if (st.isMemoState(4))
+ {
+ htmltext = "32794-01.html";
+ }
+ else if (st.isMemoState(5))
+ {
+ htmltext = "32794-03.html";
+ }
+ break;
+ }
+ case ERIS:
+ {
+ if (st.isMemoState(4))
+ {
+ htmltext = "32795-01.html";
+ }
+ else if (st.isMemoState(5))
+ {
+ htmltext = "32795-02.html";
+ }
+ break;
+ }
+ case ANAIS:
+ {
+ if (st.isMemoState(4))
+ {
+ htmltext = "32796-01.html";
+ }
+ else if (st.isMemoState(5))
+ {
+ htmltext = "32796-02.html";
+ }
+ break;
+ }
+ case JUDE_VAN_ETINA:
+ {
+ if (st.isMemoState(4))
+ {
+ htmltext = "32797-01.html";
+ }
+ else if (st.isMemoState(5))
+ {
+ htmltext = "32797-02.html";
+ }
+ break;
+ }
+ case TELEPORT_CONTROL_DEVICE_1:
+ {
+ if (st.getMemoState() > 1)
+ {
+ takeItems(player, -1, SCROLL_OF_ABSTINENCE, SHIELD_OF_SACRIFICE, SWORD_OF_HOLY_SPIRIT, STAFF_OF_BLESSING);
+ htmltext = "32837-01.html";
+ }
+ else if (st.isMemoState(1))
+ {
+ htmltext = "32837-03.html";
+ }
+ break;
+ }
+ case POWERFUL_DEVICE_1:
+ {
+ if (st.isMemoState(1))
+ {
+ htmltext = "32838-01.html";
+ }
+ break;
+ }
+ case POWERFUL_DEVICE_2:
+ {
+ if (st.isMemoState(1))
+ {
+ htmltext = "32839-01.html";
+ }
+ break;
+ }
+ case POWERFUL_DEVICE_3:
+ {
+ if (st.isMemoState(1))
+ {
+ htmltext = "32840-01.html";
+ }
+ break;
+ }
+ case POWERFUL_DEVICE_4:
+ {
+ if (st.isMemoState(1))
+ {
+ htmltext = "32841-01.html";
+ }
+ break;
+ }
+ case TELEPORT_CONTROL_DEVICE_2:
+ {
+ if (st.getMemoState() > 2)
+ {
+ htmltext = "32842-01.html";
+ }
+ break;
+ }
+ case TOMB_OF_THE_SAINTESS:
+ {
+ if (st.isMemoState(2))
+ {
+ htmltext = "32843-01.html";
+ }
+ else if (st.getMemoState() > 2)
+ {
+ htmltext = "32843-02.html";
+ }
+ break;
+ }
+ case TELEPORT_CONTROL_DEVICE_3:
+ {
+ if (st.getMemoState() > 2)
+ {
+ htmltext = "32844-01.html";
+ }
+ break;
+ }
+ case ALTAR_OF_HALLOWS_1:
+ {
+ if (st.isMemoState(1))
+ {
+ htmltext = "32857-01.html";
+ }
+ break;
+ }
+ case ALTAR_OF_HALLOWS_2:
+ {
+ if (st.isMemoState(1))
+ {
+ htmltext = "32858-01.html";
+ }
+ break;
+ }
+ case ALTAR_OF_HALLOWS_3:
+ {
+ if (st.isMemoState(1))
+ {
+ htmltext = "32859-01.html";
+ }
+ break;
+ }
+ case ALTAR_OF_HALLOWS_4:
+ {
+ if (st.isMemoState(1))
+ {
+ htmltext = "32860-01.html";
+ }
+ break;
+ }
+ case ELCADIA:
+ {
+ final int memoState = st.getMemoState();
+ if (memoState < 1)
+ {
+ htmltext = "32787-01.html";
+ }
+ else
+ {
+ switch (memoState)
+ {
+ case 1:
+ {
+ htmltext = "32787-02.html";
+ break;
+ }
+ case 2:
+ {
+ htmltext = "32787-03.html";
+ break;
+ }
+ case 3:
+ {
+ htmltext = "32787-04.html";
+ break;
+ }
+ case 4:
+ {
+ htmltext = "32787-05.html";
+ break;
+ }
+ case 5:
+ {
+ htmltext = "32787-06.html";
+ break;
+ }
+ }
+ }
+ break;
+ }
+ }
+ }
+ return htmltext;
+ }
+}
diff --git a/dist/game/data/scripts/quests/QuestMasterHandler.java b/dist/game/data/scripts/quests/QuestMasterHandler.java
index d6837f9859..1dfe5380a3 100644
--- a/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -511,6 +511,7 @@ import quests.Q10291_FireDragonDestroyer.Q10291_FireDragonDestroyer;
import quests.Q10292_SevenSignsGirlOfDoubt.Q10292_SevenSignsGirlOfDoubt;
import quests.Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom;
import quests.Q10294_SevenSignsToTheMonasteryOfSilence.Q10294_SevenSignsToTheMonasteryOfSilence;
+import quests.Q10295_Seven_Signs_Solinas_Tomb.Q10295_Seven_Signs_Solinas_Tomb;
import quests.Q10501_ZakenEmbroideredSoulCloak.Q10501_ZakenEmbroideredSoulCloak;
import quests.Q10502_FreyaEmbroideredSoulCloak.Q10502_FreyaEmbroideredSoulCloak;
import quests.Q10503_FrintezzaEmbroideredSoulCloak.Q10503_FrintezzaEmbroideredSoulCloak;
@@ -1016,6 +1017,7 @@ public class QuestMasterHandler
Q10292_SevenSignsGirlOfDoubt.class,
Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.class,
Q10294_SevenSignsToTheMonasteryOfSilence.class,
+ Q10295_Seven_Signs_Solinas_Tomb.class,
Q10501_ZakenEmbroideredSoulCloak.class,
Q10502_FreyaEmbroideredSoulCloak.class,
Q10503_FrintezzaEmbroideredSoulCloak.class,
diff --git a/dist/game/data/stats/items/17200-17299.xml b/dist/game/data/stats/items/17200-17299.xml
index 8b7f2c5111..9232cb8ef7 100644
--- a/dist/game/data/stats/items/17200-17299.xml
+++ b/dist/game/data/stats/items/17200-17299.xml
@@ -218,28 +218,53 @@
<item id="17227" type="EtcItem" name="Elcadia's Token">
<!-- Description: Rune token created by magic for Elcadia's test. -->
<set name="icon" val="icon.etc_fire_rune_i00" />
+ <set name="immediate_effect" val="true" />
<set name="material" val="PAPER" />
+ <set name="is_tradable" val="false" />
+ <set name="is_dropable" val="false" />
+ <set name="is_sellable" val="false" />
<set name="is_stackable" val="true" />
+ <set name="is_questitem" val="true" />
</item>
<item id="17228" type="EtcItem" name="Scroll of Abstinence">
<!-- Description: One of the relics stored inside the Seal of the Saintess. This scroll emanates an unusual energy. The scroll is very old and worn. It must be handled with care. -->
<set name="icon" val="icon.etc_spell_books_element_i00" />
+ <set name="immediate_effect" val="true" />
<set name="material" val="PAPER" />
+ <set name="is_tradable" val="false" />
+ <set name="is_dropable" val="false" />
+ <set name="is_sellable" val="false" />
+ <set name="is_questitem" val="true" />
</item>
<item id="17229" type="EtcItem" name="Shield of Sacrifice">
<!-- Description: One of the relics stored inside the Seal of the Saintess. This shield emanates an unusual energy. But it is very worn and large. It is fragile and cannot be used in battle. -->
<set name="icon" val="icon.shield_shrnoens_shield_i00" />
+ <set name="immediate_effect" val="true" />
<set name="material" val="PAPER" />
+ <set name="is_tradable" val="false" />
+ <set name="is_dropable" val="false" />
+ <set name="is_sellable" val="false" />
+ <set name="is_questitem" val="true" />
</item>
<item id="17230" type="EtcItem" name="Sword of Holy Spirit">
<!-- Description: One of the relics stored inside the Seal of the Saintess. The sword emanates an unusual energy. But it is very worn and large. It is fragile and cannot be used in battle. -->
<set name="icon" val="icon.weapon_raid_sword_i01" />
+ <set name="immediate_effect" val="true" />
<set name="material" val="PAPER" />
+ <set name="is_tradable" val="false" />
+ <set name="is_dropable" val="false" />
+ <set name="is_sellable" val="false" />
+ <set name="is_questitem" val="true" />
</item>
<item id="17231" type="EtcItem" name="Staff of Blessing">
<!-- Description: One of the relics stored inside the Seal of the Saintess. This staff emanates an unusual energy. But it is very worn and heavy. It is fragile cannot be used in battle. -->
<set name="icon" val="icon.weapon_mace_of_prayer_i01" />
+ <set name="immediate_effect" val="true" />
<set name="material" val="PAPER" />
+ <set name="is_tradable" val="false" />
+ <set name="is_dropable" val="false" />
+ <set name="is_sellable" val="false" />
+ <set name="is_questitem" val="true" />
</item>
<item id="17232" type="EtcItem" name="Ball Trapping Gnosian Agathion Pack">
<!-- Description: Wrapped pack containing a Ball Trapping Gnosian Agathion. Cannot be exchanged or dropped. Cannot use a private store. Can be stored in a private warehouse. -->
diff --git a/dist/game/data/stats/npcs/18900-18999.xml b/dist/game/data/stats/npcs/18900-18999.xml
index 98644433bc..c729823482 100644
--- a/dist/game/data/stats/npcs/18900-18999.xml
+++ b/dist/game/data/stats/npcs/18900-18999.xml
@@ -2128,164 +2128,288 @@
<height normal="35" />
</collision>
</npc>
- <npc id="18952" level="80" type="L2Npc" name="Solina's Guardian">
+ <npc id="18952" level="82" type="L2Monster" name="Solina's Guardian">
<!-- TODO: Must be confirmed -->
+ <race>HUMAN</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3643.38976668326" hpRegen="8.5" mp="1743" mpRegen="3" />
+ <attack physical="1055.28566004965" magical="720.623302603812" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+ <defence physical="349.77477" magical="255.95" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="HOLY" value="160" />
+ <defence fire="170" water="170" wind="170" earth="170" holy="200" dark="120" default="140" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="50" />
+ <run ground="120" />
</speed>
</stats>
+ <skillList>
+ <skill id="4416" level="14" /> <!--Humans -->
+ <skill id="5466" level="1" /> <!--Holy Attacks -->
+ <skill id="4408" level="10" /> <!--HP Increase (2x) -->
+ <skill id="4409" level="1" /> <!--MP Increase (1x)-->
+ <skill id="4410" level="9" /> <!--Slightly Weak P. Atk. -->
+ <skill id="4411" level="8" /> <!--Weak M. Atk. -->
+ <skill id="4412" level="9" /> <!--Slightly Weak P. Def. -->
+ <skill id="4413" level="8" /> <!--Weak M. Def. -->
+ <skill id="4414" level="1" /> <!--Heavy Armor Type -->
+ <skill id="4415" level="3" /> <!--One-handed Sword -->
+ </skillList>
+ <ai type="BALANCED" aggroRange="300" clanHelpRange="300" />
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="15" />
+ <height normal="30" />
</collision>
</npc>
- <npc id="18953" level="80" type="L2Npc" name="Solina's Guardian">
+ <npc id="18953" level="82" type="L2Monster" name="Solina's Guardian">
<!-- TODO: Must be confirmed -->
+ <race>HUMAN</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3643.38976668326" hpRegen="8.5" mp="1743" mpRegen="3" />
+ <attack physical="1055.28566004965" magical="720.623302603812" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+ <defence physical="349.77477" magical="255.95" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="HOLY" value="160" />
+ <defence fire="170" water="170" wind="170" earth="170" holy="200" dark="120" default="140" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="50" />
+ <run ground="120" />
</speed>
</stats>
+ <skillList>
+ <skill id="4416" level="14" /> <!--Humans -->
+ <skill id="5466" level="1" /> <!--Holy Attacks -->
+ <skill id="4408" level="10" /> <!--HP Increase (2x) -->
+ <skill id="4409" level="1" /> <!--MP Increase (1x)-->
+ <skill id="4410" level="9" /> <!--Slightly Weak P. Atk. -->
+ <skill id="4411" level="8" /> <!--Weak M. Atk. -->
+ <skill id="4412" level="9" /> <!--Slightly Weak P. Def. -->
+ <skill id="4413" level="8" /> <!--Weak M. Def. -->
+ <skill id="4414" level="1" /> <!--Heavy Armor Type -->
+ <skill id="4415" level="3" /> <!--One-handed Sword -->
+ </skillList>
+ <ai type="BALANCED" aggroRange="300" clanHelpRange="300" />
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="15" />
+ <height normal="30" />
</collision>
</npc>
- <npc id="18954" level="80" type="L2Npc" name="Solina's Guardian">
+ <npc id="18954" level="82" type="L2Monster" name="Solina's Guardian">
<!-- TODO: Must be confirmed -->
+ <race>HUMAN</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3643.38976668326" hpRegen="8.5" mp="1743" mpRegen="3" />
+ <attack physical="1055.28566004965" magical="720.623302603812" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+ <defence physical="349.77477" magical="255.95" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="HOLY" value="160" />
+ <defence fire="170" water="170" wind="170" earth="170" holy="200" dark="120" default="140" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="50" />
+ <run ground="120" />
</speed>
</stats>
+ <skillList>
+ <skill id="4416" level="14" /> <!--Humans -->
+ <skill id="5466" level="1" /> <!--Holy Attacks -->
+ <skill id="4408" level="10" /> <!--HP Increase (2x) -->
+ <skill id="4409" level="1" /> <!--MP Increase (1x)-->
+ <skill id="4410" level="9" /> <!--Slightly Weak P. Atk. -->
+ <skill id="4411" level="8" /> <!--Weak M. Atk. -->
+ <skill id="4412" level="9" /> <!--Slightly Weak P. Def. -->
+ <skill id="4413" level="8" /> <!--Weak M. Def. -->
+ <skill id="4414" level="1" /> <!--Heavy Armor Type -->
+ <skill id="4415" level="3" /> <!--One-handed Sword -->
+ </skillList>
+ <ai type="BALANCED" aggroRange="300" clanHelpRange="300" />
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="15" />
+ <height normal="30" />
</collision>
</npc>
- <npc id="18955" level="80" type="L2Npc" name="Solina's Guardian">
+ <npc id="18955" level="82" type="L2Monster" name="Solina's Guardian">
<!-- TODO: Must be confirmed -->
+ <race>HUMAN</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3643.38976668326" hpRegen="8.5" mp="1743" mpRegen="3" />
+ <attack physical="1055.28566004965" magical="720.623302603812" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+ <defence physical="349.77477" magical="255.95" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="HOLY" value="160" />
+ <defence fire="170" water="170" wind="170" earth="170" holy="200" dark="120" default="140" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="50" />
+ <run ground="120" />
</speed>
</stats>
+ <skillList>
+ <skill id="4416" level="14" /> <!--Humans -->
+ <skill id="5466" level="1" /> <!--Holy Attacks -->
+ <skill id="4408" level="10" /> <!--HP Increase (2x) -->
+ <skill id="4409" level="1" /> <!--MP Increase (1x)-->
+ <skill id="4410" level="9" /> <!--Slightly Weak P. Atk. -->
+ <skill id="4411" level="8" /> <!--Weak M. Atk. -->
+ <skill id="4412" level="9" /> <!--Slightly Weak P. Def. -->
+ <skill id="4413" level="8" /> <!--Weak M. Def. -->
+ <skill id="4414" level="1" /> <!--Heavy Armor Type -->
+ <skill id="4415" level="3" /> <!--One-handed Sword -->
+ </skillList>
+ <ai type="BALANCED" aggroRange="300" clanHelpRange="300" />
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="15" />
+ <height normal="30" />
</collision>
</npc>
- <npc id="18956" level="80" type="L2Npc" name="Guardian of the Tomb">
+ <npc id="18956" level="82" type="L2Monster" name="Guardian of the Tomb">
<!-- TODO: Must be confirmed -->
+ <race>DIVINE</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3643.38976668326" hpRegen="8.5" mp="1743" mpRegen="3" />
+ <attack physical="1055.28566004965" magical="720.623302603812" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
+ <defence physical="349.77477" magical="255.95" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="HOLY" value="160" />
+ <defence fire="170" water="170" wind="170" earth="170" holy="200" dark="120" default="140" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="30" />
+ <run ground="220" />
</speed>
</stats>
+ <status canMove="false" />
+ <skillList>
+ <skill id="4416" level="8" /> <!--Angels -->
+ <skill id="5466" level="1" /> <!--Holy Attacks -->
+ <skill id="4408" level="10" /> <!--HP Increase (2x) -->
+ <skill id="4409" level="1" /> <!--MP Increase (1x)-->
+ <skill id="4410" level="9" /> <!--Slightly Weak P. Atk. -->
+ <skill id="4411" level="8" /> <!--Weak M. Atk. -->
+ <skill id="4412" level="9" /> <!--Slightly Weak P. Def. -->
+ <skill id="4413" level="8" /> <!--Weak M. Def. -->
+ <skill id="4414" level="2" /> <!--Standard Type -->
+ <skill id="4415" level="5" /> <!--Blunt Weapons -->
+ </skillList>
+ <ai type="BALANCED" aggroRange="300" clanHelpRange="300" />
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="13" />
+ <height normal="47" />
</collision>
</npc>
- <npc id="18957" level="80" type="L2Npc" name="Guardian of the Tomb">
+ <npc id="18957" level="82" type="L2Monster" name="Guardian of the Tomb">
<!-- TODO: Must be confirmed -->
+ <race>DIVINE</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3643.38976668326" hpRegen="8.5" mp="1743" mpRegen="3" />
+ <attack physical="1055.28566004965" magical="720.623302603812" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
+ <defence physical="349.77477" magical="255.95" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="HOLY" value="160" />
+ <defence fire="170" water="170" wind="170" earth="170" holy="200" dark="120" default="140" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="30" />
+ <run ground="220" />
</speed>
</stats>
+ <status canMove="false" />
+ <skillList>
+ <skill id="4416" level="8" /> <!--Angels -->
+ <skill id="5466" level="1" /> <!--Holy Attacks -->
+ <skill id="4408" level="10" /> <!--HP Increase (2x) -->
+ <skill id="4409" level="1" /> <!--MP Increase (1x)-->
+ <skill id="4410" level="9" /> <!--Slightly Weak P. Atk. -->
+ <skill id="4411" level="8" /> <!--Weak M. Atk. -->
+ <skill id="4412" level="9" /> <!--Slightly Weak P. Def. -->
+ <skill id="4413" level="8" /> <!--Weak M. Def. -->
+ <skill id="4414" level="2" /> <!--Standard Type -->
+ <skill id="4415" level="5" /> <!--Blunt Weapons -->
+ </skillList>
+ <ai type="BALANCED" aggroRange="300" clanHelpRange="300" />
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="13" />
+ <height normal="47" />
</collision>
</npc>
- <npc id="18958" level="80" type="L2Npc" name="Guardian of the Tomb">
+ <npc id="18958" level="82" type="L2Monster" name="Guardian of the Tomb">
<!-- TODO: Must be confirmed -->
+ <race>DIVINE</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3643.38976668326" hpRegen="8.5" mp="1743" mpRegen="3" />
+ <attack physical="1055.28566004965" magical="720.623302603812" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
+ <defence physical="349.77477" magical="255.95" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="HOLY" value="160" />
+ <defence fire="170" water="170" wind="170" earth="170" holy="200" dark="120" default="140" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="30" />
+ <run ground="220" />
</speed>
</stats>
+ <status canMove="false" />
+ <skillList>
+ <skill id="4416" level="8" /> <!--Angels -->
+ <skill id="5466" level="1" /> <!--Holy Attacks -->
+ <skill id="4408" level="10" /> <!--HP Increase (2x) -->
+ <skill id="4409" level="1" /> <!--MP Increase (1x)-->
+ <skill id="4410" level="9" /> <!--Slightly Weak P. Atk. -->
+ <skill id="4411" level="8" /> <!--Weak M. Atk. -->
+ <skill id="4412" level="9" /> <!--Slightly Weak P. Def. -->
+ <skill id="4413" level="8" /> <!--Weak M. Def. -->
+ <skill id="4414" level="2" /> <!--Standard Type -->
+ <skill id="4415" level="5" /> <!--Blunt Weapons -->
+ </skillList>
+ <ai type="BALANCED" aggroRange="300" clanHelpRange="300" />
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="13" />
+ <height normal="47" />
</collision>
</npc>
- <npc id="18959" level="80" type="L2Npc" name="Guardian of the Tomb">
+ <npc id="18959" level="82" type="L2Monster" name="Guardian of the Tomb">
<!-- TODO: Must be confirmed -->
+ <race>DIVINE</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3643.38976668326" hpRegen="8.5" mp="1743" mpRegen="3" />
+ <attack physical="1055.28566004965" magical="720.623302603812" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
+ <defence physical="349.77477" magical="255.95" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="HOLY" value="160" />
+ <defence fire="170" water="170" wind="170" earth="170" holy="200" dark="120" default="140" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="30" />
+ <run ground="220" />
</speed>
</stats>
+ <status canMove="false" />
+ <skillList>
+ <skill id="4416" level="8" /> <!--Angels -->
+ <skill id="5466" level="1" /> <!--Holy Attacks -->
+ <skill id="4408" level="10" /> <!--HP Increase (2x) -->
+ <skill id="4409" level="1" /> <!--MP Increase (1x)-->
+ <skill id="4410" level="9" /> <!--Slightly Weak P. Atk. -->
+ <skill id="4411" level="8" /> <!--Weak M. Atk. -->
+ <skill id="4412" level="9" /> <!--Slightly Weak P. Def. -->
+ <skill id="4413" level="8" /> <!--Weak M. Def. -->
+ <skill id="4414" level="2" /> <!--Standard Type -->
+ <skill id="4415" level="5" /> <!--Blunt Weapons -->
+ </skillList>
+ <ai type="BALANCED" aggroRange="300" clanHelpRange="300" />
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="13" />
+ <height normal="47" />
</collision>
</npc>
<npc id="18960" level="80" type="L2Npc" name="Drake Lord">
diff --git a/dist/game/data/stats/npcs/27400-27499.xml b/dist/game/data/stats/npcs/27400-27499.xml
index 9487969055..a2ac85877b 100644
--- a/dist/game/data/stats/npcs/27400-27499.xml
+++ b/dist/game/data/stats/npcs/27400-27499.xml
@@ -134,67 +134,102 @@
<height normal="27.5" />
</collision>
</npc>
- <npc id="27403" level="80" type="L2Npc" name="Trainee of Rest">
+ <npc id="27403" level="80" type="L2Monster" name="Trainee of Rest">
<!-- TODO: Must be confirmed -->
+ <race>DIVINE</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3290.11306877694" hpRegen="8.5" mp="1674.8" mpRegen="3" />
+ <attack physical="970.537548504614" magical="662.751329129412" random="50" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+ <defence physical="341.375" magical="249.80341" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="HOLY" value="130" />
+ <defence fire="130" water="130" wind="130" earth="130" holy="150" dark="90" default="100" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="53" />
+ <run ground="180" />
</speed>
</stats>
+ <skillList>
+ <skill id="4416" level="8" /> <!--Angels -->
+ <skill id="5466" level="1" /> <!--Holy Attacks -->
+ <skill id="4408" level="8" /> <!--HP Increase (1/4x) -->
+ <skill id="4409" level="1" /> <!--MP Increase (1x)-->
+ <skill id="4410" level="9" /> <!--Slightly Weak P. Atk. -->
+ <skill id="4411" level="8" /> <!--Weak M. Atk. -->
+ <skill id="4412" level="9" /> <!--Slightly Weak P. Def. -->
+ <skill id="4413" level="8" /> <!--Weak M. Def. -->
+ <skill id="4414" level="2" /> <!--Standard Type -->
+ <skill id="4415" level="3" /> <!--One-handed Sword -->
+ </skillList>
+ <exCrtEffect>true</exCrtEffect>
+ <ai type="FIGHTER" aggroRange="300" clanHelpRange="300" />
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="12" />
+ <height normal="28.4" />
</collision>
</npc>
- <npc id="27404" level="80" type="L2Npc" name="Supplicant of Rest">
+ <npc id="27404" level="80" type="L2Monster" name="Supplicant of Rest">
<!-- TODO: Must be confirmed -->
+ <race>DIVINE</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3290.11306877694" hpRegen="8.5" mp="1674.8" mpRegen="3" />
+ <attack physical="970.537548504614" magical="662.751329129412" random="50" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+ <defence physical="341.375" magical="249.80341" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="HOLY" value="130" />
+ <defence fire="130" water="130" wind="130" earth="130" holy="150" dark="90" default="100" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="40" />
+ <run ground="150" />
</speed>
</stats>
+ <skillList>
+ <skill id="4416" level="8" /> <!--Angels -->
+ <skill id="5466" level="1" /> <!--Holy Attacks -->
+ <skill id="4408" level="8" /> <!--HP Increase (1/4x) -->
+ <skill id="4409" level="1" /> <!--MP Increase (1x)-->
+ <skill id="4410" level="9" /> <!--Slightly Weak P. Atk. -->
+ <skill id="4411" level="8" /> <!--Weak M. Atk. -->
+ <skill id="4412" level="9" /> <!--Slightly Weak P. Def. -->
+ <skill id="4413" level="8" /> <!--Weak M. Def. -->
+ <skill id="4414" level="2" /> <!--Standard Type -->
+ <skill id="4415" level="3" /> <!--One-handed Sword -->
+ </skillList>
+ <exCrtEffect>true</exCrtEffect>
+ <ai type="FIGHTER" aggroRange="300" clanHelpRange="300" />
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="18" />
+ <height normal="44" />
</collision>
</npc>
- <npc id="27405" level="80" type="L2Npc" name="Monastic Pilgrim">
+ <npc id="27405" level="80" type="L2Monster" name="Monastic Pilgrim">
<!-- TODO: Must be confirmed -->
+ <race>DIVINE</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <equipment rhand="148" /> <!-- rhand: Sword of Valhalla -->
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3290.11306877694" hpRegen="8.5" mp="1674.8" mpRegen="3" />
+ <attack physical="970.537548504614" magical="662.751329129412" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+ <defence physical="341.375" magical="249.80341" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="HOLY" value="100" />
+ <defence fire="110" water="110" wind="110" earth="110" holy="130" dark="70" default="80" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="30" />
+ <run ground="170" />
</speed>
</stats>
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="12" />
+ <height normal="27.8" />
</collision>
</npc>
- <npc id="27406" level="80" type="L2Npc" name="Monastic Crusader">
+ <npc id="27406" level="80" type="L2Monster" name="Monastic Crusader">
<!-- TODO: Must be confirmed -->
<sex>MALE</sex>
<stats str="10" int="10" dex="10" wit="10" con="10" men="10">
@@ -214,27 +249,30 @@
<height normal="35" />
</collision>
</npc>
- <npc id="27407" level="80" type="L2Npc" name="Solina Lay Brother">
+ <npc id="27407" level="80" type="L2Monster" name="Solina Lay Brother">
<!-- TODO: Must be confirmed -->
+ <race>DIVINE</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <equipment rhand="8212" /> <!-- rhand: Monster Only (Solina Brother Mace) -->
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3290.11306877694" hpRegen="8.5" mp="1674.8" mpRegen="3" />
+ <attack physical="970.537548504614" magical="662.751329129412" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
+ <defence physical="341.375" magical="249.80341" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="HOLY" value="100" />
+ <defence fire="110" water="110" wind="110" earth="110" holy="130" dark="70" default="80" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="61" />
+ <run ground="180" />
</speed>
</stats>
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="9" />
+ <height normal="23.4" />
</collision>
</npc>
- <npc id="27408" level="80" type="L2Npc" name="Savior Solina">
+ <npc id="27408" level="80" type="L2Monster" name="Savior Solina">
<!-- TODO: Must be confirmed -->
<sex>MALE</sex>
<stats str="10" int="10" dex="10" wit="10" con="10" men="10">
@@ -254,7 +292,7 @@
<height normal="35" />
</collision>
</npc>
- <npc id="27409" level="80" type="L2Npc" name="Solina Knight Captain">
+ <npc id="27409" level="80" type="L2Monster" name="Solina Knight Captain">
<!-- TODO: Must be confirmed -->
<sex>MALE</sex>
<stats str="10" int="10" dex="10" wit="10" con="10" men="10">
@@ -274,27 +312,30 @@
<height normal="35" />
</collision>
</npc>
- <npc id="27410" level="80" type="L2Npc" name="Solina Knights">
+ <npc id="27410" level="80" type="L2Monster" name="Solina Knights">
<!-- TODO: Must be confirmed -->
+ <race>DIVINE</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <equipment rhand="8211" lhand="8210" /> <!-- rhand: Monster Only (Monk Warrior Sword) lhand: Monster Only (Monk Warrior Shield) -->
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3290.11306877694" hpRegen="8.5" mp="1674.8" mpRegen="3" />
+ <attack physical="970.537548504614" magical="662.751329129412" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+ <defence physical="341.375" magical="249.80341" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="HOLY" value="100" />
+ <defence fire="110" water="110" wind="110" earth="110" holy="130" dark="70" default="80" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="53" />
+ <run ground="190" />
</speed>
</stats>
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="12" />
+ <height normal="28.4" />
</collision>
</npc>
- <npc id="27411" level="80" type="L2Npc" name="Divinity Manager">
+ <npc id="27411" level="80" type="L2Monster" name="Divinity Manager">
<!-- TODO: Must be confirmed -->
<sex>MALE</sex>
<stats str="10" int="10" dex="10" wit="10" con="10" men="10">
@@ -314,64 +355,70 @@
<height normal="35" />
</collision>
</npc>
- <npc id="27412" level="80" type="L2Npc" name="Divinity Supervisor">
+ <npc id="27412" level="80" type="L2Monster" name="Divinity Supervisor">
<!-- TODO: Must be confirmed -->
+ <race>DIVINE</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3290.11306877694" hpRegen="8.5" mp="1674.8" mpRegen="3" />
+ <attack physical="970.537548504614" magical="662.751329129412" random="30" critical="4" accuracy="0" attackSpeed="253" type="POLE" range="80" distance="80" width="120" />
+ <defence physical="341.375" magical="249.80341" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="HOLY" value="100" />
+ <defence fire="110" water="110" wind="110" earth="110" holy="130" dark="70" default="80" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="30" />
+ <run ground="200" />
</speed>
</stats>
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="13" />
+ <height normal="47" />
</collision>
</npc>
- <npc id="27413" level="80" type="L2Npc" name="Divinity Fighter">
+ <npc id="27413" level="80" type="L2Monster" name="Divinity Fighter">
<!-- TODO: Must be confirmed -->
- <sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <race>DIVINE</race>
+ <sex>FEMALE</sex>
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3290.11306877694" hpRegen="8.5" mp="1674.8" mpRegen="3" />
+ <attack physical="970.537548504614" magical="662.751329129412" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+ <defence physical="341.375" magical="249.80341" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="HOLY" value="130" />
+ <defence fire="130" water="130" wind="130" earth="130" holy="150" dark="90" default="100" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="50" />
+ <run ground="150" />
</speed>
</stats>
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="24" />
+ <height normal="49" />
</collision>
</npc>
- <npc id="27414" level="80" type="L2Npc" name="Divinity Magus">
+ <npc id="27414" level="80" type="L2Monster" name="Divinity Magus">
<!-- TODO: Must be confirmed -->
+ <race>DIVINE</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3290.11306877694" hpRegen="8.5" mp="1674.8" mpRegen="3" />
+ <attack physical="970.537548504614" magical="662.751329129412" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+ <defence physical="341.375" magical="249.80341" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="HOLY" value="130" />
+ <defence fire="130" water="130" wind="130" earth="130" holy="150" dark="90" default="100" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="40" />
+ <run ground="150" />
</speed>
</stats>
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="18" />
+ <height normal="44" />
</collision>
</npc>
<npc id="27415" level="80" type="L2Monster" name="Guide Solina">
@@ -395,7 +442,7 @@
<height normal="23.4" />
</collision>
</npc>
- <npc id="27416" level="80" type="L2Npc" name="Relic Manager Golem">
+ <npc id="27416" level="80" type="L2Monster" name="Relic Manager Golem">
<!-- TODO: Must be confirmed -->
<sex>MALE</sex>
<stats str="10" int="10" dex="10" wit="10" con="10" men="10">
@@ -415,47 +462,53 @@
<height normal="35" />
</collision>
</npc>
- <npc id="27417" level="80" type="L2Npc" name="Mutant Archer">
+ <npc id="27417" level="80" type="L2Monster" name="Mutant Archer">
<!-- TODO: Must be confirmed -->
+ <race>UNDEAD</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <equipment rhand="275" /> <!-- rhand: Long Bow -->
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3290.11306877694" hpRegen="8.5" mp="1674.8" mpRegen="3" />
+ <attack physical="970.537548504614" magical="662.751329129412" random="10" critical="8" accuracy="0" reuseDelay="1500" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
+ <defence physical="341.375" magical="249.80341" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="DARK" value="100" />
+ <defence fire="110" water="110" wind="110" earth="110" holy="70" dark="130" default="80" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="40" />
+ <run ground="100" />
</speed>
</stats>
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="11" />
+ <height normal="27" />
</collision>
</npc>
- <npc id="27418" level="80" type="L2Npc" name="Mutant Warrior">
+ <npc id="27418" level="80" type="L2Monster" name="Mutant Warrior">
<!-- TODO: Must be confirmed -->
+ <race>UNDEAD</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <equipment rhand="150" /> <!-- rhand:Elemental Sword -->
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3290.11306877694" hpRegen="8.5" mp="1674.8" mpRegen="3" />
+ <attack physical="970.537548504614" magical="662.751329129412" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="1100" distance="80" width="120" />
+ <defence physical="341.375" magical="249.80341" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="DARK" value="130" />
+ <defence fire="130" water="130" wind="130" earth="130" holy="90" dark="150" default="100" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="40" />
+ <run ground="120" />
</speed>
</stats>
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="10" />
+ <height normal="25" />
</collision>
</npc>
- <npc id="27419" level="80" type="L2Npc" name="Divinity Watcher">
+ <npc id="27419" level="80" type="L2Monster" name="Divinity Watcher">
<!-- TODO: Must be confirmed -->
<sex>MALE</sex>
<stats str="10" int="10" dex="10" wit="10" con="10" men="10">
@@ -475,24 +528,26 @@
<height normal="35" />
</collision>
</npc>
- <npc id="27420" level="80" type="L2Npc" name="Instructor Solina">
+ <npc id="27420" level="80" type="L2Monster" name="Instructor Solina">
<!-- TODO: Must be confirmed -->
+ <race>DIVINE</race>
<sex>MALE</sex>
- <stats str="10" int="10" dex="10" wit="10" con="10" men="10">
- <vitals hp="2444" mp="2444.0" />
- <attack physical="500" magical="500" attackSpeed="278" range="40" />
- <defence physical="500" magical="500" />
+ <stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+ <vitals hp="3290.11306877694" hpRegen="8.5" mp="1674.8" mpRegen="3" />
+ <attack physical="970.537548504614" magical="662.751329129412" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+ <defence physical="341.375" magical="249.80341" />
<attribute>
- <defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+ <attack type="HOLY" value="100" />
+ <defence fire="110" water="110" wind="110" earth="110" holy="130" dark="70" default="80" />
</attribute>
<speed>
- <walk ground="60" />
- <run ground="160" />
+ <walk ground="30" />
+ <run ground="66" />
</speed>
</stats>
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="14" />
+ <height normal="31.5" />
</collision>
</npc>
<npc id="27421" level="80" type="L2Monster" name="Creature of the Dusk">
diff --git a/dist/game/data/stats/npcs/32700-32799.xml b/dist/game/data/stats/npcs/32700-32799.xml
index 6859ba6288..83a0aff6b5 100644
--- a/dist/game/data/stats/npcs/32700-32799.xml
+++ b/dist/game/data/stats/npcs/32700-32799.xml
@@ -3206,7 +3206,7 @@
</speed>
</stats>
<collision>
- <radius normal="11" />
+ <radius normal="12" />
<height normal="23" />
</collision>
</npc>
@@ -3227,7 +3227,7 @@
</stats>
<collision>
<radius normal="11" />
- <height normal="12" />
+ <height normal="22" />
</collision>
</npc>
<npc id="32796" level="80" type="L2Npc" name="Anais" title="Solina's Disciple">
@@ -3246,8 +3246,8 @@
</speed>
</stats>
<collision>
- <radius normal="25" />
- <height normal="35" />
+ <radius normal="14" />
+ <height normal="27" />
</collision>
</npc>
<npc id="32797" level="80" type="L2Npc" name="Jude van Etina" title="Solina's Disciple">
diff --git a/dist/sql/game/spawnlist.sql b/dist/sql/game/spawnlist.sql
index f01031b673..45bddfe42b 100644
--- a/dist/sql/game/spawnlist.sql
+++ b/dist/sql/game/spawnlist.sql
@@ -29626,7 +29626,7 @@ INSERT INTO `spawnlist` VALUES
-- Odd Globe
("monastery_of_silence", 1, 32815, 115475, -81400, -3374, 0, 0, 0, 60, 0, 0, 0),
("monastery_of_silence", 1, 32815, 116400, -81402, -3376, 0, 0, 32272, 60, 0, 0, 0),
-("monastery_of_silence", 1, 32815, 116400, -84992, -3371, 0, 0, 33168, 60, 0, 0, 0),
+("monastery_of_silence", 1, 32815, 116400, -84992, -3371, 0, 0, -32368, 60, 0, 0, 0),
("monastery_of_silence", 1, 32815, 115467, -84990, -3376, 0, 0, 0, 60, 0, 0, 0);
INSERT INTO `spawnlist` VALUES
--
GitLab