From 4f8cf83370a6039a769fbf78cad8b6c5d41363b4 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 14 Sep 2009 19:59:42 -0600 Subject: Make Itka's timer longer --- npc/021-1_Tulimshar/bakery.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npc/021-1_Tulimshar/bakery.txt b/npc/021-1_Tulimshar/bakery.txt index 0cdb83ee..d7ca399f 100644 --- a/npc/021-1_Tulimshar/bakery.txt +++ b/npc/021-1_Tulimshar/bakery.txt @@ -7,7 +7,7 @@ mes "\"This bakery is the best!\""; close; -OnTimer60000: +OnTimer300000: npctalk "Come to the bakery!"; setnpctimer 0; end; -- cgit v1.2.3-60-g2f50 From 6b50195dc7da88d6e7f5dc61b466e23aba458dd5 Mon Sep 17 00:00:00 2001 From: Chuck Miller Date: Mon, 14 Sep 2009 23:59:53 -0400 Subject: Create a new map for Omar's house for the special song --- data/001-4.wlk | Bin 0 -> 16004 bytes data/resnametable.txt | 1 + npc/001-1_Tulimshar/_warps.txt | 2 +- npc/001-2_Tulimshar/_import.txt | 1 - npc/001-2_Tulimshar/omar.txt | 348 ----------------------------------- npc/001-4_Omars_house/_import.txt | 4 + npc/001-4_Omars_house/_warps.txt | 3 + npc/001-4_Omars_house/dedication.txt | 9 + npc/001-4_Omars_house/omar.txt | 348 +++++++++++++++++++++++++++++++++++ npc/_import.txt | 1 + 10 files changed, 367 insertions(+), 350 deletions(-) create mode 100644 data/001-4.wlk delete mode 100644 npc/001-2_Tulimshar/omar.txt create mode 100644 npc/001-4_Omars_house/_import.txt create mode 100644 npc/001-4_Omars_house/_warps.txt create mode 100644 npc/001-4_Omars_house/dedication.txt create mode 100644 npc/001-4_Omars_house/omar.txt diff --git a/data/001-4.wlk b/data/001-4.wlk new file mode 100644 index 00000000..0a762e12 Binary files /dev/null and b/data/001-4.wlk differ diff --git a/data/resnametable.txt b/data/resnametable.txt index 5a055e85..2a144dc8 100644 --- a/data/resnametable.txt +++ b/data/resnametable.txt @@ -1,6 +1,7 @@ 001-1.gat#001-1.wlk# 001-2.gat#001-2.wlk# 001-3.gat#001-3.wlk# +001-4.gat#001-4.wlk# 002-1.gat#002-1.wlk# 002-2.gat#002-2.wlk# 002-3.gat#002-3.wlk# diff --git a/npc/001-1_Tulimshar/_warps.txt b/npc/001-1_Tulimshar/_warps.txt index 751b0df8..ec36a41b 100644 --- a/npc/001-1_Tulimshar/_warps.txt +++ b/npc/001-1_Tulimshar/_warps.txt @@ -4,4 +4,4 @@ 001-1.gat,44,20 warp toCentralTulimshar 3,-1,021-1.gat,55,145 001-1.gat,125,20 warp toCentralTulimshar 0,-1,021-1.gat,136,146 001-1.gat,32,71 warp ToInn -1,-1,001-2.gat,25,34 -001-1.gat,75,41 warp ToHouse -1,-1,001-2.gat,71,72 +001-1.gat,75,41 warp ToHouse -1,-1,001-4.gat,71,72 diff --git a/npc/001-2_Tulimshar/_import.txt b/npc/001-2_Tulimshar/_import.txt index 99123cba..6b8f78b6 100644 --- a/npc/001-2_Tulimshar/_import.txt +++ b/npc/001-2_Tulimshar/_import.txt @@ -2,7 +2,6 @@ map: 001-2.gat npc: npc/001-2_Tulimshar/_mobs.txt npc: npc/001-2_Tulimshar/_warps.txt npc: npc/001-2_Tulimshar/casino.txt -npc: npc/001-2_Tulimshar/omar.txt npc: npc/001-2_Tulimshar/phaet.txt npc: npc/001-2_Tulimshar/shops.txt npc: npc/001-2_Tulimshar/troupe_leader.txt diff --git a/npc/001-2_Tulimshar/omar.txt b/npc/001-2_Tulimshar/omar.txt deleted file mode 100644 index 4f75574e..00000000 --- a/npc/001-2_Tulimshar/omar.txt +++ /dev/null @@ -1,348 +0,0 @@ -// -function script KadiyaSubquestConsts { - set @Q_kadiya_status, (QUEST_MAGIC2 & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT; - - set @Q_STATUS_NONE, 0; - set @Q_STATUS_KNOWS_MOPOX, 1; - set @Q_STATUS_MADE_MOPOX, 2; - set @Q_STATUS_DIDNT_DRINK, 3; - set @Q_STATUS_WANTS_CHOCOCAKE, 4; - set @Q_STATUS_WANTS_ORANGECUPCAKE, 5; - set @Q_STATUS_COMPLETED, 6; - set @Q_STATUS_COMPLETED_ELANORE, 7; - set @Q_STATUS_COMPLETED_NOELANORE, 8; - set @Q_STATUS_COMPLETED_POST_ELANORE, 9; - - if (((QUEST_MAGIC2 & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT) < 4) - set @Q_kadiya_status, @Q_STATUS_NONE; - - if (((QUEST_MAGIC2 & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT) > 4) - set @Q_kadiya_status, @Q_STATUS_COMPLETED_POST_ELANORE; - - return; -} - - -001-2.gat,70,60,0 script Omar 162,{ - callfunc "ElanoreFix"; - callfunc "KadiyaSubquestConsts"; - - set @Q_status, @Q_kadiya_status; - - if (@Q_status >= @Q_STATUS_COMPLETED) - goto L_cured; - - if (@Q_status == @Q_STATUS_DIDNT_DRINK) - goto L_didnt_drink; - - if (@Q_status > @Q_STATUS_DIDNT_DRINK) - goto L_make_food; - - mes "[Omar]"; - mes "\"Welcome to my humble abode.\""; - next; - - menu - "Well met! May I ask who you are?", L_omar, - "What's wrong with your daughter?", L_kadiya_sick, - "Thank you!", -; - close; - -L_omar: - mes "[Omar]"; - mes "\"My name is Omar; I am a trader of oils and spices.\""; - close; - -L_kadiya_sick: - mes "[Omar]"; - mes "\"Kadiya has caught Ponderpox, I fear.\""; - mes "He sighs."; - mes "\"She's has been feverish for many days now. I wish there were something I could do.\""; - next; - - menu - "Have you asked Elanore the healer?", L_sick_elanore, - "How about the Hurnscald hospital?", L_sick_hospital, - "Can I help?", L_sick_self, - "I'm sorry to hear that.", -; - - mes "[Omar]"; - mes "\"Well, she is a strong girl. I am sure that she will get over it eventually.\""; - mes "He smiles, but you see doubt in his eyes."; - close; - -L_sick_elanore: - mes "[Omar]"; - mes "\"Elanore?\""; - mes "He frowns."; - mes "\"She knows nothing. I see no point in talking to her.\""; - close; - -L_sick_hospital: - mes "[Omar]"; - mes "\"Hurnscald is too far away. I don't think that it would be good for her to go on such a long trip.\""; - close; - -L_sick_self: - mes "[Omar]"; - mes "\"You are very kind, but I don't think there is anything you can do.\""; - close; - -L_didnt_drink: - mes "[Omar]"; - mes "\"So she has Mopox, not Ponderpox, you say? Hmm. That is much harder to cure, I think.\""; - mes "\"I am grateful for the effort you put into brewing a potion for her. But it does smell vile...\""; - next; - - mes "[Omar]"; - mes "\"I promised my dear wife that I would never make Kadiya eat or drink anything she doesn't like. So I won't force her to drink this.\""; - next; - - mes "[Omar]"; - set @Q_status, (@Q_STATUS_WANTS_CHOCOCAKE + rand(2)); - callsub S_update_var; - - if (@Q_status == @Q_STATUS_WANTS_ORANGECUPCAKE) - mes "\"If only we could make it smell and taste like orange cupcakes... she really loves those cupcakes.\""; - if (@Q_status == @Q_STATUS_WANTS_CHOCOCAKE) - mes "\"If only this were a chocolate cake and not a potion... she really loves chocolate cakes.\""; - close; - -L_make_food: - mes "[Omar]"; - mes "\"I should stay here to watch over her. I wish I could think of a way to convince her to drink the potion...\""; - if (@Q_status == @Q_STATUS_WANTS_ORANGECUPCAKE) - mes "\"Alas, it is not an orange cupcake.\""; - if (@Q_status == @Q_STATUS_WANTS_CHOCOCAKE) - mes "\"If only it were to smell and taste like her favourite chocolate cake...\""; - close; - -L_cured: - if (@Q_status == @Q_STATUS_COMPLETED) - goto L_cured_choice; - mes "[Omar]"; - mes "\"She is sleeping now, but she seems to be much better. I am sure that she will be up and running around again soon.\""; - close; - -L_cured_choice: - mes "[Omar]"; - mes "\"I am very grateful for your help. I really was sure that it was Ponderpox, not Mopox, that she had.\""; - next; - - menu - "Oh, it was nothing.", L_cured_nothing, - "I didn't do it alone; Elanore helped.", L_cured_elanore, - "That will be 5000 GP.", -; - - mes "[Omar]"; - mes "\"Ah, certainly.\""; - mes "He hands you a small bag of money."; - next; - - set @Q_status, @Q_STATUS_COMPLETED_NOELANORE; - callsub S_update_var; - - set zeny, zeny + 5000; - close; - -L_cured_nothing: - mes "[Omar]"; - mes "\"No, this wasn't nothing. She is everything to me. Here, you deserve a reward.\""; - mes "He hands you a bag of money containing 10,000 GP and two pearls."; - mes "\"And feel free to drop by again whenever you would like!\""; - - set @Q_status, @Q_STATUS_COMPLETED_NOELANORE; - callsub S_update_var; - - getitem "Pearl", 2; - set zeny, zeny + 10000; - close; - -L_cured_elanore: - mes "[Omar]"; - mes "Omar frowns."; - mes "\"That witch? You worked with her without telling me?\""; - mes "He looks over to his daughter, concern suddenly in his eyes."; - mes "\"She is looking better, though...\""; - next; - - mes "[Omar]"; - mes "Omar shakes his head."; - mes "\"I will have to think about this. Please leave me alone.\""; - next; - - set @Q_status, @Q_STATUS_COMPLETED_ELANORE; - callsub S_update_var; - - close; - -S_update_var: - set QUEST_MAGIC2, - (QUEST_MAGIC2 & ~(NIBBLE_3_MASK) - | (@Q_status << NIBBLE_3_SHIFT)); - return; -} - - -001-2.gat,76,59,0 script _______Kadiya 174,{ - callfunc "ElanoreFix"; - set @Q_MASK, NIBBLE_3_MASK; - set @Q_SHIFT, NIBBLE_3_SHIFT; - - callfunc "KadiyaSubquestConsts"; - set @Q_status, @Q_kadiya_status; - - if (@Q_status >= @Q_STATUS_COMPLETED) - goto L_cured; - - mes "You see a young girl lying in bed. At first she doesn't seem to notice you approaching."; - mes "Finally, she turns her head towards you. Judging from the sweat on her forehead and look in her eyes, she is suffering from some kind of fever."; - next; - - mes "[Kadiya]"; - mes "\"Hello,\" she says in a tiny voice."; - next; - - set @M_NAME, 1; - set @M_CANDY, 2; - set @M_POTION, 3; - set @M_CHOCOCAKE, 4; - set @M_CUPCAKE, 5; - - setarray @choice$, "Hello! What's your name?", "Would you like some candy?", "", "", "", "", "", ""; - setarray @choice_idx, @M_NAME, @M_CANDY, 0, 0, 0, 0, 0, 0; - set @choices_nr, 2; - - if (countitem("MopoxCurePotion") == 0) - goto L_M_no_cure; - - set @choice_idx[@choices_nr], @M_POTION; - set @choice$[@choices_nr], "This potion will cure your illness!"; - set @choices_nr, @choices_nr + 1; - -L_M_no_cure: - - if ((countitem("LacedChocolateCake") == 0) || (@Q_status != @Q_STATUS_WANTS_CHOCOCAKE)) - goto L_M_no_chococake; - - set @choice_idx[@choices_nr], @M_CHOCOCAKE; - set @choice$[@choices_nr], "Would you like special chocolate cake?"; - set @choices_nr, @choices_nr + 1; - -L_M_no_chococake: - - if ((countitem("LacedOrangeCupcake") == 0) || (@Q_status != @Q_STATUS_WANTS_ORANGECUPCAKE)) - goto L_M_no_cupcake; - - set @choice_idx[@choices_nr], @M_CUPCAKE; - set @choice$[@choices_nr], "Would you like special orange cupcake?"; - set @choices_nr, @choices_nr + 1; - -L_M_no_cupcake: - - set @choice_idx[@choices_nr], 0; - set @choice$[@choices_nr], "Goodbye."; - set @choices_nr, @choices_nr + 1; - - menu - @choice$[0], -, - @choice$[1], -, - @choice$[2], -, - @choice$[3], -, - @choice$[4], -, - @choice$[5], -; - - set @choice, @choice_idx[@menu - 1]; - - if (@choice == @M_NAME) goto L_name; - if (@choice == @M_CANDY) goto L_no_candy; - if (@choice == @M_POTION) goto L_potion; - if (@choice == @M_CHOCOCAKE) goto L_chococake; - if (@choice == @M_CUPCAKE) goto L_cupcake; - - close; - -L_name: - mes "[Kadiya]"; - mes "She smiles a faint smile."; - mes "\"My name is Kadiya.\""; - - close; - -L_no_candy: - mes "[Kadiya]"; - mes "She hesitates for a moment."; - mes "\"No, thank you. I don't think I should.\""; - - close; - -L_potion: - mes "[Kadiya]"; - if (@Q_status < @Q_STATUS_DIDNT_DRINK) - set @Q_status, @Q_STATUS_DIDNT_DRINK; - callsub S_update_var; - - mes "Kadiya grimaces and pushes the bottle away."; - mes "\"That smells terrible!\""; - next; - - mes "[Kadiya]"; - mes "She pulls the sheets over her head."; - mes "\"I won't drink that!\""; - next; - - close; - -L_chococake: - delitem "LacedChocolateCake", 1; - goto L_do_cure; - -L_cupcake: - delitem "LacedOrangeCupcake", 1; - goto L_do_cure; - -L_do_cure: - if (@Q_status < @Q_STATUS_COMPLETED) - set @Q_status, @Q_STATUS_COMPLETED; - callsub S_update_var; - mes "[Kadiya]"; - mes "Kadiya's eyes widen."; - mes "\"Oh! Daddy, is it okay if I eat this?\""; - mes "Omar nods and smiles. \"You should eat a bit to regain your strength, sweetheart.\""; - next; - - mes "[Kadiya]"; - mes "Kadiya devours your gift in just a handful of bites."; - next; - - mes "[Kadiya]"; - mes "She smiles. \"Thank you! I feel better already!\"."; - next; - - mes "[Kadiya]"; - mes "She looks much healthier, too. Omar walks over and touches her forehead."; - mes "\"Now that is funny-- your fever has gone down quite a bit!\""; - mes "He smiles at you. \"Thank you for your help!\""; - next; - - mes "[Kadiya]"; - mes "\"You should get some sleep now, sweetheart. I'm sure that you will be better soon.\""; - close; - -L_goodbye: - mes "[Kadiya]"; - mes "Goodbye!"; - - close; - -L_cured: - mes "[Kadiya]"; - mes "Kadiya seems to be sleeping calmly. She looks much less sweaty than earlier; unless you are very much mistaken, her fever has disappeared."; - close; - -S_update_var: - set QUEST_MAGIC2, - (QUEST_MAGIC2 & ~(@Q_MASK) - | (@Q_status << @Q_SHIFT)); - return; -} diff --git a/npc/001-4_Omars_house/_import.txt b/npc/001-4_Omars_house/_import.txt new file mode 100644 index 00000000..2a2d618c --- /dev/null +++ b/npc/001-4_Omars_house/_import.txt @@ -0,0 +1,4 @@ +map: 001-4.gat +npc: npc/001-4_Omars_house/_warps.txt +npc: npc/001-4_Omars_house/omar.txt +npc: npc/001-4_Omars_house/dedication.txt diff --git a/npc/001-4_Omars_house/_warps.txt b/npc/001-4_Omars_house/_warps.txt new file mode 100644 index 00000000..2f29349e --- /dev/null +++ b/npc/001-4_Omars_house/_warps.txt @@ -0,0 +1,3 @@ +// 001-4 Omar's house warps + +001-4.gat,71,73 warp ToOutdoor -1,-1,001-1.gat,75,42 diff --git a/npc/001-4_Omars_house/dedication.txt b/npc/001-4_Omars_house/dedication.txt new file mode 100644 index 00000000..edb0e388 --- /dev/null +++ b/npc/001-4_Omars_house/dedication.txt @@ -0,0 +1,9 @@ +// Dedication to Irene Christina + +001-4.gat,76,68,0 script #IreneDedication 127,{ + mes "~ Irene Christina ~"; + mes "The song in this house is dedicated to Irene."; + mes ""; + mes "She had seen only twenty hours of this world when she died in her father's arms."; + close; +}; diff --git a/npc/001-4_Omars_house/omar.txt b/npc/001-4_Omars_house/omar.txt new file mode 100644 index 00000000..a6ac2277 --- /dev/null +++ b/npc/001-4_Omars_house/omar.txt @@ -0,0 +1,348 @@ +// +function script KadiyaSubquestConsts { + set @Q_kadiya_status, (QUEST_MAGIC2 & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT; + + set @Q_STATUS_NONE, 0; + set @Q_STATUS_KNOWS_MOPOX, 1; + set @Q_STATUS_MADE_MOPOX, 2; + set @Q_STATUS_DIDNT_DRINK, 3; + set @Q_STATUS_WANTS_CHOCOCAKE, 4; + set @Q_STATUS_WANTS_ORANGECUPCAKE, 5; + set @Q_STATUS_COMPLETED, 6; + set @Q_STATUS_COMPLETED_ELANORE, 7; + set @Q_STATUS_COMPLETED_NOELANORE, 8; + set @Q_STATUS_COMPLETED_POST_ELANORE, 9; + + if (((QUEST_MAGIC2 & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT) < 4) + set @Q_kadiya_status, @Q_STATUS_NONE; + + if (((QUEST_MAGIC2 & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT) > 4) + set @Q_kadiya_status, @Q_STATUS_COMPLETED_POST_ELANORE; + + return; +} + + +001-4.gat,70,60,0 script Omar 162,{ + callfunc "ElanoreFix"; + callfunc "KadiyaSubquestConsts"; + + set @Q_status, @Q_kadiya_status; + + if (@Q_status >= @Q_STATUS_COMPLETED) + goto L_cured; + + if (@Q_status == @Q_STATUS_DIDNT_DRINK) + goto L_didnt_drink; + + if (@Q_status > @Q_STATUS_DIDNT_DRINK) + goto L_make_food; + + mes "[Omar]"; + mes "\"Welcome to my humble abode.\""; + next; + + menu + "Well met! May I ask who you are?", L_omar, + "What's wrong with your daughter?", L_kadiya_sick, + "Thank you!", -; + close; + +L_omar: + mes "[Omar]"; + mes "\"My name is Omar; I am a trader of oils and spices.\""; + close; + +L_kadiya_sick: + mes "[Omar]"; + mes "\"Kadiya has caught Ponderpox, I fear.\""; + mes "He sighs."; + mes "\"She's has been feverish for many days now. I wish there were something I could do.\""; + next; + + menu + "Have you asked Elanore the healer?", L_sick_elanore, + "How about the Hurnscald hospital?", L_sick_hospital, + "Can I help?", L_sick_self, + "I'm sorry to hear that.", -; + + mes "[Omar]"; + mes "\"Well, she is a strong girl. I am sure that she will get over it eventually.\""; + mes "He smiles, but you see doubt in his eyes."; + close; + +L_sick_elanore: + mes "[Omar]"; + mes "\"Elanore?\""; + mes "He frowns."; + mes "\"She knows nothing. I see no point in talking to her.\""; + close; + +L_sick_hospital: + mes "[Omar]"; + mes "\"Hurnscald is too far away. I don't think that it would be good for her to go on such a long trip.\""; + close; + +L_sick_self: + mes "[Omar]"; + mes "\"You are very kind, but I don't think there is anything you can do.\""; + close; + +L_didnt_drink: + mes "[Omar]"; + mes "\"So she has Mopox, not Ponderpox, you say? Hmm. That is much harder to cure, I think.\""; + mes "\"I am grateful for the effort you put into brewing a potion for her. But it does smell vile...\""; + next; + + mes "[Omar]"; + mes "\"I promised my dear wife that I would never make Kadiya eat or drink anything she doesn't like. So I won't force her to drink this.\""; + next; + + mes "[Omar]"; + set @Q_status, (@Q_STATUS_WANTS_CHOCOCAKE + rand(2)); + callsub S_update_var; + + if (@Q_status == @Q_STATUS_WANTS_ORANGECUPCAKE) + mes "\"If only we could make it smell and taste like orange cupcakes... she really loves those cupcakes.\""; + if (@Q_status == @Q_STATUS_WANTS_CHOCOCAKE) + mes "\"If only this were a chocolate cake and not a potion... she really loves chocolate cakes.\""; + close; + +L_make_food: + mes "[Omar]"; + mes "\"I should stay here to watch over her. I wish I could think of a way to convince her to drink the potion...\""; + if (@Q_status == @Q_STATUS_WANTS_ORANGECUPCAKE) + mes "\"Alas, it is not an orange cupcake.\""; + if (@Q_status == @Q_STATUS_WANTS_CHOCOCAKE) + mes "\"If only it were to smell and taste like her favourite chocolate cake...\""; + close; + +L_cured: + if (@Q_status == @Q_STATUS_COMPLETED) + goto L_cured_choice; + mes "[Omar]"; + mes "\"She is sleeping now, but she seems to be much better. I am sure that she will be up and running around again soon.\""; + close; + +L_cured_choice: + mes "[Omar]"; + mes "\"I am very grateful for your help. I really was sure that it was Ponderpox, not Mopox, that she had.\""; + next; + + menu + "Oh, it was nothing.", L_cured_nothing, + "I didn't do it alone; Elanore helped.", L_cured_elanore, + "That will be 5000 GP.", -; + + mes "[Omar]"; + mes "\"Ah, certainly.\""; + mes "He hands you a small bag of money."; + next; + + set @Q_status, @Q_STATUS_COMPLETED_NOELANORE; + callsub S_update_var; + + set zeny, zeny + 5000; + close; + +L_cured_nothing: + mes "[Omar]"; + mes "\"No, this wasn't nothing. She is everything to me. Here, you deserve a reward.\""; + mes "He hands you a bag of money containing 10,000 GP and two pearls."; + mes "\"And feel free to drop by again whenever you would like!\""; + + set @Q_status, @Q_STATUS_COMPLETED_NOELANORE; + callsub S_update_var; + + getitem "Pearl", 2; + set zeny, zeny + 10000; + close; + +L_cured_elanore: + mes "[Omar]"; + mes "Omar frowns."; + mes "\"That witch? You worked with her without telling me?\""; + mes "He looks over to his daughter, concern suddenly in his eyes."; + mes "\"She is looking better, though...\""; + next; + + mes "[Omar]"; + mes "Omar shakes his head."; + mes "\"I will have to think about this. Please leave me alone.\""; + next; + + set @Q_status, @Q_STATUS_COMPLETED_ELANORE; + callsub S_update_var; + + close; + +S_update_var: + set QUEST_MAGIC2, + (QUEST_MAGIC2 & ~(NIBBLE_3_MASK) + | (@Q_status << NIBBLE_3_SHIFT)); + return; +} + + +001-4.gat,76,59,0 script _______Kadiya 174,{ + callfunc "ElanoreFix"; + set @Q_MASK, NIBBLE_3_MASK; + set @Q_SHIFT, NIBBLE_3_SHIFT; + + callfunc "KadiyaSubquestConsts"; + set @Q_status, @Q_kadiya_status; + + if (@Q_status >= @Q_STATUS_COMPLETED) + goto L_cured; + + mes "You see a young girl lying in bed. At first she doesn't seem to notice you approaching."; + mes "Finally, she turns her head towards you. Judging from the sweat on her forehead and look in her eyes, she is suffering from some kind of fever."; + next; + + mes "[Kadiya]"; + mes "\"Hello,\" she says in a tiny voice."; + next; + + set @M_NAME, 1; + set @M_CANDY, 2; + set @M_POTION, 3; + set @M_CHOCOCAKE, 4; + set @M_CUPCAKE, 5; + + setarray @choice$, "Hello! What's your name?", "Would you like some candy?", "", "", "", "", "", ""; + setarray @choice_idx, @M_NAME, @M_CANDY, 0, 0, 0, 0, 0, 0; + set @choices_nr, 2; + + if (countitem("MopoxCurePotion") == 0) + goto L_M_no_cure; + + set @choice_idx[@choices_nr], @M_POTION; + set @choice$[@choices_nr], "This potion will cure your illness!"; + set @choices_nr, @choices_nr + 1; + +L_M_no_cure: + + if ((countitem("LacedChocolateCake") == 0) || (@Q_status != @Q_STATUS_WANTS_CHOCOCAKE)) + goto L_M_no_chococake; + + set @choice_idx[@choices_nr], @M_CHOCOCAKE; + set @choice$[@choices_nr], "Would you like special chocolate cake?"; + set @choices_nr, @choices_nr + 1; + +L_M_no_chococake: + + if ((countitem("LacedOrangeCupcake") == 0) || (@Q_status != @Q_STATUS_WANTS_ORANGECUPCAKE)) + goto L_M_no_cupcake; + + set @choice_idx[@choices_nr], @M_CUPCAKE; + set @choice$[@choices_nr], "Would you like special orange cupcake?"; + set @choices_nr, @choices_nr + 1; + +L_M_no_cupcake: + + set @choice_idx[@choices_nr], 0; + set @choice$[@choices_nr], "Goodbye."; + set @choices_nr, @choices_nr + 1; + + menu + @choice$[0], -, + @choice$[1], -, + @choice$[2], -, + @choice$[3], -, + @choice$[4], -, + @choice$[5], -; + + set @choice, @choice_idx[@menu - 1]; + + if (@choice == @M_NAME) goto L_name; + if (@choice == @M_CANDY) goto L_no_candy; + if (@choice == @M_POTION) goto L_potion; + if (@choice == @M_CHOCOCAKE) goto L_chococake; + if (@choice == @M_CUPCAKE) goto L_cupcake; + + close; + +L_name: + mes "[Kadiya]"; + mes "She smiles a faint smile."; + mes "\"My name is Kadiya.\""; + + close; + +L_no_candy: + mes "[Kadiya]"; + mes "She hesitates for a moment."; + mes "\"No, thank you. I don't think I should.\""; + + close; + +L_potion: + mes "[Kadiya]"; + if (@Q_status < @Q_STATUS_DIDNT_DRINK) + set @Q_status, @Q_STATUS_DIDNT_DRINK; + callsub S_update_var; + + mes "Kadiya grimaces and pushes the bottle away."; + mes "\"That smells terrible!\""; + next; + + mes "[Kadiya]"; + mes "She pulls the sheets over her head."; + mes "\"I won't drink that!\""; + next; + + close; + +L_chococake: + delitem "LacedChocolateCake", 1; + goto L_do_cure; + +L_cupcake: + delitem "LacedOrangeCupcake", 1; + goto L_do_cure; + +L_do_cure: + if (@Q_status < @Q_STATUS_COMPLETED) + set @Q_status, @Q_STATUS_COMPLETED; + callsub S_update_var; + mes "[Kadiya]"; + mes "Kadiya's eyes widen."; + mes "\"Oh! Daddy, is it okay if I eat this?\""; + mes "Omar nods and smiles. \"You should eat a bit to regain your strength, sweetheart.\""; + next; + + mes "[Kadiya]"; + mes "Kadiya devours your gift in just a handful of bites."; + next; + + mes "[Kadiya]"; + mes "She smiles. \"Thank you! I feel better already!\"."; + next; + + mes "[Kadiya]"; + mes "She looks much healthier, too. Omar walks over and touches her forehead."; + mes "\"Now that is funny-- your fever has gone down quite a bit!\""; + mes "He smiles at you. \"Thank you for your help!\""; + next; + + mes "[Kadiya]"; + mes "\"You should get some sleep now, sweetheart. I'm sure that you will be better soon.\""; + close; + +L_goodbye: + mes "[Kadiya]"; + mes "Goodbye!"; + + close; + +L_cured: + mes "[Kadiya]"; + mes "Kadiya seems to be sleeping calmly. She looks much less sweaty than earlier; unless you are very much mistaken, her fever has disappeared."; + close; + +S_update_var: + set QUEST_MAGIC2, + (QUEST_MAGIC2 & ~(@Q_MASK) + | (@Q_status << @Q_SHIFT)); + return; +} diff --git a/npc/_import.txt b/npc/_import.txt index 403fb447..624cac46 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -1,6 +1,7 @@ import: npc/001-1_Tulimshar/_import.txt import: npc/001-2_Tulimshar/_import.txt import: npc/001-3_Tulimshar_arena/_import.txt +import: npc/001-4_Omars_house/_import.txt import: npc/002-1_Sandstorm/_import.txt import: npc/002-3_Desert_mines/_import.txt import: npc/002-4_Desert_mines/_import.txt -- cgit v1.2.3-60-g2f50 From c5a79ce04a1146da187be975bd11d57dd870649e Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Tue, 15 Sep 2009 10:44:44 -0600 Subject: Add a news entry about the recent magic fixes --- news.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news.txt b/news.txt index 4b01b82a..b60e0b1e 100644 --- a/news.txt +++ b/news.txt @@ -1,3 +1,15 @@ +##3 Magic Fixes +##3 2009-09-15 + +##0 The second tier healing spell no longer works on +##0 yourself, and when used on others, will transfer +##0 health from you to them, as originally intended. +##0 It will still take mana if you try to cast it +##0 dead players. We're working to fix that. + +##0 Making lifestones now prioritizes bug legs, then +##0 maggot slime, then the herbs. + ##3 Technical updates ##3 2009-08-16 -- cgit v1.2.3-60-g2f50 From 971e790e4632341b15508c5021a1288145e12e13 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Tue, 15 Sep 2009 12:05:59 -0600 Subject: Fix some errors in news --- news.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/news.txt b/news.txt index b60e0b1e..36f7f408 100644 --- a/news.txt +++ b/news.txt @@ -2,10 +2,9 @@ ##3 2009-09-15 ##0 The second tier healing spell no longer works on -##0 yourself, and when used on others, will transfer -##0 health from you to them, as originally intended. -##0 It will still take mana if you try to cast it -##0 dead players. We're working to fix that. +##0 yourself, It will still take mana if you try to +##0 cast it on dead players. We're working to fix +##0 that. It will halt health regenration when used. ##0 Making lifestones now prioritizes bug legs, then ##0 maggot slime, then the herbs. -- cgit v1.2.3-60-g2f50 From 2f931153d914a90b3be73665a90251706f2b3170 Mon Sep 17 00:00:00 2001 From: Kess Vargavind Date: Wed, 16 Sep 2009 22:20:23 +0200 Subject: Minor spelling fixes --- db/item_db.txt | 2 +- news.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db/item_db.txt b/db/item_db.txt index 34ca19e0..88c1f51c 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -262,7 +262,7 @@ 1217, CatEars, Cat Ears, 5, 100, 50, 2, , 1, , 1, 0, 2, 256, , 0, 0, {}, { bonus bAgi, 3; } 1218, PaperBag, Paper Bag, 5, 1000, 5, 1, , 1, , -1, 0, 2, 256, , 0, 0, {}, { bonus bAgi, -1; } 1219, MoubootaurHead, Moubootaur Head, 5, 10, 1, 20, , 1, , 0, 0, 2, 256, , 0, 0, {}, {} -1220, Parsley, Bunch of Parsley, 5, 3, 1, 1, , 1, , 0, 0, 2, 256, , 0, 0, {}, { bonus bDeaf, 1; } +1220, BunchOfParsley, Bunch of Parsley, 5, 3, 1, 1, , 1, , 0, 0, 2, 256, , 0, 0, {}, { bonus bDeaf, 1; } 2050, RedCottonShirt, Red Cotton Shirt, 5, 10, 5, 100, , 2, , -4, 0, 2, 512, , 0, 0, {}, {} 2051, GreenCottonShirt, Green Cotton Shirt, 5, 10, 5, 100, , 2, , -4, 0, 2, 512, , 0, 0, {}, {} diff --git a/news.txt b/news.txt index 36f7f408..0cedbce4 100644 --- a/news.txt +++ b/news.txt @@ -2,9 +2,9 @@ ##3 2009-09-15 ##0 The second tier healing spell no longer works on -##0 yourself, It will still take mana if you try to +##0 yourself, it will still take mana if you try to ##0 cast it on dead players. We're working to fix -##0 that. It will halt health regenration when used. +##0 that. It will halt health regeneration when used. ##0 Making lifestones now prioritizes bug legs, then ##0 maggot slime, then the herbs. -- cgit v1.2.3-60-g2f50