From 08e28fe058ec571e7a9637dc9882c9d845ac38b3 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 1 May 2015 21:37:03 +0000
Subject: [PATCH] Wastelands NPCs. Contributed by Stayway.
---
trunk/dist/game/data/html/default/30612.htm | 2 +-
trunk/dist/game/data/html/default/30730.htm | 2 +-
trunk/dist/game/data/html/default/32293.htm | 3 +-
trunk/dist/game/data/html/default/33179.htm | 4 +
trunk/dist/game/data/html/default/33524.htm | 5 +
.../dist/game/data/html/teleporter/33073.htm | 11 ++
.../dist/game/data/stats/npcs/33000-33099.xml | 5 +-
.../dist/game/data/stats/npcs/33400-33499.xml | 109 +-----------------
.../tools/sql/game/raidboss_spawnlist.sql | 10 ++
trunk/dist/tools/sql/game/spawnlist.sql | 43 +++++++
trunk/dist/tools/sql/game/teleport.sql | 11 +-
11 files changed, 94 insertions(+), 111 deletions(-)
create mode 100644 trunk/dist/game/data/html/default/33179.htm
create mode 100644 trunk/dist/game/data/html/default/33524.htm
create mode 100644 trunk/dist/game/data/html/teleporter/33073.htm
diff --git a/trunk/dist/game/data/html/default/30612.htm b/trunk/dist/game/data/html/default/30612.htm
index e613c9ecb1..7b03277b50 100644
--- a/trunk/dist/game/data/html/default/30612.htm
+++ b/trunk/dist/game/data/html/default/30612.htm
@@ -1,4 +1,4 @@
Wiseman Casian
-Hello, traveler. My name is Casian, I am the so-called sage of the Wastelands. I am studying the origin of the Wastelands and the giant spiders here.
+Hello, traveler. My name is Casian, I am the so-called sage of the Wasteland. I am studying the origin of the Wasteland and the giant spiders here.
\ No newline at end of file
diff --git a/trunk/dist/game/data/html/default/30730.htm b/trunk/dist/game/data/html/default/30730.htm
index e871b385c7..a904ae3f45 100644
--- a/trunk/dist/game/data/html/default/30730.htm
+++ b/trunk/dist/game/data/html/default/30730.htm
@@ -1,4 +1,4 @@
-Bodyguard Jax:
+Escort Jax:
Traveler, sir. My name is Jax. I receive money and sell my swordsmanship. That is, my job is to protect children of nobles like you. Ah? You're not a noble person? So what!
I am currently working under Trader Rolento over there. There are some neat things, have a look around.
diff --git a/trunk/dist/game/data/html/default/32293.htm b/trunk/dist/game/data/html/default/32293.htm
index cde4bb6cf5..d8979b2691 100644
--- a/trunk/dist/game/data/html/default/32293.htm
+++ b/trunk/dist/game/data/html/default/32293.htm
@@ -1,3 +1,4 @@
Jirrone:
-That place...it was hellish. Everyone became slaves to the Demons because of that accursed tyrant Beleth. I'm beside myself with worry about my brother and the other family I left behind on the island. The structure beside you was specially designed to allow entry into Hellbound, wasn't it? If only it was operational! I don't know how to activate it, but I heard that someone from the Ivory Tower does. The name was G...Ga...Galate -- yes, that's it! Galate! You can find her on your way to Innadril.
+ Something must have happened in Hellbound! The Warp Gate is now closed. But I heard that another Warp Gate exists in Heine,
+ which teleports warriors to Hellbound! Apparently the recent changes in the place has made it impossible for less than the strongest to try to go.
\ No newline at end of file
diff --git a/trunk/dist/game/data/html/default/33179.htm b/trunk/dist/game/data/html/default/33179.htm
new file mode 100644
index 0000000000..08fe916b31
--- /dev/null
+++ b/trunk/dist/game/data/html/default/33179.htm
@@ -0,0 +1,4 @@
+Guard Fred:
+This place is very dangerous. Keep your eyes open, and don't take on my fights you don't think you can win.
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/html/default/33524.htm b/trunk/dist/game/data/html/default/33524.htm
new file mode 100644
index 0000000000..16e499cd07
--- /dev/null
+++ b/trunk/dist/game/data/html/default/33524.htm
@@ -0,0 +1,5 @@
+Guard Renfad:
+There are many famous heroes in the Town of Gludio, and, though he may not be a hero himself, Lord Baron Lewin Waldner is the one I respect the most.
+He rebuilt the undeveloped city by hiring Dwarven artisans, and maintained the trading on the southern shore. The Gludio territory could have been developed like this too, if only others had his drive.
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/html/teleporter/33073.htm b/trunk/dist/game/data/html/teleporter/33073.htm
new file mode 100644
index 0000000000..18195fb579
--- /dev/null
+++ b/trunk/dist/game/data/html/teleporter/33073.htm
@@ -0,0 +1,11 @@
+Teleport Device:
+This is a teleport device for convenient travel about the Wasteland.
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/stats/npcs/33000-33099.xml b/trunk/dist/game/data/stats/npcs/33000-33099.xml
index 10bfa6c0de..694c9f80c8 100644
--- a/trunk/dist/game/data/stats/npcs/33000-33099.xml
+++ b/trunk/dist/game/data/stats/npcs/33000-33099.xml
@@ -1693,10 +1693,9 @@
-
-
+
ETC
-
+
diff --git a/trunk/dist/game/data/stats/npcs/33400-33499.xml b/trunk/dist/game/data/stats/npcs/33400-33499.xml
index 1d597f01ab..44c680e276 100644
--- a/trunk/dist/game/data/stats/npcs/33400-33499.xml
+++ b/trunk/dist/game/data/stats/npcs/33400-33499.xml
@@ -1,7 +1,6 @@
-
CONSTRUCT
@@ -26,7 +25,6 @@
-
CONSTRUCT
@@ -51,7 +49,6 @@
-
CONSTRUCT
@@ -76,7 +73,6 @@
-
CONSTRUCT
@@ -101,7 +97,6 @@
-
CONSTRUCT
@@ -126,7 +121,6 @@
-
CONSTRUCT
@@ -151,7 +145,6 @@
-
DARK_ELF
@@ -176,7 +169,6 @@
-
HUMAN
@@ -201,7 +193,6 @@
-
HUMAN
@@ -226,7 +217,6 @@
-
HUMAN
@@ -251,7 +241,6 @@
-
HUMAN
@@ -276,7 +265,6 @@
-
ELEMENTAL
@@ -302,7 +290,6 @@
-
ELEMENTAL
@@ -327,7 +314,6 @@
-
ELEMENTAL
@@ -352,7 +338,6 @@
-
HUMAN
@@ -377,7 +362,6 @@
-
HUMAN
@@ -402,7 +386,6 @@
-
CONSTRUCT
@@ -427,7 +410,6 @@
-
HUMAN
@@ -452,7 +434,6 @@
-
HUMAN
@@ -477,7 +458,6 @@
-
HUMANOID
@@ -502,7 +482,6 @@
-
HUMAN
@@ -527,7 +506,6 @@
-
HUMAN
@@ -552,7 +530,6 @@
-
HUMAN
@@ -577,7 +554,6 @@
-
HUMAN
@@ -602,7 +578,6 @@
-
HUMAN
@@ -627,8 +602,8 @@
-
HUMAN
+
@@ -642,7 +617,7 @@
500
-
+
@@ -652,8 +627,8 @@
-
HUMAN
+
@@ -667,7 +642,7 @@
500
-
+
@@ -677,8 +652,8 @@
-
HUMAN
+
@@ -692,7 +667,7 @@
500
-
+
@@ -702,7 +677,6 @@
-
HUMAN
@@ -727,7 +701,6 @@
-
HUMAN
@@ -752,7 +725,6 @@
-
HUMAN
@@ -777,7 +749,6 @@
-
HUMAN
@@ -802,7 +773,6 @@
-
HUMAN
@@ -827,7 +797,6 @@
-
HUMAN
@@ -852,7 +821,6 @@
-
HUMAN
@@ -877,7 +845,6 @@
-
HUMAN
@@ -902,7 +869,6 @@
-
HUMAN
@@ -927,7 +893,6 @@
-
HUMAN
@@ -952,7 +917,6 @@
-
CONSTRUCT
@@ -977,7 +941,6 @@
-
ETC
@@ -999,7 +962,6 @@
-
ETC
@@ -1021,7 +983,6 @@
-
ETC
@@ -1043,7 +1004,6 @@
-
ETC
@@ -1065,7 +1025,6 @@
-
ETC
@@ -1087,7 +1046,6 @@
-
ETC
@@ -1109,7 +1067,6 @@
-
ETC
@@ -1131,7 +1088,6 @@
-
ETC
@@ -1153,7 +1109,6 @@
-
HUMAN
@@ -1178,7 +1133,6 @@
-
HUMAN
@@ -1203,7 +1157,6 @@
-
HUMAN
@@ -1228,7 +1181,6 @@
-
HUMAN
@@ -1253,7 +1205,6 @@
-
HUMAN
@@ -1278,7 +1229,6 @@
-
HUMAN
@@ -1303,7 +1253,6 @@
-
HUMAN
@@ -1328,7 +1277,6 @@
-
HUMAN
@@ -1354,7 +1302,6 @@
-
ETC
@@ -1376,7 +1323,6 @@
-
ETC
@@ -1398,7 +1344,6 @@
-
ETC
@@ -1420,7 +1365,6 @@
-
ETC
@@ -1442,7 +1386,6 @@
-
ETC
@@ -1464,7 +1407,6 @@
-
HUMAN
@@ -1489,7 +1431,6 @@
-
HUMAN
@@ -1514,7 +1455,6 @@
-
HUMAN
@@ -1539,7 +1479,6 @@
-
HUMAN
@@ -1564,7 +1503,6 @@
-
HUMAN
@@ -1589,7 +1527,6 @@
-
HUMAN
@@ -1614,7 +1551,6 @@
-
HUMAN
@@ -1639,7 +1575,6 @@
-
HUMAN
@@ -1664,7 +1599,6 @@
-
CONSTRUCT
@@ -1689,7 +1623,6 @@
-
CONSTRUCT
@@ -1714,7 +1647,6 @@
-
CONSTRUCT
@@ -1739,7 +1671,6 @@
-
CONSTRUCT
@@ -1764,7 +1695,6 @@
-
CONSTRUCT
@@ -1789,7 +1719,6 @@
-
CONSTRUCT
@@ -1814,7 +1743,6 @@
-
DARK_ELF
@@ -1839,7 +1767,6 @@
-
DARK_ELF
@@ -1864,7 +1791,6 @@
-
DARK_ELF
@@ -1889,7 +1815,6 @@
-
KAMAEL
@@ -1914,7 +1839,6 @@
-
ELF
@@ -1939,7 +1863,6 @@
-
DARK_ELF
@@ -1964,7 +1887,6 @@
-
KAMAEL
@@ -1989,7 +1911,6 @@
-
KAMAEL
@@ -2014,7 +1935,6 @@
-
KAMAEL
@@ -2039,7 +1959,6 @@
-
KAMAEL
@@ -2064,7 +1983,6 @@
-
KAMAEL
@@ -2089,7 +2007,6 @@
-
KAMAEL
@@ -2114,7 +2031,6 @@
-
KAMAEL
@@ -2139,7 +2055,6 @@
-
KAMAEL
@@ -2164,7 +2079,6 @@
-
KAMAEL
@@ -2189,7 +2103,6 @@
-
CONSTRUCT
@@ -2214,7 +2127,6 @@
-
DARK_ELF
@@ -2239,7 +2151,6 @@
-
ELF
@@ -2264,7 +2175,6 @@
-
KAMAEL
@@ -2289,7 +2199,6 @@
-
HUMAN
@@ -2314,7 +2223,6 @@
-
HUMAN
@@ -2339,7 +2247,6 @@
-
HUMAN
@@ -2364,7 +2271,6 @@
-
HUMAN
@@ -2389,7 +2295,6 @@
-
HUMAN
@@ -2414,7 +2319,6 @@
-
HUMAN
@@ -2439,7 +2343,6 @@
-
HUMAN
diff --git a/trunk/dist/tools/sql/game/raidboss_spawnlist.sql b/trunk/dist/tools/sql/game/raidboss_spawnlist.sql
index 33325bf054..40558dd66c 100644
--- a/trunk/dist/tools/sql/game/raidboss_spawnlist.sql
+++ b/trunk/dist/tools/sql/game/raidboss_spawnlist.sql
@@ -359,3 +359,13 @@ INSERT IGNORE INTO `raidboss_spawnlist` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`head
(25930, 16086, -119455, -880, 7324, 8000, 0, 3271103, 5116283),
(25931, 16318, -119300, -872, 40015, 8000, 0, 3271103, 5116283);
+-- Wastelands
+-- Ragraman
+REPLACE INTO `raidboss_spawnlist` (`boss_id`, `amount`, `loc_x`, `loc_y`, `loc_z`, `heading`, `respawn_delay`, `respawn_random`, `respawn_time`, `currentHp`, `currentMp`) VALUES
+(25169, 1, -54464, 172151, -3633, 0, 129600, 86400, 0, '175403', '473');
+-- Rose
+INSERT INTO `raidboss_spawnlist` (`boss_id`, `amount`, `loc_x`, `loc_y`, `loc_z`, `heading`, `respawn_delay`, `respawn_random`, `respawn_time`, `currentHp`, `currentMp`) VALUES
+(25870, 1, -30013, 168759, -3862, 26591, 129600, 86400, 0, '517915', '517915');
+-- Thorn
+INSERT INTO `raidboss_spawnlist` (`boss_id`, `amount`, `loc_x`, `loc_y`, `loc_z`, `heading`, `respawn_delay`, `respawn_random`, `respawn_time`, `currentHp`, `currentMp`) VALUES
+(25871, 1, -27329, 182826, -3639, 24935, 129600, 86400, 0, '517915', '517915');
diff --git a/trunk/dist/tools/sql/game/spawnlist.sql b/trunk/dist/tools/sql/game/spawnlist.sql
index 61c0fe03b3..5b35aade42 100644
--- a/trunk/dist/tools/sql/game/spawnlist.sql
+++ b/trunk/dist/tools/sql/game/spawnlist.sql
@@ -49732,3 +49732,46 @@ INSERT INTO `spawnlist` VALUES ('20_14', '1', '33839', '14731', '-120358', '-111
-- Teleport Device Wasteland (Entrance)
INSERT INTO `spawnlist` (`location`, `count`, `npc_templateid`, `locx`, `locy`, `locz`, `randomx`, `randomy`, `heading`, `respawn_delay`, `respawn_random`, `loc_id`, `periodOfDay`) VALUES
('Wasteland', 1, 33072, -16365, 208927, -3664, 0, 0, 15805, 60, 0, 0, 0);
+
+-- Wastelands
+-- Guards Passive
+INSERT INTO `spawnlist` (`location`, `count`, `npc_templateid`, `locx`, `locy`, `locz`, `randomx`, `randomy`, `heading`, `respawn_delay`, `respawn_random`, `loc_id`, `periodOfDay`) VALUES
+('Wastelands', 1, 33425, -16869, 207774, -3647, 0, 0, 1129, 60, 0, 0, 0),
+('Wastelands', 1, 33425, -16838, 208396, -3649, 0, 0, 58757, 60, 0, 0, 0),
+('Wastelands', 1, 33425, -16823, 207724, -3653, 0, 0, 25873, 60, 0, 0, 0),
+('Wastelands', 1, 33425, -16801, 207781, -3653, 0, 0, 44727, 60, 0, 0, 0),
+('Wastelands', 1, 33425, -16788, 208345, -3643, 0, 0, 5344, 60, 0, 0, 0),
+('Wastelands', 1, 33425, -16708, 208338, -3643, 0, 0, 30566, 60, 0, 0, 0),
+('Wastelands', 1, 33425, -15797, 208674, -3665, 0, 0, 64703, 60, 0, 0, 0),
+('Wastelands', 1, 33425, -15747, 208597, -3665, 0, 0, 8191, 60, 0, 0, 0),
+('Wastelands', 1, 33425, -15670, 208667, -3665, 0, 0, 35981, 60, 0, 0, 0),
+('Wastelands', 1, 33425, -15595, 208900, -3665, 0, 0, 63739, 60, 0, 0, 0),
+('Wastelands', 1, 33425, -15548, 208831, -3665, 0, 0, 18879, 60, 0, 0, 0),
+('Wastelands', 1, 33425, -15532, 208953, -3665, 0, 0, 50019, 60, 0, 0, 0),
+('Wastelands', 1, 33425, -15471, 208881, -3665, 0, 0, 18259, 60, 0, 0, 0);
+-- Guard Commander
+INSERT INTO `spawnlist` (`location`, `count`, `npc_templateid`, `locx`, `locy`, `locz`, `randomx`, `randomy`, `heading`, `respawn_delay`, `respawn_random`, `loc_id`, `periodOfDay`) VALUES
+('Wastelands', 1, 33426, -16352, 209624, -3665, 0, 0, 11730, 60, 0, 0, 0),
+('Wastelands', 1, 33426, -16250, 208083, -3665, 0, 0, 12587, 60, 0, 0, 0);
+-- Trainning
+INSERT INTO `spawnlist` (`location`, `count`, `npc_templateid`, `locx`, `locy`, `locz`, `randomx`, `randomy`, `heading`, `respawn_delay`, `respawn_random`, `loc_id`, `periodOfDay`) VALUES
+('Wastelands', 1, 33427, -16464, 209770, -3665, 0, 0, 42020, 60, 0, 0, 0),
+('Wastelands', 1, 33427, -16388, 209751, -3665, 0, 0, 46835, 60, 0, 0, 0),
+('Wastelands', 1, 33427, -16307, 209719, -3665, 0, 0, 46786, 60, 0, 0, 0),
+('Wastelands', 1, 33427, -16271, 208207, -3665, 0, 0, 45183, 60, 0, 0, 0),
+('Wastelands', 1, 33427, -16247, 208280, -3664, 0, 0, 46249, 60, 0, 0, 0),
+('Wastelands', 1, 33427, -16240, 209695, -3665, 0, 0, 44315, 60, 0, 0, 0),
+('Wastelands', 1, 33427, -16214, 208363, -3663, 0, 0, 46596, 60, 0, 0, 0),
+('Wastelands', 1, 33427, -16210, 208181, -3665, 0, 0, 45574, 60, 0, 0, 0),
+('Wastelands', 1, 33427, -16182, 208261, -3665, 0, 0, 46786, 60, 0, 0, 0),
+('Wastelands', 1, 33427, -16175, 209673, -3665, 0, 0, 43893, 60, 0, 0, 0),
+('Wastelands', 1, 33427, -16153, 208352, -3665, 0, 0, 46433, 60, 0, 0, 0),
+('Wastelands', 1, 33427, -16140, 208155, -3665, 0, 0, 45916, 60, 0, 0, 0),
+('Wastelands', 1, 33427, -16115, 208233, -3665, 0, 0, 46061, 60, 0, 0, 0),
+('Wastelands', 1, 33427, -16086, 208328, -3665, 0, 0, 46191, 60, 0, 0, 0);
+-- Guard Fred
+INSERT INTO `spawnlist` (`location`, `count`, `npc_templateid`, `locx`, `locy`, `locz`, `randomx`, `randomy`, `heading`, `respawn_delay`, `respawn_random`, `loc_id`, `periodOfDay`) VALUES
+('Wastelands', 1, 33179, -16276, 208841, -3664, 0, 0, 36991, 60, 0, 0, 0);
+-- Renfad
+INSERT INTO `spawnlist` (`location`, `count`, `npc_templateid`, `locx`, `locy`, `locz`, `randomx`, `randomy`, `heading`, `respawn_delay`, `respawn_random`, `loc_id`, `periodOfDay`) VALUES
+('Wastelands', 1, 33524, -24569, 188865, -3942, 0, 0, 39437, 0, 0, 0, 0);
diff --git a/trunk/dist/tools/sql/game/teleport.sql b/trunk/dist/tools/sql/game/teleport.sql
index 7d92843ad1..45e721735b 100644
--- a/trunk/dist/tools/sql/game/teleport.sql
+++ b/trunk/dist/tools/sql/game/teleport.sql
@@ -1061,6 +1061,13 @@ INSERT INTO `teleport` VALUES ('Hunters Village -> Anghel Waterfall', 3023301, 1
INSERT INTO `teleport` VALUES ('Hunters Village -> Anghel Waterfall', 3023302, 172458, 90314, -1984, 0, 1, 57);
INSERT INTO `teleport` VALUES ('Hunters Village -> Anghel Waterfall', 3023303, 172458, 90314, -1984, 3150, 1, 57);
--- Teleport Device to Gludio
+-- Wastelands
INSERT INTO `teleport` (`Description`, `id`, `loc_x`, `loc_y`, `loc_z`, `price`, `fornoble`, `itemId`) VALUES
-('Wasteland -> Gludio', 3319001, -14567, 123872, -3104, 0, 0, 57);
+('Wastelands Merchant Entrance', 3319001, -17151, 208992, -3664, 0, 0, 57),
+('Elder Casian', 3319002, -16832, 194491, -4208, 0, 0, 57),
+('Ant Nest Entrance', 3319003, -9570, 176327, -4144, 0, 0, 57),
+('Near Wasteland Basilisk', 3319004, -16415, 174003, -3304, 0, 0, 57),
+('Gargoyle Lord Sirocco', 3319005, -16516, 182801, -3872, 0, 0, 57),
+('Ragraman', 3319006, -53027, 172265, -3680, 0, 0, 57),
+('Iris', 3319007, -31348, 169552, -3840, 0, 0, 57),
+('Thorn', 3319008, -28460, 183596, -3760, 0, 0, 57);