summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaulc <lucashelaine14@gmail.com>2018-02-09 15:30:39 +0100
committerSaulc <lucashelaine14@gmail.com>2018-02-09 15:30:39 +0100
commit2bbbacacf8cdf8a06a95b3346207ea72b9917da0 (patch)
tree4e196287df37bf726202d63e621511850e723850
parentdbae57213f3e949ef43ab1533f4616e6b6f9a9f6 (diff)
downloadserverdata-2bbbacacf8cdf8a06a95b3346207ea72b9917da0.tar.gz
serverdata-2bbbacacf8cdf8a06a95b3346207ea72b9917da0.tar.bz2
serverdata-2bbbacacf8cdf8a06a95b3346207ea72b9917da0.tar.xz
serverdata-2bbbacacf8cdf8a06a95b3346207ea72b9917da0.zip
add moving guard
-rwxr-xr-xdb/re/map_cache.datbin22229 -> 22231 bytes
-rw-r--r--npc/003-1/eugene.txt5
-rw-r--r--npc/003-1/lieutenantdausen.txt45
-rw-r--r--npc/003-1/wateranimation.txt5
-rw-r--r--npc/003-2-1.tmx-1/_import.txt4
-rw-r--r--npc/003-2-1.tmx-1/_mobs.txt39
-rw-r--r--npc/003-2-1.tmx-1/_warps.txt3
-rw-r--r--npc/005-4/tolchi.txt2
8 files changed, 46 insertions, 57 deletions
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index b1c374331..509e6ab5c 100755
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
Binary files differ
diff --git a/npc/003-1/eugene.txt b/npc/003-1/eugene.txt
index cfb5e037a..8c6b6fc38 100644
--- a/npc/003-1/eugene.txt
+++ b/npc/003-1/eugene.txt
@@ -1,7 +1,8 @@
-// Evol scripts.
+// TMW2 scripts.
// Authors:
// Reid
// Travolta
+// Saulc
// Description:
// Fishman NPC
// Quest variable:
@@ -14,7 +15,7 @@
003-1,80,127,0 script Eugene NPC_EUGENE,{
.BaitID = SmallTentacles;
- .BaitCount = 10;
+ .BaitCount = 11;
narrator S_LAST_NEXT,
l("You see a raijin boy, sitting on the edge of the dock."),
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 9144aac2d..3d7c6dceb 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -1,7 +1,14 @@
-// Author:
+// TMW2 scripts.
+// Authors:
// Saulc
-
-
+// Description:
+// Help Tulimshar guards
+// Quest variable:
+// TulimsharQuests_Guards
+// Quest stages:
+// 0 - not started
+// 1 - Lieutenant Dausen asked for help Tulimshar guards
+// 2 - completed
003-1,111,84,0 script Lieutenant Dausen NPC_PLAYER,{
@@ -86,11 +93,37 @@ function script CheckGuard {
//CheckEnfant(); // FIXME and everywhere else: Missing Function
}
end;
+
+OnTimer1000:
+ domovestep;
+
OnInit:
- .sex = G_OTHER;
- .distance = 1;
- end;
+ initpath "move", 98, 104,
+ "dir", DOWN, 0,
+ "wait", 1, 0,
+ "move", 84, 100,
+ "dir", DOWN, 0,
+ "wait", 1, 0,
+ "move", 93, 110,
+ "dir", DOWN, 0,
+ "wait", 1, 0,
+ "move", 101, 106,
+ "dir", RIGHT, 0,
+ "wait", 1, 0,
+ "move", 98, 104,
+ "dir", DOWN, 0,
+ "wait", 1, 0,
+ "move", 93, 110,
+ "dir", DOWN, 0,
+ "wait", 1, 0,
+ "move", 111, 109,
+ "dir", DOWN, 0,
+ "wait", 1, 0;
+ initialmove;
+ initnpctimer;
+ .distance = 5;
}
+
003-1,98,121,0 script Guard Defou NPC_GUARD1,{
legiontalk;
end;
diff --git a/npc/003-1/wateranimation.txt b/npc/003-1/wateranimation.txt
index c495e71b8..f99753da9 100644
--- a/npc/003-1/wateranimation.txt
+++ b/npc/003-1/wateranimation.txt
@@ -1,7 +1,8 @@
-// Evol scripts.
+// TMW2 scripts.
// Author:
// gumi
// Reid
+// Saulc
// Description:
// Water animations, splash, fishes, etc...
@@ -12,7 +13,7 @@
OnInit:
.sex = G_OTHER;
- .distance = 5;
+ .distance = 4;
end;
}
diff --git a/npc/003-2-1.tmx-1/_import.txt b/npc/003-2-1.tmx-1/_import.txt
deleted file mode 100644
index 2823c61fa..000000000
--- a/npc/003-2-1.tmx-1/_import.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// Map 003-2-1.tmx-1: Drasil Island
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/003-2-1.tmx-1/_mobs.txt",
-"npc/003-2-1.tmx-1/_warps.txt",
diff --git a/npc/003-2-1.tmx-1/_mobs.txt b/npc/003-2-1.tmx-1/_mobs.txt
deleted file mode 100644
index b0a0df0f1..000000000
--- a/npc/003-2-1.tmx-1/_mobs.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 003-2-1.tmx-1: Drasil Island mobs
-003-2-1.tmx-1,28,49,6,9 monster Tortuga 1004,3,16000,120000
-003-2-1.tmx-1,58,118,34,14 monster Tortuga 1004,4,35000,300000
-003-2-1.tmx-1,71,95,4,12 monster Tortuga 1004,1,35000,300000
-003-2-1.tmx-1,52,92,4,17 monster Tortuga 1004,2,35000,300000
-003-2-1.tmx-1,37,66,11,5 monster Tortuga 1004,2,35000,120000
-003-2-1.tmx-1,42,41,9,16 monster Tortuga 1004,2,35000,120000
-003-2-1.tmx-1,87,37,12,11 monster Tortuga 1004,3,35000,120000
-003-2-1.tmx-1,44,75,2,1 monster Little Blub 1007,2,25000,120000
-003-2-1.tmx-1,61,64,7,10 monster Little Blub 1007,2,25000,120000
-003-2-1.tmx-1,62,25,10,4 monster Little Blub 1007,2,25000,120000
-003-2-1.tmx-1,87,69,4,3 monster Blub 1008,1,60000,120000
-003-2-1.tmx-1,85,33,2,3 monster Little Blub 1007,1,25000,120000
-003-2-1.tmx-1,85,58,14,9 monster Little Blub 1007,2,35000,120000
-003-2-1.tmx-1,48,61,9,6 monster Little Blub 1007,1,35000,120000
-003-2-1.tmx-1,28,48,3,5 monster Little Blub 1007,1,35000,120000
-003-2-1.tmx-1,35,50,0,1 monster Plushroom Field 1011,1,35000,150000
-003-2-1.tmx-1,54,115,0,1 monster Plushroom Field 1011,1,35000,150000
-003-2-1.tmx-1,63,80,4,2 monster Plushroom Field 1011,1,35000,150000
-003-2-1.tmx-1,54,64,0,2 monster Plushroom Field 1011,1,35000,150000
-003-2-1.tmx-1,78,58,4,5 monster Plushroom Field 1011,2,35000,150000
-003-2-1.tmx-1,71,62,1,1 monster Plushroom Field 1011,1,35000,150000
-003-2-1.tmx-1,32,116,8,9 monster Croc 1006,2,35000,300000
-003-2-1.tmx-1,63,31,10,3 monster Croc 1006,1,35000,300000
-003-2-1.tmx-1,76,68,1,1 monster Croc 1006,1,35000,300000
-003-2-1.tmx-1,52,92,4,17 monster Croc 1006,1,35000,300000
-003-2-1.tmx-1,71,77,4,4 monster Croc 1006,1,35000,300000
-003-2-1.tmx-1,0,0,0,0 monster Piou 1002,4,60000,15000
-003-2-1.tmx-1,78,115,0,0 monster Crocotree 1010,1,420000,240000
-003-2-1.tmx-1,57,104,0,0 monster Crocotree 1010,1,420000,240000
-003-2-1.tmx-1,39,112,0,0 monster Crocotree 1010,1,420000,240000
-003-2-1.tmx-1,67,93,0,0 monster Crocotree 1010,1,420000,240000
-003-2-1.tmx-1,53,77,0,0 monster Crocotree 1010,1,420000,240000
-003-2-1.tmx-1,64,63,0,0 monster Crocotree 1010,1,420000,240000
-003-2-1.tmx-1,31,69,0,0 monster Crocotree 1010,1,420000,240000
-003-2-1.tmx-1,44,44,0,0 monster Crocotree 1010,1,420000,240000
-003-2-1.tmx-1,70,33,0,0 monster Crocotree 1010,1,420000,240000
-003-2-1.tmx-1,84,66,0,0 monster Crocotree 1010,1,420000,240000
diff --git a/npc/003-2-1.tmx-1/_warps.txt b/npc/003-2-1.tmx-1/_warps.txt
deleted file mode 100644
index 9a99d79e4..000000000
--- a/npc/003-2-1.tmx-1/_warps.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 003-2-1.tmx-1: Drasil Island warps
-003-2-1.tmx-1,94,100,0 warp #003-2-1.tmx-1_94_100 0,0,000-2-0,21,28
diff --git a/npc/005-4/tolchi.txt b/npc/005-4/tolchi.txt
index 788ac9de4..f74f19bc8 100644
--- a/npc/005-4/tolchi.txt
+++ b/npc/005-4/tolchi.txt
@@ -207,7 +207,7 @@ OnInit:
"dir", DOWN, 0,
"dir", UP, 0,
"wait", 30, 0,
- "Mmove", 45, 37,
+ "move", 45, 37,
"dir", DOWN, 0,
"wait", 30, 0,
"move", 33, 37,