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-70-g09d2