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 --- data/004-1.wlk | Bin 15565 -> 15565 bytes data/022-1.wlk | Bin 19354 -> 19354 bytes data/041-1.wlk | Bin 0 -> 15629 bytes data/042-1.wlk | Bin 0 -> 10004 bytes data/resnametable.txt | 2 ++ 5 files changed, 2 insertions(+) create mode 100644 data/041-1.wlk create mode 100644 data/042-1.wlk (limited to 'data') diff --git a/data/004-1.wlk b/data/004-1.wlk index 27423757..ec0884a3 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 18f68fed..0fc6ea4f 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 new file mode 100644 index 00000000..4113f6e4 Binary files /dev/null and b/data/041-1.wlk differ diff --git a/data/042-1.wlk b/data/042-1.wlk new file mode 100644 index 00000000..2ce449ef Binary files /dev/null and b/data/042-1.wlk differ diff --git a/data/resnametable.txt b/data/resnametable.txt index 5a9f1f14..81c28d7b 100644 --- a/data/resnametable.txt +++ b/data/resnametable.txt @@ -75,4 +75,6 @@ 032-3.gat#032-3.wlk# 033-1.gat#033-1.wlk# 034-1.gat#034-1.wlk# +041-1.gat#041-1.wlk# +042-1.gat#042-1.wlk# botcheck.gat#botcheck.wlk# -- 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 'data') 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 3a1be1d75e1a42430488339c37ac2a978945acb8 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Thu, 14 Apr 2011 17:56:59 +0200 Subject: converter updating a wlk file --- data/042-1.wlk | Bin 10004 -> 10004 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'data') diff --git a/data/042-1.wlk b/data/042-1.wlk index 2ce449ef..4c5d86df 100644 Binary files a/data/042-1.wlk and b/data/042-1.wlk differ -- 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 'data') 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 'data') 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 1d6d226aa22b990de721354b7bd3dcaadfa7a581 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Mon, 9 May 2011 21:09:46 +0200 Subject: adding 042-2 --- data/042-2.wlk | Bin 0 -> 7704 bytes data/resnametable.txt | 1 + npc/042-2/_import.txt | 4 ++++ npc/042-2/_mobs.txt | 8 ++++++++ npc/042-2/_warps.txt | 3 +++ npc/_import.txt | 1 + 6 files changed, 17 insertions(+) create mode 100644 data/042-2.wlk create mode 100644 npc/042-2/_import.txt create mode 100644 npc/042-2/_mobs.txt create mode 100644 npc/042-2/_warps.txt (limited to 'data') diff --git a/data/042-2.wlk b/data/042-2.wlk new file mode 100644 index 00000000..e86fc9c6 Binary files /dev/null and b/data/042-2.wlk differ diff --git a/data/resnametable.txt b/data/resnametable.txt index 81c28d7b..505f9fdd 100644 --- a/data/resnametable.txt +++ b/data/resnametable.txt @@ -77,4 +77,5 @@ 034-1.gat#034-1.wlk# 041-1.gat#041-1.wlk# 042-1.gat#042-1.wlk# +042-2.gat#042-2.wlk# botcheck.gat#botcheck.wlk# diff --git a/npc/042-2/_import.txt b/npc/042-2/_import.txt new file mode 100644 index 00000000..e5d03ab6 --- /dev/null +++ b/npc/042-2/_import.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 042-2.gat +npc: npc/042-2/_mobs.txt +npc: npc/042-2/_warps.txt diff --git a/npc/042-2/_mobs.txt b/npc/042-2/_mobs.txt new file mode 100644 index 00000000..589e4711 --- /dev/null +++ b/npc/042-2/_mobs.txt @@ -0,0 +1,8 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// 042-2 mobs + + + +042-2.gat,0,0,0 script Mob042-2 -1,{ + end; +} diff --git a/npc/042-2/_warps.txt b/npc/042-2/_warps.txt new file mode 100644 index 00000000..efc920e7 --- /dev/null +++ b/npc/042-2/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// 042-2 warps + diff --git a/npc/_import.txt b/npc/_import.txt index ce2f662f..3530824d 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -76,4 +76,5 @@ import: npc/033-1_Snow_field/_import.txt import: npc/034-1_Snow_field/_import.txt import: npc/041-1/_import.txt import: npc/042-1/_import.txt +import: npc/042-2/_import.txt import: npc/botcheck/_import.txt -- cgit v1.2.3-70-g09d2 From f71218e34ca60ca62507c296c380517e513c31ca Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Tue, 10 May 2011 21:58:51 +0200 Subject: converter: fix in collision of 042-2 --- data/042-2.wlk | Bin 7704 -> 7704 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'data') diff --git a/data/042-2.wlk b/data/042-2.wlk index e86fc9c6..502867f1 100644 Binary files a/data/042-2.wlk and b/data/042-2.wlk differ -- 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 'data') 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 ead07b277116fb09788d5138c3d6917414ecbe6e Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Mon, 6 Jun 2011 13:30:57 +0200 Subject: fix for a problem in maggot fight --- data/042-2.wlk | Bin 7704 -> 7704 bytes npc/042-2/mapflags.txt | 2 +- npc/042-2/tanisha.txt | 9 +++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/042-2.wlk b/data/042-2.wlk index 502867f1..ca2d33e8 100644 Binary files a/data/042-2.wlk and b/data/042-2.wlk differ diff --git a/npc/042-2/mapflags.txt b/npc/042-2/mapflags.txt index b1cd5ab2..dab75985 100644 --- a/npc/042-2/mapflags.txt +++ b/npc/042-2/mapflags.txt @@ -1 +1 @@ -042-2.gat mapflag nosave 042-1,46,26; +042-2.gat mapflag nosave 042-1,82,78; diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt index bbaf4b4b..6cb7f2d4 100644 --- a/npc/042-2/tanisha.txt +++ b/npc/042-2/tanisha.txt @@ -1,5 +1,10 @@ 042-2.gat,37,90,0 script Tanisha 114,{ +//TODO: fix the mapflag in 042-2 +//TODO: limit number of players for maggot fight + + if ((getx(0) > 29) && (getx(0) < 37) && (gety(0) > 84) && (gety(0) < 90)) goto L_Fighting; + if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; if (tanisha == 4) goto L_Again; if (tanisha == 3) goto L_Stats; @@ -160,6 +165,10 @@ L_Tut_Done: mes "She sighs."; close; +L_Fighting: + message strcharinfo(0), "Tanisha: I believe in you!"; + end; + OnTimer1000: setnpctimer 0; if (getareausers("042-2.gat", 29, 85, 36, 90) < 1) -- cgit v1.2.3-70-g09d2 From 055e62abccfcba19f6285c36578e4323aafec534 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Mon, 13 Jun 2011 19:09:26 +0200 Subject: converter: fixing a collision issue --- data/042-1.wlk | Bin 14804 -> 14804 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'data') diff --git a/data/042-1.wlk b/data/042-1.wlk index 0f44da87..2a289545 100644 Binary files a/data/042-1.wlk and b/data/042-1.wlk differ -- cgit v1.2.3-70-g09d2