summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-06-13 17:08:00 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2013-06-13 17:08:00 +0200
commitc095b1bb900459b38813ba738914df8c5287b3c9 (patch)
treef5f2064579d7cd0a206b8fdb8b2767d10a4de3c0
parent084b7a1394325fb370d49acfb075c0c0a549f948 (diff)
downloadserverdata-c095b1bb900459b38813ba738914df8c5287b3c9.tar.gz
serverdata-c095b1bb900459b38813ba738914df8c5287b3c9.tar.bz2
serverdata-c095b1bb900459b38813ba738914df8c5287b3c9.tar.xz
serverdata-c095b1bb900459b38813ba738914df8c5287b3c9.zip
Nivalis Transportation Modifications.
Frozenbeard is now DOCK_nivalis Diryn teleports player to blue sages. All ferrys now travel to and from each other.
-rw-r--r--world/map/db/const.txt1
-rw-r--r--world/map/npc/008-1/diryn.txt6
-rw-r--r--world/map/npc/031-1/frozenbeard.txt7
-rw-r--r--world/map/npc/functions/ferry.txt15
4 files changed, 22 insertions, 7 deletions
diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index f6c3ccde..b715d0f9 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -541,6 +541,7 @@ FLAG_DECLINED_BEANIEHAT 8192 // player declined Beanie Copter Hat from Milly
DOCK_tulimshar 1
DOCK_hurnscald 2
DOCK_candor 3
+DOCK_nivalis 4
// -----------------
// -- Easter 2010 --
diff --git a/world/map/npc/008-1/diryn.txt b/world/map/npc/008-1/diryn.txt
index 21767c29..dd11ec4e 100644
--- a/world/map/npc/008-1/diryn.txt
+++ b/world/map/npc/008-1/diryn.txt
@@ -11,7 +11,7 @@
set @cost_magichouse, 1000;
set @cost_terranitecave, 1500;
set @cost_tulimshar, 1000;
- set @cost_nivalis, 1000;
+ set @cost_nivalis, 1500;
L_Start:
mes "[Diryn]";
@@ -31,7 +31,7 @@ L_Diryn_Yes:
"Magic House (" + @cost_magichouse + " GP)", L_Diryn_Magic_House,
"Terranite Cave (" + @cost_terranitecave + " GP)", L_Diryn_Terranite,
"Tulimshar Town Square (" + @cost_tulimshar + " GP)", L_Diryn_Tulimshar,
- "Nivalis (" + @cost_nivalis + " GP)", L_Diryn_Nivalis,
+ "Sage Nikolai's Mansion (" + @cost_nivalis + " GP)", L_Diryn_Nivalis,
"I'm not interested.", L_Diryn_No;
L_Diryn_Druid_Tree:
@@ -85,7 +85,7 @@ L_Diryn_Nivalis:
mes "[Diryn]";
mes "\"Be fearless!\"";
set Zeny, Zeny - @cost_nivalis;
- warp "020-1.gat",71,100;
+ warp "048-1.gat",65,45;
goto L_Clearvars;
L_Diryn_No:
diff --git a/world/map/npc/031-1/frozenbeard.txt b/world/map/npc/031-1/frozenbeard.txt
index c75d6f16..a846c719 100644
--- a/world/map/npc/031-1/frozenbeard.txt
+++ b/world/map/npc/031-1/frozenbeard.txt
@@ -8,10 +8,9 @@
L_Frozenbeard_Default:
mes "[Frozenbeard]";
- mes "\"Arrr mate! There is no dock here, so I had to row boat from my ship! I am pioneering and mapping the trade route between here and Argaes, around the Hurnscald area. I'll hail my shipmates to send a boat and we'll sail out to Argaes, be there in no time, but it will cost you a fee. 500 gold pieces. What do you say?";
- menu
- "Sure. (500 GP)", L_Frozenbeard_Argaes,
- "Not right now.", L_Frozenbeard_Stay;
+ mes "\"Arrr mate! There is no dock here, so I had to row boat from my ship! I am pioneering and mapping the trade route between Nivalis and the rest of the World. I'll hail my shipmates to send a boat and we'll sail anywhere you want to go, we will be there in no time, but it will cost you a fee.";
+ set @loc, DOCK_nivalis;
+ callfunc "Ferry";
close;
L_Frozenbeard_Argaes:
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index dd3e83d8..1b03011a 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -5,6 +5,7 @@ function|script|Ferry|{
goto L_LowerCost;
set @cost_tulimshar, 500;
set @cost_hurnscald, 500;
+ set @cost_nivalis, 500;
L_Start:
set @cost_candor, 1500;
@@ -19,6 +20,7 @@ L_PlainMenu:
menu
"Tulimshar (" + @cost_tulimshar + "GP)", L_Tulimshar,
"Hurnscald (" + @cost_hurnscald + "GP)", L_Hurnscald,
+ "Nivalis (" + @cost_nivalis + "GP)", L_Nivalis,
"Nevermind", -;
goto L_Close;
@@ -26,6 +28,7 @@ L_MenuWithCandor:
menu
"Tulimshar (" + @cost_tulimshar + "GP)", L_Tulimshar,
"Hurnscald (" + @cost_hurnscald + "GP)", L_Hurnscald,
+ "Nivalis (" + @cost_nivalis + "GP)", L_Nivalis,
"Candor (" + @cost_candor + "GP)", L_Candor,
"Nevermind", -;
goto L_Close;
@@ -50,6 +53,16 @@ L_Hurnscald:
warp "008-1.gat", 137, 64;
goto L_Close;
+L_Nivalis:
+ if (@loc == DOCK_nivalis)
+ goto L_AlreadyThere;
+ if (Zeny < @cost_nivalis)
+ goto L_NotEnoughGP;
+
+ set Zeny, Zeny - @cost_nivalis;
+ warp "031-1.gat", 95, 118;
+ goto L_Close;
+
L_Candor:
if (@loc == DOCK_candor)
goto L_AlreadyThere;
@@ -71,12 +84,14 @@ L_NotEnoughGP:
L_LowerCost:
set @cost_tulimshar, 250;
set @cost_hurnscald, 250;
+ set @cost_nivalis, 250;
goto L_Start;
L_Close:
set @cost_tulimshar, 0;
set @cost_hurnscald, 0;
set @cost_candor, 0;
+ set @cost_nivalis, 0;
set @loc, 0;
close;
}