summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2011-12-08 01:38:03 +0100
committerReid <reidyaro@gmail.com>2011-12-08 01:38:03 +0100
commita25c231d8a2c4706fb2ca35f99e219f70f72238a (patch)
tree988e14bda33249763698ef8461aa462e8d87fa4b /npc
parent913a780452b48d43aa7902179b2f7e5ff7e3d31b (diff)
downloadserverdata-a25c231d8a2c4706fb2ca35f99e219f70f72238a.tar.gz
serverdata-a25c231d8a2c4706fb2ca35f99e219f70f72238a.tar.bz2
serverdata-a25c231d8a2c4706fb2ca35f99e219f70f72238a.tar.xz
serverdata-a25c231d8a2c4706fb2ca35f99e219f70f72238a.zip
Update wlk maps,
Add 000-0-0 map to resnametable.txt, Change area script to sailors script (name change), Correction on alige script, Correction on Poisoned Water function, Added function importation on scripts.conf .
Diffstat (limited to 'npc')
-rw-r--r--npc/000-0/_import.txt2
-rw-r--r--npc/000-0/sailors.txt (renamed from npc/000-0/area.txt)0
-rw-r--r--npc/000-2-1/_warps.txt3
-rw-r--r--npc/000-2-1/alige.txt6
-rw-r--r--npc/items/PoisonedWater.txt2
-rw-r--r--npc/scripts.conf8
6 files changed, 10 insertions, 11 deletions
diff --git a/npc/000-0/_import.txt b/npc/000-0/_import.txt
index 14d47ea4..79a1d1ec 100644
--- a/npc/000-0/_import.txt
+++ b/npc/000-0/_import.txt
@@ -1,4 +1,4 @@
map: 000-0.gat
npc: npc/000-0/_mobs.txt
npc: npc/000-0/_warps.txt
-npc: npc/000-0/area.txt \ No newline at end of file
+npc: npc/000-0/sailors.txt \ No newline at end of file
diff --git a/npc/000-0/area.txt b/npc/000-0/sailors.txt
index 0af6d5ad..0af6d5ad 100644
--- a/npc/000-0/area.txt
+++ b/npc/000-0/sailors.txt
diff --git a/npc/000-2-1/_warps.txt b/npc/000-2-1/_warps.txt
index 4514344f..2eae0742 100644
--- a/npc/000-2-1/_warps.txt
+++ b/npc/000-2-1/_warps.txt
@@ -1,5 +1,4 @@
// 000-2-1 warps
-000-2-1.gat,61,34 warp ToLevel2 -1,-1,000-2-2.gat,27,31
-000-2-1.gat,61,30 warp ToLevel0 -1,-1,000-2-0.gat,30,26
+000-2-1.gat,61,34 warp ToLevel2 -1,-1,000-2-2.gat,31,27
000-2-1.gat,61,30 warp ToLevel0 -1,-1,000-2-0.gat,30,26
diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index 5cc9ae7c..f1301232 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -12,7 +12,7 @@
// 0 first talking (before food)
// 1 already talked
-000-2-1.gat,33,31,0 script Alige 301,1,1{
+000-2-1.gat,33,31,0,1 script Alige 301,1,1{
if (geta2(ShipQuests, ShipQuests_Alige) == 1) goto l_AskForFood;
@@ -29,7 +29,7 @@
l_NeedHelp:
mesn l("Hidden person");
- mesq l("Good, good!") + " " + l("Could you help me please?") + " " + l("I beg you, please, pleeeease...");
+ mesq l("Good, good! ") + " " + l("Could you help me please? ") + " " + l("I beg you, please, pleeeease... ");
menu
l("Why not... but, who are you?") + l("And what kind of help do you need?"), l_CanHelp;
@@ -117,7 +117,7 @@
set @menulist$[@j], l("I don't have anything good for you today.");
set @menureference[@j], -1;
- menu @menulist$[0],-,@menulist$[1],-,....@menulist$[150],-;
+ menu @menulist$[0],-,@menulist$[1],-,@menulist$[150],-;
set @id, @menureference[@menu-1];
if (@id == -1) goto l_DamnYou;
diff --git a/npc/items/PoisonedWater.txt b/npc/items/PoisonedWater.txt
index 40e93093..93034ef8 100644
--- a/npc/items/PoisonedWater.txt
+++ b/npc/items/PoisonedWater.txt
@@ -4,7 +4,7 @@
// Description:
// Heal of 25hp and add 1/4 bad luck to be poisoned.
-function|script|usePoisonedWater|{
+function script usePoisonedWater {
set @temp, rand(4);
if (!@temp) sc_start sc_poison, 1, 50;
if (!@temp) message strcharinfo(0), "Debug: Poisoned";
diff --git a/npc/scripts.conf b/npc/scripts.conf
index 2bfd0bdd..e5db521f 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -1,7 +1,7 @@
// This is the main script import file
-// NPC Functions
-// npc: npc/functions/.txt
-
-// maps
+// Maps
import: npc/_import.txt
+
+// Item Functions
+npc: npc/items/PoisonedWater.txt \ No newline at end of file