summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Botosh <rumly111@gmail.com>2015-09-17 02:59:59 +0300
committerJoseph Botosh <rumly111@gmail.com>2015-09-17 02:59:59 +0300
commit131b072228ddc3f67f3ea701703990bdc1937f61 (patch)
treebb8a1ca6aca1c92cf4f2aaa86dc8af8f00bea628
parentd23cd0f379bd01eacea337ffb49b68c4faa1b71c (diff)
downloadserverdata-131b072228ddc3f67f3ea701703990bdc1937f61.tar.gz
serverdata-131b072228ddc3f67f3ea701703990bdc1937f61.tar.bz2
serverdata-131b072228ddc3f67f3ea701703990bdc1937f61.tar.xz
serverdata-131b072228ddc3f67f3ea701703990bdc1937f61.zip
add const NPC_SALEM 125, change trader ID
-rw-r--r--db/const.txt1
-rw-r--r--npc/001-1/flyingpiou.txt2
-rw-r--r--npc/001-1/salem.txt3
3 files changed, 4 insertions, 2 deletions
diff --git a/db/const.txt b/db/const.txt
index fd0d3fd1..10d822d7 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -3394,6 +3394,7 @@ NPC_ELVEN_FEMALE_READING 121
NPC_HUMAN_MALE_OLD 122
NPC_RAIJIN_GIRL 123
NPC_HUMAN_MALE_CHIEF_ARTIS_LEGION 124
+NPC_SALEM 125
NPC_ALIGE 401
NPC_ORC_SAILOR 402
NPC_RATTO_SAILOR 403
diff --git a/npc/001-1/flyingpiou.txt b/npc/001-1/flyingpiou.txt
index ff558a9e..64a5019d 100644
--- a/npc/001-1/flyingpiou.txt
+++ b/npc/001-1/flyingpiou.txt
@@ -73,7 +73,7 @@ function script ArtisFlyingPiouLogic {
mesn "Narrator";
mes col(l("You caught the piou, but it's trying to escape from you. You'd better hurry back to Salem."), 9);
set getvariableofnpc(.LastPiouHunter$, .@trader$), strcharinfo(0);
- set getvariableofnpc(.PiouEscapedMessage$, .@trader$), l("The Piou escaped :-P");
+ set getvariableofnpc(.PiouEscapedMessage$, .@trader$), l("Oh no, the piou escaped!");
set getvariableofnpc(.LastPiouHunterID, .@trader$), .@charid;
set getvariableofnpc(.PiouCaught, .@trader$), 1;
donpcevent .@trader$ + "::OnPiouFlee";
diff --git a/npc/001-1/salem.txt b/npc/001-1/salem.txt
index e3688272..a9c51450 100644
--- a/npc/001-1/salem.txt
+++ b/npc/001-1/salem.txt
@@ -12,7 +12,7 @@
// 2 -- quest finished
// Note: this script is ugly like hell
-001-1,57,118,0 script Salem#001-1 NPC_SHOP_BAG,{
+001-1,57,118,0 script Salem#001-1 NPC_SALEM,{
function BuyPiou {
.@price = getarg(0);
@@ -70,6 +70,7 @@
@ArtisQuests_PiouPrice = 3000;
ArtisQuests_PiouDiscount = 1;
donpcevent strnpcinfo(3) + "::OnPiouFlee";
+ .LastPiouHunter$ = "";
next;
setq ArtisQuests_CatchPiou, 2;
ArtisQuests_CatchPiou_Difficulcy = 0;