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 ++ npc/041-1/_import.txt | 4 ++++ npc/041-1/_mobs.txt | 8 ++++++++ npc/041-1/_warps.txt | 3 +++ npc/042-1/_import.txt | 4 ++++ npc/042-1/_mobs.txt | 8 ++++++++ npc/042-1/_warps.txt | 3 +++ npc/_import.txt | 2 ++ 12 files changed, 34 insertions(+) create mode 100644 data/041-1.wlk create mode 100644 data/042-1.wlk create mode 100644 npc/041-1/_import.txt create mode 100644 npc/041-1/_mobs.txt create mode 100644 npc/041-1/_warps.txt create mode 100644 npc/042-1/_import.txt create mode 100644 npc/042-1/_mobs.txt create mode 100644 npc/042-1/_warps.txt 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# diff --git a/npc/041-1/_import.txt b/npc/041-1/_import.txt new file mode 100644 index 00000000..ddd49583 --- /dev/null +++ b/npc/041-1/_import.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 041-1.gat +npc: npc/041-1/_mobs.txt +npc: npc/041-1/_warps.txt diff --git a/npc/041-1/_mobs.txt b/npc/041-1/_mobs.txt new file mode 100644 index 00000000..a3360251 --- /dev/null +++ b/npc/041-1/_mobs.txt @@ -0,0 +1,8 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// 041-1 mobs + + + +041-1.gat,0,0,0 script Mob041-1 -1,{ + end; +} diff --git a/npc/041-1/_warps.txt b/npc/041-1/_warps.txt new file mode 100644 index 00000000..e0f12767 --- /dev/null +++ b/npc/041-1/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// 041-1 warps + diff --git a/npc/042-1/_import.txt b/npc/042-1/_import.txt new file mode 100644 index 00000000..140141d6 --- /dev/null +++ b/npc/042-1/_import.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +map: 042-1.gat +npc: npc/042-1/_mobs.txt +npc: npc/042-1/_warps.txt diff --git a/npc/042-1/_mobs.txt b/npc/042-1/_mobs.txt new file mode 100644 index 00000000..f439ba03 --- /dev/null +++ b/npc/042-1/_mobs.txt @@ -0,0 +1,8 @@ +// This file is generated automatically. All manually changes will be removed when running the Converter. +// 042-1 mobs + + + +042-1.gat,0,0,0 script Mob042-1 -1,{ + end; +} 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 + diff --git a/npc/_import.txt b/npc/_import.txt index a995eee5..ce2f662f 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -74,4 +74,6 @@ import: npc/032-1_Outback/_import.txt import: npc/032-3_Cave/_import.txt 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/botcheck/_import.txt -- cgit v1.2.3-60-g2f50 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(+) 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-60-g2f50 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(-) 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-60-g2f50 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(-) 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-60-g2f50 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(-) 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-60-g2f50 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 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-60-g2f50 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(-) 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-60-g2f50 From 76d9da24cf0dca9e41a322c68fe36fe5025d5ba3 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sat, 14 May 2011 19:57:20 +0200 Subject: start on the tutorial --- npc/042-1/_import.txt | 1 + npc/042-1/testnpcs.txt | 185 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 186 insertions(+) create mode 100644 npc/042-1/testnpcs.txt diff --git a/npc/042-1/_import.txt b/npc/042-1/_import.txt index 140141d6..cfc82780 100644 --- a/npc/042-1/_import.txt +++ b/npc/042-1/_import.txt @@ -2,3 +2,4 @@ map: 042-1.gat npc: npc/042-1/_mobs.txt npc: npc/042-1/_warps.txt +npc: npc/042-1/testnpcs.txt diff --git a/npc/042-1/testnpcs.txt b/npc/042-1/testnpcs.txt new file mode 100644 index 00000000..58057f11 --- /dev/null +++ b/npc/042-1/testnpcs.txt @@ -0,0 +1,185 @@ +//TODO: put npcs in different files and give names + +042-2.gat,28,26,0 script Granny 154,{ + + if (tutorial > 2) goto L_Again; + if (tutorial == 1) goto L_Clothes; + + mes "[Granny]"; + mes "\"Ah, you're waking up. It seems you collapsed after you left the boat that brought you to Tulimshar."; + mes "A group of ragtags immediatly took advantage of that and stole all your stuff!\""; + next; +//TODO: add name of granddaughter + mes "\"My little granddaughter saw that, but couldn't do something to stop them."; + mes "She brought someone to help. It was too late to catch the thieves, but at least they brought you here to recover.\""; + next; + mes "\"This area of the town is full of shady poeple, so I don't think there's a chance to get back your stuff.\""; + mes "She has a sad look on her face, but then she shakes her head and smiles."; + next; + mes "[Granny]"; + mes "\"I'm glad you're feeling better now. You're not used to the hot weather, right?"; + mes "Are you here to look for some work? Many young people come to our Tulimshar for this reason.\""; + next; + mes "\"I can tell you some useful things, if you to hear.\""; + menu + "That would be great!",L_Tut, + "No, thanks. I already know how things are going.",L_SkipTut; + +L_Tut: + mes "[Server]"; + mes "The explanations in this tutorial are based on the official client version 0.5.2"; + mes "If you're using another client, settings and controls may be different."; + + mes "She smiles at you."; + mes "[Granny]"; + mes "\"A wise decision.\""; + next; + mes "\"Ok, I hope you didn't forget how to walk. Just use the arrow keys or click at the place you want to go to.\""; + next; + mes "\"And you really should get dressed again. I gave you an old shirt of my son.\""; + next; + set tutorial, 1; +L_Naked: + mes "\"Press F3 or click at the button for your equipment in the bar at the upper right corner to open your inventory.\""; + next; + mes "\"Then click on the shirt and press the equip button.\""; + next; + mes "\"Talk to me again when you got dressed. You can either click on me, or press N to focus on me and T to talk.\""; + close; + +L_Clothes: + if (getequipid(equip_torso) < 0) goto L_Naked; + mes "[Granny]"; + mes "\"That's much better, don't you think so?\""; + next; + mes "\"You know, there are different kind of items. You can also use usable items in your inventory.\""; + next; + mes "\"But you might find it more useful to put them on a shortcut. Press F8 to open your shortcut window.\""; + next; + mes "\"You can select the item you want to put on a shortcut with your mouse and then click on the position in the shortcut window you want to place it.\""; + 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.\""; + 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.\""; + set tutorial, 2; + close; + +L_Again: + mes "[Granny]"; + mes "\"TODO: put here a menu for explaining things again\""; + close; + +L_SkipTut: + mes "[Granny]"; + mes "\"Really? You seem quite unexperienced. Listening to some advices won't hurt.\""; + menu + "Thinking about it twice... please tell me.",L_Tut, + "Yeah, but thanks for the offer. Bye",-; + mes "[Granny]"; + mes "\"If you think so. Good luck.\""; + //TODO:set flag +close; +} + +042-2.gat,37,89,0 script YoungGirl 114,{ + mes "[YoungGirl]"; + mes "\"Hey! You're up again!\""; + emotion 3; + next; + mes "\"Are you feeling better?\""; + menu + "Yes, thank you.",-, + "Yeah, but all my stuff is gone.",-; + mes "[YoungGirl]"; + mes "\"I see. It was really bad luck how you \""; + + //TODO: remove knife from beginning items + mes "\"TODO: find some transition\""; + next; +L_Maggots: + set tutorial, 3; + mes "\"There are some maggots eating the goods and I shall get rid of them."; + mes "But they're so yucky!\""; + next; + mes "\"If you kill them, I'll give you my knife."; + mes "What do you say?\""; + menu + "Sure!",-, + "That's your job.",L_Close; + mes "[YoungGirl]"; + mes "\"Wonderful!\""; + if ($@TUT_MAGGOT) goto L_Blocked; + set $@TUT_MAGGOT, 1; + set $@TUT_COUNTER, 0; + getitem "knife", 1; + next; + mes "\"Ok, listen what to do."; + mes "Equip the knife and kill the maggots.\""; + next; + mes "\"Press A to focus on a monster. With X you can focus and attack."; + mes "But it also works to click on the monster with your mouse.\""; + next; + mes "\"If you press Shift, you can abort your attack.\""; + next; + mes "\"Maggots aren't aggressive, so they won't attack you until you attacked. Take them out one by one."; + mes "Sometimes dead monsters leave some useful things. You can pick them up with pressing Z.\""; + close2; + warp "042-2.gat", 33, 87; + areamonster "042-2.gat", 31, 85, 35, 89, "", 1002, 5, "YoungGirl::onMaggotDeath"; + startnpctimer; + end; + +L_Blocked: + mes "[YoungGirl]"; + //TODO: make this more plausible + mes "\"Oh, someone else is already in there. Let's wait a short while.\""; + close; + +OnTimer1000: + setnpctimer 0; + if (getareausers("042-2.gat", 29, 85, 36, 90) < 1) + goto L_CleanUp; + areatimer "042-2.gat", 29, 85, 36, 90, 10, "YoungGirl::onTick"; + end; + +L_CleanUp: + set $@TUT_MAGGOT, 0; + killmonster "042-2.gat", "YoungGirl::onMaggotDeath"; + stopnpctimer; + setnpctimer 0; + end; + +onTick: + if (isdead(0)) end; + if (hp > 20) + goto L_NoHeal; + heal MaxHp, 0; + message strcharinfo(0), "YoungGirl: You're doing good!"; +L_NoHeal: + if ($@TUT_COUNTER < 5) + end; + warp "042-2.gat", 36, 90; + set tutorial, 4; + goto L_CleanUp; + close; + +onMaggotDeath: + set $@TUT_COUNTER, $@TUT_COUNTER + 1; + end; + +L_Close: + close; +} + +042-1.gat,18,80,0 script Man 156,{ +end; +} +042-1.gat,105,72,0 script YoungMan 162,{ +end; +} +042-1.gat,110,74,0 script ManWithShabbyClothes 189,{ +end; +} -- cgit v1.2.3-60-g2f50 From e04997cae5f41a2d9bd1a1cfdcfd14a5a6843ffb Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 15 May 2011 11:40:47 +0200 Subject: tutorial --- npc/042-1/testnpcs.txt | 180 +++---------------------------------------------- npc/042-2/_import.txt | 2 + npc/042-2/sorfina.txt | 88 ++++++++++++++++++++++++ npc/042-2/tanisha.txt | 134 ++++++++++++++++++++++++++++++++++++ 4 files changed, 232 insertions(+), 172 deletions(-) create mode 100644 npc/042-2/sorfina.txt create mode 100644 npc/042-2/tanisha.txt diff --git a/npc/042-1/testnpcs.txt b/npc/042-1/testnpcs.txt index 58057f11..6e785576 100644 --- a/npc/042-1/testnpcs.txt +++ b/npc/042-1/testnpcs.txt @@ -1,183 +1,19 @@ //TODO: put npcs in different files and give names -042-2.gat,28,26,0 script Granny 154,{ - - if (tutorial > 2) goto L_Again; - if (tutorial == 1) goto L_Clothes; - - mes "[Granny]"; - mes "\"Ah, you're waking up. It seems you collapsed after you left the boat that brought you to Tulimshar."; - mes "A group of ragtags immediatly took advantage of that and stole all your stuff!\""; - next; -//TODO: add name of granddaughter - mes "\"My little granddaughter saw that, but couldn't do something to stop them."; - mes "She brought someone to help. It was too late to catch the thieves, but at least they brought you here to recover.\""; - next; - mes "\"This area of the town is full of shady poeple, so I don't think there's a chance to get back your stuff.\""; - mes "She has a sad look on her face, but then she shakes her head and smiles."; - next; - mes "[Granny]"; - mes "\"I'm glad you're feeling better now. You're not used to the hot weather, right?"; - mes "Are you here to look for some work? Many young people come to our Tulimshar for this reason.\""; - next; - mes "\"I can tell you some useful things, if you to hear.\""; - menu - "That would be great!",L_Tut, - "No, thanks. I already know how things are going.",L_SkipTut; - -L_Tut: - mes "[Server]"; - mes "The explanations in this tutorial are based on the official client version 0.5.2"; - mes "If you're using another client, settings and controls may be different."; - - mes "She smiles at you."; - mes "[Granny]"; - mes "\"A wise decision.\""; - next; - mes "\"Ok, I hope you didn't forget how to walk. Just use the arrow keys or click at the place you want to go to.\""; - next; - mes "\"And you really should get dressed again. I gave you an old shirt of my son.\""; - next; - set tutorial, 1; -L_Naked: - mes "\"Press F3 or click at the button for your equipment in the bar at the upper right corner to open your inventory.\""; - next; - mes "\"Then click on the shirt and press the equip button.\""; - next; - mes "\"Talk to me again when you got dressed. You can either click on me, or press N to focus on me and T to talk.\""; - close; - -L_Clothes: - if (getequipid(equip_torso) < 0) goto L_Naked; - mes "[Granny]"; - mes "\"That's much better, don't you think so?\""; - next; - mes "\"You know, there are different kind of items. You can also use usable items in your inventory.\""; - next; - mes "\"But you might find it more useful to put them on a shortcut. Press F8 to open your shortcut window.\""; - next; - mes "\"You can select the item you want to put on a shortcut with your mouse and then click on the position in the shortcut window you want to place it.\""; - 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.\""; - 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.\""; - set tutorial, 2; - close; - -L_Again: - mes "[Granny]"; - mes "\"TODO: put here a menu for explaining things again\""; - close; - -L_SkipTut: - mes "[Granny]"; - mes "\"Really? You seem quite unexperienced. Listening to some advices won't hurt.\""; - menu - "Thinking about it twice... please tell me.",L_Tut, - "Yeah, but thanks for the offer. Bye",-; - mes "[Granny]"; - mes "\"If you think so. Good luck.\""; - //TODO:set flag -close; -} - -042-2.gat,37,89,0 script YoungGirl 114,{ - mes "[YoungGirl]"; - mes "\"Hey! You're up again!\""; - emotion 3; - next; - mes "\"Are you feeling better?\""; - menu - "Yes, thank you.",-, - "Yeah, but all my stuff is gone.",-; - mes "[YoungGirl]"; - mes "\"I see. It was really bad luck how you \""; - - //TODO: remove knife from beginning items - mes "\"TODO: find some transition\""; - next; -L_Maggots: - set tutorial, 3; - mes "\"There are some maggots eating the goods and I shall get rid of them."; - mes "But they're so yucky!\""; - next; - mes "\"If you kill them, I'll give you my knife."; - mes "What do you say?\""; +042-1.gat,18,80,0 script Man 156,{ + mes "reset?"; menu - "Sure!",-, - "That's your job.",L_Close; - mes "[YoungGirl]"; - mes "\"Wonderful!\""; - if ($@TUT_MAGGOT) goto L_Blocked; - set $@TUT_MAGGOT, 1; - set $@TUT_COUNTER, 0; - getitem "knife", 1; - next; - mes "\"Ok, listen what to do."; - mes "Equip the knife and kill the maggots.\""; - next; - mes "\"Press A to focus on a monster. With X you can focus and attack."; - mes "But it also works to click on the monster with your mouse.\""; - next; - mes "\"If you press Shift, you can abort your attack.\""; - next; - mes "\"Maggots aren't aggressive, so they won't attack you until you attacked. Take them out one by one."; - mes "Sometimes dead monsters leave some useful things. You can pick them up with pressing Z.\""; - close2; - warp "042-2.gat", 33, 87; - areamonster "042-2.gat", 31, 85, 35, 89, "", 1002, 5, "YoungGirl::onMaggotDeath"; - startnpctimer; - end; - -L_Blocked: - mes "[YoungGirl]"; - //TODO: make this more plausible - mes "\"Oh, someone else is already in there. Let's wait a short while.\""; - close; - -OnTimer1000: - setnpctimer 0; - if (getareausers("042-2.gat", 29, 85, 36, 90) < 1) - goto L_CleanUp; - areatimer "042-2.gat", 29, 85, 36, 90, 10, "YoungGirl::onTick"; - end; - -L_CleanUp: - set $@TUT_MAGGOT, 0; - killmonster "042-2.gat", "YoungGirl::onMaggotDeath"; - stopnpctimer; - setnpctimer 0; - end; - -onTick: - if (isdead(0)) end; - if (hp > 20) - goto L_NoHeal; - heal MaxHp, 0; - message strcharinfo(0), "YoungGirl: You're doing good!"; -L_NoHeal: - if ($@TUT_COUNTER < 5) - end; - warp "042-2.gat", 36, 90; - set tutorial, 4; - goto L_CleanUp; - close; - -onMaggotDeath: - set $@TUT_COUNTER, $@TUT_COUNTER + 1; - end; - + "yes",-, + "no",L_Close; + set tutorial, 0; L_Close: close; -} -042-1.gat,18,80,0 script Man 156,{ +} +042-1.gat,105,60,0 script SomeGuy 162,{ end; } -042-1.gat,105,72,0 script YoungMan 162,{ +042-1.gat,105,72,0 script YoungMan 160,{ end; } 042-1.gat,110,74,0 script ManWithShabbyClothes 189,{ diff --git a/npc/042-2/_import.txt b/npc/042-2/_import.txt index e5d03ab6..1e55ae43 100644 --- a/npc/042-2/_import.txt +++ b/npc/042-2/_import.txt @@ -2,3 +2,5 @@ map: 042-2.gat npc: npc/042-2/_mobs.txt npc: npc/042-2/_warps.txt +npc: npc/042-2/sorfina.txt +npc: npc/042-2/tanisha.txt diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt new file mode 100644 index 00000000..4fe88fbe --- /dev/null +++ b/npc/042-2/sorfina.txt @@ -0,0 +1,88 @@ +042-2.gat,28,26,0 script Sorfina 154,{ + + if (tutorial > 2) goto L_Again; + if (tutorial == 1) goto L_Clothes; + + mes "[Sorfina]"; + mes "\"Ah, you're waking up. It seems you collapsed after you left the boat that brought you to Tulimshar."; + mes "A group of ragtags immediatly took advantage of that and stole all your stuff!\""; + next; + mes "\"My little granddaughter Tanisha saw that, but couldn't do something to stop them."; + mes "She brought someone to help. It was too late to catch the thieves, but at least they brought you here to recover.\""; + next; + mes "\"This area of the town is full of shady poeple, so I don't think there's a chance to get back your stuff.\""; + mes "She has a sad look on her face, but then she shakes her head and smiles."; + next; + mes "[Sorfina]"; + mes "\"I'm glad you're feeling better now. You're not used to the hot weather, right?"; + mes "Are you here to look for some work? Many young people come to our Tulimshar for this reason.\""; + next; + mes "\"I can tell you some useful things, if you to hear.\""; + menu + "That would be great!",L_Tut, + "No, thanks. I already know how things are going.",L_SkipTut; + +L_Tut: + mes "[Server]"; + mes "The explanations in this tutorial are based on the official client version 0.5.2"; + mes "If you're using another client, settings and controls may be different."; + + mes "She smiles at you."; + mes "[Sorfina]"; + mes "\"A wise decision.\""; + next; + mes "\"Ok, I hope you didn't forget how to walk. Just use the arrow keys or click at the place you want to go to.\""; + next; + mes "\"And you really should get dressed again. I gave you an old shirt of my son.\""; + next; + set tutorial, 1; +L_Naked: + mes "\"Press F3 or click at the button for your equipment in the bar at the upper right corner to open your inventory.\""; + next; + mes "\"Then click on the shirt and press the equip button.\""; + next; + mes "\"Talk to me again when you got dressed. You can either click on me, or press N to focus on me and T to talk.\""; + close; + +L_Clothes: + if (getequipid(equip_torso) < 0) goto L_Naked; + mes "[Sorfina]"; + mes "\"That's much better, don't you think so?\""; + next; + mes "\"You know, there are different kind of items. You can also use usable items in your inventory.\""; + next; + mes "\"But you might find it more useful to put them on a shortcut. Press F8 to open your shortcut window.\""; + next; + mes "\"You can select the item you want to put on a shortcut with your mouse and then click on the position in the shortcut window you want to place it.\""; + 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.\""; + 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.\""; + set tutorial, 2; + close; + +L_Again: + mes "[Sorfina]"; + mes "\"TODO: put here a menu for explaining things again\""; + close; + +L_SkipTut: + mes "[Sorfina]"; + mes "\"Really? You seem quite unexperienced. Listening to some advices won't hurt.\""; + menu + "Thinking about it twice... please tell me.",L_Tut, + "Yeah, but thanks for the offer. Bye",-; + mes "[Sorfina]"; + mes "\"If you think so. Good luck.\""; + //TODO:set flag +close; +} + +042-2.gat,45,31,0 script #DoorOut 127,1,1,{ + //TODO: add blocked door + warp "042-1.gat", 62, 63; + end; +} diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt new file mode 100644 index 00000000..598a922a --- /dev/null +++ b/npc/042-2/tanisha.txt @@ -0,0 +1,134 @@ +//TODO: remove knife from beginning items +042-2.gat,37,90,0 script Tanisha 114,{ + + if (tutorial >= 4) goto L_Again; + if (tutorial == 4) goto L_Stats; + + mes "[Tanisha]"; + mes "\"Hey! You're up again!\""; + emotion 3; + next; + mes "\"Are you feeling better?\""; + menu + "Yes, thank you.",-, + "Yeah, but all my stuff is gone.",-; + mes "[Tanisha]"; + mes "\"I see. It was really bad luck what happened to you."; + mes "Hey, I have an idea.\""; + next; +L_Maggots: + set tutorial, 3; + mes "\"There are some maggots eating the goods and I shall get rid of them."; + mes "But they're so yucky!\""; + next; + mes "\"If you kill them, I'll give you my knife."; + mes "What do you say?\""; + menu + "Sure!",-, + "That's your job.",L_Close; + mes "[Tanisha]"; + mes "\"Wonderful!\""; + if ($@TUT_MAGGOT) goto L_Blocked; + set $@TUT_MAGGOT, 1; + set $@TUT_COUNTER, 0; + getitem "knife", 1; + next; + mes "\"Ok, listen what to do."; + mes "Equip the knife and kill the maggots.\""; + next; + mes "\"Press A to focus on a monster. With X you can focus and attack."; + mes "But it also works to click on the monster with your mouse.\""; + next; + mes "\"If you press Shift, you can abort your attack.\""; + next; + mes "\"Maggots aren't aggressive, so they won't attack you until you attacked. Take them out one by one."; + mes "Sometimes dead monsters leave some useful things. You can pick them up with pressing Z.\""; + close2; + warp "042-2.gat", 33, 87; + areamonster "042-2.gat", 31, 85, 35, 89, "", 1002, 5, "Tanisha::onMaggotDeath"; + startnpctimer; + end; + +L_Stats: + mes "[Tanisha]"; + mes "\"That was great! Like a professional exterminator!\""; + next; + mes "\"And it seems you became stronger and more experienced."; + mes "That means you got some status points which you can use to increase your abilities.\""; + next; + mes "\"Press F2 to see your status window. There you can distribute your points on six different properties.\""; + next; +L_StatsRe: + mes "\"Strength makes you hit harder and you can carry more weight.\""; + next; + mes "\"Agility increases your attack speed and your ability to dodge attacks.\""; + next; + mes "\"Vitality gives you more Hit Points and more defense against physical attacks.\""; + next; + mes "\"Intelligence is useful for magic attack and defense.\""; + next; + mes "\"Dexterity is needed to hit a monster. It's also very important for the damage if you use a ranged weapon.\""; + next; + mes "\"Luck gives you the chance to do critical hits and lowers the chance to receive a critical hit from your opponent.\""; + next; + mes "\"Think about how you want to play before putting the points."; + mes "Also I heard rumors about a strange guy lurking around in the desert south of Tulimshar, who can help you to forget your abilites!\""; + mes "Tanisha looks at you with wide opened eyes."; + next; + mes "[Tanisha]"; + mes "\"But I don't think he'd do that without a service in return.\""; + + if (tutorial == 4) goto L_Advice; + close; + +L_Advice: + mes "[Tanisha]"; + mes "\"Hey, when you go to main Tulmishar, you could see Bernard. He can make a delicious soup!"; + mes "Good luck!\""; + emotion 3; + close; + +L_Again: + mes "\"TODO: menu for fighting and stats explain again\""; + +L_Blocked: + mes "[Tanisha]"; + //TODO: make this more plausible + mes "\"Oh, someone else is already in there. Let's wait a short while.\""; + close; + +OnTimer1000: + setnpctimer 0; + if (getareausers("042-2.gat", 29, 85, 36, 90) < 1) + goto L_CleanUp; + areatimer "042-2.gat", 29, 85, 36, 90, 10, "Tanisha::onTick"; + end; + +L_CleanUp: + set $@TUT_MAGGOT, 0; + killmonster "042-2.gat", "Tanisha::onMaggotDeath"; + stopnpctimer; + setnpctimer 0; + end; + +onTick: + if (isdead(0)) end; + if (hp > 20) + goto L_NoHeal; + heal MaxHp, 0; + message strcharinfo(0), "Tanisha: You're doing good!"; +L_NoHeal: + if ($@TUT_COUNTER < 5) + end; + warp "042-2.gat", 36, 90; + set tutorial, 4; + goto L_CleanUp; + close; + +onMaggotDeath: + set $@TUT_COUNTER, $@TUT_COUNTER + 1; + end; + +L_Close: + close; +} -- cgit v1.2.3-60-g2f50 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(+) 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-60-g2f50 From ec0c57d054c79aef940f3e0ea26045c807a160c5 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Tue, 24 May 2011 21:43:37 +0200 Subject: putting new npcs in seperated files some scripting and fixes --- npc/042-1/_import.txt | 5 ++++- npc/042-1/hasan.txt | 4 ++++ npc/042-1/kaan.txt | 16 ++++++++++++++++ npc/042-1/malik.txt | 10 ++++++++++ npc/042-1/testnpcs.txt | 21 --------------------- npc/042-1/valon.txt | 19 +++++++++++++++++++ npc/042-2/sorfina.txt | 19 ++++++++++--------- npc/042-2/tanisha.txt | 19 ++++++++++++------- 8 files changed, 75 insertions(+), 38 deletions(-) create mode 100644 npc/042-1/hasan.txt create mode 100644 npc/042-1/kaan.txt create mode 100644 npc/042-1/malik.txt delete mode 100644 npc/042-1/testnpcs.txt create mode 100644 npc/042-1/valon.txt diff --git a/npc/042-1/_import.txt b/npc/042-1/_import.txt index cfc82780..d3e2c8b2 100644 --- a/npc/042-1/_import.txt +++ b/npc/042-1/_import.txt @@ -2,4 +2,7 @@ map: 042-1.gat npc: npc/042-1/_mobs.txt npc: npc/042-1/_warps.txt -npc: npc/042-1/testnpcs.txt +npc: npc/042-1/hasan.txt +npc: npc/042-1/kaan.txt +npc: npc/042-1/malik.txt +npc: npc/042-1/valon.txt diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt new file mode 100644 index 00000000..c689213a --- /dev/null +++ b/npc/042-1/hasan.txt @@ -0,0 +1,4 @@ +042-1.gat,110,74,0 script Hasan 189,{ +//block the way to town +end; +} diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt new file mode 100644 index 00000000..9b002362 --- /dev/null +++ b/npc/042-1/kaan.txt @@ -0,0 +1,16 @@ +042-1.gat,105,72,0 script Kaan 160,{ + + mes "[Young Man]"; + mes "\"You're the person Tanisha brought here, right?"; + mes "My name is Kaan, I'm her brother.\""; + next; + mes "\"She was babbling at me about it all the morning until I sent her to take care of the maggots in the storehouse.\""; + next; + mes "Kaan grins mischievous"; + mes "[Kaan]"; + mes "\"She hates maggots.\""; + next; + set kaan, 1; + close; +end; +} diff --git a/npc/042-1/malik.txt b/npc/042-1/malik.txt new file mode 100644 index 00000000..59358aec --- /dev/null +++ b/npc/042-1/malik.txt @@ -0,0 +1,10 @@ +042-1.gat,105,60,0 script Malik 162,{ + + mes "reset?"; + menu + "yes",-, + "no",L_Close; + set tutorial, 0; +L_Close: + close; +} diff --git a/npc/042-1/testnpcs.txt b/npc/042-1/testnpcs.txt deleted file mode 100644 index 6e785576..00000000 --- a/npc/042-1/testnpcs.txt +++ /dev/null @@ -1,21 +0,0 @@ -//TODO: put npcs in different files and give names - -042-1.gat,18,80,0 script Man 156,{ - mes "reset?"; - menu - "yes",-, - "no",L_Close; - set tutorial, 0; -L_Close: - close; - -} -042-1.gat,105,60,0 script SomeGuy 162,{ -end; -} -042-1.gat,105,72,0 script YoungMan 160,{ -end; -} -042-1.gat,110,74,0 script ManWithShabbyClothes 189,{ -end; -} diff --git a/npc/042-1/valon.txt b/npc/042-1/valon.txt new file mode 100644 index 00000000..0e6a65c0 --- /dev/null +++ b/npc/042-1/valon.txt @@ -0,0 +1,19 @@ +042-1.gat,17,82,0 script Valon 156,2,1{ + + mes "[Valon]"; + mes "\"Hello!\""; + mes "\"You're looking for adventures, right?\""; + next; + mes "\"But you shouldn't underestimate this desert, it is dangerous.\""; + next; + mes "\"It's crawling with scorpions, and the heat has overcome men tougher than you are.\""; + next; + mes "\"If you really want to challenge the desert go to main Tulimshar first to prepare yourself.\""; + close; +OnTouch: + warp "042-1.gat", 17, 78; + mes "[Valon]"; + mes "\"The desert is merciless."; + mes "I can't let you leave like this.\""; + close; +} diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index 4fe88fbe..409d8c90 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -1,23 +1,24 @@ 042-2.gat,28,26,0 script Sorfina 154,{ - if (tutorial > 2) goto L_Again; - if (tutorial == 1) goto L_Clothes; + if (sorfina == 2) goto L_Again; + if (sorfina == 1) goto L_Clothes; - mes "[Sorfina]"; + mes "[Old Woman]"; mes "\"Ah, you're waking up. It seems you collapsed after you left the boat that brought you to Tulimshar."; mes "A group of ragtags immediatly took advantage of that and stole all your stuff!\""; next; mes "\"My little granddaughter Tanisha saw that, but couldn't do something to stop them."; - mes "She brought someone to help. It was too late to catch the thieves, but at least they brought you here to recover.\""; + mes "She hurried to get someone to help. It was too late to catch the thieves, but at least they brought you here to recover.\""; next; - mes "\"This area of the town is full of shady poeple, so I don't think there's a chance to get back your stuff.\""; + mes "\"This area of the town is full of shady people, so I don't think there's a chance to get back your stuff.\""; mes "She has a sad look on her face, but then she shakes her head and smiles."; next; - mes "[Sorfina]"; + mes "[Old Woman]"; mes "\"I'm glad you're feeling better now. You're not used to the hot weather, right?"; mes "Are you here to look for some work? Many young people come to our Tulimshar for this reason.\""; next; mes "\"I can tell you some useful things, if you to hear.\""; + mes "\"Oh, and by the way my name is Sorfina.\""; menu "That would be great!",L_Tut, "No, thanks. I already know how things are going.",L_SkipTut; @@ -26,7 +27,7 @@ L_Tut: mes "[Server]"; mes "The explanations in this tutorial are based on the official client version 0.5.2"; mes "If you're using another client, settings and controls may be different."; - + next; mes "She smiles at you."; mes "[Sorfina]"; mes "\"A wise decision.\""; @@ -35,7 +36,7 @@ L_Tut: next; mes "\"And you really should get dressed again. I gave you an old shirt of my son.\""; next; - set tutorial, 1; + set sorfina, 1; L_Naked: mes "\"Press F3 or click at the button for your equipment in the bar at the upper right corner to open your inventory.\""; next; @@ -61,7 +62,7 @@ L_Clothes: 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.\""; - set tutorial, 2; + set sorfina, 2; close; L_Again: diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt index 598a922a..255e30d7 100644 --- a/npc/042-2/tanisha.txt +++ b/npc/042-2/tanisha.txt @@ -1,8 +1,9 @@ //TODO: remove knife from beginning items 042-2.gat,37,90,0 script Tanisha 114,{ - if (tutorial >= 4) goto L_Again; - if (tutorial == 4) goto L_Stats; + if (tanisha == 3) goto L_Again; + if (tanisha == 2) goto L_Stats; + if (tanisha == 1) goto L_Maggots; mes "[Tanisha]"; mes "\"Hey! You're up again!\""; @@ -17,7 +18,7 @@ mes "Hey, I have an idea.\""; next; L_Maggots: - set tutorial, 3; + set tanisha, 1; mes "\"There are some maggots eating the goods and I shall get rid of them."; mes "But they're so yucky!\""; next; @@ -41,8 +42,8 @@ L_Maggots: next; mes "\"If you press Shift, you can abort your attack.\""; next; - mes "\"Maggots aren't aggressive, so they won't attack you until you attacked. Take them out one by one."; - mes "Sometimes dead monsters leave some useful things. You can pick them up with pressing Z.\""; + mes "\"Maggots aren't aggressive, so they won't do you harm you until you attacked them first. Take them out one by one."; + mes "Sometimes dead monsters leave some useful things. You can pick them up with pressing Z or clicking with your mouse.\""; close2; warp "042-2.gat", 33, 87; areamonster "042-2.gat", 31, 85, 35, 89, "", 1002, 5, "Tanisha::onMaggotDeath"; @@ -72,24 +73,28 @@ L_StatsRe: mes "\"Luck gives you the chance to do critical hits and lowers the chance to receive a critical hit from your opponent.\""; next; mes "\"Think about how you want to play before putting the points."; + next; mes "Also I heard rumors about a strange guy lurking around in the desert south of Tulimshar, who can help you to forget your abilites!\""; mes "Tanisha looks at you with wide opened eyes."; next; mes "[Tanisha]"; mes "\"But I don't think he'd do that without a service in return.\""; - if (tutorial == 4) goto L_Advice; + if (tanisha == 2) goto L_Advice; close; L_Advice: + next; mes "[Tanisha]"; mes "\"Hey, when you go to main Tulmishar, you could see Bernard. He can make a delicious soup!"; mes "Good luck!\""; emotion 3; + set tanisha, 3; close; L_Again: mes "\"TODO: menu for fighting and stats explain again\""; + close; L_Blocked: mes "[Tanisha]"; @@ -121,7 +126,7 @@ L_NoHeal: if ($@TUT_COUNTER < 5) end; warp "042-2.gat", 36, 90; - set tutorial, 4; + set tanisha, 2; goto L_CleanUp; close; -- cgit v1.2.3-60-g2f50 From 006f84c6635bda5f58d70f3348f35b528e1efec3 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Mon, 30 May 2011 20:14:37 +0200 Subject: beginning script for guy who's blocking the way to town --- npc/042-1/hasan.txt | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt index c689213a..1851ebc9 100644 --- a/npc/042-1/hasan.txt +++ b/npc/042-1/hasan.txt @@ -1,4 +1,60 @@ 042-1.gat,110,74,0 script Hasan 189,{ -//block the way to town -end; + + set @toll, 10000; + + mes "[Unfriendly Guy]"; + mes "\"Hey! You can't pass here.\""; + menu + "Why not?",-, + "Who says that?",-; + mes "[Unfriendly Guy]"; + mes "\"Me, Hasan the mighty, decided to put a toll on this way.\""; + next; + mes "\"Give me " + @toll + "GP, and I may let you pass.\""; + set hasan, 1; + if (zeny >= @toll) + menu + "Ok, here you go.",L_Pay, + "What? I don't have so much money!",L_NoPay, + "We'll see if you can stop me!",L_Fight; + menu + "What? I don't have so much money!",L_NoPay, + "We'll see if you can stop me!",L_Fight; + close; + +L_NoPay: + mes "[Hasan]"; + mes "\"That's not my problem. You have to stay here then.\""; + close; + +L_Fight: + mes "He laughs derisively."; + mes "[Hasan]"; + mes "\"Do you really think you can beat me?\""; + mes "He pulls out a nasty looking dagger and stabs it in your direction."; + set hp, 1; + mes "That hurt! You begin to think searching for a different solution might be healthier."; + close; + +L_Pay: + if (zeny < @toll) + goto L_Cheat; + set zeny, zeny - @toll; + mes "He grins gloatingly."; + mes "[Hasan]"; + mes "\"Very well. You may pass.\""; + //TODO: set variables + close; + +L_Cheat: + mes "[Hasan]"; + mes "\"Don't dare to cheat on me!\""; + close; +} + +042-1.gat,117,76,0 script #barrier 127,2,2{ + //TODO: check variable + warp "042-1.gat", 110, 73; + message strcharinfo(0), "Hasan: \"Stop!\""; + end; } -- cgit v1.2.3-60-g2f50 From 799f67c910006b7b2e55d7e44be5bed32a348a71 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Thu, 2 Jun 2011 18:43:57 +0200 Subject: tutorial: add story in kaan, add come-back questions/answers in sorfina and tanisha --- npc/042-1/hasan.txt | 6 +++ npc/042-1/kaan.txt | 100 +++++++++++++++++++++++++++++++++++++++++- npc/042-1/valon.txt | 1 + npc/042-2/sorfina.txt | 118 ++++++++++++++++++++++++++++++++++++++++++++++++-- npc/042-2/tanisha.txt | 58 +++++++++++++++++++++++-- 5 files changed, 275 insertions(+), 8 deletions(-) diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt index 1851ebc9..3caa47a5 100644 --- a/npc/042-1/hasan.txt +++ b/npc/042-1/hasan.txt @@ -2,6 +2,8 @@ set @toll, 10000; + if (hasan == 1) goto L_Toll; + mes "[Unfriendly Guy]"; mes "\"Hey! You can't pass here.\""; menu @@ -10,6 +12,8 @@ mes "[Unfriendly Guy]"; mes "\"Me, Hasan the mighty, decided to put a toll on this way.\""; next; +L_Toll: + mes "[Hasan]"; mes "\"Give me " + @toll + "GP, and I may let you pass.\""; set hasan, 1; if (zeny >= @toll) @@ -56,5 +60,7 @@ L_Cheat: //TODO: check variable warp "042-1.gat", 110, 73; message strcharinfo(0), "Hasan: \"Stop!\""; + // when scorpion is spawned: + // message strcharinfo(0), "Hasan: \"Please help me!\""; end; } diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt index 9b002362..e9ad6b0c 100644 --- a/npc/042-1/kaan.txt +++ b/npc/042-1/kaan.txt @@ -1,5 +1,10 @@ 042-1.gat,105,72,0 script Kaan 160,{ + if (kaan == 4) goto L_Plan; + if (kaan == 3) goto L_Trick; + if (kaan == 2) goto L_Out; + if (kaan == 1) goto L_Tanisha; + mes "[Young Man]"; mes "\"You're the person Tanisha brought here, right?"; mes "My name is Kaan, I'm her brother.\""; @@ -10,7 +15,100 @@ mes "[Kaan]"; mes "\"She hates maggots.\""; next; + mes "\"Maybe you should go to see her, she was really upset about what happened with you.\""; set kaan, 1; close; -end; + +L_Tanisha: + mes "[Kaan]"; + mes "\"Did you already talk to Tanisha?\""; + if (tanisha < 3) + close; + menu + "Yes, I helped her with the maggots.",-, + "Yeah, and she's done with the maggots.",; + mes "[Kaan]"; + mes "\"Ah, that are good news."; + mes "You know, we have a lot of problems with bugs here.\""; + next; + mes "\"If we don't watch out the maggots will eat all of our stocks."; + mes "And the desert is crawling with scorpions."; + mes "They also come here and you need to watch out not to step on them.\""; + next; + mes "\"But I took care about that problem.\""; + mes "He looks very proud."; + next; + mes "\"I build this fence to keep them out.\""; + menu + "Impressive! Just a bit... skew.",-, + "Wow, it looks very - ahm, unconventional.",-; + mes "[Kaan]"; + mes "\"Well, it keeps the scorpions out. That's all that matters.\""; + next; + mes "\"Are you going to visit main Tulimshar?"; + mes "The bazaar there is a wondeful place! Traders, entertainers, adventurers - it's very exciting there.\""; + set kaan, 2; + close; + +L_Out: + mes "[Kaan]"; + mes "\"Hello! How are you? Did you already visit main Tulimshar?\""; + if (hasan) + menu + "A guy named Hasan doesn't let me enter main Tulimshar.",L_Hasan, + "Not yet.",L_Close; + menu + "Not yet.",L_Close; + close; + +L_Hasan: + mes "[Kaan]"; + mes "\"Hasan! That's crazy. He becomes more cheekily with every day."; + mes "I'd like to help you, but - I won't risk an open confrontation with him.\""; + next; + mes "\"Sometimes he just freaks out and then he's dangerous."; + mes "We should think about some trick. Ah, if I'd now what's his weak point.\""; + next; + mes "\"He might listen to one of the adult men, but they're all off to work in main Tulimshar during the day.\""; + set kaan, 3; + next; +L_Trick: + mes "[Kaan]"; + mes "\"Do you have an idea what Hasans weakness could be?"; + if (hasan < 2) + close; + menu + "He's afraid of scorpions",-, + "No idea.",L_Close; + mes "[Kaan]"; + mes "\"Scorpions?! Right! How could I forget?"; + mes "When he was a child, he nearly died because he felt in a scorpion nest.\""; + next; +L_Explain: + mes "\"Ok, then here's the plan:"; + mes "I will catch one of the scorpions from the desert that's coming to the fence.\""; + next; + mes "\"You'll go to Hasan and give me a sign when you're ready."; + mes "I'll watch you from this point.\""; + next; + mes "\"When you give me the sign, I'll throw the scorpion down on him."; + mes "While he's distracted with the scorpion, you can pass.\""; + next; + mes "\"How's that? We can start as soon as you're ready.\""; + if (kaan == 3) + set kaan, 4; + set hasan, 3; + close; + +L_Plan: + mes "[Kaan]"; + mes "\"I'm ready. Just give me the sign when you're down there."; + mes "Or do you want me to explain the plan again?\""; + menu + "Yes please.",L_Explain, + "No, everything's alright.",-; + close; + +L_Close: + close; } diff --git a/npc/042-1/valon.txt b/npc/042-1/valon.txt index 0e6a65c0..02e91590 100644 --- a/npc/042-1/valon.txt +++ b/npc/042-1/valon.txt @@ -10,6 +10,7 @@ next; mes "\"If you really want to challenge the desert go to main Tulimshar first to prepare yourself.\""; close; + OnTouch: warp "042-1.gat", 17, 78; mes "[Valon]"; diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index 409d8c90..d82dc588 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -43,6 +43,8 @@ L_Naked: mes "\"Then click on the shirt and press the equip button.\""; next; mes "\"Talk to me again when you got dressed. You can either click on me, or press N to focus on me and T to talk.\""; + next; + mes "\"If you want to talk to other adventurers, it's a bit different. In that case, press Enter, type your message and press Enter again.\""; close; L_Clothes: @@ -67,7 +69,108 @@ L_Clothes: L_Again: mes "[Sorfina]"; - mes "\"TODO: put here a menu for explaining things again\""; + mes "\"Welcome back! Do you have any questions?\""; + + if (hasan) + menu + "A guy named Hasan doesn't let me enter main Tulimshar.",L_Hasan, + "Yes, could you explain again about...",L_Explain, + "No, thanks.",L_Close; + menu + "Yes, could you explain again about...",L_Explain, + "No, thanks.",L_Close; + close; + +L_Explain: + menu + "... walking?",L_Walk, + "... talking?",L_Talk, + "... the inventory and items?",L_Items, + "... shortcuts?",L_Shortcut, + "... what to do in main Tulimshar?",L_Aidan, + "... nevermind.",L_Close; + close; + +L_Walk: + mes "[Sorfina]"; + mes "\"You can use the arrow keys to walk around."; + mes "Or just click at the place you want to go to."; + mes "But this only works if that place is reachable and walkable.\""; + close; + +L_Talk: + mes "[Sorfina]"; + mes "\"If you want to talk to a normal person, you can click at him or her."; + mes "Or you can press N to focus on the nearest person and then press T to talk.\""; + next; + mes "\"If you want to talk to other adventurers, press Enter to open your chat window."; + mes "Then type your message and press Enter to send.\""; + next; + mes "\"You may want to talk privately to another adventuerer sometimes. In that case you can whisper."; + mes "After pressing Enter, type '/whisper [name] [message]'."; + mes "Or you can right click on someone and choose the whisper option.\""; + next; + mes "\"Press F7 to show and hide your chat window.\""; + close; + +L_Items: + mes "[Sorfina]"; + mes "\"There are three types of items."; + mes "They can be Consumables, Equipment, or Miscellaneous\""; + next; + mes "\"Consumable items such as Potions, can be used only once."; + mes "After use, they will disappear from your inventory.\""; + next; + mes "\"Equipment items like Armors, Weapons, Accessories"; + mes "can be equipped for fashionable purposes or to raise your status.\""; + next; + mes "\"Miscellaneous items such as maggot slime, are used"; + mes "in creating other items, or just to trade and sell.\""; + next; + mes "\"Press F3 to open your inventory."; + mes "When placing your cursor over an item there, you can see a box with some informations about that item.\""; + next; + mes "\"To use or equip an item, select it with clicking on it."; + mes "Then press Use or Equip.\""; + close; + +L_Shortcut: + mes "[Sorfina]"; + mes "\"Press F8 to open your shortcut window.\""; + next; + mes "\"You can select the item you want to put on a shortcut with your mouse and then click on the position in the shortcut window you want to place it.\""; + next; + mes "\"Now you can use or equip/unequip it with pressing the number of the shortcut.\""; + close; + +L_Aidan: + mes "[Sorfina]"; + mes "\"I suggest to go to the bazaar near the south gate."; + mes "We're in the north of Tulimshar here, so you have to walk across the town.\""; + next; + mes "\"When you leave this area to the Southeast, you'll come to the docks."; + mes "Follow the street to the south to pass the old towen gates.\""; + next; + mes "\"Turn West at the next intersection. You'll pass by the gates of Tulimshar's famos magic school there."; + mes "Just follow the street to the south and you'll reach the bazaar.\""; + next; + mes "\"I heard Aidan is looking for brave adventurers, you might want to talk to him."; + mes "Usually the bazaar is bustling with activity, there are many persons who might know something useful.\""; + close; + +L_Hasan: + mes "[Sorfina]"; + mes "\"Ah, Hasan. He's causing trouble again?\""; + mes "She shakes her head."; + next; + mes "[Sorfina]"; + mes "\This guy was a plague ever since. TODO: add story\""; + // some backstory, hasan living here as a child, always making trouble + // but unfortunately very strong + // player question: weak point + // answer: frightened of scropions + if (hasan == 1) + set hasan, 2; close; L_SkipTut: @@ -79,11 +182,18 @@ L_SkipTut: mes "[Sorfina]"; mes "\"If you think so. Good luck.\""; //TODO:set flag -close; + close; + +L_Close: + close; } -042-2.gat,45,31,0 script #DoorOut 127,1,1,{ - //TODO: add blocked door +042-2.gat,45,31,0 script #DoorOut 127,2,2,{ +//TODO: check also flag for having finished the tutorial + if (sorfina < 2) goto L_Block; warp "042-1.gat", 62, 63; end; +L_Block: + message strcharinfo(0), "Sorfina: Wait a moment! You're not ready to leave."; + end; } diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt index 255e30d7..b95d7ede 100644 --- a/npc/042-2/tanisha.txt +++ b/npc/042-2/tanisha.txt @@ -86,14 +86,66 @@ L_StatsRe: L_Advice: next; mes "[Tanisha]"; - mes "\"Hey, when you go to main Tulmishar, you could see Bernard. He can make a delicious soup!"; + mes "\"When you go to main Tulmishar, you could see Bernard. He can make a delicious soup!"; mes "Good luck!\""; emotion 3; - set tanisha, 3; + if (tanisha == 2) + set tanisha, 3; close; L_Again: - mes "\"TODO: menu for fighting and stats explain again\""; + mes "[Tanisha]"; + mes "\"Hi there! Is everything alright? Do you have questions?\""; + + if (hasan) + menu + "A guy named Hasan doesn't let me enter main Tulimshar.",L_Hasan, + "Yes, could you explain again about...",L_Explain, + "No, thanks.",L_Close; + menu + "Yes, could you explain again about...",L_Explain, + "No, thanks.",L_Close; + close; + +L_Explain: + menu + "... how to fight?",L_Fight, + "... monsters?",L_Mob, + "... status points?",L_StatsRe, + "... what to do in main Tulimshar",L_Advice, + "... nevermind.",L_Close; + +L_Fight: + mes "[Tanisha]"; + mes "\"Press A to focus on a monster. With X you can focus and attack."; + mes "But it also works to click on the monster with your mouse.\""; + next; + mes "\"If you press Shift, you can abort your attack.\""; + next; + mes "\"Sometimes dead monsters leave some useful things. You can pick them up with pressing Z or clicking with your mouse.\""; + close; + +L_Mob: + mes "[Tanisha]"; + mes "\"I don't know much about monsters, I'm just a little girl. But I know a few things."; + mes "There a several types of monsters, Aggressive, Neutral, and Assistants.\""; + next; + mes "\"Aggressive monsters will attack you as soon as they see you.\""; + next; + mes "\"Neutral monsters are peacefully until they get attacked.\""; + next; + mes "\"Assistants are monsters who help each other.\""; + close; + +L_Hasan: + mes "[Tanisha]"; + mes "\"Bah, Hasan. He's a jerk. But he's very strong.\""; + next; + mes "\"The only thing he's afraid of are scropions."; + mes "I'm not sure why, some bad experience when he was a child."; + mes "That was before I was born.\""; + if (hasan == 1) + set hasan, 2; close; L_Blocked: -- cgit v1.2.3-60-g2f50 From b425bbd7d291533d556c034252d7dc8f89796984 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Thu, 2 Jun 2011 22:40:34 +0200 Subject: scorpion fight, story about hasan in sorfina, some small fixes --- npc/042-1/hasan.txt | 56 +++++++++++++++++++++++++++++++++++++++++++++++---- npc/042-1/kaan.txt | 10 +++++++-- npc/042-2/sorfina.txt | 45 ++++++++++++++++++++++++++--------------- npc/042-2/tanisha.txt | 22 +++++++++++--------- 4 files changed, 101 insertions(+), 32 deletions(-) diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt index 3caa47a5..21364a44 100644 --- a/npc/042-1/hasan.txt +++ b/npc/042-1/hasan.txt @@ -2,10 +2,15 @@ set @toll, 10000; - if (hasan == 1) goto L_Toll; + if ($scorp) goto L_Fear; + + if (hasan == 4) goto L_Thank; + if (hasan == 3) goto L_Trick; + if (hasan > 0) goto L_Toll; mes "[Unfriendly Guy]"; mes "\"Hey! You can't pass here.\""; + next; menu "Why not?",-, "Who says that?",-; @@ -15,7 +20,9 @@ L_Toll: mes "[Hasan]"; mes "\"Give me " + @toll + "GP, and I may let you pass.\""; - set hasan, 1; + if (hasan == 0) + set hasan, 1; + next; if (zeny >= @toll) menu "Ok, here you go.",L_Pay, @@ -54,13 +61,54 @@ L_Cheat: mes "[Hasan]"; mes "\"Don't dare to cheat on me!\""; close; + +L_Trick: + mes "[Hasan]"; + mes "\"Are you going to pay now? " + @toll + "GP, and I may let you pass.\""; + next; + menu + "I don't have so much money!",L_NoPay, + "No. (Scratch your head.)",-; + mes "While you're scratching your head, you see Kaan coming nearer to the cliff above you."; + monster "042-1.gat",110,74,"Scorpion",1003,1, "Hasan::onScorpionDeath"; + set $scorp, 1; + close; + +L_Thank: + mes "[Hasan]"; + mes "\"You - you saved me!"; + mes "I tried to get your money and you saved me!\""; + next; + mes "\"Hey, you're a really cool person."; + mes "I mean, how you finished that ghastly scorpion!"; + mes "Amazing!\""; + next; + mes "\"I tell you something: Cool persons are allowed to pass for free."; + mes "And you can have this.\""; + getitem "SharpKnife", 1; + //TODO: clear all vars and set flag + close; + +L_Fear: + mes "[Hasan]"; + mes "\"Sc-sc-sco-scorpion! Pl-please k-kill it.\""; + mes "He seems close to tears."; + close; + +onScorpionDeath: + set $scorp, 0; + if (hasan != 3) + close; + set hasan, 4; + message strcharinfo(0), "You saved Hasan."; + end; } 042-1.gat,117,76,0 script #barrier 127,2,2{ //TODO: check variable warp "042-1.gat", 110, 73; + if ($scorp) + message strcharinfo(0), "Hasan: \"Please help me!\""; message strcharinfo(0), "Hasan: \"Stop!\""; - // when scorpion is spawned: - // message strcharinfo(0), "Hasan: \"Please help me!\""; end; } diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt index e9ad6b0c..4aec521d 100644 --- a/npc/042-1/kaan.txt +++ b/npc/042-1/kaan.txt @@ -24,9 +24,10 @@ L_Tanisha: mes "\"Did you already talk to Tanisha?\""; if (tanisha < 3) close; + next; menu "Yes, I helped her with the maggots.",-, - "Yeah, and she's done with the maggots.",; + "Yeah, and she's done with the maggots.",-; mes "[Kaan]"; mes "\"Ah, that are good news."; mes "You know, we have a lot of problems with bugs here.\""; @@ -39,6 +40,7 @@ L_Tanisha: mes "He looks very proud."; next; mes "\"I build this fence to keep them out.\""; + next; menu "Impressive! Just a bit... skew.",-, "Wow, it looks very - ahm, unconventional.",-; @@ -53,6 +55,7 @@ L_Tanisha: L_Out: mes "[Kaan]"; mes "\"Hello! How are you? Did you already visit main Tulimshar?\""; + next; if (hasan) menu "A guy named Hasan doesn't let me enter main Tulimshar.",L_Hasan, @@ -77,8 +80,9 @@ L_Trick: mes "\"Do you have an idea what Hasans weakness could be?"; if (hasan < 2) close; + next; menu - "He's afraid of scorpions",-, + "He's afraid of scorpions.",-, "No idea.",L_Close; mes "[Kaan]"; mes "\"Scorpions?! Right! How could I forget?"; @@ -89,6 +93,7 @@ L_Explain: mes "I will catch one of the scorpions from the desert that's coming to the fence.\""; next; mes "\"You'll go to Hasan and give me a sign when you're ready."; + mes "Let's say the sign is that you're scratching your head."; mes "I'll watch you from this point.\""; next; mes "\"When you give me the sign, I'll throw the scorpion down on him."; @@ -104,6 +109,7 @@ L_Plan: mes "[Kaan]"; mes "\"I'm ready. Just give me the sign when you're down there."; mes "Or do you want me to explain the plan again?\""; + next; menu "Yes please.",L_Explain, "No, everything's alright.",-; diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index d82dc588..ab5dd9f5 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -17,8 +17,9 @@ mes "\"I'm glad you're feeling better now. You're not used to the hot weather, right?"; mes "Are you here to look for some work? Many young people come to our Tulimshar for this reason.\""; next; - mes "\"I can tell you some useful things, if you to hear.\""; + mes "\"I can tell you some useful things, if you want to hear.\""; mes "\"Oh, and by the way my name is Sorfina.\""; + next; menu "That would be great!",L_Tut, "No, thanks. I already know how things are going.",L_SkipTut; @@ -70,7 +71,7 @@ L_Clothes: L_Again: mes "[Sorfina]"; mes "\"Welcome back! Do you have any questions?\""; - + next; if (hasan) menu "A guy named Hasan doesn't let me enter main Tulimshar.",L_Hasan, @@ -106,8 +107,8 @@ L_Talk: mes "\"If you want to talk to other adventurers, press Enter to open your chat window."; mes "Then type your message and press Enter to send.\""; next; - mes "\"You may want to talk privately to another adventuerer sometimes. In that case you can whisper."; - mes "After pressing Enter, type '/whisper [name] [message]'."; + mes "\"You may want to talk privately to another adventurer sometimes. In that case you can whisper."; + mes "After pressing Enter type '/whisper [name] [message]'."; mes "Or you can right click on someone and choose the whisper option.\""; next; mes "\"Press F7 to show and hide your chat window.\""; @@ -116,16 +117,15 @@ L_Talk: L_Items: mes "[Sorfina]"; mes "\"There are three types of items."; - mes "They can be Consumables, Equipment, or Miscellaneous\""; + mes "They can be Consumables, Equipment, or Miscellaneous.\""; next; mes "\"Consumable items such as Potions, can be used only once."; - mes "After use, they will disappear from your inventory.\""; + mes "After use, they will disappear from your inventory."; + mes "There are some rare items that can be used but don't get consumed."; next; - mes "\"Equipment items like Armors, Weapons, Accessories"; - mes "can be equipped for fashionable purposes or to raise your status.\""; + mes "\"Equipment items like Armors, Weapons, Accessories can be equipped for fashionable purposes or to raise your status.\""; next; - mes "\"Miscellaneous items such as maggot slime, are used"; - mes "in creating other items, or just to trade and sell.\""; + mes "\"Miscellaneous items such as maggot slime, are used in creating other items, or just to trade and sell.\""; next; mes "\"Press F3 to open your inventory."; mes "When placing your cursor over an item there, you can see a box with some informations about that item.\""; @@ -149,7 +149,7 @@ L_Aidan: mes "We're in the north of Tulimshar here, so you have to walk across the town.\""; next; mes "\"When you leave this area to the Southeast, you'll come to the docks."; - mes "Follow the street to the south to pass the old towen gates.\""; + mes "Follow the street to the south to pass the old town gates.\""; next; mes "\"Turn West at the next intersection. You'll pass by the gates of Tulimshar's famos magic school there."; mes "Just follow the street to the south and you'll reach the bazaar.\""; @@ -164,11 +164,23 @@ L_Hasan: mes "She shakes her head."; next; mes "[Sorfina]"; - mes "\This guy was a plague ever since. TODO: add story\""; - // some backstory, hasan living here as a child, always making trouble - // but unfortunately very strong - // player question: weak point - // answer: frightened of scropions + mes "\This guy was a plague ever since. He's always causing trouble.\""; + next; + mes "\"And his father... Well, one day his father thought he should teach Hasan a lesson.\""; + next; + mes "\"He took him in the desert and then left him there!"; + mes "Hasan was only seven years old!\""; + next; + mes "\"I never understood how someone can do something like that to a child, even if it's a rascal like Hasan.\""; + next; + mes "\"Anyway, Hasan tried to find his way back home, but stumbled in a nest of scorpions!\""; + mes "She shakes her head."; + next; + mes "\"If Valon wouldn't have come along that moment, Hasan would have died that day.\""; + next; + mes "\"However, the scorpions poison caused a bad fever and after Hasan had recovered from that, he was even more malicious than before.\""; + mes "She sighs."; + next; if (hasan == 1) set hasan, 2; close; @@ -176,6 +188,7 @@ L_Hasan: L_SkipTut: mes "[Sorfina]"; mes "\"Really? You seem quite unexperienced. Listening to some advices won't hurt.\""; + next; menu "Thinking about it twice... please tell me.",L_Tut, "Yeah, but thanks for the offer. Bye",-; diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt index b95d7ede..8db46057 100644 --- a/npc/042-2/tanisha.txt +++ b/npc/042-2/tanisha.txt @@ -10,6 +10,7 @@ emotion 3; next; mes "\"Are you feeling better?\""; + next; menu "Yes, thank you.",-, "Yeah, but all my stuff is gone.",-; @@ -24,6 +25,7 @@ L_Maggots: next; mes "\"If you kill them, I'll give you my knife."; mes "What do you say?\""; + next; menu "Sure!",-, "That's your job.",L_Close; @@ -37,13 +39,14 @@ L_Maggots: mes "\"Ok, listen what to do."; mes "Equip the knife and kill the maggots.\""; next; - mes "\"Press A to focus on a monster. With X you can focus and attack."; + mes "\"Press A to focus on a monster. With X you can focus and attack the same time."; mes "But it also works to click on the monster with your mouse.\""; next; mes "\"If you press Shift, you can abort your attack.\""; next; - mes "\"Maggots aren't aggressive, so they won't do you harm you until you attacked them first. Take them out one by one."; - mes "Sometimes dead monsters leave some useful things. You can pick them up with pressing Z or clicking with your mouse.\""; + mes "\"Maggots aren't aggressive, so they won't do you harm you until you attacked them first. Take them out one by one.\""; + next; + mes "\"Sometimes dead monsters leave some useful things. You can pick them up with pressing Z or clicking with your mouse.\""; close2; warp "042-2.gat", 33, 87; areamonster "042-2.gat", 31, 85, 35, 89, "", 1002, 5, "Tanisha::onMaggotDeath"; @@ -64,7 +67,7 @@ L_StatsRe: next; mes "\"Agility increases your attack speed and your ability to dodge attacks.\""; next; - mes "\"Vitality gives you more Hit Points and more defense against physical attacks.\""; + mes "\"Vitality gives you more hit points and more defense against physical attacks.\""; next; mes "\"Intelligence is useful for magic attack and defense.\""; next; @@ -72,9 +75,9 @@ L_StatsRe: next; mes "\"Luck gives you the chance to do critical hits and lowers the chance to receive a critical hit from your opponent.\""; next; - mes "\"Think about how you want to play before putting the points."; + mes "\"Think about how you want to play before putting the points.\""; next; - mes "Also I heard rumors about a strange guy lurking around in the desert south of Tulimshar, who can help you to forget your abilites!\""; + mes "Also I heard rumors about a strange guy lurking around in the desert south of Tulimshar who can help you to forget your abilites!\""; mes "Tanisha looks at you with wide opened eyes."; next; mes "[Tanisha]"; @@ -86,7 +89,7 @@ L_StatsRe: L_Advice: next; mes "[Tanisha]"; - mes "\"When you go to main Tulmishar, you could see Bernard. He can make a delicious soup!"; + mes "\"When you go to main Tulimshar, you could see Bernard. He can make a delicious soup!"; mes "Good luck!\""; emotion 3; if (tanisha == 2) @@ -96,7 +99,7 @@ L_Advice: L_Again: mes "[Tanisha]"; mes "\"Hi there! Is everything alright? Do you have questions?\""; - + next; if (hasan) menu "A guy named Hasan doesn't let me enter main Tulimshar.",L_Hasan, @@ -112,7 +115,7 @@ L_Explain: "... how to fight?",L_Fight, "... monsters?",L_Mob, "... status points?",L_StatsRe, - "... what to do in main Tulimshar",L_Advice, + "... what to do in main Tulimshar?",L_Advice, "... nevermind.",L_Close; L_Fight: @@ -150,7 +153,6 @@ L_Hasan: L_Blocked: mes "[Tanisha]"; - //TODO: make this more plausible mes "\"Oh, someone else is already in there. Let's wait a short while.\""; close; -- cgit v1.2.3-60-g2f50 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(-) 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-60-g2f50 From ffdd6b6345e32983c86041d3e1cf6f3252e2bba0 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sat, 4 Jun 2011 21:27:22 +0200 Subject: using flag to indicate the tutorial is done and adding behaviour according to that to all tut-npcs --- db/const.txt | 2 +- npc/022-1_Tulimshar/_import.txt | 1 + npc/041-1/_import.txt | 1 + npc/042-1/hasan.txt | 30 ++++++++++++++++++++++++++---- npc/042-1/kaan.txt | 6 ++++++ npc/042-1/valon.txt | 19 +++++++++++++++++-- npc/042-2/sorfina.txt | 15 ++++++++++++--- npc/042-2/tanisha.txt | 6 ++++++ 8 files changed, 70 insertions(+), 10 deletions(-) diff --git a/db/const.txt b/db/const.txt index 53ad97bd..30d988ee 100644 --- a/db/const.txt +++ b/db/const.txt @@ -255,7 +255,7 @@ FLAG_HAS_BOWLER_BURNSDAY 1 // every year's poem at burns day, shannon gives you FLAG_OPENED_UNDERGROUND 2 // this flag is a replacement for variable Open_Underground_Palace_Barrier, which was used only as bool FLAG_GOT_NAEM_GLOVES 4 // this replaces Naem_Quest_Done, which was used as a bool variable FLAG_GOT_GRADUATIONCAP 8 // this is a bit which was to be found in Tut_var second bit - +FLAG_TUTORIAL_DONE 128 // player completed tutorial (or entered the tutorial area from outside after it was added) DOCK_tulimshar 1 DOCK_hurnscald 2 DOCK_candor 3 diff --git a/npc/022-1_Tulimshar/_import.txt b/npc/022-1_Tulimshar/_import.txt index f04f9443..8f72cbc0 100644 --- a/npc/022-1_Tulimshar/_import.txt +++ b/npc/022-1_Tulimshar/_import.txt @@ -6,3 +6,4 @@ npc: npc/022-1_Tulimshar/dock.txt npc: npc/022-1_Tulimshar/elanore.txt npc: npc/022-1_Tulimshar/ferry_master.txt npc: npc/022-1_Tulimshar/mapflags.txt +npc: npc/022-1_Tulimshar/tutorial.txt diff --git a/npc/041-1/_import.txt b/npc/041-1/_import.txt index ddd49583..736f2859 100644 --- a/npc/041-1/_import.txt +++ b/npc/041-1/_import.txt @@ -2,3 +2,4 @@ map: 041-1.gat npc: npc/041-1/_mobs.txt npc: npc/041-1/_warps.txt +npc: npc/041-1/tutorial.txt diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt index 21364a44..63acf2c0 100644 --- a/npc/042-1/hasan.txt +++ b/npc/042-1/hasan.txt @@ -4,6 +4,7 @@ if ($scorp) goto L_Fear; + if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; if (hasan == 4) goto L_Thank; if (hasan == 3) goto L_Trick; if (hasan > 0) goto L_Toll; @@ -54,7 +55,11 @@ L_Pay: mes "He grins gloatingly."; mes "[Hasan]"; mes "\"Very well. You may pass.\""; - //TODO: set variables + set hasan, 0; + set kaan, 0; + set sorfina, 0; + set tanisha, 0; + set FLAGS, FLAGS | FLAG_TUTORIAL_DONE; close; L_Cheat: @@ -86,7 +91,11 @@ L_Thank: mes "\"I tell you something: Cool persons are allowed to pass for free."; mes "And you can have this.\""; getitem "SharpKnife", 1; - //TODO: clear all vars and set flag + set hasan, 0; + set kaan, 0; + set sorfina, 0; + set tanisha, 0; + set FLAGS, FLAGS | FLAG_TUTORIAL_DONE; close; L_Fear: @@ -95,6 +104,14 @@ L_Fear: mes "He seems close to tears."; close; +L_Tut_Done: + mes "[Hasan]"; + if (baselevel >= 40) + mes "\"Welcome to the suburbs of Tulimshar. I wonder what an experienced adventurer like you is doing here.\""; + if (baselevel < 40) + mes "\"Bah, nothing interesting is happening here.\""; + close; + onScorpionDeath: set $scorp, 0; if (hasan != 3) @@ -105,10 +122,15 @@ onScorpionDeath: } 042-1.gat,117,76,0 script #barrier 127,2,2{ - //TODO: check variable + if (FLAGS & FLAG_TUTORIAL_DONE) + goto L_Tut; warp "042-1.gat", 110, 73; if ($scorp) message strcharinfo(0), "Hasan: \"Please help me!\""; - message strcharinfo(0), "Hasan: \"Stop!\""; + if (!$scorp) + message strcharinfo(0), "Hasan: \"Stop!\""; + end; +L_Tut: + warp "022-1.gat", 23, 38; end; } diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt index 4aec521d..19d05ea8 100644 --- a/npc/042-1/kaan.txt +++ b/npc/042-1/kaan.txt @@ -1,5 +1,6 @@ 042-1.gat,105,72,0 script Kaan 160,{ + if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; if (kaan == 4) goto L_Plan; if (kaan == 3) goto L_Trick; if (kaan == 2) goto L_Out; @@ -115,6 +116,11 @@ L_Plan: "No, everything's alright.",-; close; +L_Tut_Done: + mes "[Kaan]"; + mes "\"Hi there. I hope you enjoy your time in Tulimshar.\""; + close; + L_Close: close; } diff --git a/npc/042-1/valon.txt b/npc/042-1/valon.txt index 02e91590..7605ae2b 100644 --- a/npc/042-1/valon.txt +++ b/npc/042-1/valon.txt @@ -1,8 +1,10 @@ 042-1.gat,17,82,0 script Valon 156,2,1{ + if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; + mes "[Valon]"; - mes "\"Hello!\""; - mes "\"You're looking for adventures, right?\""; + mes "\"Hello!"; + mes "You're looking for adventures, right?\""; next; mes "\"But you shouldn't underestimate this desert, it is dangerous.\""; next; @@ -11,10 +13,23 @@ mes "\"If you really want to challenge the desert go to main Tulimshar first to prepare yourself.\""; close; +L_Tut_Done: + mes "[Valon]"; + mes "\"Hello!"; + mes "You're an adventurer, right?\""; + next; + mes "\"Be careful in the desert.\""; + close; + OnTouch: + if (FLAGS & FLAG_TUTORIAL_DONE) + goto L_Tut; warp "042-1.gat", 17, 78; mes "[Valon]"; mes "\"The desert is merciless."; mes "I can't let you leave like this.\""; close; +L_Tut: + warp "041-1.gat", 33, 8; + end; } diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index ab5dd9f5..67ae1a87 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -1,5 +1,6 @@ 042-2.gat,28,26,0 script Sorfina 154,{ + if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; if (sorfina == 2) goto L_Again; if (sorfina == 1) goto L_Clothes; @@ -194,7 +195,16 @@ L_SkipTut: "Yeah, but thanks for the offer. Bye",-; mes "[Sorfina]"; mes "\"If you think so. Good luck.\""; - //TODO:set flag + set hasan, 0; + set kaan, 0; + set sorfina, 0; + set tanisha, 0; + set FLAGS, FLAGS | FLAG_TUTORIAL_DONE; + close; + +L_Tut_Done: + mes "[Sorfina]"; + mes "\"Welcome. Please make yourself at home.\""; close; L_Close: @@ -202,8 +212,7 @@ L_Close: } 042-2.gat,45,31,0 script #DoorOut 127,2,2,{ -//TODO: check also flag for having finished the tutorial - if (sorfina < 2) goto L_Block; + if ((sorfina < 2) && !(FLAGS & FLAG_TUTORIAL_DONE)) goto L_Block; warp "042-1.gat", 62, 63; end; L_Block: diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt index 8db46057..9ede30e3 100644 --- a/npc/042-2/tanisha.txt +++ b/npc/042-2/tanisha.txt @@ -1,6 +1,7 @@ //TODO: remove knife from beginning items 042-2.gat,37,90,0 script Tanisha 114,{ + if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; if (tanisha == 3) goto L_Again; if (tanisha == 2) goto L_Stats; if (tanisha == 1) goto L_Maggots; @@ -156,6 +157,11 @@ L_Blocked: mes "\"Oh, someone else is already in there. Let's wait a short while.\""; close; +L_Tut_Done: + mes "[Tanisha]"; + mes "\"This yucky maggots! They're eating our goods!\""; + close; + OnTimer1000: setnpctimer 0; if (getareausers("042-2.gat", 29, 85, 36, 90) < 1) -- cgit v1.2.3-60-g2f50 From 55745a041291c12cb175b1e10a0669b6e720bdb1 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sat, 4 Jun 2011 21:37:07 +0200 Subject: changing starting position and let player start without a weapon --- conf/char_athena.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/char_athena.conf b/conf/char_athena.conf index 243aa97d..eb4b62b4 100644 --- a/conf/char_athena.conf +++ b/conf/char_athena.conf @@ -44,10 +44,10 @@ backup_txt_flag: no backup_txt: save/athena_backup.txt // Start point, Map name followed by coordinates (x,y) -start_point: 001-1.gat,29,28 +start_point: 042-2.gat,26,26 // Starting weapon for new characters -start_weapon: 1201 +start_weapon: 0 // Starting armor for new characters start_armor: 1202 @@ -75,7 +75,7 @@ char_name_option: 1 // Note: add 'space' between 2 others letters/symbols. // default: void. // char_name_letters: [ ] { } , . | - # @ ! ~ ` ; : " " ? / \ = + < > -char_name_letters: a b c d e f g h i j k l m n o p r s t q u v w x y z A B C D E F G H I J K L M N O P R S T Q U V W X Y Z 1 2 3 4 5 6 7 8 9 0 - _ + = ! @ $ % ^ & * ( ) : ; ' < > , . ? / ~ ` | \ +char_name_letters: a b c d e f g h i j k l m n o p r s t q u v w x y z A B C D E F G H I J K L M N O P R S T Q U V W X Y Z 1 2 3 4 5 6 7 8 9 0 - _ + = ! @ $ % ^ & * ( ) : ; ' < > , . ? / ~ ` | \ // Filename of the file which receives the online players list in text online_txt_filename: online.txt -- cgit v1.2.3-60-g2f50 From 49dbf2f00509081627332edfea28db4984b60379 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sat, 4 Jun 2011 22:17:10 +0200 Subject: adapting Ian and the time stamp variable to the new start --- npc/001-1_Tulimshar/guide.txt | 8 +------- npc/042-1/kaan.txt | 3 ++- npc/042-2/sorfina.txt | 7 ++++++- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/npc/001-1_Tulimshar/guide.txt b/npc/001-1_Tulimshar/guide.txt index d00a2a6f..4b0d8a25 100644 --- a/npc/001-1_Tulimshar/guide.txt +++ b/npc/001-1_Tulimshar/guide.txt @@ -1,6 +1,6 @@ // -001-1.gat,32,27,0 script Ian 102,4,4,{ +001-1.gat,32,27,0 script Ian 102,{ // This line is only relevant for players, who started before the timestamp was introduced. // Set the graduation cap flag at the right position. // It is a bugfix @@ -176,10 +176,4 @@ L_TooMany: mes "\"I wanted to give you something, but you don't have room for it.\""; next; return; - -OnTouch: - if (TUT_var != 0) close; - callfunc "GameRules"; - mes "Ian, the trainer, can help you get to know the game."; - close; } diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt index 19d05ea8..cb0f67b2 100644 --- a/npc/042-1/kaan.txt +++ b/npc/042-1/kaan.txt @@ -49,7 +49,8 @@ L_Tanisha: mes "\"Well, it keeps the scorpions out. That's all that matters.\""; next; mes "\"Are you going to visit main Tulimshar?"; - mes "The bazaar there is a wondeful place! Traders, entertainers, adventurers - it's very exciting there.\""; + mes "The bazaar there is a wondeful place! Traders, entertainers, adventurers - it's very exciting there."; + mes "And Ian the trainer is hanging around there often. You should talk to him, he's a smart guy.\""; set kaan, 2; close; diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index 67ae1a87..a422d428 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -1,4 +1,4 @@ -042-2.gat,28,26,0 script Sorfina 154,{ +042-2.gat,28,26,0 script Sorfina 154,4,4{ if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; if (sorfina == 2) goto L_Again; @@ -209,6 +209,11 @@ L_Tut_Done: L_Close: close; + +OnTouch: + if (TUT_var != 0) close; + callfunc "GameRules"; + close; } 042-2.gat,45,31,0 script #DoorOut 127,2,2,{ -- cgit v1.2.3-60-g2f50 From a03d6aa6043269d2d15d82c141f47c2c3a24e1f3 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sat, 4 Jun 2011 23:11:45 +0200 Subject: fixing some issues discovered while testing --- npc/042-1/kaan.txt | 16 +++++++++++++--- npc/042-2/sorfina.txt | 13 ++++++------- npc/042-2/tanisha.txt | 8 ++++---- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt index cb0f67b2..9cd91982 100644 --- a/npc/042-1/kaan.txt +++ b/npc/042-1/kaan.txt @@ -1,6 +1,7 @@ 042-1.gat,105,72,0 script Kaan 160,{ if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; + if (hasan == 4) goto L_Hasan_Saved; if (kaan == 4) goto L_Plan; if (kaan == 3) goto L_Trick; if (kaan == 2) goto L_Out; @@ -49,8 +50,9 @@ L_Tanisha: mes "\"Well, it keeps the scorpions out. That's all that matters.\""; next; mes "\"Are you going to visit main Tulimshar?"; - mes "The bazaar there is a wondeful place! Traders, entertainers, adventurers - it's very exciting there."; - mes "And Ian the trainer is hanging around there often. You should talk to him, he's a smart guy.\""; + mes "The bazaar there is a wondeful place! Traders, entertainers, adventurers - it's very exciting there.\""; + next; + mes "\"And Ian the trainer is hanging around there often. You should talk to him, he's a smart guy.\""; set kaan, 2; close; @@ -92,7 +94,7 @@ L_Trick: next; L_Explain: mes "\"Ok, then here's the plan:"; - mes "I will catch one of the scorpions from the desert that's coming to the fence.\""; + mes "I will catch one of the scorpions that's coming to the fence from the desert.\""; next; mes "\"You'll go to Hasan and give me a sign when you're ready."; mes "Let's say the sign is that you're scratching your head."; @@ -117,6 +119,14 @@ L_Plan: "No, everything's alright.",-; close; +L_Hasan_Saved: + mes "[Kaan]"; + mes "\"I told you to pass when he's distracted, not to fight the scorpion!"; + mes "But maybe Hasan is thankful now?\""; + next; + mes "\"Maybe you should talk to him again.\""; + close; + L_Tut_Done: mes "[Kaan]"; mes "\"Hi there. I hope you enjoy your time in Tulimshar.\""; diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index a422d428..cc8a5357 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -5,7 +5,7 @@ if (sorfina == 1) goto L_Clothes; mes "[Old Woman]"; - mes "\"Ah, you're waking up. It seems you collapsed after you left the boat that brought you to Tulimshar."; + mes "\"Ah, you woke up. It seems you collapsed after you left the boat that brought you to Tulimshar."; mes "A group of ragtags immediatly took advantage of that and stole all your stuff!\""; next; mes "\"My little granddaughter Tanisha saw that, but couldn't do something to stop them."; @@ -16,10 +16,10 @@ next; mes "[Old Woman]"; mes "\"I'm glad you're feeling better now. You're not used to the hot weather, right?"; - mes "Are you here to look for some work? Many young people come to our Tulimshar for this reason.\""; + mes "Are you here to look for a job? Many young people come to our Tulimshar for this reason.\""; next; - mes "\"I can tell you some useful things, if you want to hear.\""; - mes "\"Oh, and by the way my name is Sorfina.\""; + mes "\"I can tell you some useful things, if you want to hear."; + mes "Oh, and by the way my name is Sorfina.\""; next; menu "That would be great!",L_Tut, @@ -36,7 +36,7 @@ L_Tut: next; mes "\"Ok, I hope you didn't forget how to walk. Just use the arrow keys or click at the place you want to go to.\""; next; - mes "\"And you really should get dressed again. I gave you an old shirt of my son.\""; + mes "\"And you really should get dressed again. I gave you an old shirt from my son.\""; next; set sorfina, 1; L_Naked: @@ -181,7 +181,6 @@ L_Hasan: next; mes "\"However, the scorpions poison caused a bad fever and after Hasan had recovered from that, he was even more malicious than before.\""; mes "She sighs."; - next; if (hasan == 1) set hasan, 2; close; @@ -192,7 +191,7 @@ L_SkipTut: next; menu "Thinking about it twice... please tell me.",L_Tut, - "Yeah, but thanks for the offer. Bye",-; + "Yeah, but thanks for the offer. Bye.",-; mes "[Sorfina]"; mes "\"If you think so. Good luck.\""; set hasan, 0; diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt index 9ede30e3..649d780e 100644 --- a/npc/042-2/tanisha.txt +++ b/npc/042-2/tanisha.txt @@ -1,7 +1,7 @@ //TODO: remove knife from beginning items 042-2.gat,37,90,0 script Tanisha 114,{ - if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; + if ((FLAGS & FLAG_TUTORIAL_DONE) || ($@TUT_MAGGOT)) goto L_Maggot_Fight; if (tanisha == 3) goto L_Again; if (tanisha == 2) goto L_Stats; if (tanisha == 1) goto L_Maggots; @@ -45,7 +45,7 @@ L_Maggots: next; mes "\"If you press Shift, you can abort your attack.\""; next; - mes "\"Maggots aren't aggressive, so they won't do you harm you until you attacked them first. Take them out one by one.\""; + mes "\"Maggots aren't aggressive, so they won't harm you until you attacked them first. Take them out one by one.\""; next; mes "\"Sometimes dead monsters leave some useful things. You can pick them up with pressing Z or clicking with your mouse.\""; close2; @@ -145,7 +145,7 @@ L_Hasan: mes "[Tanisha]"; mes "\"Bah, Hasan. He's a jerk. But he's very strong.\""; next; - mes "\"The only thing he's afraid of are scropions."; + mes "\"The only thing he's afraid of are scorpions."; mes "I'm not sure why, some bad experience when he was a child."; mes "That was before I was born.\""; if (hasan == 1) @@ -157,7 +157,7 @@ L_Blocked: mes "\"Oh, someone else is already in there. Let's wait a short while.\""; close; -L_Tut_Done: +L_Maggot_Fight: mes "[Tanisha]"; mes "\"This yucky maggots! They're eating our goods!\""; close; -- cgit v1.2.3-60-g2f50 From 57f072749c9cb2b8407fbe40fa05e2891707f5e1 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 5 Jun 2011 11:29:45 +0200 Subject: making maggot fight available for many players the same time and some fixes --- npc/042-1/hasan.txt | 2 ++ npc/042-1/kaan.txt | 3 ++- npc/042-1/malik.txt | 6 +++++- npc/042-2/sorfina.txt | 1 + npc/042-2/tanisha.txt | 59 ++++++++++++++++++++++++++++++++------------------- 5 files changed, 47 insertions(+), 24 deletions(-) diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt index 63acf2c0..e3949de3 100644 --- a/npc/042-1/hasan.txt +++ b/npc/042-1/hasan.txt @@ -59,6 +59,7 @@ L_Pay: set kaan, 0; set sorfina, 0; set tanisha, 0; + set maggot, 0; set FLAGS, FLAGS | FLAG_TUTORIAL_DONE; close; @@ -95,6 +96,7 @@ L_Thank: set kaan, 0; set sorfina, 0; set tanisha, 0; + set maggot, 0; set FLAGS, FLAGS | FLAG_TUTORIAL_DONE; close; diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt index 9cd91982..e0aeacc3 100644 --- a/npc/042-1/kaan.txt +++ b/npc/042-1/kaan.txt @@ -129,7 +129,8 @@ L_Hasan_Saved: L_Tut_Done: mes "[Kaan]"; - mes "\"Hi there. I hope you enjoy your time in Tulimshar.\""; + mes "\"Hi there. I hope you enjoy your time in Tulimshar."; + mes "Hasan is a real troublemaker, but it seems he calmed down now.\""; close; L_Close: diff --git a/npc/042-1/malik.txt b/npc/042-1/malik.txt index 59358aec..a6a190ee 100644 --- a/npc/042-1/malik.txt +++ b/npc/042-1/malik.txt @@ -4,7 +4,11 @@ menu "yes",-, "no",L_Close; - set tutorial, 0; + set hasan, 0; + set kaan, 0; + set sorfina, 0; + set tanisha, 0; + set maggot, 0; L_Close: close; } diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index cc8a5357..903a35a3 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -198,6 +198,7 @@ L_SkipTut: set kaan, 0; set sorfina, 0; set tanisha, 0; + set maggot, 0; set FLAGS, FLAGS | FLAG_TUTORIAL_DONE; close; diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt index 649d780e..bbaf4b4b 100644 --- a/npc/042-2/tanisha.txt +++ b/npc/042-2/tanisha.txt @@ -1,9 +1,9 @@ -//TODO: remove knife from beginning items 042-2.gat,37,90,0 script Tanisha 114,{ - if ((FLAGS & FLAG_TUTORIAL_DONE) || ($@TUT_MAGGOT)) goto L_Maggot_Fight; - if (tanisha == 3) goto L_Again; - if (tanisha == 2) goto L_Stats; + if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; + if (tanisha == 4) goto L_Again; + if (tanisha == 3) goto L_Stats; + if (tanisha == 2) goto L_Fail; if (tanisha == 1) goto L_Maggots; mes "[Tanisha]"; @@ -32,11 +32,11 @@ L_Maggots: "That's your job.",L_Close; mes "[Tanisha]"; mes "\"Wonderful!\""; - if ($@TUT_MAGGOT) goto L_Blocked; - set $@TUT_MAGGOT, 1; - set $@TUT_COUNTER, 0; + set $@TUT_MAGGOT, $@TUT_MAGGOT + 1; + set maggot, 0; getitem "knife", 1; next; +L_Fight_Again: mes "\"Ok, listen what to do."; mes "Equip the knife and kill the maggots.\""; next; @@ -48,6 +48,7 @@ L_Maggots: mes "\"Maggots aren't aggressive, so they won't harm you until you attacked them first. Take them out one by one.\""; next; mes "\"Sometimes dead monsters leave some useful things. You can pick them up with pressing Z or clicking with your mouse.\""; + set tanisha, 2; close2; warp "042-2.gat", 33, 87; areamonster "042-2.gat", 31, 85, 35, 89, "", 1002, 5, "Tanisha::onMaggotDeath"; @@ -84,7 +85,7 @@ L_StatsRe: mes "[Tanisha]"; mes "\"But I don't think he'd do that without a service in return.\""; - if (tanisha == 2) goto L_Advice; + if (tanisha == 3) goto L_Advice; close; L_Advice: @@ -93,8 +94,8 @@ L_Advice: mes "\"When you go to main Tulimshar, you could see Bernard. He can make a delicious soup!"; mes "Good luck!\""; emotion 3; - if (tanisha == 2) - set tanisha, 3; + if (tanisha == 3) + set tanisha, 4; close; L_Again: @@ -152,14 +153,11 @@ L_Hasan: set hasan, 2; close; -L_Blocked: - mes "[Tanisha]"; - mes "\"Oh, someone else is already in there. Let's wait a short while.\""; - close; - -L_Maggot_Fight: +L_Tut_Done: mes "[Tanisha]"; - mes "\"This yucky maggots! They're eating our goods!\""; + mes "\"This yucky maggots! They're eating our goods!"; + mes "No matter how many of them you kill, they always come back.\""; + mes "She sighs."; close; OnTimer1000: @@ -170,8 +168,8 @@ OnTimer1000: end; L_CleanUp: - set $@TUT_MAGGOT, 0; killmonster "042-2.gat", "Tanisha::onMaggotDeath"; + set $@TUT_MAGGOT, 0; stopnpctimer; setnpctimer 0; end; @@ -183,17 +181,34 @@ onTick: heal MaxHp, 0; message strcharinfo(0), "Tanisha: You're doing good!"; L_NoHeal: - if ($@TUT_COUNTER < 5) + if (maggot < 5) end; warp "042-2.gat", 36, 90; - set tanisha, 2; - goto L_CleanUp; + set tanisha, 3; + set maggot, 0; + if ($@TUT_MAGGOT > 0) + set $@TUT_MAGGOT, $@TUT_MAGGOT - 1; close; onMaggotDeath: - set $@TUT_COUNTER, $@TUT_COUNTER + 1; + set maggot, maggot + 1; end; +L_Fail: + mes "Tanisha seems to try hard to supress laughter."; + mes "[Tanisha]"; + mes "\"The maggots defeated you.\""; + next; + mes "She bursts out with laughter."; + mes "[Tanisha]"; + mes "\"Oups, I'm sorry. It's just too funny."; + mes "Do you want to try it again?\""; + next; + menu + "Sure!",L_Fight_Again, + "No, I need a rest.",L_Close; + close; + L_Close: close; } -- cgit v1.2.3-60-g2f50 From 3273efd3a2a9c660ee2c3a1ff74600de87536885 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 5 Jun 2011 18:10:46 +0200 Subject: adding files i forgot --- npc/022-1_Tulimshar/tutorial.txt | 5 +++++ npc/041-1/tutorial.txt | 5 +++++ npc/042-2/mapflags.txt | 1 + 3 files changed, 11 insertions(+) create mode 100644 npc/022-1_Tulimshar/tutorial.txt create mode 100644 npc/041-1/tutorial.txt create mode 100644 npc/042-2/mapflags.txt diff --git a/npc/022-1_Tulimshar/tutorial.txt b/npc/022-1_Tulimshar/tutorial.txt new file mode 100644 index 00000000..6981c4c5 --- /dev/null +++ b/npc/022-1_Tulimshar/tutorial.txt @@ -0,0 +1,5 @@ +022-1.gat,19,37,0 script #tutorial 127,2,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 new file mode 100644 index 00000000..2b9080b2 --- /dev/null +++ b/npc/041-1/tutorial.txt @@ -0,0 +1,5 @@ +041-1.gat,33,5,0 script #tutorial 127,2,2{ + set FLAGS, FLAGS | FLAG_TUTORIAL_DONE; + warp "042-1.gat", 17, 78; + end; +} diff --git a/npc/042-2/mapflags.txt b/npc/042-2/mapflags.txt new file mode 100644 index 00000000..b1cd5ab2 --- /dev/null +++ b/npc/042-2/mapflags.txt @@ -0,0 +1 @@ +042-2.gat mapflag nosave 042-1,46,26; -- cgit v1.2.3-60-g2f50 From fd34e5fc13048912e939241f3abd88de78b25a4d Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 5 Jun 2011 19:24:20 +0200 Subject: small fix to avoid confusion --- npc/042-2/sorfina.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index 903a35a3..281e7233 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -42,7 +42,7 @@ L_Tut: L_Naked: mes "\"Press F3 or click at the button for your equipment in the bar at the upper right corner to open your inventory.\""; next; - mes "\"Then click on the shirt and press the equip button.\""; + mes "\"After we talked click on the shirt and press the equip button.\""; next; mes "\"Talk to me again when you got dressed. You can either click on me, or press N to focus on me and T to talk.\""; next; -- cgit v1.2.3-60-g2f50 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 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(-) 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-60-g2f50 From 9a92d56600ba934646ec8790530f325d4dfca278 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Mon, 6 Jun 2011 18:01:32 +0200 Subject: changing mapflag of 042-2, so sorfina can't be skipped lot's of fixes in tanisha --- npc/042-2/mapflags.txt | 2 +- npc/042-2/tanisha.txt | 62 +++++++++++++++++++++++++++++++++++--------------- 2 files changed, 45 insertions(+), 19 deletions(-) diff --git a/npc/042-2/mapflags.txt b/npc/042-2/mapflags.txt index dab75985..b21135a4 100644 --- a/npc/042-2/mapflags.txt +++ b/npc/042-2/mapflags.txt @@ -1 +1 @@ -042-2.gat mapflag nosave 042-1,82,78; +042-2.gat mapflag nosave 042-2,33,27; diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt index 6cb7f2d4..1397fa9a 100644 --- a/npc/042-2/tanisha.txt +++ b/npc/042-2/tanisha.txt @@ -1,7 +1,6 @@ 042-2.gat,37,90,0 script Tanisha 114,{ -//TODO: fix the mapflag in 042-2 -//TODO: limit number of players for maggot fight + set @playerlimit, 4; if ((getx(0) > 29) && (getx(0) < 37) && (gety(0) > 84) && (gety(0) < 90)) goto L_Fighting; @@ -37,6 +36,8 @@ L_Maggots: "That's your job.",L_Close; mes "[Tanisha]"; mes "\"Wonderful!\""; + if ($@TUT_MAGGOT >= @playerlimit) + goto L_Crowded; set $@TUT_MAGGOT, $@TUT_MAGGOT + 1; set maggot, 0; getitem "knife", 1; @@ -133,6 +134,8 @@ L_Fight: mes "\"If you press Shift, you can abort your attack.\""; next; mes "\"Sometimes dead monsters leave some useful things. You can pick them up with pressing Z or clicking with your mouse.\""; + next; + mes "\"If you feel exhausted from battle you can sit down with pressing S to recover faster.\""; close; L_Mob: @@ -165,6 +168,41 @@ L_Tut_Done: mes "She sighs."; close; +L_Crowded: + mes "[Tanisha]"; + mes "\"That's great! But..."; + mes "it seems it's crowded in there.\""; + next; + mes "\"Let's wait a short while.\""; + close; + +L_Sleep: + warp "042-2.gat", 36, 90; + mes "[Tanisha]"; + mes "\"What are you doing in there?"; + mes "Sleeping?"; + mes "Come back when you're serious.\""; + close; + +L_Fail: + mes "Tanisha seems to try hard to supress laughter."; + mes "[Tanisha]"; + mes "\"The maggots defeated you.\""; + next; + mes "She bursts out with laughter."; + mes "[Tanisha]"; + mes "\"Oups, I'm sorry. It's just too funny."; + mes "Do you want to try it again?\""; + next; + menu + "Sure!",-, + "No, I need a rest.",L_Close; + if ($@TUT_MAGGOT >= @playerlimit) + goto L_Crowded; + goto L_Fight_Again; + set $@TUT_MAGGOT, $@TUT_MAGGOT + 1; + close; + L_Fighting: message strcharinfo(0), "Tanisha: I believe in you!"; end; @@ -173,7 +211,7 @@ OnTimer1000: setnpctimer 0; if (getareausers("042-2.gat", 29, 85, 36, 90) < 1) goto L_CleanUp; - areatimer "042-2.gat", 29, 85, 36, 90, 10, "Tanisha::onTick"; + areatimer "042-2.gat", 30, 85, 36, 89, 10, "Tanisha::onTick"; end; L_CleanUp: @@ -184,6 +222,9 @@ L_CleanUp: end; onTick: + set @time, @time + 1; + if (@time > 300) + goto L_Sleep; if (isdead(0)) end; if (hp > 20) goto L_NoHeal; @@ -203,21 +244,6 @@ onMaggotDeath: set maggot, maggot + 1; end; -L_Fail: - mes "Tanisha seems to try hard to supress laughter."; - mes "[Tanisha]"; - mes "\"The maggots defeated you.\""; - next; - mes "She bursts out with laughter."; - mes "[Tanisha]"; - mes "\"Oups, I'm sorry. It's just too funny."; - mes "Do you want to try it again?\""; - next; - menu - "Sure!",L_Fight_Again, - "No, I need a rest.",L_Close; - close; - L_Close: close; } -- cgit v1.2.3-60-g2f50 From 2db53fdb1db441f162f49d563859c697f87ec709 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Wed, 8 Jun 2011 19:36:15 +0200 Subject: trying to make sorfina's dialogue shorter correcting the debug npc --- npc/042-1/malik.txt | 1 + npc/042-2/sorfina.txt | 31 +++++++++---------------------- npc/042-2/tanisha.txt | 6 ++++++ 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/npc/042-1/malik.txt b/npc/042-1/malik.txt index a6a190ee..8da665de 100644 --- a/npc/042-1/malik.txt +++ b/npc/042-1/malik.txt @@ -9,6 +9,7 @@ set sorfina, 0; set tanisha, 0; set maggot, 0; + set FLAGS, FLAGS & ~FLAG_TUTORIAL_DONE; L_Close: close; } diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index 407279a9..d4c541d2 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -1,22 +1,21 @@ 042-2.gat,28,26,0 script Sorfina 154,4,4{ - if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; + if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Again; if (sorfina == 2) goto L_Again; if (sorfina == 1) goto L_Clothes; mes "[Old Woman]"; - mes "\"Ah, you woke up. It seems you collapsed after you left the boat that brought you to Tulimshar."; - mes "A group of ragtags immediatly took advantage of that and stole all your stuff!\""; + mes "\"Ah, you woke up. It seems you collapsed after you left the boat that brought you to Tulimshar.\""; next; - mes "\"My little granddaughter Tanisha saw that, but couldn't do something to stop them."; - mes "She hurried to get someone to help. It was too late to catch the thieves, but at least they brought you here to recover.\""; + mes "\"My little granddaughter Tanisha found you lying next to the road, with all your clothes gone."; + mes "It seems you were robbed!"; next; mes "\"This area of the town is full of shady people, so I don't think there's a chance to get back your stuff.\""; mes "She has a sad look on her face, but then she shakes her head and smiles."; next; mes "[Old Woman]"; mes "\"I'm glad you're feeling better now. You're not used to the hot weather, right?"; - mes "Are you here to look for a job? Many young people come to our Tulimshar for this reason.\""; + mes "Are you here to look for a job? Many young people come to Tulimshar for this reason.\""; next; mes "\"I can tell you some useful things, if you want to hear."; mes "Oh, and by the way my name is Sorfina.\""; @@ -45,8 +44,6 @@ L_Naked: mes "\"After we talked click on the shirt and press the equip button.\""; next; mes "\"Talk to me again when you got dressed. You can either click on me, or press N to focus on me and T to talk.\""; - next; - mes "\"If you want to talk to other adventurers, it's a bit different. In that case, press Enter, type your message and press Enter again.\""; close; L_Clothes: @@ -54,13 +51,8 @@ L_Clothes: mes "[Sorfina]"; mes "\"That's much better, don't you think so?\""; next; - mes "\"You know, there are different kind of items. You can also use usable items in your inventory.\""; - next; - mes "\"But you might find it more useful to put them on a shortcut. Press F8 to open your shortcut window.\""; - next; - mes "\"You can select the item you want to put on a shortcut with your mouse and then click on the position in the shortcut window you want to place it.\""; - 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.\""; + 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."; + mes "Talk to me again if you want me to explain more things.\""; next; 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; @@ -71,7 +63,7 @@ L_Clothes: L_Again: mes "[Sorfina]"; - mes "\"Welcome back! Do you have any questions?\""; + mes "\"Make yourself at home! Do you have any questions?\""; next; if (hasan) menu @@ -79,7 +71,7 @@ L_Again: "Yes, could you explain again about...",L_Explain, "No, thanks.",L_Close; menu - "Yes, could you explain again about...",L_Explain, + "Yes, could you explain about...",L_Explain, "No, thanks.",L_Close; close; @@ -202,11 +194,6 @@ L_SkipTut: set FLAGS, FLAGS | FLAG_TUTORIAL_DONE; close; -L_Tut_Done: - mes "[Sorfina]"; - mes "\"Welcome. Please make yourself at home.\""; - close; - L_Close: close; diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt index 1397fa9a..f279f3ea 100644 --- a/npc/042-2/tanisha.txt +++ b/npc/042-2/tanisha.txt @@ -166,6 +166,12 @@ L_Tut_Done: mes "\"This yucky maggots! They're eating our goods!"; mes "No matter how many of them you kill, they always come back.\""; mes "She sighs."; + next; + mes "[Tanisha]"; + mes "\"Do you have any questions?\""; + menu + "Yes, could you explain about...",L_Explain, + "No, thanks.",L_Close; close; L_Crowded: -- cgit v1.2.3-60-g2f50 From 31dd86e43eb2ba8d54564d315b6a9928f205da30 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Thu, 9 Jun 2011 14:18:32 +0200 Subject: some changes in sorfina to make her more interactive --- npc/042-2/sorfina.txt | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index d4c541d2..f157a908 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -1,21 +1,24 @@ 042-2.gat,28,26,0 script Sorfina 154,4,4{ if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Again; - if (sorfina == 2) goto L_Again; - if (sorfina == 1) goto L_Clothes; + if (sorfina == 3) goto L_Again; + if (sorfina == 2) goto L_Clothes; + if (sorfina == 1) goto L_Carpet; +L_Start: + mes "You open your eyes."; + mes ""; mes "[Old Woman]"; mes "\"Ah, you woke up. It seems you collapsed after you left the boat that brought you to Tulimshar.\""; next; mes "\"My little granddaughter Tanisha found you lying next to the road, with all your clothes gone."; - mes "It seems you were robbed!"; + mes "It seems you were robbed!\""; next; mes "\"This area of the town is full of shady people, so I don't think there's a chance to get back your stuff.\""; mes "She has a sad look on her face, but then she shakes her head and smiles."; next; mes "[Old Woman]"; - mes "\"I'm glad you're feeling better now. You're not used to the hot weather, right?"; - mes "Are you here to look for a job? Many young people come to Tulimshar for this reason.\""; + mes "\"Did you come here to look for a job? Many young people come to Tulimshar for this reason.\""; next; mes "\"I can tell you some useful things, if you want to hear."; mes "Oh, and by the way my name is Sorfina.\""; @@ -33,11 +36,28 @@ L_Tut: mes "[Sorfina]"; mes "\"A wise decision.\""; next; - mes "\"Ok, I hope you didn't forget how to walk. Just use the arrow keys or click at the place you want to go to.\""; + mes "\"You still look rather shaky."; + mes "You're not used to the hot weather, right?\""; next; - mes "\"And you really should get dressed again. I gave you an old shirt from my son.\""; +L_Carpet: + if ((getx(0) > 31) && (getx(0) < 35) && (gety(0) > 25) && (gety(0) < 29)) goto L_Shirt; + mes "\"Try to do some steps and walk to that carpet over there."; + mes "Just use the arrow keys or click at the place you want to go to.\""; next; + mes "\"Talk to me again when you're on the carpet. You can either click on me, or press N to focus on me and T to talk.\""; set sorfina, 1; + close; + +L_Shirt: + mes "\"Very good! I'm glad you're recovering."; + mes "Now you should get dressed again. I gave you an old shirt from my son.\""; + next; + mes "\"Press F3 or click at the button for your equipment in the bar at the upper right corner to open your inventory.\""; + next; + mes "\"After we finished talking click on the shirt and press the equip button.\""; + set sorfina, 2; + close; + L_Naked: mes "\"Press F3 or click at the button for your equipment in the bar at the upper right corner to open your inventory.\""; next; @@ -58,7 +78,7 @@ L_Clothes: 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.\""; - set sorfina, 2; + set sorfina, 3; close; L_Again: @@ -185,13 +205,15 @@ L_SkipTut: "Thinking about it twice... please tell me.",L_Tut, "Yeah, but thanks for the offer. Bye.",-; mes "[Sorfina]"; - mes "\"If you think so. Good luck.\""; + mes "\"If you think so. But take at least this."; set hasan, 0; set kaan, 0; set sorfina, 0; set tanisha, 0; set maggot, 0; set FLAGS, FLAGS | FLAG_TUTORIAL_DONE; + getitem "knife", 1; + mes "Good luck.\""; close; L_Close: @@ -200,11 +222,12 @@ L_Close: OnTouch: if (TUT_var != 0) close; callfunc "GameRules"; + goto L_Start; close; } 042-2.gat,44,31,0 script #DoorOut 127,0,0{ - if ((sorfina < 2) && !(FLAGS & FLAG_TUTORIAL_DONE)) goto L_Block; + if ((sorfina < 3) && !(FLAGS & FLAG_TUTORIAL_DONE)) goto L_Block; warp "042-1.gat", 37, 57; end; L_Block: -- cgit v1.2.3-60-g2f50 From 7b6b655601312c12b75b3213ee13e1612cf38b91 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Fri, 10 Jun 2011 14:47:58 +0200 Subject: fixed some warps, changed some dialogue, changed position of hasan and kaan, hasan offers to bring to bazaar after saving him --- npc/001-1_Tulimshar/guide.txt | 2 +- npc/042-1/hasan.txt | 60 ++++++++++++++++++++++++++++++++++++------- npc/042-1/kaan.txt | 2 +- npc/042-1/valon.txt | 2 +- npc/042-2/mapflags.txt | 2 +- npc/042-2/sorfina.txt | 11 ++++---- 6 files changed, 61 insertions(+), 18 deletions(-) diff --git a/npc/001-1_Tulimshar/guide.txt b/npc/001-1_Tulimshar/guide.txt index 4b0d8a25..be04e307 100644 --- a/npc/001-1_Tulimshar/guide.txt +++ b/npc/001-1_Tulimshar/guide.txt @@ -40,7 +40,7 @@ L_Fight: L_Items: mes "[Ian the Guide]"; mes "\"There are three types of items."; - mes "They can be Consumables, Equipment, or Miscellaneous\""; + mes "They can be Consumables, Equipment or Miscellaneous\""; next; mes "[Ian the Guide]"; mes "\"Consumable items such as Potions, can be used only once."; diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt index 2dbf0386..8ea59f65 100644 --- a/npc/042-1/hasan.txt +++ b/npc/042-1/hasan.txt @@ -1,10 +1,13 @@ -042-1.gat,110,74,0 script Hasan 189,{ +042-1.gat,111,68,0 script Hasan 189,{ set @toll, 10000; + set @x, getx(0); + set @y, gety(0); - if ($scorp) goto L_Fear; + if ($@scorp) goto L_Fear; if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; + if ( (@y < 64)&&(@x < 110) || (@x < 107) ) goto L_Cliff_Up; if (hasan == 4) goto L_Thank; if (hasan == 3) goto L_Trick; if (hasan > 0) goto L_Toll; @@ -76,8 +79,8 @@ L_Trick: "I don't have so much money!",L_NoPay, "No. (Scratch your head.)",-; mes "While you're scratching your head, you see Kaan coming nearer to the cliff above you."; - monster "042-1.gat",110,74,"Scorpion",1003,1, "Hasan::onScorpionDeath"; - set $scorp, 1; + monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath"; + set $@scorp, 1; close; L_Thank: @@ -92,12 +95,34 @@ L_Thank: mes "\"I tell you something: Cool persons are allowed to pass for free."; mes "And you can have this.\""; getitem "SharpKnife", 1; + next; set hasan, 0; set kaan, 0; set sorfina, 0; set tanisha, 0; set maggot, 0; set FLAGS, FLAGS | FLAG_TUTORIAL_DONE; + mes "\"You want to go to the bazaar, right? Shall I bring you there?\""; + next; + menu + "Sure, thanks.",-, + "I'll try to find the way myself.",L_Explore, + "Could you just explain me the way?",L_Directions; + warp "001-1.gat", 44, 40; + close; + +L_Explore: + mes "[Hasan]"; + mes "\"Alright. Take care!\""; + close; + +L_Directions: + mes "[Hasan]"; + mes "\"Ok, when you leave here follow the road past the docks until you reach the old city gates.\""; + next; + mes "\"Pass through them and at the crossway, just go west and then south until you reach some other gateway.\""; + next; + mes "\"Behind it there is the bazaar of Tulimshar.\""; close; L_Fear: @@ -114,8 +139,16 @@ L_Tut_Done: mes "\"Bah, nothing interesting is happening here.\""; close; +L_Distance: + mes "There is a person in some distance. He doesn't seem to notice you, maybe you should go closer."; + close; + +L_Cliff_Up: + mes "You see a guy in shaby clothes when you look down the cliff."; + close; + onScorpionDeath: - set $scorp, 0; + set $@scorp, 0; if (hasan != 3) close; set hasan, 4; @@ -123,14 +156,23 @@ onScorpionDeath: end; } +042-1.gat,112,66,0 script #barrier 127,1,0{ + if ((FLAGS & FLAG_TUTORIAL_DONE) || $@scorp) + end; + warp "042-1.gat", 112, 64; + if (!$@scorp) + message strcharinfo(0), "Hasan: \"Stop!\""; + end; +} + 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; - if ($scorp) + warp "042-1.gat", 115, 76; + if ($@scorp) message strcharinfo(0), "Hasan: \"Please help me!\""; - if (!$scorp) - message strcharinfo(0), "Hasan: \"Stop!\""; + if (!$@scorp) + message strcharinfo(0), "Hasan: \"Please wait a moment!\""; end; L_Tut: warp "022-1.gat", 23, 38; diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt index e0aeacc3..b7ccc44e 100644 --- a/npc/042-1/kaan.txt +++ b/npc/042-1/kaan.txt @@ -1,4 +1,4 @@ -042-1.gat,105,72,0 script Kaan 160,{ +042-1.gat,106,70,0 script Kaan 160,{ if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; if (hasan == 4) goto L_Hasan_Saved; diff --git a/npc/042-1/valon.txt b/npc/042-1/valon.txt index 9170223a..3e2cd791 100644 --- a/npc/042-1/valon.txt +++ b/npc/042-1/valon.txt @@ -24,7 +24,7 @@ L_Tut_Done: OnTouch: if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut; - warp "042-1.gat", 17, 78; + warp "042-1.gat", 17, 81; mes "[Valon]"; mes "\"The desert is merciless."; mes "I can't let you leave like this.\""; diff --git a/npc/042-2/mapflags.txt b/npc/042-2/mapflags.txt index b21135a4..4ed80f8e 100644 --- a/npc/042-2/mapflags.txt +++ b/npc/042-2/mapflags.txt @@ -1 +1 @@ -042-2.gat mapflag nosave 042-2,33,27; +042-2.gat mapflag nosave 042-2,40,34; diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index f157a908..90f06cb9 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -9,10 +9,11 @@ L_Start: mes "You open your eyes."; mes ""; mes "[Old Woman]"; - mes "\"Ah, you woke up. It seems you collapsed after you left the boat that brought you to Tulimshar.\""; + mes "\"Ah, you woke up. It seems you collapsed after you left the boat that brought you to Tulimshar."; + mes "A group of ragtags immediatly took advantage of that and stole all your stuff!\""; next; - mes "\"My little granddaughter Tanisha found you lying next to the road, with all your clothes gone."; - mes "It seems you were robbed!\""; + mes "\"My little granddaughter Tanisha saw that, but couldn't do anything to stop them."; + mes "She hurried to get someone to help. It was too late to catch the thieves, but at least the helpers brought you here to recover.\""; next; mes "\"This area of the town is full of shady people, so I don't think there's a chance to get back your stuff.\""; mes "She has a sad look on her face, but then she shakes her head and smiles."; @@ -52,7 +53,7 @@ L_Shirt: mes "\"Very good! I'm glad you're recovering."; mes "Now you should get dressed again. I gave you an old shirt from my son.\""; next; - mes "\"Press F3 or click at the button for your equipment in the bar at the upper right corner to open your inventory.\""; + mes "\"You can open your inventory with pressing F3 or clicking at the button 'Equipment' in the bar at the upper right corner.\""; next; mes "\"After we finished talking click on the shirt and press the equip button.\""; set sorfina, 2; @@ -130,7 +131,7 @@ L_Talk: L_Items: mes "[Sorfina]"; mes "\"There are three types of items."; - mes "They can be Consumables, Equipment, or Miscellaneous.\""; + mes "They can be Consumables, Equipment or Miscellaneous.\""; next; mes "\"Consumable items such as Potions, can be used only once."; mes "After use, they will disappear from your inventory."; -- cgit v1.2.3-60-g2f50 From 886adda7450f9a9fa126387d17c6813fc666ab1d Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sat, 11 Jun 2011 22:48:58 +0200 Subject: some changes: sorfina mentions being in the suburbs of tulimshar make kaans dialogue more continous if player already talked to tanisha and/or hasan --- npc/042-1/kaan.txt | 12 ++++++++++++ npc/042-2/sorfina.txt | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt index b7ccc44e..849b1d06 100644 --- a/npc/042-1/kaan.txt +++ b/npc/042-1/kaan.txt @@ -19,8 +19,15 @@ next; mes "\"Maybe you should go to see her, she was really upset about what happened with you.\""; set kaan, 1; + if (tanisha >= 3) + goto L_Tanisha2; close; +L_Tanisha2: + menu + "I already did and helped her with the maggots.",L_Tanisha3, + "I talked to her, and she's done with the maggots.",L_Tanisha3; + L_Tanisha: mes "[Kaan]"; mes "\"Did you already talk to Tanisha?\""; @@ -30,6 +37,7 @@ L_Tanisha: menu "Yes, I helped her with the maggots.",-, "Yeah, and she's done with the maggots.",-; +L_Tanisha3: mes "[Kaan]"; mes "\"Ah, that are good news."; mes "You know, we have a lot of problems with bugs here.\""; @@ -54,6 +62,10 @@ L_Tanisha: next; mes "\"And Ian the trainer is hanging around there often. You should talk to him, he's a smart guy.\""; set kaan, 2; + if (hasan) + menu + "A guy named Hasan doesn't let me enter main Tulimshar.",L_Hasan, + "Thanks for the advice.",L_Close; close; L_Out: diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index 90f06cb9..cef082b8 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -1,3 +1,5 @@ +//TODO: music in the maps +//TODO: check the starting point 042-2.gat,28,26,0 script Sorfina 154,4,4{ if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Again; @@ -15,7 +17,7 @@ L_Start: mes "\"My little granddaughter Tanisha saw that, but couldn't do anything to stop them."; mes "She hurried to get someone to help. It was too late to catch the thieves, but at least the helpers brought you here to recover.\""; next; - mes "\"This area of the town is full of shady people, so I don't think there's a chance to get back your stuff.\""; + mes "\"We're in the suburbs of Tulimshar here and this area of the town is full of shady people, so I don't think there's a chance to get back your stuff.\""; mes "She has a sad look on her face, but then she shakes her head and smiles."; next; mes "[Old Woman]"; -- cgit v1.2.3-60-g2f50 From 4e36d1ff39110205d3cb8e751d7a9de2d6f65e55 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 12 Jun 2011 10:01:35 +0200 Subject: fixing the nosaveflag --- npc/042-2/mapflags.txt | 2 +- npc/042-2/sorfina.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/npc/042-2/mapflags.txt b/npc/042-2/mapflags.txt index 4ed80f8e..c9f5cc23 100644 --- a/npc/042-2/mapflags.txt +++ b/npc/042-2/mapflags.txt @@ -1 +1 @@ -042-2.gat mapflag nosave 042-2,40,34; +042-2.gat mapflag nosave 042-2,26,26; diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index cef082b8..09c8d39d 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -1,5 +1,5 @@ //TODO: music in the maps -//TODO: check the starting point +//TODO: place monsters on 041-1 042-2.gat,28,26,0 script Sorfina 154,4,4{ if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Again; -- cgit v1.2.3-60-g2f50 From 81d602d55637d97731c0f674875ffe5005459742 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 12 Jun 2011 10:26:01 +0200 Subject: Converter: adding monsters to 041-1 --- npc/041-1/_mobs.txt | 31 +++++++++++++++++++++++++++++++ npc/042-2/sorfina.txt | 2 -- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/npc/041-1/_mobs.txt b/npc/041-1/_mobs.txt index a3360251..91741bbb 100644 --- a/npc/041-1/_mobs.txt +++ b/npc/041-1/_mobs.txt @@ -1,8 +1,39 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // 041-1 mobs +041-1.gat,56,55,18,9 monster Scorpion 1003,3,100000,30000,Mob041-1::On1003 +041-1.gat,76,67,18,9 monster Scorpion 1003,3,100000,30000,Mob041-1::On1003 +041-1.gat,75,84,18,9 monster Scorpion 1003,3,100000,30000,Mob041-1::On1003 +041-1.gat,36,34,13,20 monster Scorpion 1003,3,100000,30000,Mob041-1::On1003 +041-1.gat,30,30,10,48 monster Sea Slime 1033,3,100000,30000,Mob041-1::On1033 +041-1.gat,34,13,10,9 monster Scorpion 1003,3,100000,30000,Mob041-1::On1003 +041-1.gat,35,7,3,2 monster Black Scorpion 1009,1,100000,30000,Mob041-1::On1009 +041-1.gat,41,49,3,2 monster Black Scorpion 1009,1,100000,30000,Mob041-1::On1009 +041-1.gat,70,75,21,9 monster Black Scorpion 1009,1,100000,30000,Mob041-1::On1009 +041-1.gat,75,57,18,9 monster Red Scorpion 1004,3,100000,30000,Mob041-1::On1004 +041-1.gat,58,64,18,9 monster Red Scorpion 1004,3,100000,30000,Mob041-1::On1004 041-1.gat,0,0,0 script Mob041-1 -1,{ +On1003: + set @mobID, 1003; + callfunc "MobPoints"; + break; + +On1004: + set @mobID, 1004; + callfunc "MobPoints"; + break; + +On1009: + set @mobID, 1009; + callfunc "MobPoints"; + break; + +On1033: + set @mobID, 1033; + callfunc "MobPoints"; + break; + end; } diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index 09c8d39d..55f96aaf 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -1,5 +1,3 @@ -//TODO: music in the maps -//TODO: place monsters on 041-1 042-2.gat,28,26,0 script Sorfina 154,4,4{ if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Again; -- cgit v1.2.3-60-g2f50 From aecd1989767b9cc837591509d3d0b92f74a07627 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 12 Jun 2011 12:16:53 +0200 Subject: fixing a problem when player clicks on sorfina before doing a step --- npc/042-2/sorfina.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index 55f96aaf..6d192af1 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -5,6 +5,7 @@ if (sorfina == 2) goto L_Clothes; if (sorfina == 1) goto L_Carpet; + callfunc "GameRules"; L_Start: mes "You open your eyes."; mes ""; @@ -221,8 +222,8 @@ L_Close: close; OnTouch: - if (TUT_var != 0) close; - callfunc "GameRules"; + if (TUT_var != 0) close; + callfunc "GameRules"; goto L_Start; close; } -- cgit v1.2.3-60-g2f50 From 13d0566600ddec66e1c175aa534f0c3325cbdfc4 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 12 Jun 2011 16:31:00 +0200 Subject: some fixes to make easier to understand --- npc/042-1/hasan.txt | 3 ++- npc/042-1/kaan.txt | 6 ++++++ npc/042-2/sorfina.txt | 6 +++--- npc/042-2/tanisha.txt | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt index 8ea59f65..8dc44a38 100644 --- a/npc/042-1/hasan.txt +++ b/npc/042-1/hasan.txt @@ -1,3 +1,4 @@ +//TODO: first barrier into hasan 042-1.gat,111,68,0 script Hasan 189,{ set @toll, 10000; @@ -93,7 +94,7 @@ L_Thank: mes "Amazing!\""; next; mes "\"I tell you something: Cool persons are allowed to pass for free."; - mes "And you can have this.\""; + mes "And you can my Sharp Knife.\""; getitem "SharpKnife", 1; next; set hasan, 0; diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt index 849b1d06..30376310 100644 --- a/npc/042-1/kaan.txt +++ b/npc/042-1/kaan.txt @@ -2,6 +2,7 @@ if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; if (hasan == 4) goto L_Hasan_Saved; + if ($@scorp) goto L_Run; if (kaan == 4) goto L_Plan; if (kaan == 3) goto L_Trick; if (kaan == 2) goto L_Out; @@ -145,6 +146,11 @@ L_Tut_Done: mes "Hasan is a real troublemaker, but it seems he calmed down now.\""; close; +L_Run: + mes "[Kaan]"; + mes "\"He's distracted! What are you waiting for?\""; + close; + L_Close: close; } diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index 6d192af1..ea332a91 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -43,10 +43,10 @@ L_Tut: next; L_Carpet: if ((getx(0) > 31) && (getx(0) < 35) && (gety(0) > 25) && (gety(0) < 29)) goto L_Shirt; - mes "\"Try to do some steps and walk to that carpet over there."; + mes "\"Try to do some steps and walk to that red carpet over there."; mes "Just use the arrow keys or click at the place you want to go to.\""; next; - mes "\"Talk to me again when you're on the carpet. You can either click on me, or press N to focus on me and T to talk.\""; + mes "\"Talk to me again when you're on the red carpet. You can either click on me, or press N to focus on me and T to talk.\""; set sorfina, 1; close; @@ -54,7 +54,7 @@ L_Shirt: mes "\"Very good! I'm glad you're recovering."; mes "Now you should get dressed again. I gave you an old shirt from my son.\""; next; - mes "\"You can open your inventory with pressing F3 or clicking at the button 'Equipment' in the bar at the upper right corner.\""; + mes "\"You can open your inventory with pressing F3 or clicking at the button 'Inventory' in the bar at the upper right corner.\""; next; mes "\"After we finished talking click on the shirt and press the equip button.\""; set sorfina, 2; diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt index f279f3ea..fdc76ef0 100644 --- a/npc/042-2/tanisha.txt +++ b/npc/042-2/tanisha.txt @@ -46,7 +46,7 @@ L_Fight_Again: mes "\"Ok, listen what to do."; mes "Equip the knife and kill the maggots.\""; next; - mes "\"Press A to focus on a monster. With X you can focus and attack the same time."; + mes "\"Press A to focus on a monster. With X you can focus and start attacking the same time."; mes "But it also works to click on the monster with your mouse.\""; next; mes "\"If you press Shift, you can abort your attack.\""; -- cgit v1.2.3-60-g2f50 From 1b800e81c08d79eb42dcd8f5721e8d1e4fad3bdb Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 12 Jun 2011 17:11:33 +0200 Subject: putting first barrier and hasan into one npc --- npc/042-1/hasan.txt | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt index 8dc44a38..a0ef2324 100644 --- a/npc/042-1/hasan.txt +++ b/npc/042-1/hasan.txt @@ -1,12 +1,10 @@ -//TODO: first barrier into hasan -042-1.gat,111,68,0 script Hasan 189,{ +042-1.gat,111,68,0 script Hasan 189,2,2{ set @toll, 10000; set @x, getx(0); set @y, gety(0); if ($@scorp) goto L_Fear; - if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; if ( (@y < 64)&&(@x < 110) || (@x < 107) ) goto L_Cliff_Up; if (hasan == 4) goto L_Thank; @@ -80,9 +78,10 @@ L_Trick: "I don't have so much money!",L_NoPay, "No. (Scratch your head.)",-; mes "While you're scratching your head, you see Kaan coming nearer to the cliff above you."; + close2; monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath"; set $@scorp, 1; - close; + end; L_Thank: mes "[Hasan]"; @@ -148,6 +147,13 @@ L_Cliff_Up: mes "You see a guy in shaby clothes when you look down the cliff."; close; +OnTouch: + if ((FLAGS & FLAG_TUTORIAL_DONE) || $@scorp) + end; + warp "042-1.gat", 112, 64; + message strcharinfo(0), "Hasan: \"Stop!\""; + end; + onScorpionDeath: set $@scorp, 0; if (hasan != 3) @@ -157,15 +163,6 @@ onScorpionDeath: end; } -042-1.gat,112,66,0 script #barrier 127,1,0{ - if ((FLAGS & FLAG_TUTORIAL_DONE) || $@scorp) - end; - warp "042-1.gat", 112, 64; - if (!$@scorp) - message strcharinfo(0), "Hasan: \"Stop!\""; - end; -} - 042-1.gat,117,76,0 script #barrier 127,0,2{ if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut; -- cgit v1.2.3-60-g2f50 From dd5a1ed7e2e1e93bb74908ba4068350966e541b0 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 12 Jun 2011 19:32:50 +0200 Subject: invisible npc that can't be clicked on the carpet --- conf/char_athena.conf | 2 +- npc/042-1/hasan.txt | 4 +++- npc/042-2/sorfina.txt | 42 ++++++++++++++++++++++++++---------------- npc/042-2/tanisha.txt | 2 +- 4 files changed, 31 insertions(+), 19 deletions(-) diff --git a/conf/char_athena.conf b/conf/char_athena.conf index eb4b62b4..dd387fd2 100644 --- a/conf/char_athena.conf +++ b/conf/char_athena.conf @@ -50,7 +50,7 @@ start_point: 042-2.gat,26,26 start_weapon: 0 // Starting armor for new characters -start_armor: 1202 +start_armor: 0 // Starting zeny for new characters start_zeny: 50 diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt index a0ef2324..5d70fc23 100644 --- a/npc/042-1/hasan.txt +++ b/npc/042-1/hasan.txt @@ -163,7 +163,9 @@ onScorpionDeath: end; } -042-1.gat,117,76,0 script #barrier 127,0,2{ +042-1.gat,117,76,0 script #barrier 45,0,2{ + end; +OnTouch: if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut; warp "042-1.gat", 115, 76; diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index ea332a91..33c67e06 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -42,22 +42,10 @@ L_Tut: mes "You're not used to the hot weather, right?\""; next; L_Carpet: - if ((getx(0) > 31) && (getx(0) < 35) && (gety(0) > 25) && (gety(0) < 29)) goto L_Shirt; mes "\"Try to do some steps and walk to that red carpet over there."; mes "Just use the arrow keys or click at the place you want to go to.\""; - next; - mes "\"Talk to me again when you're on the red carpet. You can either click on me, or press N to focus on me and T to talk.\""; - set sorfina, 1; - close; - -L_Shirt: - mes "\"Very good! I'm glad you're recovering."; - mes "Now you should get dressed again. I gave you an old shirt from my son.\""; - next; - mes "\"You can open your inventory with pressing F3 or clicking at the button 'Inventory' in the bar at the upper right corner.\""; - next; - mes "\"After we finished talking click on the shirt and press the equip button.\""; - set sorfina, 2; + if (!sorfina) + set sorfina, 1; close; L_Naked: @@ -214,7 +202,8 @@ L_SkipTut: set tanisha, 0; set maggot, 0; set FLAGS, FLAGS | FLAG_TUTORIAL_DONE; - getitem "knife", 1; + getitem "Knife", 1; + getitem "CottonShirt", 1; mes "Good luck.\""; close; @@ -228,7 +217,28 @@ OnTouch: close; } -042-2.gat,44,31,0 script #DoorOut 127,0,0{ +042-2.gat,33,27,0 script #Carpet 45,1,1{ + end; +OnTouch: + if (sorfina != 1) + end; + mes "[Sorfina]"; + mes "\"Very good! I'm glad you're recovering."; + mes "Now you should get dressed again. Here is an old shirt from my son.\""; + getitem "CottonShirt", 1; + next; + mes "\"You can open your inventory with pressing F3 or clicking at the button 'Inventory' in the bar at the upper right corner.\""; + next; + mes "\"After we finished talking click on the shirt and press the equip button.\""; + next; + mes "\"Talk to me again when you got dressed. You can either click on me, or press N to focus on me and T to talk.\""; + set sorfina, 2; + close; +} + +042-2.gat,44,31,0 script #DoorOut 45,0,0{ + end; +OnTouch: if ((sorfina < 3) && !(FLAGS & FLAG_TUTORIAL_DONE)) goto L_Block; warp "042-1.gat", 37, 57; end; diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt index fdc76ef0..b7855e2f 100644 --- a/npc/042-2/tanisha.txt +++ b/npc/042-2/tanisha.txt @@ -40,7 +40,7 @@ L_Maggots: goto L_Crowded; set $@TUT_MAGGOT, $@TUT_MAGGOT + 1; set maggot, 0; - getitem "knife", 1; + getitem "Knife", 1; next; L_Fight_Again: mes "\"Ok, listen what to do."; -- cgit v1.2.3-60-g2f50 From cd340c55d12dcd62e81fb3d6d0d9f02333c1e65e Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 12 Jun 2011 21:41:04 +0200 Subject: sorfina explains how to interact with npcs seperated and shirt is in a chest --- npc/042-2/sorfina.txt | 53 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index 33c67e06..b3160155 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -1,8 +1,9 @@ 042-2.gat,28,26,0 script Sorfina 154,4,4{ if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Again; - if (sorfina == 3) goto L_Again; - if (sorfina == 2) goto L_Clothes; + if (sorfina == 4) goto L_Again; + if (sorfina == 3) goto L_Clothes; + if (sorfina == 2) goto L_Chest; if (sorfina == 1) goto L_Carpet; callfunc "GameRules"; @@ -48,6 +49,15 @@ L_Carpet: set sorfina, 1; close; +L_Chest: + mes "[Sorfina]"; + mes "\"In that chest there is a shirt you can have.\""; + next; + mes "\"To interact with things in your environment or talk to NPCs you can either click on it or press N to focus and T to talk/activate.\""; + next; + mes "\"Now get the shirt out of the chest.\""; + close; + L_Naked: mes "\"Press F3 or click at the button for your equipment in the bar at the upper right corner to open your inventory.\""; next; @@ -68,7 +78,7 @@ L_Clothes: 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.\""; - set sorfina, 3; + set sorfina, 4; close; L_Again: @@ -224,22 +234,49 @@ OnTouch: end; mes "[Sorfina]"; mes "\"Very good! I'm glad you're recovering."; - mes "Now you should get dressed again. Here is an old shirt from my son.\""; + mes "Now you should get dressed again.\""; + next; + mes "Sorfina unlocks the chest behind her."; + next; + mes "[Sorfina]"; + mes "\"In that chest there is a shirt you can have.\""; + next; + mes "\"To interact with things in your environment or talk to NPCs you can either click on it or press N to focus and T to talk/activate.\""; + next; + mes "\"Now get the shirt out of the chest.\""; + set sorfina, 2; + close; +} + +042-2.gat,27,23,0 script Chest 111,{ + + if (sorfina > 2) goto L_Empty; + if (sorfina == 2) goto L_Shirt; + + mes "The chest is locked."; + close; +L_Shirt: + mes "You take a simple Cotton Shirt out of the chest."; getitem "CottonShirt", 1; next; + mes "[Sorfina]"; + mes "\"Great! Now you can equip it.\""; + next; mes "\"You can open your inventory with pressing F3 or clicking at the button 'Inventory' in the bar at the upper right corner.\""; next; mes "\"After we finished talking click on the shirt and press the equip button.\""; - next; - mes "\"Talk to me again when you got dressed. You can either click on me, or press N to focus on me and T to talk.\""; - set sorfina, 2; + set sorfina, 3; + close; + +L_Empty: + mes "The chest is empty."; close; } 042-2.gat,44,31,0 script #DoorOut 45,0,0{ end; OnTouch: - if ((sorfina < 3) && !(FLAGS & FLAG_TUTORIAL_DONE)) goto L_Block; + if ((sorfina < 4) && !(FLAGS & FLAG_TUTORIAL_DONE)) goto L_Block; warp "042-1.gat", 37, 57; end; L_Block: -- cgit v1.2.3-60-g2f50 From 00c750030f967a863613304d16565f8fb4ad6034 Mon Sep 17 00:00:00 2001 From: Coffee Date: Sun, 12 Jun 2011 21:25:33 -0300 Subject: Fix some issues with the maggot fight --- npc/042-2/tanisha.txt | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt index b7855e2f..b75bc99d 100644 --- a/npc/042-2/tanisha.txt +++ b/npc/042-2/tanisha.txt @@ -1,5 +1,21 @@ 042-2.gat,37,90,0 script Tanisha 114,{ +// Comments(Remove it later): + +// 1) I used a temporary variable to count the kills, so if the player relog he will have to +// kill the 5 maggots in a single fight. + +// 2) Changed the maggots spawn to one by one, at the exact place the player is standing, so +// there is less chances of someone getting your kills from outside (It is possible when the +// maggots are in the corner). And if someone insists in killing your maggots during the fight, +// all that will happen is this person will finish the fight quickly leaving you alone with your maggots. + +// 3) Also, in the L_noheal label, I put a check so when there is no one fighting the npc timer +// is stopped and set to zero. + +// 4) And I put a message in the middle of the fight, with tanisha commenting about the way the +// maggots just keep popping out from nowhere. + set @playerlimit, 4; if ((getx(0) > 29) && (getx(0) < 37) && (gety(0) > 84) && (gety(0) < 90)) goto L_Fighting; @@ -39,7 +55,6 @@ L_Maggots: if ($@TUT_MAGGOT >= @playerlimit) goto L_Crowded; set $@TUT_MAGGOT, $@TUT_MAGGOT + 1; - set maggot, 0; getitem "Knife", 1; next; L_Fight_Again: @@ -55,9 +70,13 @@ L_Fight_Again: next; mes "\"Sometimes dead monsters leave some useful things. You can pick them up with pressing Z or clicking with your mouse.\""; set tanisha, 2; + set @maggot, 0; + set @time, 0; close2; warp "042-2.gat", 33, 87; - areamonster "042-2.gat", 31, 85, 35, 89, "", 1002, 5, "Tanisha::onMaggotDeath"; + +L_Summon: + monster "042-2.gat", getx(0), gety(0), "", 1002, 1, "Tanisha::onMaggotDeath"; startnpctimer; end; @@ -188,6 +207,12 @@ L_Sleep: mes "\"What are you doing in there?"; mes "Sleeping?"; mes "Come back when you're serious.\""; + set @maggot, 0; + set @time, 0; + if ($@TUT_MAGGOT > 0) + set $@TUT_MAGGOT, $@TUT_MAGGOT - 1; + if ($@TUT_MAGGOT == 0) stopnpctimer; + if ($@TUT_MAGGOT == 0) setnpctimer 0; close; L_Fail: @@ -237,17 +262,23 @@ onTick: heal MaxHp, 0; message strcharinfo(0), "Tanisha: You're doing good!"; L_NoHeal: - if (maggot < 5) + if (@maggot < 5) end; warp "042-2.gat", 36, 90; set tanisha, 3; - set maggot, 0; + set @maggot, 0; + set @time, 0; if ($@TUT_MAGGOT > 0) set $@TUT_MAGGOT, $@TUT_MAGGOT - 1; + if ($@TUT_MAGGOT == 0) stopnpctimer; + if ($@TUT_MAGGOT == 0) setnpctimer 0; close; onMaggotDeath: - set maggot, maggot + 1; + if (@maggot == 2) message strcharinfo(0), "Tanisha: Ohh... Irrhk... Eeeeww... They just appear from nowhere!"; + if ((getx(0) > 29) && (getx(0) < 37) && (gety(0) > 84) && (gety(0) < 90)) set @maggot, @maggot + 1; + if (@maggot < 5 && (getx(0) <= 29) || (getx(0) >= 37) || (gety(0) <= 84) || (gety(0) >= 90)) monster "042-2.gat", 33, 87, "", 1002, 1, "Tanisha::onMaggotDeath"; + if (@maggot < 5 && (getx(0) > 29) && (getx(0) < 37) && (gety(0) > 84) && (gety(0) < 90)) monster "042-2.gat", getx(0), gety(0), "", 1002, 1, "Tanisha::onMaggotDeath"; end; L_Close: -- cgit v1.2.3-60-g2f50 From d6419687dad8681167609331cfd4e5d236ca530d Mon Sep 17 00:00:00 2001 From: Coffee Date: Mon, 13 Jun 2011 09:07:52 -0300 Subject: Add new option in debug npc. New messages for Tanisha. Fix issues in hasan. --- npc/042-1/hasan.txt | 52 ++++++++++++++++++++++++++++++++++++++++++++++----- npc/042-1/malik.txt | 12 +++++++++--- npc/042-2/tanisha.txt | 18 ++---------------- 3 files changed, 58 insertions(+), 24 deletions(-) diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt index 5d70fc23..202581f7 100644 --- a/npc/042-1/hasan.txt +++ b/npc/042-1/hasan.txt @@ -1,4 +1,4 @@ -042-1.gat,111,68,0 script Hasan 189,2,2{ +042-1.gat,111,68,0 script Hasan 189,{ set @toll, 10000; set @x, getx(0); @@ -80,7 +80,9 @@ L_Trick: mes "While you're scratching your head, you see Kaan coming nearer to the cliff above you."; close2; monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath"; + set $@ScorpionFighter$, strcharinfo(0); set $@scorp, 1; + startnpctimer; end; L_Thank: @@ -147,19 +149,57 @@ L_Cliff_Up: mes "You see a guy in shaby clothes when you look down the cliff."; close; -OnTouch: - if ((FLAGS & FLAG_TUTORIAL_DONE) || $@scorp) - end; +L_SummonAgain: + message strcharinfo(0), "Kaan is mad with your interference! He comes near the cliff and throws a rock on the top of your head, and let another scorpion run just near Hasan!"; + percentheal -100, 0; + attachrid(getcharid(3,$@ScorpionFighter$)); + message strcharinfo(0), "Kaan: \"Just go while he is distracted and no one is interfering!\""; + monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath"; + end; + +L_Clean: + killmonster "042-1.gat", "Hasan::onScorpionDeath"; + set $@ScorpionTimer, 0; + set $@ScorpionFighter$, ""; + set $@scorp, 0; + attachrid(getcharid(3,$@ScorpionFighter$)); + message strcharinfo(0), "Hasan, with his eyes almost closed, trembling with fear, runs toward the scorpion and stabs it with all his strenght! Seems like it took too long and the plan didn't work this time."; warp "042-1.gat", 112, 64; - message strcharinfo(0), "Hasan: \"Stop!\""; + message strcharinfo(0), "Hasan: \"Hey you! I told you you cannot pass!\""; + end; + +OnTimer5000: + set $@ScorpionTimer, $@ScorpionTimer + 5; + if ($@ScorpionTimer >= 300) goto L_Clean; + setnpctimer 0; end; onScorpionDeath: + if (strcharinfo(0) != $@ScorpionFighter$) goto L_SummonAgain; set $@scorp, 0; if (hasan != 3) close; set hasan, 4; message strcharinfo(0), "You saved Hasan."; + set $@ScorpionTimer, 0; + set $@ScorpionFighter$, ""; + end; + +OnInit: + initnpctimer; + stopnpctimer; + +} + +042-1.gat,111,68,0 script #Toll 127,2,2,{ + + end; + +OnTouch: + if ((FLAGS & FLAG_TUTORIAL_DONE) || $@scorp || (hasan == 4)) + end; + warp "042-1.gat", 112, 64; + message strcharinfo(0), "Hasan: \"Stop!\""; end; } @@ -177,4 +217,6 @@ OnTouch: L_Tut: warp "022-1.gat", 23, 38; end; + + } diff --git a/npc/042-1/malik.txt b/npc/042-1/malik.txt index 8da665de..389d3233 100644 --- a/npc/042-1/malik.txt +++ b/npc/042-1/malik.txt @@ -1,9 +1,9 @@ 042-1.gat,105,60,0 script Malik 162,{ - mes "reset?"; menu - "yes",-, - "no",L_Close; + "Reset",-, + "Test Scorpion Fight", L_Scorp, + "close",L_Close; set hasan, 0; set kaan, 0; set sorfina, 0; @@ -12,4 +12,10 @@ set FLAGS, FLAGS & ~FLAG_TUTORIAL_DONE; L_Close: close; + +L_Scorp: + set sorfina, 4; + set kaan, 4; + set hasan, 3; + close; } diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt index b75bc99d..6fc7de1d 100644 --- a/npc/042-2/tanisha.txt +++ b/npc/042-2/tanisha.txt @@ -1,21 +1,5 @@ 042-2.gat,37,90,0 script Tanisha 114,{ -// Comments(Remove it later): - -// 1) I used a temporary variable to count the kills, so if the player relog he will have to -// kill the 5 maggots in a single fight. - -// 2) Changed the maggots spawn to one by one, at the exact place the player is standing, so -// there is less chances of someone getting your kills from outside (It is possible when the -// maggots are in the corner). And if someone insists in killing your maggots during the fight, -// all that will happen is this person will finish the fight quickly leaving you alone with your maggots. - -// 3) Also, in the L_noheal label, I put a check so when there is no one fighting the npc timer -// is stopped and set to zero. - -// 4) And I put a message in the middle of the fight, with tanisha commenting about the way the -// maggots just keep popping out from nowhere. - set @playerlimit, 4; if ((getx(0) > 29) && (getx(0) < 37) && (gety(0) > 84) && (gety(0) < 90)) goto L_Fighting; @@ -275,7 +259,9 @@ L_NoHeal: close; onMaggotDeath: + if (@maggot == 1) message strcharinfo(0), "Tanisha: Aaahhhh... another one! It will crawl up your legs!"; if (@maggot == 2) message strcharinfo(0), "Tanisha: Ohh... Irrhk... Eeeeww... They just appear from nowhere!"; + if (@maggot == 3) message strcharinfo(0), "Tanisha: Yuck... I think I am getting sick."; if ((getx(0) > 29) && (getx(0) < 37) && (gety(0) > 84) && (gety(0) < 90)) set @maggot, @maggot + 1; if (@maggot < 5 && (getx(0) <= 29) || (getx(0) >= 37) || (gety(0) <= 84) || (gety(0) >= 90)) monster "042-2.gat", 33, 87, "", 1002, 1, "Tanisha::onMaggotDeath"; if (@maggot < 5 && (getx(0) > 29) && (getx(0) < 37) && (gety(0) > 84) && (gety(0) < 90)) monster "042-2.gat", getx(0), gety(0), "", 1002, 1, "Tanisha::onMaggotDeath"; -- cgit v1.2.3-60-g2f50 From 260d4f44930e7f4e36dc83855c33e4473c0813e3 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Mon, 13 Jun 2011 14:31:15 +0200 Subject: using 45 as sprite id for invisible npc --- npc/042-1/hasan.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt index 202581f7..47db10a8 100644 --- a/npc/042-1/hasan.txt +++ b/npc/042-1/hasan.txt @@ -152,7 +152,7 @@ L_Cliff_Up: L_SummonAgain: message strcharinfo(0), "Kaan is mad with your interference! He comes near the cliff and throws a rock on the top of your head, and let another scorpion run just near Hasan!"; percentheal -100, 0; - attachrid(getcharid(3,$@ScorpionFighter$)); + attachrid(getcharid(3,$@ScorpionFighter$)); message strcharinfo(0), "Kaan: \"Just go while he is distracted and no one is interfering!\""; monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath"; end; @@ -191,7 +191,7 @@ OnInit: } -042-1.gat,111,68,0 script #Toll 127,2,2,{ +042-1.gat,111,68,0 script #Toll 45,2,2,{ end; -- cgit v1.2.3-60-g2f50 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(-) 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-60-g2f50 From ecb0764a20be1704261f77e05f39cd3a417edab2 Mon Sep 17 00:00:00 2001 From: Coffee Date: Mon, 13 Jun 2011 21:00:37 -0300 Subject: Fix some serious bugs that could cause the server to crash --- npc/042-1/hasan.txt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt index 47db10a8..7572591c 100644 --- a/npc/042-1/hasan.txt +++ b/npc/042-1/hasan.txt @@ -82,6 +82,7 @@ L_Trick: monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath"; set $@ScorpionFighter$, strcharinfo(0); set $@scorp, 1; + set $@ScorpDeath, PC_DIE_COUNTER; startnpctimer; end; @@ -160,17 +161,28 @@ L_SummonAgain: L_Clean: killmonster "042-1.gat", "Hasan::onScorpionDeath"; set $@ScorpionTimer, 0; - set $@ScorpionFighter$, ""; set $@scorp, 0; + stopnpctimer; + setnpctimer 0; + if (isloggedin(getcharid(3,$@ScorpionFighter$))==0) end; attachrid(getcharid(3,$@ScorpionFighter$)); + if (PC_DIE_COUNTER > $@ScorpDeath) goto L_MessageDeath; message strcharinfo(0), "Hasan, with his eyes almost closed, trembling with fear, runs toward the scorpion and stabs it with all his strenght! Seems like it took too long and the plan didn't work this time."; warp "042-1.gat", 112, 64; message strcharinfo(0), "Hasan: \"Hey you! I told you you cannot pass!\""; + set $@ScorpionFighter$, ""; + end; + +L_MessageDeath: + message strcharinfo(0), "Ouch... I should be more careful when fighting these monsters."; end; OnTimer5000: + if(isloggedin(getcharid(3,$@ScorpionFighter$))==0) goto L_Clean; set $@ScorpionTimer, $@ScorpionTimer + 5; if ($@ScorpionTimer >= 300) goto L_Clean; + attachrid(getcharid(3,$@ScorpionFighter$)); + if (PC_DIE_COUNTER > $@ScorpDeath) goto L_Clean; setnpctimer 0; end; -- cgit v1.2.3-60-g2f50 From d93334d760d6ca6aba505cb49a1fb39f4b2ec0e6 Mon Sep 17 00:00:00 2001 From: Coffee Date: Mon, 13 Jun 2011 23:17:44 -0300 Subject: Change a line in sorfina and add a new check in hasan --- npc/042-1/hasan.txt | 5 +++++ npc/042-2/sorfina.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt index 7572591c..973e2583 100644 --- a/npc/042-1/hasan.txt +++ b/npc/042-1/hasan.txt @@ -77,6 +77,7 @@ L_Trick: menu "I don't have so much money!",L_NoPay, "No. (Scratch your head.)",-; + if ($@scorp == 1) goto L_Wait; mes "While you're scratching your head, you see Kaan coming nearer to the cliff above you."; close2; monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath"; @@ -177,6 +178,10 @@ L_MessageDeath: message strcharinfo(0), "Ouch... I should be more careful when fighting these monsters."; end; +L_Wait: + mes "There is a scorpion near Hasan already. I think Kaan is helping someone else... Maybe I should try the plan later."; + close; + OnTimer5000: if(isloggedin(getcharid(3,$@ScorpionFighter$))==0) goto L_Clean; set $@ScorpionTimer, $@ScorpionTimer + 5; diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt index b3160155..2b1a8f84 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -71,7 +71,7 @@ L_Clothes: mes "[Sorfina]"; mes "\"That's much better, don't you think so?\""; 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."; + mes "\"I think this will help you a bit. To get more informations, press the button Setup and look at the controls on the Keyboard tab. You can also change them as you like."; mes "Talk to me again if you want me to explain more things.\""; next; 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.\""; -- cgit v1.2.3-60-g2f50 From 58742aae67697a5ffe7f460adaa10d567a0d4434 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Tue, 14 Jun 2011 20:39:50 +0200 Subject: fix an issue in hasan --- npc/042-1/hasan.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt index 973e2583..ff7ad12b 100644 --- a/npc/042-1/hasan.txt +++ b/npc/042-1/hasan.txt @@ -97,7 +97,7 @@ L_Thank: mes "Amazing!\""; next; mes "\"I tell you something: Cool persons are allowed to pass for free."; - mes "And you can my Sharp Knife.\""; + mes "And you can have my Sharp Knife.\""; getitem "SharpKnife", 1; next; set hasan, 0; @@ -200,6 +200,7 @@ onScorpionDeath: message strcharinfo(0), "You saved Hasan."; set $@ScorpionTimer, 0; set $@ScorpionFighter$, ""; + stopnpctimer; end; OnInit: -- cgit v1.2.3-60-g2f50 From 61ba1b5ae4c06a64377e601076621bf645d425ec Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Tue, 14 Jun 2011 21:54:21 +0200 Subject: adding comments and a small addition to the fix in hasan --- npc/022-1_Tulimshar/tutorial.txt | 4 ++++ npc/041-1/tutorial.txt | 4 ++++ npc/042-1/hasan.txt | 4 ++++ npc/042-1/kaan.txt | 3 +++ npc/042-1/valon.txt | 3 +++ npc/042-2/sorfina.txt | 3 +++ npc/042-2/tanisha.txt | 3 +++ 7 files changed, 24 insertions(+) diff --git a/npc/022-1_Tulimshar/tutorial.txt b/npc/022-1_Tulimshar/tutorial.txt index 2ab32bdb..a0166921 100644 --- a/npc/022-1_Tulimshar/tutorial.txt +++ b/npc/022-1_Tulimshar/tutorial.txt @@ -1,3 +1,7 @@ +// This file is part of the Tutorial +// Author: Jenalya +// if you enter the tutorial area, it is set to be already done + 022-1.gat,19,37,0 script #tutorial 127,0,2{ set FLAGS, FLAGS | FLAG_TUTORIAL_DONE; warp "042-1.gat", 114, 76; diff --git a/npc/041-1/tutorial.txt b/npc/041-1/tutorial.txt index 93d19e69..866bc145 100644 --- a/npc/041-1/tutorial.txt +++ b/npc/041-1/tutorial.txt @@ -1,3 +1,7 @@ +// This file is part of the Tutorial +// Author: Jenalya +// if you enter the tutorial area, it is set to be already done + 041-1.gat,33,5,0 script #tutorial 127,1,0{ set FLAGS, FLAGS | FLAG_TUTORIAL_DONE; warp "042-1.gat", 17, 80; diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt index ff7ad12b..e39ad986 100644 --- a/npc/042-1/hasan.txt +++ b/npc/042-1/hasan.txt @@ -1,3 +1,6 @@ +// This file is part of the Tutorial +// Authors: Jenalya, alastrim + 042-1.gat,111,68,0 script Hasan 189,{ set @toll, 10000; @@ -201,6 +204,7 @@ onScorpionDeath: set $@ScorpionTimer, 0; set $@ScorpionFighter$, ""; stopnpctimer; + setnpctimer 0; end; OnInit: diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt index 30376310..8af50cd5 100644 --- a/npc/042-1/kaan.txt +++ b/npc/042-1/kaan.txt @@ -1,3 +1,6 @@ +// This file is part of the Tutorial +// Author: Jenalya + 042-1.gat,106,70,0 script Kaan 160,{ if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; diff --git a/npc/042-1/valon.txt b/npc/042-1/valon.txt index 3e2cd791..6ca6ff6a 100644 --- a/npc/042-1/valon.txt +++ b/npc/042-1/valon.txt @@ -1,3 +1,6 @@ +// This file is part of the Tutorial +// Author: Jenalya + 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/sorfina.txt b/npc/042-2/sorfina.txt index 2b1a8f84..5b55997f 100644 --- a/npc/042-2/sorfina.txt +++ b/npc/042-2/sorfina.txt @@ -1,3 +1,6 @@ +// This file is part of the Tutorial +// Author: Jenalya + 042-2.gat,28,26,0 script Sorfina 154,4,4{ if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Again; diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt index 6fc7de1d..5e040da3 100644 --- a/npc/042-2/tanisha.txt +++ b/npc/042-2/tanisha.txt @@ -1,3 +1,6 @@ +// This file is part of the Tutorial +// Authors: Jenalya, alastrim + 042-2.gat,37,90,0 script Tanisha 114,{ set @playerlimit, 4; -- cgit v1.2.3-60-g2f50 From 246072120a1edcba61a350bad56049f110457489 Mon Sep 17 00:00:00 2001 From: Coffee Date: Wed, 15 Jun 2011 20:53:56 -0300 Subject: Make kaan react normally when you are not the one doing the quest. Set some more detailed messages in the barriers and remove the parts when he can give the players the impression that they have to kill the scorpion when not doing the quest. --- npc/042-1/hasan.txt | 25 ++++++++++++++++++++----- npc/042-1/kaan.txt | 2 +- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt index e39ad986..db32179d 100644 --- a/npc/042-1/hasan.txt +++ b/npc/042-1/hasan.txt @@ -134,7 +134,7 @@ L_Directions: L_Fear: mes "[Hasan]"; - mes "\"Sc-sc-sco-scorpion! Pl-please k-kill it.\""; + mes "\"Sc-sc-sco-scorpion!\""; mes "He seems close to tears."; close; @@ -218,11 +218,24 @@ OnInit: end; OnTouch: - if ((FLAGS & FLAG_TUTORIAL_DONE) || $@scorp || (hasan == 4)) + if ($@scorp && $@ScorpionFighter$ == strcharinfo(0)) end; + if ((FLAGS & FLAG_TUTORIAL_DONE) || (hasan == 4)) + end; + if ($@scorp && $@ScorpionFighter$ != strcharinfo(0)) + goto L_Scared; + +L_Normal: warp "042-1.gat", 112, 64; message strcharinfo(0), "Hasan: \"Stop!\""; end; + +L_Scared: + warp "042-1.gat", 112, 64; + message strcharinfo(0), "Hasan seems to be completely irrational. He waves his sharp knife in the air with his eyes closed and hits you. Maybe you shoudn't get too close or you are going to get hurt."; + percentheal -10, 0; + end; + } 042-1.gat,117,76,0 script #barrier 45,0,2{ @@ -231,9 +244,11 @@ OnTouch: if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut; warp "042-1.gat", 115, 76; - if ($@scorp) - message strcharinfo(0), "Hasan: \"Please help me!\""; - if (!$@scorp) + if ($@scorp && $@ScorpionFighter$ == strcharinfo(0)) + message strcharinfo(0), "Hasan: \" " + strcharinfo(0) + "! Please help me!\""; + if ($@scorp && $@ScorpionFighter$ != strcharinfo(0)) + message strcharinfo(0), "Hasan: \"Hey! Stop right there!\""; + if (!$@scorp && hasan == 4) message strcharinfo(0), "Hasan: \"Please wait a moment!\""; end; L_Tut: diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt index 8af50cd5..494dc874 100644 --- a/npc/042-1/kaan.txt +++ b/npc/042-1/kaan.txt @@ -5,7 +5,7 @@ if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; if (hasan == 4) goto L_Hasan_Saved; - if ($@scorp) goto L_Run; + if ($@ScorpionFighter$ == strcharinfo(0)) goto L_Run; if (kaan == 4) goto L_Plan; if (kaan == 3) goto L_Trick; if (kaan == 2) goto L_Out; -- cgit v1.2.3-60-g2f50