From 3ea3de6a5ad3ade366cc7a0118949b10476b0798 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 5 Jun 2011 22:37:48 +0200 Subject: fixing a lot of warps that didn't git --- npc/022-1_Tulimshar/tutorial.txt | 2 +- npc/041-1/tutorial.txt | 4 ++-- npc/042-1/_warps.txt | 8 ++++---- npc/042-1/hasan.txt | 2 +- npc/042-1/valon.txt | 2 +- npc/042-2/_import.txt | 1 + npc/042-2/_warps.txt | 6 +++--- npc/042-2/sorfina.txt | 6 +++--- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/npc/022-1_Tulimshar/tutorial.txt b/npc/022-1_Tulimshar/tutorial.txt index 6981c4c5..2ab32bdb 100644 --- a/npc/022-1_Tulimshar/tutorial.txt +++ b/npc/022-1_Tulimshar/tutorial.txt @@ -1,4 +1,4 @@ -022-1.gat,19,37,0 script #tutorial 127,2,2{ +022-1.gat,19,37,0 script #tutorial 127,0,2{ set FLAGS, FLAGS | FLAG_TUTORIAL_DONE; warp "042-1.gat", 114, 76; end; diff --git a/npc/041-1/tutorial.txt b/npc/041-1/tutorial.txt index 2b9080b2..93d19e69 100644 --- a/npc/041-1/tutorial.txt +++ b/npc/041-1/tutorial.txt @@ -1,5 +1,5 @@ -041-1.gat,33,5,0 script #tutorial 127,2,2{ +041-1.gat,33,5,0 script #tutorial 127,1,0{ set FLAGS, FLAGS | FLAG_TUTORIAL_DONE; - warp "042-1.gat", 17, 78; + warp "042-1.gat", 17, 80; end; } diff --git a/npc/042-1/_warps.txt b/npc/042-1/_warps.txt index 78f5cbfc..d1a7aa3d 100644 --- a/npc/042-1/_warps.txt +++ b/npc/042-1/_warps.txt @@ -1,7 +1,7 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // 042-1 warps -042-1.gat,87,76 warp toStorehouse -1,-1,042-2.gat,45,91 -042-1.gat,77,76 warp toStorehouse -1,-1,042-2.gat,21,93 -042-1.gat,62,62 warp toInside -1,-1,042-2.gat,44,31 -042-1.gat,37,56 warp toInside -1,-1,042-2.gat,29,61 +042-1.gat,87,76 warp toStorehouse -1,-1,042-2.gat,44,91 +042-1.gat,77,76 warp toStorehouse -1,-1,042-2.gat,22,91 +042-1.gat,62,62 warp toInside -1,-1,042-2.gat,29,60 +042-1.gat,37,56 warp toInside -1,-1,042-2.gat,44,29 diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt index e3949de3..2dbf0386 100644 --- a/npc/042-1/hasan.txt +++ b/npc/042-1/hasan.txt @@ -123,7 +123,7 @@ onScorpionDeath: end; } -042-1.gat,117,76,0 script #barrier 127,2,2{ +042-1.gat,117,76,0 script #barrier 127,0,2{ if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut; warp "042-1.gat", 110, 73; diff --git a/npc/042-1/valon.txt b/npc/042-1/valon.txt index 7605ae2b..9170223a 100644 --- a/npc/042-1/valon.txt +++ b/npc/042-1/valon.txt @@ -1,4 +1,4 @@ -042-1.gat,17,82,0 script Valon 156,2,1{ +042-1.gat,17,82,0 script Valon 156,1,0{ if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; diff --git a/npc/042-2/_import.txt b/npc/042-2/_import.txt index 1e55ae43..5d2ff6df 100644 --- a/npc/042-2/_import.txt +++ b/npc/042-2/_import.txt @@ -2,5 +2,6 @@ map: 042-2.gat npc: npc/042-2/_mobs.txt npc: npc/042-2/_warps.txt +npc: npc/042-2/mapflags.txt npc: npc/042-2/sorfina.txt npc: npc/042-2/tanisha.txt diff --git a/npc/042-2/_warps.txt b/npc/042-2/_warps.txt index 1e72f19d..7e218f24 100644 --- a/npc/042-2/_warps.txt +++ b/npc/042-2/_warps.txt @@ -1,6 +1,6 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // 042-2 warps -042-2.gat,29,62 warp toOutside -1,-1,042-1.gat,37,57 -042-2.gat,21,93 warp toOutside -1,-1,042-1.gat,77,77 -042-2.gat,45,93 warp toOutside -1,-1,042-1.gat,87,77 +042-2.gat,29,62 warp toOutside -1,-1,042-1.gat,62,64 +042-2.gat,22,93 warp toOutside -1,-1,042-1.gat,77,78 +042-2.gat,44,93 warp toOutside -1,-1,042-1.gat,87,78 diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index 281e7233..407279a9 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -62,7 +62,7 @@ L_Clothes: next; mes "\"I think this will help you a bit. To get more informations, press the button settings and look at the controls. You can also change them as you like.\""; next; - mes "\"Now you should go to see my granddaughter, she is very worried. She's in the storehouse, that's the building just a few steps southeast from here.\""; + mes "\"Now you should go to see my granddaughter, she is very worried. She's in the storehouse, that's the second building southeast from here.\""; next; mes "\"Oh, and if you're looking for work, you should talk to Aidan when you go to main Tulimshar. They're giving rewards for monster hunting."; mes "You can find him near the south gate. Well, good luck.\""; @@ -216,9 +216,9 @@ OnTouch: close; } -042-2.gat,45,31,0 script #DoorOut 127,2,2,{ +042-2.gat,44,31,0 script #DoorOut 127,0,0{ if ((sorfina < 2) && !(FLAGS & FLAG_TUTORIAL_DONE)) goto L_Block; - warp "042-1.gat", 62, 63; + warp "042-1.gat", 37, 57; end; L_Block: message strcharinfo(0), "Sorfina: Wait a moment! You're not ready to leave."; -- cgit v1.2.3-60-g2f50