summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-05-08 08:07:29 -0300
committerJesusaves <cpntb1@ymail.com>2020-05-08 08:07:29 -0300
commitaccbcf190182c262043260fa9f47a9cb3b9b2a48 (patch)
treeb232f2c810ca612f0e2118a86311fa5644ab9e1d
parent55478cd4d40745ca64a194b431ef0c03a088d6ea (diff)
downloadserverdata-accbcf190182c262043260fa9f47a9cb3b9b2a48.tar.gz
serverdata-accbcf190182c262043260fa9f47a9cb3b9b2a48.tar.bz2
serverdata-accbcf190182c262043260fa9f47a9cb3b9b2a48.tar.xz
serverdata-accbcf190182c262043260fa9f47a9cb3b9b2a48.zip
Receive the client-data changes smoothly.
Now, I have a small problem.....
-rw-r--r--npc/001-2-31/_import.txt2
-rw-r--r--npc/001-2-31/_warps.txt2
-rw-r--r--npc/001-2-41/_import.txt2
-rw-r--r--npc/001-2-41/_warps.txt2
-rw-r--r--npc/001-3-0/_warps.txt2
-rw-r--r--npc/001-3-0/gates.txt31
-rw-r--r--npc/001-3-1/_warps.txt1
7 files changed, 35 insertions, 7 deletions
diff --git a/npc/001-2-31/_import.txt b/npc/001-2-31/_import.txt
index a599f2ae..ef587396 100644
--- a/npc/001-2-31/_import.txt
+++ b/npc/001-2-31/_import.txt
@@ -1,4 +1,4 @@
-// Map 001-2-31: unnamed
+// Map 001-2-31: West Commercial Building
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/001-2-31/_warps.txt",
"npc/001-2-31/mapflags.txt",
diff --git a/npc/001-2-31/_warps.txt b/npc/001-2-31/_warps.txt
index b25ab888..2dfa6c99 100644
--- a/npc/001-2-31/_warps.txt
+++ b/npc/001-2-31/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 001-2-31: unnamed warps
+// Map 001-2-31: West Commercial Building warps
001-2-31,32,40,0 warp #001-2-31_32_40 0,0,001-1,49,97
001-2-31,36,32,0 warp #001-2-31_36_32 0,0,001-2-41,25,32
diff --git a/npc/001-2-41/_import.txt b/npc/001-2-41/_import.txt
index a8eee726..1584e4d6 100644
--- a/npc/001-2-41/_import.txt
+++ b/npc/001-2-41/_import.txt
@@ -1,4 +1,4 @@
-// Map 001-2-41: unnamed
+// Map 001-2-41: Barber
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/001-2-41/_warps.txt",
"npc/001-2-41/edouard.txt",
diff --git a/npc/001-2-41/_warps.txt b/npc/001-2-41/_warps.txt
index 7a10c00d..76251c2a 100644
--- a/npc/001-2-41/_warps.txt
+++ b/npc/001-2-41/_warps.txt
@@ -1,3 +1,3 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 001-2-41: unnamed warps
+// Map 001-2-41: Barber warps
001-2-41,24,32,0 warp #001-2-41_24_32 0,0,001-2-31,35,32
diff --git a/npc/001-3-0/_warps.txt b/npc/001-3-0/_warps.txt
index feb436c9..d192e4ef 100644
--- a/npc/001-3-0/_warps.txt
+++ b/npc/001-3-0/_warps.txt
@@ -6,5 +6,3 @@
001-3-0,198,60,0 warp #001-3-0_198_60 0,0,001-1,199,61
001-3-0,152,55,0 warp #001-3-0_152_55 0,0,001-1,152,51
001-3-0,85,130,0 warp #001-3-0_85_130 0,0,001-1,86,130
-001-3-0,90,61,0 warp #001-3-0_90_61 0,0,001-2-43,51,34
-001-3-0,56,43,0 warp #001-3-0_56_43 0,0,001-2-40,56,40
diff --git a/npc/001-3-0/gates.txt b/npc/001-3-0/gates.txt
index fabce4b1..a40ce2ce 100644
--- a/npc/001-3-0/gates.txt
+++ b/npc/001-3-0/gates.txt
@@ -44,3 +44,34 @@ OnInit:
.distance = 1;
end;
}
+
+///////////////////////////
+// The controlled warps
+001-3-0,90,61,0 script #001-3-0_90_61 NPC_HIDDEN,0,0,{
+ end;
+
+OnTouch:
+ // FIXME
+ warp "001-2-43", 51, 34;
+ end;
+}
+
+001-3-0,56,43,0 script #001-3-0_56_43 NPC_HIDDEN,0,0,{
+ end;
+
+OnTouch:
+ // FIXME
+ warp "001-2-40", 56, 40;
+ end;
+}
+
+001-3-1,30,19,0 script #001-3-1_30_19 NPC_HIDDEN,0,0,{
+ end;
+
+OnTouch:
+ // FIXME
+ warp "001-3-2", 30, 116;
+ end;
+}
+
+
diff --git a/npc/001-3-1/_warps.txt b/npc/001-3-1/_warps.txt
index 4f79c590..f0c3d747 100644
--- a/npc/001-3-1/_warps.txt
+++ b/npc/001-3-1/_warps.txt
@@ -2,4 +2,3 @@
// Map 001-3-1: Rivercave warps
001-3-1,24,58,0 warp #001-3-1_24_58 1,0,001-3-0,162,41
001-3-1,35,59,0 warp #001-3-1_35_59 1,0,001-3-0,172,42
-001-3-1,30,19,0 warp #001-3-1_30_19 0,0,001-3-2,30,116