From 52ffedc581038aeee42141819342b333734bece4 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sat, 9 Apr 2011 11:23:18 +0200 Subject: converter: adding 041-1 and 042-2, changes in 004-1 and 022-1 --- npc/042-1/_warps.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 npc/042-1/_warps.txt (limited to 'npc/042-1/_warps.txt') diff --git a/npc/042-1/_warps.txt b/npc/042-1/_warps.txt new file mode 100644 index 00000000..0c25ca9d --- /dev/null +++ b/npc/042-1/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// 042-1 warps + -- cgit v1.2.3-70-g09d2 From 4452ac3b71abc558759e8bb23c45a9d318a01c2c Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Wed, 13 Apr 2011 19:53:01 +0200 Subject: updates of some maps done by the converter --- data/033-1.wlk | Bin 17668 -> 17668 bytes data/034-1.wlk | Bin 22788 -> 22788 bytes npc/004-1_Beach/_warps.txt | 1 + npc/022-1_Tulimshar/_warps.txt | 1 + npc/041-1/_warps.txt | 2 ++ npc/042-1/_warps.txt | 2 ++ 6 files changed, 6 insertions(+) (limited to 'npc/042-1/_warps.txt') diff --git a/data/033-1.wlk b/data/033-1.wlk index 87e0e43e..ccdf43f0 100644 Binary files a/data/033-1.wlk and b/data/033-1.wlk differ diff --git a/data/034-1.wlk b/data/034-1.wlk index 49dc84c4..24c6049c 100644 Binary files a/data/034-1.wlk and b/data/034-1.wlk differ diff --git a/npc/004-1_Beach/_warps.txt b/npc/004-1_Beach/_warps.txt index 5795092b..89327e5a 100644 --- a/npc/004-1_Beach/_warps.txt +++ b/npc/004-1_Beach/_warps.txt @@ -5,3 +5,4 @@ 004-1.gat,37,111 warp ToBeach 1,-1,003-1.gat,141,21 004-1.gat,80,31 warp ToHouse -1,-1,004-2.gat,21,28 004-1.gat,86,27 warp To2ndFloor -1,-1,004-2.gat,57,65 +004-1.gat,68,18 warp to041-1 1,-1,041-1.gat,79,94 diff --git a/npc/022-1_Tulimshar/_warps.txt b/npc/022-1_Tulimshar/_warps.txt index 811db150..a69c60d4 100644 --- a/npc/022-1_Tulimshar/_warps.txt +++ b/npc/022-1_Tulimshar/_warps.txt @@ -3,3 +3,4 @@ 022-1.gat,72,108 warp ToCentralTulimshar 3,-1,021-1.gat,73,21 022-1.gat,113,108 warp ToCentralTulimshar 3,-1,021-1.gat,113,21 +022-1.gat,19,36 warp to042-1 -1,1,042-1.gat,112,39 diff --git a/npc/041-1/_warps.txt b/npc/041-1/_warps.txt index e0f12767..26928b31 100644 --- a/npc/041-1/_warps.txt +++ b/npc/041-1/_warps.txt @@ -1,3 +1,5 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // 041-1 warps +041-1.gat,37,20 warp to042-1 1,-1,042-1.gat,17,69 +041-1.gat,76,95 warp to004-1 1,-1,004-1.gat,68,20 diff --git a/npc/042-1/_warps.txt b/npc/042-1/_warps.txt index 0c25ca9d..e04209d8 100644 --- a/npc/042-1/_warps.txt +++ b/npc/042-1/_warps.txt @@ -1,3 +1,5 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // 042-1 warps +042-1.gat,112,50 warp to022-1 1,-1,022-1.gat,20,37 +042-1.gat,16,70 warp to041-1 1,-1,041-1.gat,37,21 -- cgit v1.2.3-70-g09d2 From f95ea578383733815d22d7180498adf9282574b9 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 8 May 2011 15:07:55 +0200 Subject: converter: - changes in 042-1 - compressions from zlib to gzip --- data/004-1.wlk | Bin 15565 -> 15565 bytes data/022-1.wlk | Bin 19354 -> 19354 bytes data/033-1.wlk | Bin 17668 -> 17668 bytes data/034-1.wlk | Bin 22788 -> 22788 bytes data/041-1.wlk | Bin 15629 -> 15629 bytes data/042-1.wlk | Bin 10004 -> 14804 bytes npc/042-1/_warps.txt | 4 ++-- 7 files changed, 2 insertions(+), 2 deletions(-) (limited to 'npc/042-1/_warps.txt') diff --git a/data/004-1.wlk b/data/004-1.wlk index ec0884a3..435ee4a7 100644 Binary files a/data/004-1.wlk and b/data/004-1.wlk differ diff --git a/data/022-1.wlk b/data/022-1.wlk index 0fc6ea4f..b586416d 100644 Binary files a/data/022-1.wlk and b/data/022-1.wlk differ diff --git a/data/033-1.wlk b/data/033-1.wlk index ccdf43f0..6d1630bf 100644 Binary files a/data/033-1.wlk and b/data/033-1.wlk differ diff --git a/data/034-1.wlk b/data/034-1.wlk index 24c6049c..eaaa8b5e 100644 Binary files a/data/034-1.wlk and b/data/034-1.wlk differ diff --git a/data/041-1.wlk b/data/041-1.wlk index 4113f6e4..3f203d46 100644 Binary files a/data/041-1.wlk and b/data/041-1.wlk differ diff --git a/data/042-1.wlk b/data/042-1.wlk index 4c5d86df..37b26519 100644 Binary files a/data/042-1.wlk and b/data/042-1.wlk differ diff --git a/npc/042-1/_warps.txt b/npc/042-1/_warps.txt index e04209d8..8f0b06d4 100644 --- a/npc/042-1/_warps.txt +++ b/npc/042-1/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // 042-1 warps -042-1.gat,112,50 warp to022-1 1,-1,022-1.gat,20,37 -042-1.gat,16,70 warp to041-1 1,-1,041-1.gat,37,21 +042-1.gat,117,76 warp to022-1 -2,1,022-1.gat,20,37 +042-1.gat,16,82 warp to041-1 1,-1,041-1.gat,37,21 -- cgit v1.2.3-70-g09d2 From c50ca1d2b612b1149b14eb161fcf443bbe3f2f16 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 8 May 2011 18:26:42 +0200 Subject: converter: fixing some warps and changing some collision tiles --- data/022-1.wlk | Bin 19354 -> 19354 bytes data/041-1.wlk | Bin 15629 -> 15629 bytes data/042-1.wlk | Bin 14804 -> 14804 bytes npc/004-1_Beach/_warps.txt | 2 +- npc/022-1_Tulimshar/_warps.txt | 2 +- npc/041-1/_warps.txt | 2 +- npc/042-1/_warps.txt | 4 ++-- 7 files changed, 5 insertions(+), 5 deletions(-) (limited to 'npc/042-1/_warps.txt') diff --git a/data/022-1.wlk b/data/022-1.wlk index b586416d..01da8bf6 100644 Binary files a/data/022-1.wlk and b/data/022-1.wlk differ diff --git a/data/041-1.wlk b/data/041-1.wlk index 3f203d46..df0ec560 100644 Binary files a/data/041-1.wlk and b/data/041-1.wlk differ diff --git a/data/042-1.wlk b/data/042-1.wlk index 37b26519..175d1a7d 100644 Binary files a/data/042-1.wlk and b/data/042-1.wlk differ diff --git a/npc/004-1_Beach/_warps.txt b/npc/004-1_Beach/_warps.txt index 89327e5a..8182c8e4 100644 --- a/npc/004-1_Beach/_warps.txt +++ b/npc/004-1_Beach/_warps.txt @@ -5,4 +5,4 @@ 004-1.gat,37,111 warp ToBeach 1,-1,003-1.gat,141,21 004-1.gat,80,31 warp ToHouse -1,-1,004-2.gat,21,28 004-1.gat,86,27 warp To2ndFloor -1,-1,004-2.gat,57,65 -004-1.gat,68,18 warp to041-1 1,-1,041-1.gat,79,94 +004-1.gat,68,19 warp to041-1 1,-1,041-1.gat,76,94 diff --git a/npc/022-1_Tulimshar/_warps.txt b/npc/022-1_Tulimshar/_warps.txt index a69c60d4..0204e10f 100644 --- a/npc/022-1_Tulimshar/_warps.txt +++ b/npc/022-1_Tulimshar/_warps.txt @@ -3,4 +3,4 @@ 022-1.gat,72,108 warp ToCentralTulimshar 3,-1,021-1.gat,73,21 022-1.gat,113,108 warp ToCentralTulimshar 3,-1,021-1.gat,113,21 -022-1.gat,19,36 warp to042-1 -1,1,042-1.gat,112,39 +022-1.gat,19,37 warp to042-1 -1,2,042-1.gat,112,76 diff --git a/npc/041-1/_warps.txt b/npc/041-1/_warps.txt index 26928b31..f412f831 100644 --- a/npc/041-1/_warps.txt +++ b/npc/041-1/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // 041-1 warps -041-1.gat,37,20 warp to042-1 1,-1,042-1.gat,17,69 +041-1.gat,33,5 warp to042-1 1,-1,042-1.gat,17,81 041-1.gat,76,95 warp to004-1 1,-1,004-1.gat,68,20 diff --git a/npc/042-1/_warps.txt b/npc/042-1/_warps.txt index 8f0b06d4..eac9343f 100644 --- a/npc/042-1/_warps.txt +++ b/npc/042-1/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // 042-1 warps -042-1.gat,117,76 warp to022-1 -2,1,022-1.gat,20,37 -042-1.gat,16,82 warp to041-1 1,-1,041-1.gat,37,21 +042-1.gat,17,82 warp to041-1 1,-1,041-1.gat,33,6 +042-1.gat,118,77 warp to022-1 -1,2,022-1.gat,20,37 -- cgit v1.2.3-70-g09d2 From f0937be55e19b05dd4b0a53829b1eb249a2c4a21 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 15 May 2011 11:41:22 +0200 Subject: adding warps on 042-1 and 042-2 --- data/042-1.wlk | Bin 14804 -> 14804 bytes npc/042-1/_warps.txt | 4 ++++ npc/042-2/_warps.txt | 3 +++ 3 files changed, 7 insertions(+) (limited to 'npc/042-1/_warps.txt') diff --git a/data/042-1.wlk b/data/042-1.wlk index 175d1a7d..0f44da87 100644 Binary files a/data/042-1.wlk and b/data/042-1.wlk differ diff --git a/npc/042-1/_warps.txt b/npc/042-1/_warps.txt index eac9343f..9d7f9244 100644 --- a/npc/042-1/_warps.txt +++ b/npc/042-1/_warps.txt @@ -3,3 +3,7 @@ 042-1.gat,17,82 warp to041-1 1,-1,041-1.gat,33,6 042-1.gat,118,77 warp to022-1 -1,2,022-1.gat,20,37 +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 diff --git a/npc/042-2/_warps.txt b/npc/042-2/_warps.txt index efc920e7..1e72f19d 100644 --- a/npc/042-2/_warps.txt +++ b/npc/042-2/_warps.txt @@ -1,3 +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 -- cgit v1.2.3-70-g09d2 From d087c8b0aec29469244fa2e5c4b997a2c4e41d2d Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sat, 4 Jun 2011 21:25:58 +0200 Subject: running converter to remove some warps --- npc/022-1_Tulimshar/_warps.txt | 1 - npc/041-1/_warps.txt | 1 - npc/042-1/_warps.txt | 2 -- 3 files changed, 4 deletions(-) (limited to 'npc/042-1/_warps.txt') diff --git a/npc/022-1_Tulimshar/_warps.txt b/npc/022-1_Tulimshar/_warps.txt index 0204e10f..811db150 100644 --- a/npc/022-1_Tulimshar/_warps.txt +++ b/npc/022-1_Tulimshar/_warps.txt @@ -3,4 +3,3 @@ 022-1.gat,72,108 warp ToCentralTulimshar 3,-1,021-1.gat,73,21 022-1.gat,113,108 warp ToCentralTulimshar 3,-1,021-1.gat,113,21 -022-1.gat,19,37 warp to042-1 -1,2,042-1.gat,112,76 diff --git a/npc/041-1/_warps.txt b/npc/041-1/_warps.txt index f412f831..16e9f68c 100644 --- a/npc/041-1/_warps.txt +++ b/npc/041-1/_warps.txt @@ -1,5 +1,4 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // 041-1 warps -041-1.gat,33,5 warp to042-1 1,-1,042-1.gat,17,81 041-1.gat,76,95 warp to004-1 1,-1,004-1.gat,68,20 diff --git a/npc/042-1/_warps.txt b/npc/042-1/_warps.txt index 9d7f9244..78f5cbfc 100644 --- a/npc/042-1/_warps.txt +++ b/npc/042-1/_warps.txt @@ -1,8 +1,6 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // 042-1 warps -042-1.gat,17,82 warp to041-1 1,-1,041-1.gat,33,6 -042-1.gat,118,77 warp to022-1 -1,2,022-1.gat,20,37 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 -- cgit v1.2.3-70-g09d2 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(-) (limited to 'npc/042-1/_warps.txt') 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-70-g09d2