diff --git a/trunk/dist/game/data/html/admin/teleports/WorldAreas/DionTerritory.htm b/trunk/dist/game/data/html/admin/teleports/WorldAreas/DionTerritory.htm index 2f01c8ba66..48835c1b82 100644 --- a/trunk/dist/game/data/html/admin/teleports/WorldAreas/DionTerritory.htm +++ b/trunk/dist/game/data/html/admin/teleports/WorldAreas/DionTerritory.htm @@ -6,7 +6,7 @@ + \ No newline at end of file diff --git a/trunk/dist/game/data/html/default/30631.htm b/trunk/dist/game/data/html/default/30631.htm index 8b4cf59303..3eeca6e91f 100644 --- a/trunk/dist/game/data/html/default/30631.htm +++ b/trunk/dist/game/data/html/default/30631.htm @@ -1,4 +1,5 @@ -Warden Roderik:
-Hello. There are so many people who died innocent here, that is why this place is haunted by so many ghosts and undead. To keep an eye on the dead, that is my job.
+Guillotine Fortress Watchman Roderik:
+Hello. There are so many people who died innocent here, which is why this place is haunted by so many ghosts and undead. To keep an eye on the dead, that is my job.
+ \ No newline at end of file diff --git a/trunk/dist/game/data/html/default/30632.htm b/trunk/dist/game/data/html/default/30632.htm index 3f5824fb53..673fcd1226 100644 --- a/trunk/dist/game/data/html/default/30632.htm +++ b/trunk/dist/game/data/html/default/30632.htm @@ -1,4 +1,4 @@ -Warden Endrigo:
-Be careful! The Execution Ground is a very dangerous place where the spirits of the dead wander freely. They hate all living things... As for me, I guard this place, but even I can't go deep inside there. It is just too dangerous...
+Guillotine Fortress Watchman Endrigo:
+Be careful! The Execution Grounds is a very dangerous place where the spirits of the dead wander freely. They hate all living things... As for me, I guard this place, but even I can't go deep inside there. It is just too dangerous...
\ No newline at end of file diff --git a/trunk/dist/game/data/html/default/33697.htm b/trunk/dist/game/data/html/default/33697.htm new file mode 100644 index 0000000000..ff2c003898 --- /dev/null +++ b/trunk/dist/game/data/html/default/33697.htm @@ -0,0 +1,5 @@ +Dadphyna:
+I never thought that this place would be beautiful. And I never imagined that the stench of death would be so powerful!
+Can you hear it? The screams or the dead?
+ + \ No newline at end of file diff --git a/trunk/dist/game/data/html/default/33698.htm b/trunk/dist/game/data/html/default/33698.htm new file mode 100644 index 0000000000..d8f5290ced --- /dev/null +++ b/trunk/dist/game/data/html/default/33698.htm @@ -0,0 +1,5 @@ +Guillotine Fortress Watchman's Assistant:
+Pick your feet up and keep your nose clean. And don't slouch. A note on our system here in Guillotine Fortress: I administrate some of the assignments Roderik or Endrigo give, but you'll be responsible for reporting others.
+We're sticklers for organization here, so don't let things pile up.
+ + \ No newline at end of file diff --git a/trunk/dist/game/data/stats/npcs/23100-23200.xml b/trunk/dist/game/data/stats/npcs/23100-23200.xml index 6edab1e210..a0f2dbce49 100644 --- a/trunk/dist/game/data/stats/npcs/23100-23200.xml +++ b/trunk/dist/game/data/stats/npcs/23100-23200.xml @@ -1683,7 +1683,7 @@ - + HUMAN FEMALE @@ -1694,13 +1694,13 @@ - + - + HUMAN FEMALE @@ -1711,7 +1711,7 @@ - + diff --git a/trunk/dist/game/data/stats/npcs/23200-23300.xml b/trunk/dist/game/data/stats/npcs/23200-23300.xml index a2beb3caec..21ab151b1e 100644 --- a/trunk/dist/game/data/stats/npcs/23200-23300.xml +++ b/trunk/dist/game/data/stats/npcs/23200-23300.xml @@ -1,6 +1,6 @@ - + HUMAN FEMALE @@ -11,13 +11,13 @@ - + - + HUMAN FEMALE @@ -28,13 +28,13 @@ - + - + HUMAN FEMALE @@ -45,13 +45,13 @@ - + - + HUMAN FEMALE @@ -62,13 +62,13 @@ - + - + HUMAN FEMALE @@ -79,13 +79,13 @@ - + - + HUMAN FEMALE @@ -96,13 +96,13 @@ - + - + HUMAN FEMALE @@ -113,13 +113,13 @@ - + - + HUMAN FEMALE @@ -130,13 +130,13 @@ - + - + HUMAN FEMALE @@ -147,13 +147,13 @@ - + - + HUMAN FEMALE @@ -164,13 +164,13 @@ - + - + HUMAN FEMALE @@ -181,13 +181,13 @@ - + - + HUMAN FEMALE @@ -198,7 +198,7 @@ - + @@ -680,7 +680,7 @@ - + HUMAN FEMALE @@ -691,13 +691,13 @@ - + - + HUMAN FEMALE @@ -708,7 +708,7 @@ - + @@ -765,7 +765,7 @@ - + HUMAN FEMALE @@ -776,7 +776,7 @@ - + diff --git a/trunk/dist/game/data/stats/npcs/25800-25900.xml b/trunk/dist/game/data/stats/npcs/25800-25900.xml index c3d754889c..eb6d80e6db 100644 --- a/trunk/dist/game/data/stats/npcs/25800-25900.xml +++ b/trunk/dist/game/data/stats/npcs/25800-25900.xml @@ -1533,7 +1533,7 @@ - + HUMAN FEMALE @@ -1544,13 +1544,13 @@ - + - + HUMAN FEMALE @@ -1561,13 +1561,13 @@ - + - + HUMAN FEMALE @@ -1578,7 +1578,7 @@ - + @@ -1635,7 +1635,7 @@ - + HUMAN FEMALE @@ -1646,7 +1646,7 @@ - + diff --git a/trunk/dist/game/data/stats/npcs/33600-33700.xml b/trunk/dist/game/data/stats/npcs/33600-33700.xml index 95a216d2d2..fbd5cf52ac 100644 --- a/trunk/dist/game/data/stats/npcs/33600-33700.xml +++ b/trunk/dist/game/data/stats/npcs/33600-33700.xml @@ -1667,20 +1667,43 @@ - + + + + HUMAN - FEMALE + MALE + - + + + + + + + + + + + + + + + + + + + true + - - + + diff --git a/trunk/dist/tools/sql/game/raidboss_spawnlist.sql b/trunk/dist/tools/sql/game/raidboss_spawnlist.sql index 6939078934..8cd2382eea 100644 --- a/trunk/dist/tools/sql/game/raidboss_spawnlist.sql +++ b/trunk/dist/tools/sql/game/raidboss_spawnlist.sql @@ -335,4 +335,12 @@ INSERT IGNORE INTO `raidboss_spawnlist` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`head (25727,148482,117859,-3712,36584,129600,86400,6165648,20499); -- Dragon Beast (85) -- Removed -DELETE FROM `raidboss_spawnlist` WHERE (boss_id = 25252); -- Palibati Queen Themis (70) +DELETE FROM `raidboss_spawnlist` WHERE (boss_id = 25118); -- Guilotine, Warden Of The Execution Grounds +DELETE FROM `raidboss_spawnlist` WHERE (boss_id = 25252); -- Palibati Queen Themis + +-- Guilotine Fortress +INSERT IGNORE INTO `raidboss_spawnlist` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`respawn_delay`,`respawn_random`,`currentHp`,`currentMp`) VALUES +(25886,48232,147384,-3400,10866,86400,21600,0,0), +(25887,43151,144689,-3100,52598,86400,21600,0,0), +(25888,44970,155903,-1000,52598,86400,21600,0,0), +(25892,44824,155944,-1056,35323,86400,21600,0,0); diff --git a/trunk/dist/tools/sql/game/spawnlist.sql b/trunk/dist/tools/sql/game/spawnlist.sql index 044c20f083..78708fd301 100644 --- a/trunk/dist/tools/sql/game/spawnlist.sql +++ b/trunk/dist/tools/sql/game/spawnlist.sql @@ -42343,6 +42343,42 @@ INSERT INTO `spawnlist` VALUES ('19_14', '1', '33839', '14731', '-120358', '-111 INSERT INTO `spawnlist` VALUES ('19_14', '1', '33831', '17244', '-114896', '-227', '0', '0', '39326', '0', '0', '0', '0'); INSERT INTO `spawnlist` VALUES ('19_14', '1', '33832', '17148', '-115005', '-229', '0', '0', '18051', '0', '0', '0', '0'); +-- Guilotine Fortress Area +DELETE FROM `spawnlist` WHERE (locx>'35090' AND locx<'64420' AND locy>'137190' AND locy<'157490'); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 18267, 47064, 141816, -3280, 0, 0, 33635, 600, 0, 0, 0); -- chest +INSERT INTO `spawnlist` VALUES ('21_22', 1, 18267, 42328, 144568, -3248, 0, 0, 23041, 600, 0, 0, 0); -- chest +INSERT INTO `spawnlist` VALUES ('21_22', 1, 18270, 43368, 147656, -3680, 0, 0, 36564, 600, 0, 0, 0); -- chest +INSERT INTO `spawnlist` VALUES ('21_22', 1, 18270, 50408, 147624, -3584, 0, 0, 63371, 600, 0, 0, 0); -- chest +INSERT INTO `spawnlist` VALUES ('21_22', 1, 20941, 63628, 150615, -3239, 0, 0, 0, 45, 0, 0, 0); -- old +INSERT INTO `spawnlist` VALUES ('21_22', 1, 20944, 63920, 144848, -3239, 0, 0, 0, 45, 0, 0, 0); -- old +INSERT INTO `spawnlist` VALUES ('21_22', 1, 33697, 44713, 146520, -3686, 0, 0, 10875, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 30631, 45043, 146348, -3694, 0, 0, 11175, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 30632, 45628, 148498, -3623, 0, 0, 44315, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 23199, 49873, 154302, -2752, 0, 0, 54869, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 23200, 50565, 154061, -2760, 0, 0, 49037, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 23201, 55671, 144874, -3024, 0, 0, 40769, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 23202, 55307, 144896, -2968, 0, 0, 62410, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 23203, 55294, 149660, -2392, 0, 0, 59900, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 23204, 55340, 146977, -2936, 0, 0, 53699, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 23205, 50660, 155236, -2752, 0, 0, 37527, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 23206, 55726, 144861, -3032, 0, 0, 13314, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 23207, 55164, 147465, -2848, 0, 0, 45141, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 23208, 56129, 146787, -2912, 0, 0, 12033, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 23209, 49940, 154175, -2760, 0, 0, 52637, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 23210, 40588, 149416, -3896, 0, 0, 0, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 23211, 40749, 145861, -3808, 0, 0, 40273, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 23240, 56032, 141304, -2776, 0, 0, 2416, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 23241, 56005, 141457, -2776, 0, 0, 51405, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 23245, 57333, 143838, -2568, 0, 0, 6711, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 33682, 45875, 146653, -3688, 0, 0, 20466, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 33683, 49341, 150368, -3568, 0, 0, 33266, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 33684, 46551, 146393, -3704, 0, 0, 56411, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 33698, 51414, 152104, -2440, 0, 0, 59709, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 33701, 49986, 154018, -2760, 0, 0, 9373, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 33717, 47081, 154635, -1928, 0, 0, 39028, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 33718, 48316, 147415, -3400, 0, 0, 35928, 60, 0, 0, 0); +INSERT INTO `spawnlist` VALUES ('21_22', 1, 33719, 43044, 144730, -3120, 0, 0, 59999, 60, 0, 0, 0); + -- Cemetary Area DELETE FROM `spawnlist` WHERE (locx>'163840' AND locx<'196608' AND locy>'0' AND locy<'32768'); INSERT INTO `spawnlist` VALUES ('25_18', 1, 23147, 177420, 8592, -2728, 0, 0, 52976, 60, 0, 0, 0);