summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorSaulc <lucashelaine14@gmail.com>2018-02-21 20:01:06 +0100
committerSaulc <lucashelaine14@gmail.com>2018-02-21 20:01:06 +0100
commit78809ebba2fd700890e32b450a567167dad0844e (patch)
treec23aa6626965b7f3e3519a7eeac094db66bdb3be /npc
parentddf0125101f4f5b1eb4085968b4ba1e45d2888a6 (diff)
downloadserverdata-78809ebba2fd700890e32b450a567167dad0844e.tar.gz
serverdata-78809ebba2fd700890e32b450a567167dad0844e.tar.bz2
serverdata-78809ebba2fd700890e32b450a567167dad0844e.tar.xz
serverdata-78809ebba2fd700890e32b450a567167dad0844e.zip
fix vaccum bug in 002-3,need @jesusalva fix warp
Diffstat (limited to 'npc')
-rw-r--r--npc/002-1/_warps.txt2
-rw-r--r--npc/002-3/_warps.txt2
-rw-r--r--npc/002-3/billybons.txt2
-rw-r--r--npc/002-3/doors.txt6
-rw-r--r--npc/002-3/juliet.txt3
-rw-r--r--npc/002-3/note.txt2
-rw-r--r--npc/003-1/lieutenantdausen.txt15
-rw-r--r--npc/003-1/ship.txt2
-rw-r--r--npc/005-1/ship.txt2
9 files changed, 18 insertions, 18 deletions
diff --git a/npc/002-1/_warps.txt b/npc/002-1/_warps.txt
index 17c593156..a3d236338 100644
--- a/npc/002-1/_warps.txt
+++ b/npc/002-1/_warps.txt
@@ -1,3 +1,3 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 002-1: Second Deck warps
-002-1,72,30,0 warp #002-1_72_30 0,0,002-3,31,26
+002-1,72,30,0 warp #002-1_72_30 0,0,002-3,42,26
diff --git a/npc/002-3/_warps.txt b/npc/002-3/_warps.txt
index 11eb4b760..939438c45 100644
--- a/npc/002-3/_warps.txt
+++ b/npc/002-3/_warps.txt
@@ -1,3 +1,3 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 002-3: First Deck warps
-002-3,31,25,0 warp #002-3_31_25 0,0,002-1,72,29
+002-3,42,25,0 warp #002-3_42_25 0,0,002-1,72,29
diff --git a/npc/002-3/billybons.txt b/npc/002-3/billybons.txt
index 9dbb64ba4..4459a9656 100644
--- a/npc/002-3/billybons.txt
+++ b/npc/002-3/billybons.txt
@@ -4,7 +4,7 @@
// Description:
// Drunk easteregg telling about the player's past.
-002-3,20,23,0 script Billy Bons#TMW2 NPC_BILLY_BONS,{
+002-3,31,23,0 script Billy Bons#TMW2 NPC_BILLY_BONS,{
if (rand(5) == 2) goto L_Hic;
.@q = getq(ShipQuests_Bottle);
if (.@q) == 1 close;
diff --git a/npc/002-3/doors.txt b/npc/002-3/doors.txt
index 5d48818a4..eaf44f732 100644
--- a/npc/002-3/doors.txt
+++ b/npc/002-3/doors.txt
@@ -1,7 +1,5 @@
// TMW2 Scripts.
-// Evol scripts.
// Author:
-// Reid
// Jesusalva
// Description:
// Doors NPCs.
@@ -21,7 +19,7 @@
// 11 Need to see Julia
// 12 Has been registered by Julia
-002-3,19,28,0 script AreaNPC#doors4 NPC_HIDDEN,0,0,{
+002-3,30,28,0 script AreaNPC#doors4 NPC_HIDDEN,0,0,{
OnTouch:
.@nard = getq(ShipQuests_Nard);
@@ -80,7 +78,7 @@ L_End:
close;
}
-002-3,33,28,0 script AreaNPC#doors5 NPC_HIDDEN,0,0,{
+002-3,44,28,0 script AreaNPC#doors5 NPC_HIDDEN,0,0,{
OnTouch:
.@julia = getq(ShipQuests_Julia);
diff --git a/npc/002-3/juliet.txt b/npc/002-3/juliet.txt
index c773f8755..2e716b76c 100644
--- a/npc/002-3/juliet.txt
+++ b/npc/002-3/juliet.txt
@@ -1,5 +1,4 @@
// TMW2 scripts.
-// Evol scripts.
// Authors:
// 4144
// Qwerty Dragon
@@ -16,7 +15,7 @@
// 01 Need to see Julia.
// 02 Has been registered by Julia.
-002-3,27,24,0 script Juliet#TMW2 NPC_JULIA,2,10,{
+002-3,38,24,0 script Juliet#TMW2 NPC_JULIA,2,10,{
function ynMenu {
if (select(l("Yes, I do."), l("No, none.")) == 1) {
diff --git a/npc/002-3/note.txt b/npc/002-3/note.txt
index 9bdbb8692..0ab6c88c0 100644
--- a/npc/002-3/note.txt
+++ b/npc/002-3/note.txt
@@ -7,7 +7,7 @@
// Description:
// A small note presenting the 6 main rules of Evol Online.
-002-3,29,25,0 script Note#johanne NPC_PAPER_NOTE,{
+002-3,40,25,0 script Note#johanne NPC_PAPER_NOTE,{
narrator S_LAST_NEXT,
l("There is a paper with some rules written on it.");
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index f1ef748ac..1a4e2fc95 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -190,16 +190,19 @@ OnTimer1000:
OnInit:
initpath "move", 58, 100,
"dir", DOWN, 0,
- "wait", 1, 0,
+ "wait", 100, 0,
"move", 62, 100,
"dir", DOWN, 0,
- "wait", 1, 0,
- "move", 58, 104,
+ "wait", 35, 0,
+ "move", 62, 93,
"dir", DOWN, 0,
- "wait", 1, 0,
- "move", 56, 99,
+ "wait", 48, 0,
+ "move", 58, 104,
"dir", DOWN, 0,
- "wait", 1, 0;
+ "wait", 55, 0,
+ "move", 54, 102,
+ "dir", RIGHT, 0,
+ "wait", 82, 0;
initialmove;
initnpctimer;
diff --git a/npc/003-1/ship.txt b/npc/003-1/ship.txt
index 9c7461127..327db573f 100644
--- a/npc/003-1/ship.txt
+++ b/npc/003-1/ship.txt
@@ -11,7 +11,7 @@ OnTouch:
goto L_Warp;
L_Warp:
- warp "002-3", 21, 28;
+ warp "002-3", 31, 28;
closedialog;
close;
}
diff --git a/npc/005-1/ship.txt b/npc/005-1/ship.txt
index 72cc2932a..95394abaf 100644
--- a/npc/005-1/ship.txt
+++ b/npc/005-1/ship.txt
@@ -11,7 +11,7 @@ OnTouch:
goto L_Warp;
L_Warp:
- warp "002-3", 21, 28;
+ warp "002-3", 31, 28;
closedialog;
close;
}