summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/018-2_Woodland_mining_camp/caul.txt24
-rw-r--r--npc/019-1_Snow_field/santa_helper.txt2
-rw-r--r--npc/019-1_Snow_field/snowman.txt2
-rwxr-xr-xnpc/020-1_Nivalis/KrickKrackKrock.txt6
-rwxr-xr-xnpc/020-2_Nivalis/baktar.txt6
-rw-r--r--npc/021-1_Tulimshar/gate_guards.txt2
-rw-r--r--npc/021-2_Tulimshar/bakery.txt2
-rw-r--r--npc/021-2_Tulimshar/furquest.txt12
-rw-r--r--npc/021-2_Tulimshar/government_building.txt4
-rw-r--r--npc/021-2_Tulimshar/heathin.txt2
-rw-r--r--npc/022-1_Tulimshar/ferry_master.txt2
-rw-r--r--npc/024-1_Tulimshar_Canyon/tondar.txt2
-rw-r--r--npc/027-2_Caretakers_House/_import.txt2
-rw-r--r--npc/027-2_Caretakers_House/_mobs.txt21
-rwxr-xr-xnpc/027-2_Caretakers_House/alacrius.txt2
-rwxr-xr-xnpc/027-2_Caretakers_House/alacrius2.txt4
-rw-r--r--npc/027-2_Caretakers_House/diary.txt2
-rw-r--r--npc/027-2_Caretakers_House/door.txt9
-rw-r--r--npc/027-2_Caretakers_House/husband.txt200
-rw-r--r--npc/027-2_Caretakers_House/innkeeper.txt2
-rwxr-xr-xnpc/027-2_Caretakers_House/testnpcs.txt4
-rw-r--r--npc/031-1_NivalisPort/angelaOutside.txt20
-rw-r--r--npc/031-2_Angelas_House/angelaHouse.txt8
-rw-r--r--npc/031-2_Angelas_House/cindyHouse.txt4
-rw-r--r--npc/031-3_Cave/cindyCave.txt12
-rw-r--r--npc/032-1_Outback/miriam.txt30
26 files changed, 305 insertions, 81 deletions
diff --git a/npc/018-2_Woodland_mining_camp/caul.txt b/npc/018-2_Woodland_mining_camp/caul.txt
index 2949c0e9..56734a69 100644
--- a/npc/018-2_Woodland_mining_camp/caul.txt
+++ b/npc/018-2_Woodland_mining_camp/caul.txt
@@ -201,7 +201,7 @@ L_monster_oil_why_dangerous:
L_monster_oil_ingredients:
mes "[Caul]";
- mes "\"You will need one pearl, two snake skins, three black scorpion stingers, two piles of ash, and a golden scorpion stinger. The golden stinger goes in last, after the dangerous part, so you won't lose if if your brew blows up.\"";
+ mes "\"You will need one pearl, two snake skins, three black scorpion stingers, two piles of ash, and a golden scorpion stinger. The golden stinger goes in last, after the dangerous part, so you won't lose it if your brew blows up.\"";
next;
mes "[Caul]";
mes "\"You should also bring gamboge, mauve, alizarin and cobalt leaves. You will have to stabilize the brew, and they will help with that.\"";
@@ -709,7 +709,7 @@ L_DemPotion:
next;
mes "Caul goes three steps away and watches your actions carefully.";
menu
- "Please explain me what you know about that potion.", L_explain_dempo,
+ "Please explain to me what you know about that potion.", L_explain_dempo,
"Ok, I will start brewing.", L_brew_dempo_init,
"Nevermind", -;
close;
@@ -717,22 +717,22 @@ L_explain_dempo:
mes "[Caul]";
mes "\"Hrrm. I have heard of that potion. I hope I can remember all the stuff needed.\"";
next;
- mes "\"Basically this potion is a balancing between death and life. You see a balance between knowlegde and forgetting.\"";
+ mes "\"Basically this potion is a balancing between death and life; between knowledge and forgetting.\"";
next;
- mes "\"So to get it balanced, we need ingredients for both sides.\"";
+ mes "\"So, to get it balanced, we need ingredients for both sides.\"";
next;
- mes "\"For the death and forgetting side we can use bones. Although bones do not work good. Best results we would get with a diseased heart of zombies. Of course we can use undead ears and skulls as well.\"";
+ mes "\"For the death and forgetting side we can use bones. Although, bones do not work well. We would get the best results with a diseased heart of zombies. Of course, we can use undead ears and skulls as well.\"";
next;
- mes "\"For the life side we can use fresh mauve herbs. But life stones would be even better. Roots will do as well. Although these must be really fresh to show effect.\"";
+ mes "\"For the life and knowledge side we can use fresh mauve herbs. Lifestones would be even better. Roots will do as well, although these must be really fresh to show effect.\"";
next;
mes "\"Brewing such a powerful potion is dangerous. That is why you will need to do it yourself. I will try to assist you as best as I can.\"";
next;
mes "\"I don't know exactly, but there is a slight chance of exploding all time.\"";
next;
- mes "\"The color of the mixture will give you a quite good impression what you need to do.\"";
- mes "\"And to get that potion working, we need to stabilize it with a pearl at the end\"";
+ mes "\"The color of the mixture will give you a very good impression of what you need to do.\"";
+ mes "\"And to get that potion working, we need to stabilize it with a pearl at the end.\"";
next;
- mes "\"Ah yes the color will be in a range of really dark black to bright shining white. In between it is grey in different nuances.\"";
+ mes "\"The color will be in a range of really dark black to bright shining white. In between it is grey in different nuances.\"";
mes "\"When it is calm grey, the finalisation with a pearl will work best, so I have heard.\"";
next;
goto L_DemPotion;
@@ -750,16 +750,16 @@ L_brew_dempo_init:
set @dempo_color, rand(10);
if (rand(2)==0)
set @dempo_color, @dempo_color + 90 ;
- mes "To start with that potion you put in the cauldron a bone, a bottle of water and a lifestone.";
+ mes "To start that potion you put in the cauldron a bone, a bottle of water and a lifestone.";
next;
goto L_brew_dempo;
L_dempo_noinit:
mes "[Caul]";
mes "\"Hrrm. Usually you start that potion with a bone, a bottle of water and a lifestone.\"";
- mes "\"I'd propose you do it exactly that way. You see maybe it would even work with a skull and a healing potion, but since we don't know, and I don't want to repair my cauldron again, please don't try other solutions.\"";
+ mes "\"I'd propose you do it exactly that way. You see, maybe it would even work with a skull and a healing potion, but since we don't know, and I don't want to repair my cauldron again, please don't try other solutions.\"";
next;
- mes "\"Please use only this way to start the recipe: a bone, a bottle of water and a lifestone. In this order!\"";
+ mes "\"Please use only this way to start the recipe: a bone, a bottle of water and a lifestone. In that order!\"";
mes "\"Ah, and of course you will need at least one pearl with you. This pearl is needed to finalize the potion.\"";
close;
diff --git a/npc/019-1_Snow_field/santa_helper.txt b/npc/019-1_Snow_field/santa_helper.txt
index e9c0772d..79089975 100644
--- a/npc/019-1_Snow_field/santa_helper.txt
+++ b/npc/019-1_Snow_field/santa_helper.txt
@@ -44,7 +44,7 @@ L_R:
L_N:
mes "[Santa's Helper]";
- mes "\"Enjoy your holidays and I wish you an happy Christmas!\"";
+ mes "\"Enjoy your holidays and I wish you a happy Christmas!\"";
close;
L_NoItem:
diff --git a/npc/019-1_Snow_field/snowman.txt b/npc/019-1_Snow_field/snowman.txt
index 72b40a13..eda1e733 100644
--- a/npc/019-1_Snow_field/snowman.txt
+++ b/npc/019-1_Snow_field/snowman.txt
@@ -52,7 +52,7 @@ L_NoItem:
L_Done:
mes "[Snowman]";
- mes "\"Thank you for help!\"";
+ mes "\"Thank you for your help!\"";
close;
L_TooMany:
diff --git a/npc/020-1_Nivalis/KrickKrackKrock.txt b/npc/020-1_Nivalis/KrickKrackKrock.txt
index b3cc3dd8..b37dd0e1 100755
--- a/npc/020-1_Nivalis/KrickKrackKrock.txt
+++ b/npc/020-1_Nivalis/KrickKrackKrock.txt
@@ -96,7 +96,7 @@ if( @BET == 2000) getitem @ITEM_HEALTH[3], 5 + rand(10);
L_Full_Inv:
mes @NPC_NAME$;
- mes "\"What are you doing? You have so many stuff with you, you can't carry what you won. Ha, well, then I will keep it!\"";
+ mes "\"What are you doing? You have so much stuff with you, you can't carry what you won. Ha, well, then I will keep it!\"";
close;
L_poor:
@@ -105,7 +105,7 @@ L_poor:
close;
L_Too_rich:
mes @NPC_NAME$;
- mes "\"Mh... I have to bet too. How I'll get a present which is "+ @BET +"? No, that's too much.\"";
+ mes "\"Mh... I have to bet too. How will I get a present which is "+ @BET +"? No, that's too much.\"";
close;
L_No_Money:
mes @NPC_NAME$;
@@ -113,7 +113,7 @@ L_No_Money:
close;
L_info:
mes @NPC_NAME$;
- mes "\"Well, if you want to play Krick Krack Krock with me, you need to bet some money. We will both say a word (Krack, Krick or Krock). If we say the same, you can win the double of your money or an item worth of what you bet. \"";
+ mes "\"Well, if you want to play Krick Krack Krock with me, you need to bet some money. We will both say a word (Krack, Krick or Krock). If we say the same, you can win double your money or an item worth what you bet. \"";
next;
mes "\"So, do you want to play? \"";
goto L_Menu;
diff --git a/npc/020-2_Nivalis/baktar.txt b/npc/020-2_Nivalis/baktar.txt
index 410e4c33..1bcbf152 100755
--- a/npc/020-2_Nivalis/baktar.txt
+++ b/npc/020-2_Nivalis/baktar.txt
@@ -321,11 +321,11 @@ L_2_talk2:
next;
mes "\"*sob*\"";
next;
- mes "\"I was always bullied by him. You know in the early childhood we were very nice friends. We played some roleplaying. He was the captain, and I was the soldier.";
+ mes "\"I was always bullied by him. You know in early childhood we were very nice friends. We played some roleplaying. He was the captain, and I was the soldier.";
next;
mes "\"Or another day he was the chieftain and I was the redskin.\"";
next;
- mes "\"but to tell you the truth, HE was ALWAYS the one who directed me.\"";
+ mes "\"But to tell you the truth, HE was ALWAYS the one who directed me.\"";
next;
mes "\"I DO NOT LIKE THAT!\"";
next;
@@ -373,7 +373,7 @@ L_2_name:
menu "I am sorry for the joke... Please forgive me", -,
"They call me Mistakes. I am a professional killer as well. You heard about that business in the terranite cave?", -;
mes @npcname$;
- mes "\"Alright, I see. Ok maybe I really need to calm down. Please let me alone... I will try to calm down, ok?\"";
+ mes "\"Alright, I see. Ok maybe I really need to calm down. Please leave me alone... I will try to calm down, ok?\"";
close;
S_Update_Var2:
diff --git a/npc/021-1_Tulimshar/gate_guards.txt b/npc/021-1_Tulimshar/gate_guards.txt
index 1a090c5f..2d0dc504 100644
--- a/npc/021-1_Tulimshar/gate_guards.txt
+++ b/npc/021-1_Tulimshar/gate_guards.txt
@@ -3,7 +3,7 @@
// Guards by the gates to the port
021-1.gat,70,23,0 script Guard 104,{
mes "[Guard]";
- mes "\"Lot's of stuff happens in the port district. Those sailors can get quite roudy.\"";
+ mes "\"Lots of stuff happens in the port district. Those sailors can get quite rowdy.\"";
close;
}
diff --git a/npc/021-2_Tulimshar/bakery.txt b/npc/021-2_Tulimshar/bakery.txt
index 18219a82..8fcddf81 100644
--- a/npc/021-2_Tulimshar/bakery.txt
+++ b/npc/021-2_Tulimshar/bakery.txt
@@ -51,7 +51,7 @@ L_lace_chococake:
mes "[Riskim]";
mes "\"Please have a seat!\"";
- mes "You watch at Riskim melts the chocolate and stirs in the potion, then glazes a cake with the mixture.";
+ mes "You watch as Riskim melts the chocolate and stirs in the potion, then glazes a cake with the mixture.";
mes "\"It's a bit more chocolatey than your average chocolate cake, of course...\"";
next;
diff --git a/npc/021-2_Tulimshar/furquest.txt b/npc/021-2_Tulimshar/furquest.txt
index 44126aa5..6727ea7d 100644
--- a/npc/021-2_Tulimshar/furquest.txt
+++ b/npc/021-2_Tulimshar/furquest.txt
@@ -157,8 +157,8 @@ L_State_1:
L_State_2:
mes "[Agostine, The Legendary Tailor]";
mes "\"Well, Winter Gloves are so fashionable for their lovable fur!";
- mes "Only the best furs can be saw for these gloves!";
- mes "But, as you see, I am a tailor, not a hunter! So, why don't you bring me the best fluffy's fur you can see?\"";
+ mes "Only the best furs can be used for these gloves!";
+ mes "But, as you see, I am a tailor, not a hunter! So, why don't you bring me the best fluffy's fur you can find?\"";
set QUEST_WG_state, 3;
next;
menu
@@ -202,7 +202,7 @@ L_State_4_try:
close;
L_State_4_success:
- mes "Agostine turns into a smile";
+ mes "Agostine breaks into a smile";
next;
mes "[Agostine, The Legendary Tailor]";
mes "\"It's perfect! Perfect! Good job, my friend! I will prepare your gloves right now!\"";
@@ -227,7 +227,7 @@ L_State_5_pay:
getitem "WinterGloves", 1;
set QUEST_WG_state, 6;
mes "[Agostine, The Legendary Tailor]";
- mes "\"Here they are. You will have the more fashionable hands in the world!\"";
+ mes "\"Here they are. You will have the most fashionable hands in the world!\"";
close;
L_State_5_nocash:
@@ -287,7 +287,7 @@ L_State_11_try:
close;
L_State_11_success:
- mes "Agostine turns into a smile";
+ mes "Agostine breaks into a smile";
next;
mes "[Agostine, The Legendary Tailor]";
mes "\"This one is good enough, my friend. Good job.\"";
@@ -300,7 +300,7 @@ L_State_12:
mes "And my payment, obviously. 15,000 GP is right.\"";
next;
menu
- "Sure, here it is all.", L_State_12_pay,
+ "Sure, here it all is.", L_State_12_pay,
"I missed something, I will be back soon!", -;
close;
diff --git a/npc/021-2_Tulimshar/government_building.txt b/npc/021-2_Tulimshar/government_building.txt
index 9ecfb219..f4f9d0de 100644
--- a/npc/021-2_Tulimshar/government_building.txt
+++ b/npc/021-2_Tulimshar/government_building.txt
@@ -3,7 +3,7 @@
// A clerk
021-2.gat,27,17,0 script Estard 107,{
mes "[Estard]";
- mes "\"Hello what Can I do for you?\"";
+ mes "\"Hello what can I do for you?\"";
next;
L_main:
@@ -48,7 +48,7 @@ L_marry_too_young:
next;
menu
- "Can I atleast get wedding rings?", L_get_rings,
+ "Can I at least get wedding rings?", L_get_rings,
"Thanks anyways.", -;
close;
diff --git a/npc/021-2_Tulimshar/heathin.txt b/npc/021-2_Tulimshar/heathin.txt
index 556a7141..5d675e3c 100644
--- a/npc/021-2_Tulimshar/heathin.txt
+++ b/npc/021-2_Tulimshar/heathin.txt
@@ -119,7 +119,7 @@ L_Heathin_Terranite_Yes:
next;
mes "Heathin thinks for a moment.";
next;
- mes "\"Ah, I know! I will make a helm... Well, more like a hood, since it will woven.\"";
+ mes "\"Ah, I know! I will make a helm... Well, more like a hood, since it will be woven.\"";
next;
mes "\"It will require a great amount of heat, if the rumors are to be believed. For this, I will need 100 [Coal] to keep my forge burning hot. I will also need 10 [Terranite Ore] to make the armor. Of course, such work does not come cheap. While I may enjoy my work, my time and effort is very valuable. To compensate my efforts I will need 200,000 gold pieces. Please come back with the gold, [Coal] and ore and I'll make this hood for you.\"";
close;
diff --git a/npc/022-1_Tulimshar/ferry_master.txt b/npc/022-1_Tulimshar/ferry_master.txt
index 3cc10ce3..a1d9d69a 100644
--- a/npc/022-1_Tulimshar/ferry_master.txt
+++ b/npc/022-1_Tulimshar/ferry_master.txt
@@ -11,6 +11,6 @@
L_Explain:
mes "[Ferry Master]";
- mes "\"You'll setup on the dock and select your destination. Each destination has an associated price that you need to pay. You don't have to go anywhere. Choosing the current port will result in nothing.\"";
+ mes "\"You'll step up on the dock and select your destination. Each destination has an associated price that you need to pay. You don't have to go anywhere. Choosing the current port will result in nothing.\"";
close;
}
diff --git a/npc/024-1_Tulimshar_Canyon/tondar.txt b/npc/024-1_Tulimshar_Canyon/tondar.txt
index ea44e635..585806df 100644
--- a/npc/024-1_Tulimshar_Canyon/tondar.txt
+++ b/npc/024-1_Tulimshar_Canyon/tondar.txt
@@ -47,7 +47,7 @@ L_askspell:
L_spell:
mes "[Tondar]";
mes "\"Well, all right; this one can't do much harm. Press your hands together and say `" + getspellinvocation("ask-magic-exp") + "'.\"";
- mes "\"This will release a steady flow of magic within you. Focus and try to control it; it is a good metitative practice.\"";
+ mes "\"This will release a steady flow of magic within you. Focus and try to control it; it is a good meditative practice.\"";
close;
diff --git a/npc/027-2_Caretakers_House/_import.txt b/npc/027-2_Caretakers_House/_import.txt
index 5a78e00e..5ba5f6d5 100644
--- a/npc/027-2_Caretakers_House/_import.txt
+++ b/npc/027-2_Caretakers_House/_import.txt
@@ -7,7 +7,7 @@ npc: npc/027-2_Caretakers_House/caretaker.txt
npc: npc/027-2_Caretakers_House/diary.txt
npc: npc/027-2_Caretakers_House/door.txt
npc: npc/027-2_Caretakers_House/gy_inn_shops.txt
-//npc: npc/027-2_Caretakers_House/husband.txt
+npc: npc/027-2_Caretakers_House/husband.txt
npc: npc/027-2_Caretakers_House/innkeeper.txt
npc: npc/027-2_Caretakers_House/crying_child.txt
//npc: npc/027-2_Caretakers_House/lover.txt
diff --git a/npc/027-2_Caretakers_House/_mobs.txt b/npc/027-2_Caretakers_House/_mobs.txt
index e765f51c..b6827a92 100644
--- a/npc/027-2_Caretakers_House/_mobs.txt
+++ b/npc/027-2_Caretakers_House/_mobs.txt
@@ -1,7 +1,28 @@
// 027-2 Caretaker's House mobs
+027-2.gat,81,41,11,9 monster DrunkenSkeleton 1077,1,100000,30000,Mob027-2::On1077
+027-2.gat,91,38,11,9 monster TipsySkeleton 1078,1,100000,30000,Mob027-2::On1078
+027-2.gat,110,26,11,11 monster TipsySkeleton 1078,1,100000,30000,Mob027-2::On1078
+027-2.gat,104,28,11,9 monster DrunkenSkeleton 1077,1,100000,30000,Mob027-2::On1077
+027-2.gat,89,34,11,9 monster DrunkenLadySkeleton 1079,1,100000,30000,Mob027-2::On1079
+027-2.gat,116,26,11,9 monster DrunkenLadySkeleton 1079,1,100000,30000,Mob027-2::On1079
027-2.gat,0,0,0 script Mob027-2 -1,{
+On1077:
+ set @mobID, 1077;
+ callfunc "MobPoints";
+ break;
+
+On1078:
+ set @mobID, 1078;
+ callfunc "MobPoints";
+ break;
+
+On1079:
+ set @mobID, 1079;
+ callfunc "MobPoints";
+ break;
+
end;
}
diff --git a/npc/027-2_Caretakers_House/alacrius.txt b/npc/027-2_Caretakers_House/alacrius.txt
index 825c114b..40ae2df1 100755
--- a/npc/027-2_Caretakers_House/alacrius.txt
+++ b/npc/027-2_Caretakers_House/alacrius.txt
@@ -7,7 +7,7 @@
// if cooldown go to cooldown
// start quest section
- mes "hi want to fight the reaper?";
+ mes "Hi, want to fight the reaper?";
menu
"Let's go",L_START,
"No thank you",-;
diff --git a/npc/027-2_Caretakers_House/alacrius2.txt b/npc/027-2_Caretakers_House/alacrius2.txt
index 51614868..bd2c90a3 100755
--- a/npc/027-2_Caretakers_House/alacrius2.txt
+++ b/npc/027-2_Caretakers_House/alacrius2.txt
@@ -8,14 +8,14 @@
mes "\"Hello, I'm Alacrius. \"";
next;
mes "[ALACRIUS]";
- mes "\"Very long time ago, i figured a way to cheat the death and the limits of time and space. You may think it actually is evil, but I made it because of true love... \"";
+ mes "\"A very long time ago, I figured a way to cheat death and the limits of time and space. You may think it actually is evil, but I did it because of true love... \"";
next;
mes "[ALACRIUS]";
mes "\"The reaper kidnapped my beloved wife, and took her to the underworld, so I had to find a way to stop him, and as time went by, I became what you can see now... But if you dare to cheat death, time and space you'll have to pay a high price... \"";
next;
mes "[ALACRIUS]";
- mes "\"Being away from the time and space doesn't allow me to try to save my beloved wife... I need your help, do you think you have what it takes to handle the most powerful monsters over the world of Mana? \"";
+ mes "\"Being away from time and space doesn't allow me to try to save my beloved wife... I need your help. Do you think you have what it takes to handle the most powerful monsters over the world of Mana? \"";
next;
menu
diff --git a/npc/027-2_Caretakers_House/diary.txt b/npc/027-2_Caretakers_House/diary.txt
index f110c9f7..98febebb 100644
--- a/npc/027-2_Caretakers_House/diary.txt
+++ b/npc/027-2_Caretakers_House/diary.txt
@@ -1,4 +1,4 @@
-027-2.gat,26,97,0 script #Diary 127,1,1,{
+027-2.gat,26,97,0 script #Diary 127, {
set @Graveyard_Inn_MASK, NIBBLE_0_MASK;
set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;
diff --git a/npc/027-2_Caretakers_House/door.txt b/npc/027-2_Caretakers_House/door.txt
index 7cf479fd..630e0ee2 100644
--- a/npc/027-2_Caretakers_House/door.txt
+++ b/npc/027-2_Caretakers_House/door.txt
@@ -1,4 +1,4 @@
-027-2.gat,24,99,0 script #Door 127,1,1,{
+027-2.gat,25,100,0 script #DoorIn 127,1,1,{
set @Graveyard_Inn_MASK, NIBBLE_0_MASK;
set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;
@@ -9,6 +9,11 @@
end;
L_Warp:
- warp "027-2.gat", 26, 99;
+ warp "027-2.gat", 27, 99;
+ end;
+}
+
+027-2.gat,26,99,0 script #DoorOut 127,1,1,{
+ warp "027-2.gat", 23, 98;
end;
}
diff --git a/npc/027-2_Caretakers_House/husband.txt b/npc/027-2_Caretakers_House/husband.txt
new file mode 100644
index 00000000..7e2e578d
--- /dev/null
+++ b/npc/027-2_Caretakers_House/husband.txt
@@ -0,0 +1,200 @@
+027-2.gat,22,84,0 script Hamond 319,{
+
+ set @Graveyard_Inn_MASK, NIBBLE_3_MASK;
+ set @Graveyard_Inn_SHIFT, NIBBLE_3_SHIFT;
+
+ set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);
+
+ //TODO: find out, why this don't work
+ set @Graveyard_Inn_Woman_MASK, NIBBLE_0_MASK;
+ set @Graveyard_Inn_Woman_SHIFT, NIBBLE_0_SHIFT;
+
+ set @woman, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK_Woman) >> @Graveyard_Inn_SHIFT_Woman);
+
+ //TODO: determine correct nibble
+ set @Graveyard_Inn_Kid_MASK, NIBBLE_2_MASK;
+ set @Graveyard_Inn_Kid_SHIFT, NIBBLE_2_SHIFT;
+
+ set @kidstate, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Kid_MASK) >> @Graveyard_Inn_Kid_SHIFT);
+
+ //TODO: determine sane values
+ set @ICE_CUBE_AMOUNT, 100;
+ set @ICE_CUBE_EXP, 10000;
+ //TODO: determine sane values
+ set @BONE_AMOUNT, 100;
+ set @SKULL_AMOUNT, 50;
+ set @BONE_EXP, 30000;
+
+ if ((@state == 4) && (sex == 0) && (@kidstate >= 5)) goto L_Helped_Kid; //TODO: determine right value of kidstate
+ if (@state == 3) goto L_Brought_Bones;
+ if (@state == 2) goto L_Check_Bones;
+ if (@state == 1) goto L_Ice_Cube;
+
+ mes "[Pale Man]";
+ mes "\"Hello, I hope you're enjoying your time in Reids Inn. My name is Hamond, and I'm running this inn together with my beautiful wife Reid. If there is anything I can do for you, please let me know.\"";
+ if (baselevel < 85) goto L_Close;
+ next;
+ menu
+ "I'd like to know, why all the people in here are dead.",-,
+ "Are you feeling well? You look very pale, better to say - deathly pale.",-,
+ "Thank you, but I'm fine.", L_Close;
+
+ mes "Hamond seems very confused. Then he notices the grey color of his hands and begans to shake his head in panic.";
+ mes "[Hamond]";
+ mes "\"WHAT IS THIS?\"";
+ next;
+ //TODO: ask a native speaker if this is understandable
+ mes "Because of the rapid movement of his head, it snaps back in his neck along a cut in his throat you haven't seen before.";
+ next;
+ mes "You're trying hard not to run away screaming. Instead, you grab his hair and pull his head back in place.";
+ next;
+ mes "Hamond blinks his eyes with a puzzled look on his face.";
+ mes "[Hamond]";
+ mes "\"This was uncomfortable! It seems, you are right. I am dead. Weird.\"";
+ next;
+ mes "\"How can I be dead, but walking around and talking? This is very strange. \"";
+ next;
+ mes "\"But nevertheless, I will continue to run this inn and do my best to make happy all our patrons - may they be alive or dead.\"";
+ next;
+ menu
+ "Can I help with that?", -;
+ mes "[Hamond]";
+ mes "\"Helping me? I never would have asked, but actually, I need something to cool the drinks. Maybe you can find something.\"";
+
+ set @state, 1;
+ callsub S_Update_Mask;
+
+ close;
+
+L_Ice_Cube:
+ mes "[Hamond]";
+ mes "\"Hello my friend! Good to see you again. Did you find something to cool the drinks?\"";
+ next;
+
+ if (countitem("IceCube") > 0)
+ menu
+ "Maybe this never melting Ice Cubes?", L_Check_Ice,
+ "I'm still searching.", L_Close;
+
+ mes "\"You didn't? Too bad.\"";
+ close;
+
+L_Check_Ice:
+ if (countitem("IceCube") < @ICE_CUBE_AMOUNT)
+ goto L_Not_Enough_Cubes;
+ delitem "IceCube", @ICE_CUBE_AMOUNT;
+
+ set @state, 2;
+ callsub S_Update_Mask;
+
+ mes "[Hamond]";
+ mes "\"Yes, wonderfull! That's exactly what I need.\"";
+ next;
+ mes "\"I put all my effort in making this inn a well running place for my beloved Reid.\"";
+ next;
+ mes "\"You know, she had a very hard childhood.\"";
+ next;
+ mes "\"Her parents were the former owners of the inn. But they had some problems and the inn wasn't running well.\"";
+ next;
+ mes "\"Also they died very early and Reid was so lonely and sad. She is such a wonderful woman, I'd do everything for her.\"";
+ next;
+ mes "He is mumbling to himself the next sentence.";
+ next;
+ mes "\"And I won't let a wannabe mage take her away from me...\"";
+ next;
+ menu
+ "What do you mean?",-;
+ mes "[Hamond]";
+ mes "\"Nevermind, nevermind. I'd like to ask you for another favor, if I might.\"";
+ next;
+ mes "\"A patron asked for - uhm, bones. He said, he need it to replace some of his bones, which were damaged in a scuffle with mortals.\"";
+ next;
+ mes "\"I know, this is a bit strange - I'm still getting used to being dead. But a patrons wish is a patrons wish!\"";
+ next;
+ mes "\"Maybe you can bring me a huge amount of bones and skulls, so I can fulfill those wishes in future?\"";
+ close;
+
+L_Check_Bones:
+ mes "[Hamond]";
+ mes "\"Welcome back! Let me see what you have.\"";
+ if ((countitem("Bone") < @BONE_AMOUNT) || (countitem("Skull") < @SKULL_AMOUNT))
+ goto L_Not_Enough_B;
+ delitem "Bone", @BONE_AMOUNT;
+ delitem "Skull", @SKULL_AMOUNT;
+
+ set @state, 3;
+ callsub S_Update_Mask;
+
+L_Brought_Bones:
+ mes "[Hamond]";
+ mes "\"Thanks for your help! Now I'll be able to satisfy our patrons wishes.\"";
+ next;
+
+ mes "TODO: remove, debug: @woman =" + @woman;
+
+ if (@woman > 5)
+ menu
+ "Would you tell me about this mage named Savaric?", L_Savaric,
+ "Your welcome.",-;
+ mes "[Hamond]";
+ mes "\"Please make yourself at home.\"";
+
+ close;
+
+L_Savaric:
+ mes "Hamonds face turns into an ugly grimace.";
+ mes "[Hamond]";
+ mes "\"This egomaniac cheekily - \"";
+ next;
+
+ if (Sex == 1) goto L_Man;
+ //TODO: think, if gender change should be checked
+ //TODO: determine correct value for kidstate
+ if ((Sex == 0) && (@kidstate < 5)) goto L_Woman;
+
+ mes "\"Hrm - I don't think, you'll understand. It is something between men.\"";
+ next;
+ mes "\"Although you're a woman, it was very nice of you to help my son. I'll tell you nevertheless.\"";
+
+L_Jealousy:
+//TODO: go on here
+ mes "TODO: add story :P";
+ close;
+L_Man:
+ mes "[Hamond]";
+ mes "\"You're a man - I think you will understand what I'm going to tell you.\"";
+ goto L_Jealousy;
+
+L_Woman:
+ mes "[Hamond]";
+ mes "\"Hrm - I don't think, you'll understand. It is something between men.\"";
+ next;
+ mes "\"Maybe if you show me, you're a understanding person.\"";
+ close;
+
+L_Helped_Kid:
+ mes "[Hamond]";
+ mes "\"It was very nice of you to help my son. I think, I can tell you about Savaric.\"";
+ goto L_Jealousy;
+
+L_Not_Enough_B:
+ if (countitem("Bone") < @BONE_AMOUNT)
+ mes "\"I'm not sure, but I think, more bones will be better.\"";
+ if (countitem("Skull") < @SKULL_AMOUNT)
+ mes "\"That are not enough skulls.\"";
+ close;
+
+L_Not_Enough_Cubes:
+ mes "[Hamond]";
+ mes "\"Yes, they look good! But I think, I need more of them. Maybe " + @ICE_CUBE_AMOUNT + "?\"";
+ close;
+
+L_Close:
+ close;
+
+S_Update_Mask:
+ set QUEST_Graveyard_Inn,
+ (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK))
+ | (@state << @Graveyard_Inn_SHIFT);
+ return;
+}
diff --git a/npc/027-2_Caretakers_House/innkeeper.txt b/npc/027-2_Caretakers_House/innkeeper.txt
index 4afe1074..855168bd 100644
--- a/npc/027-2_Caretakers_House/innkeeper.txt
+++ b/npc/027-2_Caretakers_House/innkeeper.txt
@@ -1,4 +1,6 @@
027-2.gat,104,39,0 script Reids Ghost 315,{
+
+//TODO: add child quest context another way: not helping her child, but finding the bracelet
set @Graveyard_Inn_MASK, NIBBLE_0_MASK;
set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;
diff --git a/npc/027-2_Caretakers_House/testnpcs.txt b/npc/027-2_Caretakers_House/testnpcs.txt
index 38f961c3..684bc87f 100755
--- a/npc/027-2_Caretakers_House/testnpcs.txt
+++ b/npc/027-2_Caretakers_House/testnpcs.txt
@@ -105,7 +105,3 @@ L_3:
027-2.gat,24,77,0 script Headless Man 318,{
end;
}
-
-027-2.gat,22,84,0 script Lantern Man 319,{
- end;
-}
diff --git a/npc/031-1_NivalisPort/angelaOutside.txt b/npc/031-1_NivalisPort/angelaOutside.txt
index b42c5318..3812b918 100644
--- a/npc/031-1_NivalisPort/angelaOutside.txt
+++ b/npc/031-1_NivalisPort/angelaOutside.txt
@@ -17,7 +17,7 @@
if (@rescue_Cindy == 1) goto L_Please_Help;
mes "[Angela]";
- mes "\"Please, I need help! My little daugther!\"";
+ mes "\"Please, I need help! My little daughter!\"";
next;
mes "\"It's terrible, oh my dear child!\"";
next;
@@ -31,13 +31,13 @@
L_Whining:
mes "[Angela]";
- mes "\"My poor little daugther, please! Oh no, oh no...\"";
+ mes "\"My poor little daughter, please! Oh no, oh no...\"";
next;
mes "\"We need to do something! My poor little Cindy! My cute little girl!\"";
next;
mes "\"It's so terrible, how could that happen? Please, I need help, it's so terrible.\"";
next;
- mes "\"That awful filthy monsters - terrible!\"";
+ mes "\"Those awful filthy monsters - terrible!\"";
next;
mes "\"Oh Cindy, my little Cindy - oh no...\"";
next;
@@ -45,11 +45,11 @@ L_Whining:
next;
mes "\"It's so terrible, my poor cute little Cindy...\"";
next;
- mes "\"Oh, when I think, what might happen to her right now!\"";
+ mes "\"Oh, when I think what might happen to her right now!\"";
next;
mes "\"She is crying and sobbing.\"";
next;
- mes "\"It seems, she is too upset to tell you anything helpful. If she would just calm down and concentrate a bit...\"";
+ mes "\"It seems she is too upset to tell you anything helpful. If she would just calm down and concentrate a bit...\"";
close;
L_Menu_Potion:
@@ -66,11 +66,11 @@ L_Calm_Down:
mes "[Angela]";
mes "\"Thank you, this was helpful.\"";
next;
- mes "\"My daughter Cindy and me were on our way to Santa, to bring him some presents. Many people here in Nivalis are helping Santa with his business.\"";
+ mes "\"My daughter Cindy and I were on our way to Santa, to bring him some presents. Many people here in Nivalis are helping Santa with his business.\"";
next;
- mes "\"When we passed the entrance of this cave, a pack of Yetis came out there. It's disturbing, usually, they are very shy.\"";
+ mes "\"When we passed the entrance of this cave, a pack of Yetis came out of there. It's disturbing, because usually they are very shy.\"";
next;
- mes "\"We tried to run away, but there were to many of them. They took my poor little Cindy and all the presents with them.\"";
+ mes "\"We tried to run away, but there were too many of them. They took my poor little Cindy and all the presents with them.\"";
next;
mes "\"Oh my poor little girl. I'm so worried - what might they do with her? Oh no!\"";
next;
@@ -90,7 +90,7 @@ L_Please_Help:
L_Please_Visit:
mes "[Angela]";
- mes "\"Thank you so much for rescueing my beloved Cindy. Please come to visit us in our house at the beach.\"";
+ mes "\"Thank you so much for rescuing my beloved Cindy. Please come to visit us in our house at the beach.\"";
next;
mes "\"My husband is an adventurer like you, and I want to give you something he got on his travels to show my gratitude.\"";
close;
@@ -99,7 +99,7 @@ L_Please_Visit_Again:
mes "[Angela]";
mes "\"Hello! You are welcome to visit us in our house at the beach everytime. Cindy loves to see you!\"";
next;
- mes "\"If you have found any present boxes, the Yetis took away, please bring them to our house. Usually, the Yetis are very shy... their behavior is a bit odd.\"";
+ mes "\"If you have found any present boxes the Yetis took away, please bring them to our house. Usually, the Yetis are very shy... their behavior is a bit odd.\"";
close;
S_Update_Mask:
diff --git a/npc/031-2_Angelas_House/angelaHouse.txt b/npc/031-2_Angelas_House/angelaHouse.txt
index be1a86a1..488f600a 100644
--- a/npc/031-2_Angelas_House/angelaHouse.txt
+++ b/npc/031-2_Angelas_House/angelaHouse.txt
@@ -20,11 +20,11 @@
L_Reward:
mes "[Angela]";
- mes "\"Hello " + strcharinfo(0) + ", thank you again. I'm so glad, Cindy is back home safe.\"";
+ mes "\"Hello " + strcharinfo(0) + ", thank you again. I'm so glad Cindy is back home safe.\"";
next;
- mes "\"As I told you, my husband is an adventurer. He is at one of his travels, so he couldn't rescue Cindy himself.\"";
+ mes "\"As I told you, my husband is an adventurer. He is on one of his travels, so he couldn't rescue Cindy himself.\"";
next;
- mes "\"I want to give you one of his treasures. Beside of all the junk he brings, there are some very valuable things.\"";
+ mes "\"I want to give you one of his treasures. Beside all the junk he brings, there are some very valuable things.\"";
next;
mes "\"This item is called the Rock Knife. When you wield it, you feel as robust as a rock.\"";
@@ -41,7 +41,7 @@ L_Reward:
next;
mes "\"I am so glad Cindy is safe. But there is still another problem. The Yetis took away all the white and yellow present boxes we wanted to bring to Santa!\"";
next;
- mes "\"Usually, Yetis are very shy - I wonder why they do that. There is something strange going on.\"";
+ mes "\"Usually, Yetis are very shy - I wonder why they did that. There is something strange going on.\"";
next;
mes "\"May I ask you for help again? I'll give you a small reward for every 3 boxes of one color you bring me.\"";
close;
diff --git a/npc/031-2_Angelas_House/cindyHouse.txt b/npc/031-2_Angelas_House/cindyHouse.txt
index 46546777..97aa2bb9 100644
--- a/npc/031-2_Angelas_House/cindyHouse.txt
+++ b/npc/031-2_Angelas_House/cindyHouse.txt
@@ -21,10 +21,10 @@ L_Happy_Random:
set @candy, rand(50);
if (@inventorylist_count < 100 && @candy == 42) goto L_Candy;
- setarray @quote_Cindy$, "Thank you so much for rescueing me!",
+ setarray @quote_Cindy$, "Thank you so much for rescuing me!",
"My mother made really tasty cookies yesterday. But I already ate them all...",
"I want to go ice skating tomorrow. That will be fun!",
- "I wonder, when Daddy will come home next time. He always brings exciting stuff!",
+ "I wonder when Daddy will come home next time. He always brings exciting stuff!",
strcharinfo(0) + "! You're my hero!",
"My mother is so upset about the Yetis - they are very very shy usually. You have to be lucky to see one. I wonder what's wrong with them.",
"When I'm a little older, I want to travel like you and my father. I want to see every place on the world!",
diff --git a/npc/031-3_Cave/cindyCave.txt b/npc/031-3_Cave/cindyCave.txt
index e4c7b29f..29b328f0 100644
--- a/npc/031-3_Cave/cindyCave.txt
+++ b/npc/031-3_Cave/cindyCave.txt
@@ -39,7 +39,7 @@ L_Please_Help:
next;
mes "\"It's so cold in here! Can you please open the cage?\"";
next;
- mes "\"But be careful, if the Yetis hear you, they will come!\"";
+ mes "\"But be careful. If the Yetis hear you, they will come!\"";
menu
"Try to open the cage", L_Try_Cage,
"Leave", -;
@@ -49,7 +49,7 @@ L_Try_Cage:
if (baselevel < 70) goto L_To_Weak;
if (countitem("TreasureKey") < @KEYS_AMOUNT) goto L_Not_Enough_Keys;
delitem "TreasureKey", @KEYS_AMOUNT;
- mes "As you try to open the door of the cage, there is a loudly squeaking noise.";
+ mes "As you try to open the door of the cage, there is a loud squeaking noise.";
next;
mes "You get an uncomfortable feeling and Cindy starts to shiver.";
next;
@@ -78,7 +78,7 @@ L_Yeti:
L_Reward:
mes "[Cindy]";
- mes "\"You are a hero! All this strong monsters!\"";
+ mes "\"You are a hero! All these strong monsters!\"";
next;
mes "\"I've found this thing in the cave - it looks valuable. I want you to have it.\"";
next;
@@ -100,9 +100,9 @@ L_Wizard_Hat:
callsub S_Update_Mask;
L_Visit:
- mes "\"Thank you so much, please come to my home. It's the house at the beach.\"";
+ mes "\"Thank you so much; please come to my home. It's the house at the beach.\"";
next;
- mes "\"I'm sure, my mother wants to thank you as well.\"";
+ mes "\"I'm sure my mother wants to thank you as well.\"";
close;
L_Please_Visit:
@@ -161,7 +161,7 @@ L_NextWave:
if ($@FIGHT_YETI_WAVE == 3)
mapannounce "031-3.gat", "Cindy: More of them are coming!", 0;
if ($@FIGHT_YETI_WAVE == 4)
- mapannounce "031-3.gat", "Cindy: Be carful! More of them!", 0;
+ mapannounce "031-3.gat", "Cindy: Be careful! More of them!", 0;
if ($@FIGHT_YETI_WAVE == 5)
mapannounce "031-3.gat", "Cindy: Attention! There is another bunch of them!", 0;
if ($@FIGHT_YETI_WAVE == 6)
diff --git a/npc/032-1_Outback/miriam.txt b/npc/032-1_Outback/miriam.txt
index 858a5088..a469ae36 100644
--- a/npc/032-1_Outback/miriam.txt
+++ b/npc/032-1_Outback/miriam.txt
@@ -46,7 +46,7 @@ L_intro:
mes "[Miriam]";
mes "\"Yes, I am. Why? Do you think I am not OK? I am OK. You interrupted my meditation. Now I will need hours to calm down and stay quiet! Yes, yes, I know, I'm a fast talker!\"";
next;
- mes "\"In fact, I am fast in everything I do! I can kill a Mountain Snake before it even starts to think about atacking me! Yes my friend, in a battle, speed is power!";
+ mes "\"In fact, I am fast in everything I do! I can kill a Mountain Snake before it even starts to think about attacking me! Yes my friend, in a battle, speed is power!";
next;
menu
"Wow! Very impressi...",-;
@@ -84,7 +84,7 @@ L_canthelp2:
next;
mes "\"...\"";
next;
- mes "\"Well, if you don't have time to help, at least don't make things difficult to me!\"";
+ mes "\"Well, if you don't have time to help, at least don't make things difficult for me!\"";
close;
L_ask1:
@@ -93,7 +93,7 @@ L_ask1:
next;
menu
"Yes, I will get what you want!",-,
- "No, I have not time right now.",L_canthelp2;
+ "No, I have no time right now.",L_canthelp2;
set QUEST_MIRIAM, 2;
mes "\"Good. So, run and get it!\"";
close;
@@ -114,7 +114,7 @@ L_ask3:
mes "[Miriam]";
mes "\"You have a small mind, haven't you? I am meditating here and I asked you to bring me stuff, so I can concentrate better.\"";
next;
- mes "\"And stop asking so silly questions in the future.\"";
+ mes "\"And stop asking such silly questions in the future.\"";
next;
mes "\"So, if you really want to help me now, bring me 5 [Concentration Potions] and 10 [Snake Tongues].\"";
close;
@@ -138,7 +138,7 @@ L_notenough:
L_teach:
mes "[Miriam]";
- mes "\"Hmm... do you think you can learn the special speed skill?\"";
+ mes "\"Hmm... do you think you can learn the special Speed skill?\"";
next;
menu
"Yes, I am prepared...", -,
@@ -155,19 +155,19 @@ L_teach:
L_heavyweight:
mes "[Miriam]";
- mes "\"Wow... Why do you bring so many things with you? You must be carrying more than one third of your own weight! I wont teach you unless you get rid of some stuff... \"";
+ mes "\"Wow... Why do you bring so many things with you? You must be carrying more than one third of your own weight! I won't teach you unless you get rid of some stuff... \"";
close;
L_heavymetal:
mes "[Miriam]";
- mes "\"Hmm... I see... You want to be one of those lazy slow warriors... wasting all their strenght carrying kilos of metal clothes... Why no one sees the great advantages of a beautiful, flexible, lightweight armor nowadays?\"";
+ mes "\"Hmm... I see... You want to be one of those lazy slow warriors... wasting all their strength carrying kilos of metal clothes... Why does no one see the great advantages of a beautiful, flexible, lightweight armor nowadays?\"";
next;
mes "\"Come back here when you get rid of this junk...\"";
close;
L_slow:
mes "[Miriam]";
- mes "Oh, wait, wait... " +@agi+ " Agility? Are you serious? What do you do with all your Character points? Put them all to 'Strenght'? Really... I dont even want to know... Come back here when you have a decent character points distribution!\"";
+ mes "Oh, wait, wait... " +@agi+ " Agility? Are you serious? What do you do with all your Character points? Put them all to 'Strength'? Really... I don't even want to know... Come back here when you have a decent character points distribution!\"";
close;
L_lowlevel:
@@ -177,14 +177,14 @@ L_lowlevel:
L_offer:
mes "[Miriam]";
- mes "\"Hmm! You look great on these clothes! They look very comfortable too... And it seems like you are not carrying too much weight.\"";
+ mes "\"Hmm! You look great in these clothes! They look very comfortable too... And it seems like you are not carrying too much weight.\"";
next;
if (!(getskilllv(SKILL_POOL))) goto L_noskill;
menu
- "Yes, I look really good on this " +@torso$+ ".",-;
+ "Yes, I look really good in this " +@torso$+ ".",-;
next;
mes "[Miriam]";
- mes "\"I see. I like the way you distributed your Character Points too... " +@agi+ " points to Agility! You really know how to prepare yourself to a good fight!\"";
+ mes "\"I see. I like the way you distributed your Character Points too... " +@agi+ " points to Agility! You really know how to prepare yourself for a good fight!\"";
next;
mes "\"Well... Even if you have a potential to be a good fighter, moving the way you do will not help. You need to be fast to avoid the monsters. \"";
next;
@@ -192,14 +192,14 @@ L_offer:
next;
menu
"I'm in! What kind of test is it?",-,
- "I dont think I need more speed right now",L_giveup;
+ "I don't think I need more speed right now",L_giveup;
next;
L_test:
mes "[Miriam]";
- mes "\"Great! The test is simple. You need to run as fast as you can from the place where I am sitting to the mountains and talk to Pachua, the chief. When you get there and talk to Pachua, he will send a special smoke signal to me, so I can know how much time it took for you to go there.\"";
+ mes "\"Great! The test is simple. You need to run as fast as you can from the place where I am sitting to the mountains and talk to Pachua, the chief. When you get there and talk to Pachua, he will send a special smoke signal to me, so I can know how much time it took for you to get there.\"";
next;
- mes "\"If you make it in a good time, I will teach you the special speeding skill, if not, you can always try again. So, are you ready?\"";
+ mes "\"If you make it in a good time, I will teach you the special speeding skill. If not, you can always try again. So, are you ready?\"";
next;
menu
"Yes, let's do it!",-,
@@ -232,7 +232,7 @@ L_noskill:
L_giveup:
mes "[Miriam]";
- mes "\"Oh, that is bad... But if you change your mind, come back!\"";
+ mes "\"Oh, that is too bad... But if you change your mind, come back!\"";
set QUEST_MIRIAM, 4;
close;