From acf0c17ba44908870019585e7a38d6d1e0a86b0f Mon Sep 17 00:00:00 2001 From: mobius <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 30 Jan 2015 23:11:18 +0000 Subject: [PATCH] Gainak Town rework and some mapregion additions. Contributed by Ionut. --- trunk/dist/game/data/html/default/33830.htm | 4 +++ trunk/dist/game/data/html/default/33831.htm | 7 ++++ trunk/dist/game/data/html/default/33832.htm | 4 +++ trunk/dist/game/data/html/default/33833.htm | 4 +++ trunk/dist/game/data/html/default/33834.htm | 6 ++++ trunk/dist/game/data/html/default/33839-1.htm | 5 +++ trunk/dist/game/data/html/default/33839.htm | 6 ++++ .../dist/game/data/html/teleporter/33836.htm | 6 ++++ .../dist/game/data/html/warehouse/33835-1.htm | 7 ++++ .../dist/game/data/html/warehouse/33835-2.htm | 7 ++++ trunk/dist/game/data/html/warehouse/33835.htm | 9 +++++ .../dist/game/data/html/warehouse/33947-3.htm | 8 ----- trunk/dist/game/data/mapregion/arcan_town.xml | 24 +++++++++++++ .../game/data/mapregion/gainak_village.xml | 13 +++++++ trunk/dist/game/data/mapregion/miscs.xml | 18 ---------- trunk/dist/game/data/mapregion/orc_town.xml | 3 -- .../dist/game/data/mapregion/refugee_camp.xml | 13 +++++++ trunk/dist/game/data/multisell/2063.xml | 1 + trunk/dist/game/data/multisell/2064.xml | 1 + trunk/dist/game/data/multisell/2065.xml | 1 + trunk/dist/game/data/multisell/631.xml | 3 +- .../dist/game/data/stats/npcs/30000-30100.xml | 2 +- .../dist/game/data/stats/npcs/33800-33900.xml | 35 ++++++++++++++++--- trunk/dist/game/data/teleporters/Camille.xml | 10 ++++++ trunk/dist/tools/sql/game/spawnlist.sql | 10 ++++++ 25 files changed, 171 insertions(+), 36 deletions(-) create mode 100644 trunk/dist/game/data/html/default/33830.htm create mode 100644 trunk/dist/game/data/html/default/33831.htm create mode 100644 trunk/dist/game/data/html/default/33832.htm create mode 100644 trunk/dist/game/data/html/default/33833.htm create mode 100644 trunk/dist/game/data/html/default/33834.htm create mode 100644 trunk/dist/game/data/html/default/33839-1.htm create mode 100644 trunk/dist/game/data/html/default/33839.htm create mode 100644 trunk/dist/game/data/html/teleporter/33836.htm create mode 100644 trunk/dist/game/data/html/warehouse/33835-1.htm create mode 100644 trunk/dist/game/data/html/warehouse/33835-2.htm create mode 100644 trunk/dist/game/data/html/warehouse/33835.htm delete mode 100644 trunk/dist/game/data/html/warehouse/33947-3.htm create mode 100644 trunk/dist/game/data/mapregion/arcan_town.xml create mode 100644 trunk/dist/game/data/mapregion/gainak_village.xml create mode 100644 trunk/dist/game/data/mapregion/refugee_camp.xml create mode 100644 trunk/dist/game/data/teleporters/Camille.xml diff --git a/trunk/dist/game/data/html/default/33830.htm b/trunk/dist/game/data/html/default/33830.htm new file mode 100644 index 0000000000..715e2cfeec --- /dev/null +++ b/trunk/dist/game/data/html/default/33830.htm @@ -0,0 +1,4 @@ +Heming:
+Did you know that the Noble Orcs requested reinforcements from Elmore?
+Things are quite strange here. Ah, well. A mercenary's job is to fight for money, not ponder the world's mysteries! + \ No newline at end of file diff --git a/trunk/dist/game/data/html/default/33831.htm b/trunk/dist/game/data/html/default/33831.htm new file mode 100644 index 0000000000..3c25d0c138 --- /dev/null +++ b/trunk/dist/game/data/html/default/33831.htm @@ -0,0 +1,7 @@ +Cacteon:
+Have you heard of the Orc Supervia?
+When our orc kingdom collapsed, they fought against the Noble Orcs. Currently, they don't belong to the orc coalition, and work independently.
+Their anti-orc behavior is troubling.
+Worse, they have unified various other tribes into their anti-Noble Orc agenda. They're now more powerful than any other individual tribe.
+I'm certain they're plotting something. + \ No newline at end of file diff --git a/trunk/dist/game/data/html/default/33832.htm b/trunk/dist/game/data/html/default/33832.htm new file mode 100644 index 0000000000..aeb7b30c64 --- /dev/null +++ b/trunk/dist/game/data/html/default/33832.htm @@ -0,0 +1,4 @@ +Hanzon:
+Apparently Kakai, the Lord of Flame requested reinforcements from Astair van Halter, the king of Elmore. Somehow that gets passed down to Rune Captain Mathias, and now here I am.
+I suppose I should find out what's going on here. + \ No newline at end of file diff --git a/trunk/dist/game/data/html/default/33833.htm b/trunk/dist/game/data/html/default/33833.htm new file mode 100644 index 0000000000..274343a34a --- /dev/null +++ b/trunk/dist/game/data/html/default/33833.htm @@ -0,0 +1,4 @@ +Hundt:
+Ever seen Half-Devil Avataria?
+I ran into the creature once. Half-Devil Avataria, I mean. I ran like a madman! I'm not so young and strong as I used to be, you know, and... well, I'm just hoping for no more encounters. + \ No newline at end of file diff --git a/trunk/dist/game/data/html/default/33834.htm b/trunk/dist/game/data/html/default/33834.htm new file mode 100644 index 0000000000..0193672508 --- /dev/null +++ b/trunk/dist/game/data/html/default/33834.htm @@ -0,0 +1,6 @@ +Lezonne:
+Are you a mercenary too?
+We've had a lot of them lately. Probably because this place turns into a battlefield.
+But peace returns eventually! You can never tell how long it'll take to become a battlefield or how long it'll stay one. It's pretty disturbing.
+What the heck is going on... + \ No newline at end of file diff --git a/trunk/dist/game/data/html/default/33839-1.htm b/trunk/dist/game/data/html/default/33839-1.htm new file mode 100644 index 0000000000..a4e2e6babe --- /dev/null +++ b/trunk/dist/game/data/html/default/33839-1.htm @@ -0,0 +1,5 @@ +Flame Patrol Vice Captain Tuska:
+The war may be momentarily on hold, but this place is where the Noble Orc' fiercest enemy resides. Orc Supervia believes that Pa'agrio showed them a briliant future and tries to build a kingdom, But...
+Ha... I won't go through all the details. I can't imagine how sad Pa'agrio would be to see Orcs fighting one another!
+ + \ No newline at end of file diff --git a/trunk/dist/game/data/html/default/33839.htm b/trunk/dist/game/data/html/default/33839.htm new file mode 100644 index 0000000000..e08c126eb0 --- /dev/null +++ b/trunk/dist/game/data/html/default/33839.htm @@ -0,0 +1,6 @@ +Flame Patrol Vice Captain Tuska:
+Training the mind is a far more difficult task than training the body. But this must be done. When you are in a dangerous place, you have to be even more diligent with your mind training.
+I, Tuska, am now here to keep peace, acording to the will of Kakai the Lord of Flame. You, however, are a wide-ranging traveler. I grow suspicious of why you are here.
+ + + \ No newline at end of file diff --git a/trunk/dist/game/data/html/teleporter/33836.htm b/trunk/dist/game/data/html/teleporter/33836.htm new file mode 100644 index 0000000000..b20301c6ab --- /dev/null +++ b/trunk/dist/game/data/html/teleporter/33836.htm @@ -0,0 +1,6 @@ +Camille:
+Greetings. I am the Gainak Gatekeeper. What brings you to this dangerous place?
+Perhaps it's better I do not know. Whatever you want to leave here, tell me. Do you?
+(If your Main Class is Lv. 76 or below, you may teleport for free.)
+ + \ No newline at end of file diff --git a/trunk/dist/game/data/html/warehouse/33835-1.htm b/trunk/dist/game/data/html/warehouse/33835-1.htm new file mode 100644 index 0000000000..d8cb34de6f --- /dev/null +++ b/trunk/dist/game/data/html/warehouse/33835-1.htm @@ -0,0 +1,7 @@ +Warehouse Keeper Edward:
+
+ + + +
+ \ No newline at end of file diff --git a/trunk/dist/game/data/html/warehouse/33835-2.htm b/trunk/dist/game/data/html/warehouse/33835-2.htm new file mode 100644 index 0000000000..6b46dd62cb --- /dev/null +++ b/trunk/dist/game/data/html/warehouse/33835-2.htm @@ -0,0 +1,7 @@ +Warehouse Keeper Edward:
+
+ + + +
+ \ No newline at end of file diff --git a/trunk/dist/game/data/html/warehouse/33835.htm b/trunk/dist/game/data/html/warehouse/33835.htm new file mode 100644 index 0000000000..d3ad75668a --- /dev/null +++ b/trunk/dist/game/data/html/warehouse/33835.htm @@ -0,0 +1,9 @@ +Edward:
+You need a warehouse, right?
+
+ + + + +
+ \ No newline at end of file diff --git a/trunk/dist/game/data/html/warehouse/33947-3.htm b/trunk/dist/game/data/html/warehouse/33947-3.htm deleted file mode 100644 index 62bb7b3042..0000000000 --- a/trunk/dist/game/data/html/warehouse/33947-3.htm +++ /dev/null @@ -1,8 +0,0 @@ -Even heard of the Wondrous Cubic? It's the fruit of our guild's labor! It can produce all kinds of Cube Fragments!
-But the thing is, you can't really use this item more than once a day. You see where this is going? So you get me some of these fragments, and I give you scrolls and items in exchange -- how about it? If you don't have the Wondrous Cubic, go to Helvetia in the Village of Giran, and she'll tell you all about it.
-(Cooldown for the Wondrous Cubic resets at 6 am.)
- - - - - \ No newline at end of file diff --git a/trunk/dist/game/data/mapregion/arcan_town.xml b/trunk/dist/game/data/mapregion/arcan_town.xml new file mode 100644 index 0000000000..6c14004f66 --- /dev/null +++ b/trunk/dist/game/data/mapregion/arcan_town.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/mapregion/gainak_village.xml b/trunk/dist/game/data/mapregion/gainak_village.xml new file mode 100644 index 0000000000..58547126a7 --- /dev/null +++ b/trunk/dist/game/data/mapregion/gainak_village.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/mapregion/miscs.xml b/trunk/dist/game/data/mapregion/miscs.xml index ac1456a0a1..350e0163c0 100644 --- a/trunk/dist/game/data/mapregion/miscs.xml +++ b/trunk/dist/game/data/mapregion/miscs.xml @@ -48,24 +48,6 @@ - - - - - - - - - - - - - - - - - - diff --git a/trunk/dist/game/data/mapregion/orc_town.xml b/trunk/dist/game/data/mapregion/orc_town.xml index 24f14e5f23..f1aa3355a4 100644 --- a/trunk/dist/game/data/mapregion/orc_town.xml +++ b/trunk/dist/game/data/mapregion/orc_town.xml @@ -33,11 +33,8 @@ - - - diff --git a/trunk/dist/game/data/mapregion/refugee_camp.xml b/trunk/dist/game/data/mapregion/refugee_camp.xml new file mode 100644 index 0000000000..62ed1b5f1f --- /dev/null +++ b/trunk/dist/game/data/mapregion/refugee_camp.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/multisell/2063.xml b/trunk/dist/game/data/multisell/2063.xml index 9bb754f78a..2f59a445a0 100644 --- a/trunk/dist/game/data/multisell/2063.xml +++ b/trunk/dist/game/data/multisell/2063.xml @@ -50,6 +50,7 @@ 31959 32170 32172 + 33835 33947 diff --git a/trunk/dist/game/data/multisell/2064.xml b/trunk/dist/game/data/multisell/2064.xml index dfc8fa7368..953b44dbbb 100644 --- a/trunk/dist/game/data/multisell/2064.xml +++ b/trunk/dist/game/data/multisell/2064.xml @@ -50,6 +50,7 @@ 31959 32170 32172 + 33835 33947 diff --git a/trunk/dist/game/data/multisell/2065.xml b/trunk/dist/game/data/multisell/2065.xml index 2ace76c8af..86d00fe1f8 100644 --- a/trunk/dist/game/data/multisell/2065.xml +++ b/trunk/dist/game/data/multisell/2065.xml @@ -50,6 +50,7 @@ 31959 32170 32172 + 33835 33947 diff --git a/trunk/dist/game/data/multisell/631.xml b/trunk/dist/game/data/multisell/631.xml index 206f9b6a04..9acb64a3d7 100644 --- a/trunk/dist/game/data/multisell/631.xml +++ b/trunk/dist/game/data/multisell/631.xml @@ -50,7 +50,8 @@ 31959 32170 32172 - 33947 + 33835 + 33947 diff --git a/trunk/dist/game/data/stats/npcs/30000-30100.xml b/trunk/dist/game/data/stats/npcs/30000-30100.xml index bfc36f8f38..08584d151b 100644 --- a/trunk/dist/game/data/stats/npcs/30000-30100.xml +++ b/trunk/dist/game/data/stats/npcs/30000-30100.xml @@ -200,7 +200,7 @@ - + diff --git a/trunk/dist/game/data/stats/npcs/33800-33900.xml b/trunk/dist/game/data/stats/npcs/33800-33900.xml index 4607b85180..d684761bfb 100644 --- a/trunk/dist/game/data/stats/npcs/33800-33900.xml +++ b/trunk/dist/game/data/stats/npcs/33800-33900.xml @@ -595,35 +595,60 @@ - + - HUMAN - FEMALE + DWARF + MALE + + + + + + + + + true + - - + + + + + + + HUMAN FEMALE + + + + + + + + + true + diff --git a/trunk/dist/game/data/teleporters/Camille.xml b/trunk/dist/game/data/teleporters/Camille.xml new file mode 100644 index 0000000000..411f2b6bb9 --- /dev/null +++ b/trunk/dist/game/data/teleporters/Camille.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/tools/sql/game/spawnlist.sql b/trunk/dist/tools/sql/game/spawnlist.sql index 785c13ab3e..bae4ea10be 100644 --- a/trunk/dist/tools/sql/game/spawnlist.sql +++ b/trunk/dist/tools/sql/game/spawnlist.sql @@ -42390,3 +42390,13 @@ INSERT INTO `spawnlist` VALUES ('Nevou', '1', '33101', '-113919', '252997', '-14 INSERT INTO `spawnlist` VALUES ('Darrygun', '1', '33110', '-113713', '253148', '-1502', '0', '0', '7724', '0', '0', '0', '0'); INSERT INTO `spawnlist` VALUES ('Rinne', '1', '33234', '-112382', '257002', '-1459', '0', '0', '5717', '0', '0', '0', '0'); INSERT INTO `spawnlist` VALUES ('Soros', '1', '33218', '-107788', '248821', '-3211', '0', '0', '5717', '0', '0', '0', '0'); + +-- Gainak Town +INSERT INTO `spawnlist` VALUES ('19_14', '1', '33834', '16233', '-114355', '-226', '0', '0', '12415', '0', '0', '0', '0'); +INSERT INTO `spawnlist` VALUES ('19_14', '1', '33836', '16606', '-114161', '-206', '0', '0', '30709', '0', '0', '0', '0'); +INSERT INTO `spawnlist` VALUES ('19_14', '1', '33835', '16437', '-113838', '-226', '0', '0', '46433', '0', '0', '0', '0'); +INSERT INTO `spawnlist` VALUES ('19_14', '1', '33833', '17110', '-114919', '-228', '0', '0', '56543', '0', '0', '0', '0'); +INSERT INTO `spawnlist` VALUES ('19_14', '1', '33830', '17242', '-115022', '-227', '0', '0', '24752', '0', '0', '0', '0'); +INSERT INTO `spawnlist` VALUES ('19_14', '1', '33839', '14731', '-120358', '-1117', '0', '0', '13464', '0', '0', '0', '0'); +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');