summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
m---------client-data0
-rw-r--r--world/map/conf/magic.conf.template2
-rw-r--r--world/map/db/const.txt2
-rw-r--r--world/map/db/skill_db.txt2
-rw-r--r--world/map/npc/006-1/pachua.txt2
-rw-r--r--world/map/npc/009-2/olana.txt44
-rw-r--r--world/map/npc/011-6/_warps.txt2
-rw-r--r--world/map/npc/013-2/notes.txt2
-rw-r--r--world/map/npc/018-2/caul.txt2
-rw-r--r--world/map/npc/024-1/david.txt16
-rw-r--r--world/map/npc/025-1/rossy.txt96
-rw-r--r--world/map/npc/025-4/julia.txt4
-rw-r--r--world/map/npc/032-1/miriam.txt2
-rw-r--r--world/map/npc/033-1/birrod.txt2
-rw-r--r--world/map/npc/033-1/kimarr.txt50
-rw-r--r--world/map/npc/042-2/tanisha.txt3
16 files changed, 143 insertions, 88 deletions
diff --git a/client-data b/client-data
-Subproject 60760da93d48ae8c0c1a727c843945c2fd9b4c8
+Subproject 00bdb989e56d8dbd3a86346d4c888f83156524c
diff --git a/world/map/conf/magic.conf.template b/world/map/conf/magic.conf.template
index c8fd29df..22f2e423 100644
--- a/world/map/conf/magic.conf.template
+++ b/world/map/conf/magic.conf.template
@@ -566,7 +566,7 @@ SPELL lay-on-hands (target : STRING) : "#L10" =
(pc(target) <> caster)
&&
(rdistance(location(caster),
- location(pc(target))) < 2 + (spellpower / 50))
+ location(pc(target))) < 2 + sqrt(spellpower) / 4)
&& not (running_status_update(pc(target), SC_HALT_REGENERATE))
))
=> EFFECT CALL adjust_spellpower(school);
diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index f7b12451..50084b5b 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -217,7 +217,7 @@ SKILL_LUCKY_COUNTER 351
SKILL_SPEED 352
SKILL_RESIST_POISON 353
SKILL_ASTRAL_SOUL 354
-SKILL_WARRIOR_BERSERK 355
+SKILL_WARRIOR_RAGING 355
// Magic skills
SKILL_MAGIC 340
diff --git a/world/map/db/skill_db.txt b/world/map/db/skill_db.txt
index 91bf1405..eee6d9d2 100644
--- a/world/map/db/skill_db.txt
+++ b/world/map/db/skill_db.txt
@@ -32,7 +32,7 @@
353, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, none, 0, passive,vit, Poison_Resistance //TMW_POISON_RESISTANCE
354, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, magic, 0, passive,int, Astral_Soul //TMW_ASTRAL_SOUL
45, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, weapon, 0, passive,dex, Mallard's_Eye //AC_OWL
-355, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, weapon, 0, passive,str, Beserking //SKILL_WARRIOR_BERSERK implemented
+355, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, weapon, 0, passive,str, Raging //SKILL_WARRIOR_RAGING implemented
28, 0, 6, 4, 0, 1, 0, 2, 1, yes, 0, 0, 0, magic, 0, no, none, Teleport //AL_TELEPORT
30, 9, 6, 16, 0, 1, 0, 10, 1, yes, 0, 0, 0, magic, 0, no, none, Heal //AL_HEAL
// maxrse describes the max. level that the skill can be raised to through the `raise skill' option. Further raising has to happen via quests.
diff --git a/world/map/npc/006-1/pachua.txt b/world/map/npc/006-1/pachua.txt
index c7bd1855..c1bfb83f 100644
--- a/world/map/npc/006-1/pachua.txt
+++ b/world/map/npc/006-1/pachua.txt
@@ -228,7 +228,7 @@ L_TooMany:
L_smoke:
message strcharinfo(0), "Pachua quickly inhales from his pipe and releases a ring of smoke towards the sky!";
- set QUEST_MIRIAM_run, gettimetick(1) - QUEST_MIRIAM_start;
+ set QUEST_MIRIAM_run, gettimetick(2) - QUEST_MIRIAM_start;
set QUEST_MIRIAM_start, 0;
end;
diff --git a/world/map/npc/009-2/olana.txt b/world/map/npc/009-2/olana.txt
index e2f868d1..84643483 100644
--- a/world/map/npc/009-2/olana.txt
+++ b/world/map/npc/009-2/olana.txt
@@ -2,10 +2,22 @@
009-2.gat,63,79,0 script Olana 190,{
+ set @MinLevel, 60;
+
+ set @Cherry_Amount, 10;
+ set @Cherry_EXP, 1000;
+ set @Cherry_Money, 1000;
+
+ set @RedRose_Amount, 15;
+ set @RedTulip_Amount, 15;
+ set @Flower_Money, 1500;
+
+ set @Finish_EXP, 5000;
+ set @Finish_Money, 5000;
+
if (FLAGS & FLAG_ROSSI_COMPLETED) goto L_FinalEnd;
if (Rossy_Quest == 17 || Rossy_Quest == 18) goto L_End;
-
if (Rossy_Quest >= 14 && Rossy_Quest <= 16) goto L_Julia;
if (Rossy_Quest == 13) goto L_Best;
if (Rossy_Quest == 12) goto L_Give;
@@ -23,13 +35,13 @@
mes "\"Hello. We don't usually get guests back here.\"";
next;
mes "\"My name is Olana and my father owns this inn. I live in Tulimshar, but came to Hurnscald on vacation with my two young daughters, Rossy and Julia.\"";
- if (baselevel < 60) close;
+ if (baselevel < @MinLevel) close;
next;
mes "\"I let my two lovely girls play in the woods nearby but they haven't come back yet!\"";
next;
mes "Olana suddenly looks very pale and starts to shiver.";
next;
- mes "\"I'm starting to get a bad feeling about this... If you go to the forest near the swamps, could you see if you can find my daughters? I need to know if they are safe!\"";
+ mes "\"I'm starting to get a bad feeling about this. If you go to the forest near the swamps, could you see if you can find my daughters? I need to know if they are safe!\"";
menu
"Sure, I can do that.", -,
"I am sorry, I don't usually go to that area.", L_No;
@@ -63,19 +75,19 @@ L_Help:
L_Worried:
mes "Olana smiles at you, trying to show some happiness, but her facial expression only conveys tension and preoccupation.";
next;
- mes "You suddenly remember that Rossy asked for your help to collect some fruits... Maybe she could also have some ideas on how to cheer her mother up.";
+ mes "You suddenly remember that Rossy asked for your help to collect some fruits. Maybe she could also have some ideas on how to cheer her mother up.";
close;
L_See:
if (gotcherry == 1) goto L_Task;
- if (countitem("cherry") < 10) goto L_Worried;
- delitem "cherry", 10;
+ if (countitem("cherry") < @Cherry_Amount) goto L_Worried;
+ delitem "cherry", @Cherry_Amount;
menu
"Hi, Rossy asked me to give you this. She says it is a gift from both her and Julia.", -;
mes "[Olana]";
- mes "\"Ohhh... How sweet... Sometimes Rossy impresses me with her kindness. Here...You are spending so much time helping us, and we give nothing back. Take this as a small reward. \"";
- getexp 1000, 0;
- set zeny, zeny + 1000;
+ mes "\"Ohhh... How sweet... Sometimes Rossy impresses me with her kindness. Here... You are spending so much time helping us, and we give nothing back. Take this as a small reward.\"";
+ getexp @Cherry_EXP, 0;
+ set zeny, zeny + @Cherry_Money;
set gotcherry, 1;
goto L_Task;
@@ -119,7 +131,7 @@ L_Rose:
"Just tell me what to do.", -,
"No, I'm busy, maybe later.", L_No;
mes "[Olana]";
- mes "\"Can you bring me 15 Red Roses? I would like to give them to Rossy. I am sure she will love them!\"";
+ mes "\"Can you bring me " + @RedRose_Amount + " Red Roses? I would like to give them to Rossy. I am sure she will love them!\"";
menu
"Ok, I will be back with the roses.", L_RG,
"I'm allergic to roses, can't even touch them. Sorry.", L_No;
@@ -127,11 +139,11 @@ L_Rose:
L_RG:
if (Rossy_Quest == 8) set Rossy_Quest, 9;
mes "[Olana]";
- mes "\"Please, bring me 15 Red Roses as soon as you can.\"";
+ mes "\"Please, bring me " + @RedRose_Amount + " Red Roses as soon as you can.\"";
close;
L_RC:
- if(countitem("redrose") < 15) goto L_RG;
+ if(countitem("redrose") < @RedRose_Amount) goto L_RG;
mes "[Olana]";
set Rossy_Quest, 10;
mes "\"Great job! Please hand them to my brilliant daughter, Rossy.\"";
@@ -151,7 +163,7 @@ L_Allergic:
set Rossy_Quest, 12;
mes "[Olana]";
mes "\"Oh, how stupid I am! Here, take some of my money and buy Red Tulips instead, the same amount. Keep the flowers.\"";
- set zeny, zeny + 1500;
+ set zeny, zeny + @Flower_Money;
next;
mes "\"Please, tell Rossy I am really sorry. My mind was on Julia when I asked you to bring the red roses, they are her favorite.\"";
menu
@@ -162,7 +174,7 @@ L_Allergic:
L_Give:
mes "[Olana]";
- mes "\""+ strcharinfo(0) +", please, get 15 Red Tulips and hand them to Rossy. Don't forget to tell her that I'm really sorry.\"";
+ mes "\""+ strcharinfo(0) +", please, get " + @RedTulip_Amount + " Red Tulips and hand them to Rossy. Don't forget to tell her that I'm really sorry.\"";
close;
L_Best:
@@ -187,8 +199,8 @@ L_Found:
if (Rossy_Quest == 17) set Rossy_Quest, 18;
if (Rossy_Quest == 18) set Rossy_Quest, 19;
mes "\"Thank you "+ strcharinfo(0) +", thank you! Here is a reward for you.\"";
- getexp 5000, 0;
- set zeny, zeny + 5000;
+ getexp @Finish_EXP, 0;
+ set zeny, zeny + @Finish_Money;
if (Rossy_Quest == 19) goto L_Clear;
close;
diff --git a/world/map/npc/011-6/_warps.txt b/world/map/npc/011-6/_warps.txt
index 458bc283..513c1c51 100644
--- a/world/map/npc/011-6/_warps.txt
+++ b/world/map/npc/011-6/_warps.txt
@@ -14,7 +14,7 @@
011-6.gat,49,101 warp toOutside -1,-1,011-1.gat,38,37
011-6.gat,24,206 warp warp -1,-1,011-4.gat,17,59
011-6.gat,47,185 warp warp -1,-1,011-4.gat,39,38
-011-6.gat,97,170 warp warp -1,-1,011-4.gat,89,21
+011-6.gat,97,169 warp warp -1,-1,011-4.gat,89,21
011-6.gat,113,182 warp warp -1,-1,011-4.gat,105,34
011-6.gat,122,211 warp warp -1,-1,011-4.gat,114,63
011-6.gat,94,225 warp warp -1,-1,011-4.gat,86,77
diff --git a/world/map/npc/013-2/notes.txt b/world/map/npc/013-2/notes.txt
index f45b2554..dcc1123b 100644
--- a/world/map/npc/013-2/notes.txt
+++ b/world/map/npc/013-2/notes.txt
@@ -56,7 +56,7 @@
L_cheat:
set QUEST_MIRIAM_cheat, 1;
- set QUEST_MIRIAM_run, gettimetick(1) - QUEST_MIRIAM_start;
+ set QUEST_MIRIAM_run, gettimetick(2) - QUEST_MIRIAM_start;
set QUEST_MIRIAM_start, 0;
message strcharinfo(0), "You were supposed to actually run to this place. You are not sure if this is going to work for Miriam...";
close;
diff --git a/world/map/npc/018-2/caul.txt b/world/map/npc/018-2/caul.txt
index ddbe6a3c..51196583 100644
--- a/world/map/npc/018-2/caul.txt
+++ b/world/map/npc/018-2/caul.txt
@@ -811,7 +811,7 @@ L_noheart:
set @choice$[@choices_nr], "Add a bone";
set @choices_nr, @choices_nr + 1;
L_nobone:
- if (countitem("DiseasedHeart") == 0) goto L_noskull;
+ if (countitem("Skull") == 0) goto L_noskull;
set @choice_idx[@choices_nr], @C_skull;
set @choice$[@choices_nr], "Add a skull";
set @choices_nr, @choices_nr + 1;
diff --git a/world/map/npc/024-1/david.txt b/world/map/npc/024-1/david.txt
index a7dfc094..00794e03 100644
--- a/world/map/npc/024-1/david.txt
+++ b/world/map/npc/024-1/david.txt
@@ -1,19 +1,21 @@
-024-1.gat,70,70,0 script David 120,{
+024-1.gat,70,70,0 script David 120,{
+
+ set @Potion_EXP, 2000;
if (Rossy_Quest == 17) goto L_FinalEnd;
if (Rossy_Quest == 14) goto L_Julia;
if (Rossy_Quest >= 8) goto L_Done;
-
+
mes "[David]";
mes "\"Learning magic is hard...\"";
if (Rossy_Quest == 7) goto L_Help;
close;
-
+
L_Help:
menu
"Do you know Rossy?", L_Set,
"I can tell, it is hard.", L_No;
-
+
L_Set:
mes "[David]";
mes "\"Yes, I do. I am her teacher. Actually, that reminds me about her final exam... she didn't hand in her potion yet. Time is running out.\"";
@@ -21,12 +23,12 @@ L_Set:
"A potion? Oh, uhm... Strange kind of exam. Bye.", L_No,
"Right, I have her potion in my pocket. She asked me to bring it to you. Here it is.", -;
mes "[David]";
- mes "\"Let me see...\"";
+ mes "\"Let me see.\"";
set Rossy_Quest, 8;
mes "\"This potion is... perfect! Tell Rossy that she succesfully made her potion, it is flawless!\"";
- getexp 2000, 0;
+ getexp @Potion_EXP, 0;
close;
-
+
L_Done:
mes "[David]";
mes "\"I am really happy that my best student succesfully passed her exam!\"";
diff --git a/world/map/npc/025-1/rossy.txt b/world/map/npc/025-1/rossy.txt
index a9f425bb..86cc1bff 100644
--- a/world/map/npc/025-1/rossy.txt
+++ b/world/map/npc/025-1/rossy.txt
@@ -2,6 +2,23 @@
025-1.gat,80,88,0 script Rossy 114,{
+ set @Cherry_Amount, 10;
+ set @Cherry_EXP, 2000;
+
+ set @CactusDrink_Amount, 24;
+ set @MaggotSlime_Amount, 32;
+ set @GambodgeHerb_Amount, 50;
+ set @AlizarinHerb_Amount, 43;
+ set @BugLeg_Amount, 30;
+ set @Potion_EXP, 3000;
+
+ set @RedRose_Amount, 15;
+ set @RedTulip_Amount, 15;
+ set @Flower_EXP, 2500;
+
+ set @Finish_EXP, 5000;
+ set @Finish_Money, 5000;
+
if (FLAGS & FLAG_ROSSI_COMPLETED) goto L_FinalEnd;
if (Rossy_Quest == 17 || Rossy_Quest == 18) goto L_End;
@@ -23,19 +40,19 @@
"Hey, hey... Why are you crying? Are you hurt?", -,
"Sorry kid, I don't have time to play with children.", L_No;
mes "[Young Girl]";
- mes "\"No. I am crying because I lost all my fruits. My sister and I were collecting some near Dimond's Cove, but then I stumbled on a giant snail and it attacked us!";
+ mes "\"No. I'm crying because I lost all my fruits. My sister and I were collecting some near Dimond's Cove, but then I stumbled on a giant snail and it attacked us!";
next;
- mes "But we were lucky, because the snail is really slow and we ran away from it. Julia ran to the left and I ran to the right. The snail got pretty confused, because we are identical twins... But the problem is that I dropped the basket full of fruits on the ground and that evil snail ate them all! And now I can't find Julia to help me collect more fruits.\"";
+ mes "But we were lucky, because the snail is really slow and we ran away from it. Julia ran to the left and I ran to the right. The snail got pretty confused, because we are identical twins. The problem is that I dropped the basket full of fruits on the ground and that evil snail ate them all! And now I can't find Julia to help me collect more fruits.\"";
next;
menu
"Did you say Julia? I talked to you mother. She is very worried about you.", -;
mes "[Rossy]";
- mes "\"Really? But she let us play in the woods... There is no reason to be worried. Unless...\"";
+ mes "\"Really? But she let us play in the woods. There is no reason to be worried. Unless...\"";
next;
- mes "Rossy suddenly gets a strange look on her face, mumbling something about Julia...";
+ mes "Rossy suddenly gets a strange look on her face, mumbling something about Julia.";
next;
mes "[Rossy]";
- mes "\"Could you do me a favor? Please, tell my mother we are alright... There is.. uh... there is no reason to worry about us.\"";
+ mes "\"Could you do me a favor? Please, tell my mother we are alright. There is.. uh... there is no reason to worry about us.\"";
next;
menu
"Ok, if you say so.", -,
@@ -55,21 +72,21 @@ L_Mother:
L_Get_Cherry:
mes "[Young Girl]";
- mes "\"No, you don't have 10 cherries. I know how to count. I hope you get them soon.\"";
+ mes "\"No, you don't have " + @Cherry_Amount + " cherries. I know how to count. I hope you get them soon.\"";
close;
L_Check:
mes "[Rossy]";
- mes "\"Hey, that is nice of you to come back. I was thinking about giving a basket full of cherries to my mother, to make her happy, you know... But we'd need at least ten cherries, and it would take ages for me to get so many by myself!\"";
+ mes "\"Hey, that is nice of you to come back. I was thinking about giving a basket full of cherries to my mother, to make her happy, you know. But we'd need at least " + @Cherry_Amount + " cherries, and it would take ages for me to get so many by myself!\"";
next;
menu
"That is no problem for me. Just wait and I will come back with the cherries.", L_No,
"Hey, I have some cherries in my backpack!", -,
"You should get them yourself.", L_No;
- if(countitem("Cherry") < 10) goto L_Get_Cherry;
+ if(countitem("Cherry") < @Cherry_Amount) goto L_Get_Cherry;
mes "[Rossy]";
set Rossy_Quest, 4;
- getexp 2000, 0;
+ getexp @Cherry_EXP, 0;
mes "\"I can't believe it, you got them all! Please give them to my mother. Tell her it is a gift from me and Julia and there is no reason to worry about us.\"";
next;
mes "Rossy mumbles to herself.";
@@ -82,7 +99,7 @@ L_Check:
L_Cherry_Done:
mes "[Rossy]";
- mes "\"Please, try to distract my mother... I don't want her to be worried about us. While you do this, I will try to find Julia.\"";
+ mes "\"Please, try to distract my mother. I don't want her to be worried about us. While you do this, I will try to find Julia.\"";
close;
L_Let:
@@ -91,10 +108,9 @@ L_Let:
next;
menu
"Your mother asked me to hand you this letter. She told me it was from your teacher.", L_Let2,
- "Not at all... I need to go now, see you next time.", L_No;
+ "Not at all. I need to go now, see you next time.", L_No;
L_Let2:
- mes "[Rossy]";
mes "The little girl grabs the piece of paper and reads it quickly. Her face turns pale.";
menu
"What does it say?", -;
@@ -102,35 +118,35 @@ L_Let2:
mes "\"Oh no, I completely forgot! My magic school exam! I need to make a potion and give it to my teacher today! But I haven't found Julia yet and I don't even have any of the ingredients required. Could you get them for me, please?\"";
next;
set Rossy_Quest, 6;
- mes "\"I need 24 Cactus Drinks, 32 Maggot Slimes, 50 Gamboge Herbs, 43 Alizarin Herbs and 30 Bug Legs.\"";
+ mes "\"I need " + @CactusDrink_Amount + " Cactus Drinks, " + @MaggotSlime_Amount + " Maggot Slimes, " + @GambodgeHerb_Amount + " Gamboge Herbs, " + @AlizarinHerb_Amount + " Alizarin Herbs and " + @BugLeg_Amount + " Bug Legs.\"";
next;
mes "\"Please come back to see me when you have the ingredients. I know the recipe by heart.\"";
close;
L_NE:
mes "[Rossy]";
- mes "\"Please bring me 24 Cactus Drinks, 32 Maggot Slimes, 50 Gamboge Herbs, 43 Alizarin Herbs and 30 Bug Legs.\"";
+ mes "\"Please bring me " + @CactusDrink_Amount + " Cactus Drinks, " + @MaggotSlime_Amount + " Maggot Slimes, " + @GambodgeHerb_Amount + " Gamboge Herbs, " + @AlizarinHerb_Amount + " Alizarin Herbs and " + @BugLeg_Amount + " Bug Legs.\"";
next;
mes "\"Please hurry!\"";
close;
L_Check2:
- if(countitem("CactusDrink") < 24) goto L_NE;
- if(countitem("MaggotSlime") < 32) goto L_NE;
- if(countitem("GambogeHerb") < 50) goto L_NE;
- if(countitem("AlizarinHerb") < 43) goto L_NE;
- if(countitem("BugLeg") < 30) goto L_NE;
- delitem "CactusDrink", 24;
- delitem "MaggotSlime", 32;
- delitem "GambogeHerb", 50;
- delitem "AlizarinHerb", 43;
- delitem "BugLeg", 30;
- mes "Rossy gets all the ingredients and places them on the ground. She starts to mix some herbs with the cactus drinks and appears to cast some spells... She seems to know what she is doing.";
- next;
- mes "[Rossy]";
- mes "\"Oh, thank you "+ strcharinfo(0) +" ! It is done. If you don't mind, please give this potion to my teacher.\"";
+ if(countitem("CactusDrink") < @CactusDrink_Amount) goto L_NE;
+ if(countitem("MaggotSlime") < @MaggotSlime_Amount) goto L_NE;
+ if(countitem("GambogeHerb") < @GambodgeHerb_Amount) goto L_NE;
+ if(countitem("AlizarinHerb") < @AlizarinHerb_Amount) goto L_NE;
+ if(countitem("BugLeg") < @BugLeg_Amount) goto L_NE;
+ delitem "CactusDrink", @CactusDrink_Amount;
+ delitem "MaggotSlime", @MaggotSlime_Amount;
+ delitem "GambogeHerb", @GambodgeHerb_Amount;
+ delitem "AlizarinHerb", @AlizarinHerb_Amount;
+ delitem "BugLeg", @BugLeg_Amount;
+ mes "Rossy takes all the ingredients and places them on the ground. She starts to mix some herbs with the cactus drinks and appears to cast some spells. She seems to know what she is doing.";
+ next;
+ mes "[Rossy]";
+ mes "\"Oh, thank you "+ strcharinfo(0) +"! It is done. If you don't mind, please give this potion to my teacher.\"";
set Rossy_Quest, 7;
- getexp 3000, 0;
+ getexp @Potion_EXP, 0;
message strcharinfo(0), "Rossy hands you the potion, holding the bottle very carefully.";
next;
mes "\"My teacher's name is David. He is a very young magician and lives near the magic school in the north of Tulimshar.\"";
@@ -146,7 +162,7 @@ L_BT:
close;
L_Donet:
- if (Rossy_Quest == 10 && countitem("redrose") >= 15) goto L_RG;
+ if (Rossy_Quest == 10 && countitem("redrose") >= @RedRose_Amount) goto L_RG;
menu
"David took your potion and he tested it in front of me. It worked perfectly!", -;
mes "[Rossy]";
@@ -154,8 +170,8 @@ L_Donet:
close;
L_RG:
- if (countitem("redrose") < 15) goto L_No;
- delitem "redrose", 15;
+ if (countitem("redrose") < @RedRose_Amount) goto L_No;
+ delitem "redrose", @RedRose_Amount;
menu
"Your mother was so happy that she asked me to bring you these flowers.", -;
mes "[Rossy]";
@@ -171,7 +187,7 @@ L_RG:
L_Allergic:
mes "Rossy sneezes a lot.";
- if (Rossy_Quest == 12 && countitem("redtulip") >= 15) goto L_Sorry;
+ if (Rossy_Quest == 12 && countitem("redtulip") >= @RedTulip_Amount) goto L_Sorry;
close;
L_Sorry:
@@ -180,13 +196,13 @@ L_Sorry:
L_See:
mes "[Rossy]";
- if (countitem("redtulip") < 15) goto L_No;
- delitem "redtulip", 15;
+ if (countitem("redtulip") < @RedTulip_Amount) goto L_No;
+ delitem "redtulip", @RedTulip_Amount;
set Rossy_Quest, 13;
mes "\"That's better! Go and tell my mother that she is the nicest mother in the world.\"";
next;
- mes "\"Now I should really find my sister... Come back later.\"";
- getexp 2500, 0;
+ mes "\"Now I should really find my sister. Come back later.\"";
+ getexp @Flower_EXP, 0;
close;
L_Best:
@@ -195,7 +211,7 @@ L_Best:
next;
menu
"Did you find your sister? I am starting to get worried too.", -;
- mes "\"I think I have an idea where she might be... Come back in a few minutes, I will tell you if she is ok.\"";
+ mes "\"I think I have an idea where she might be. Come back in a few minutes, I will tell you if she is ok.\"";
set Rossy_Quest, 14;
close;
@@ -218,8 +234,8 @@ L_Found:
mes "\"Oh "+ strcharinfo(0) +", thank you very much! Take this, you deserve it!\"";
next;
mes "Rossy hands you a huge bag full of coins.";
- getexp 5000, 0;
- set zeny, zeny + 5000;
+ getexp @Finish_EXP, 0;
+ set zeny, zeny + @Finish_Money;
if (Rossy_Quest == 19) goto L_Clear;
close;
diff --git a/world/map/npc/025-4/julia.txt b/world/map/npc/025-4/julia.txt
index ef52faa1..ecb7703a 100644
--- a/world/map/npc/025-4/julia.txt
+++ b/world/map/npc/025-4/julia.txt
@@ -2,6 +2,8 @@
025-4.gat,89,21,0 script Julia 114,{
+ set @Reward_EXP, 5000;
+
if (Rossy_Quest > 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_End;
if (Rossy_Quest == 16) goto L_Done;
if (Rossy_Quest <= 15) goto L_Hmmm;
@@ -16,7 +18,7 @@ L_Done:
getinventorylist;
if (@inventorylist_count == 100) goto L_TooMany;
getitem "BlackBoots", 1;
- getexp 5000, 0;
+ getexp @Reward_EXP, 0;
set Rossy_Quest, 17;
mes "\"I'm out of here now, lets get out of this horrible cave.\"";
close;
diff --git a/world/map/npc/032-1/miriam.txt b/world/map/npc/032-1/miriam.txt
index b6dac559..0516f4b5 100644
--- a/world/map/npc/032-1/miriam.txt
+++ b/world/map/npc/032-1/miriam.txt
@@ -207,7 +207,7 @@ L_test:
warp "032-1.gat",55,21;
npctalk "Run " +strcharinfo(0)+ ", run!";
set QUEST_MIRIAM, 5;
- set QUEST_MIRIAM_start, gettimetick(1);
+ set QUEST_MIRIAM_start, gettimetick(2);
set QUEST_MIRIAM_cheat, 0;
end;
diff --git a/world/map/npc/033-1/birrod.txt b/world/map/npc/033-1/birrod.txt
index 0e962e21..24b5bd8f 100644
--- a/world/map/npc/033-1/birrod.txt
+++ b/world/map/npc/033-1/birrod.txt
@@ -216,7 +216,7 @@ L_Success52:
L_Success5:
getexp @minigame_exp, 0;
mes "TODO: some introductionw words to the skill";
- setskill SKILL_WARRIOR_BERSERK, 1;
+ setskill SKILL_WARRIOR_RAGING, 1;
set @state, 6;
callsub S_Update_Mask;
close;
diff --git a/world/map/npc/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt
index 4895e78b..20752771 100644
--- a/world/map/npc/033-1/kimarr.txt
+++ b/world/map/npc/033-1/kimarr.txt
@@ -42,7 +42,7 @@ L_Ask:
mes "[Kimarr]";
mes "\"So, are you going to try?\"";
menu
- "Yeah, let's start",L_Game,
+ "Yeah, let's start!",L_Game,
"Could you explain again?",-,
"Maybe later.",L_Close;
@@ -87,7 +87,7 @@ L_Again:
goto L_ShowRecord;
L_Full_Inv:
- message strcharinfo(0), "Kimarr: That was very impressing - now you can call yourself hunter " + strcharinfo(0) +".\"";
+ message strcharinfo(0), "Kimarr: You can't carry the reward I want to give you.";
close;
L_Close:
@@ -101,7 +101,7 @@ L_Game:
set $@FLUFFY_FIGHTER$, strcharinfo(0);
set $@FLUFFY_TIME, 0;
set $@FLUFFY_LVL, baselevel;
-//TODO: set minimum number of killed fluffies (maybe based on level?)
+//TODO: set minimum number of killed fluffies (maybe based on level?)
set $@FLUFFY_MIN, 1;
warp "033-1.gat", 79, 34;
set @place, 0;
@@ -123,7 +123,7 @@ L_Attention:
OnTimer1000:
if (isloggedin(getcharid(3,$@FLUFFY_FIGHTER$)) == 0) goto L_GotOut;
attachrid(getcharid(3,$@FLUFFY_FIGHTER$));
- if (getareausers("033-1.gat", 79, 29, 88, 42) == 0) goto L_GotOut;
+ if (getareausers("033-1.gat", 79, 29, 88, 42) == 0) goto L_WarpedOut;
if (PC_DIE_COUNTER > $@FLUFFY_DEATHS) goto L_Died;
set $@FLUFFY_TIME, $@FLUFFY_TIME + 1;
if ($@FLUFFY_TIME > 300) goto L_TooSlow;
@@ -144,6 +144,7 @@ L_CheckDrops:
end;
L_Hunting:
+ // TODO: limit the number of monsters that can be spawned, to prevent people creating lag with massive amount of monsters
set $@DROP_TIME, 0;
set $@FLUFFY_SPAWN, $@FLUFFY_REDAPPLES + 5 * $@FLUFFY_XMASCAKE + 3 * $@FLUFFY_CAKE + $@FLUFFY_GREENAPPLE;
areamonster "033-1.gat", 79, 29, 88, 42, "", 1020, $@FLUFFY_SPAWN, "Kimarr::onFluffyDeath";
@@ -151,6 +152,7 @@ L_Hunting:
areamonster "033-1.gat", 79, 29, 88, 42, "", 1058, 1, "Kimarr::onPetDeath";
if (($@FLUFFY_SPAWN > 0) && ($@FLUFFY_LVL > 60) && (rand(5 * $@FLUFFY_XMASCAKE + 3 * $@FLUFFY_CAKE + 10 * $@FLUFFY_LVL) > 550)) // Santa Slime
areamonster "033-1.gat", 79, 29, 88, 42, "", 1015, 1, "Kimarr::onPetDeath";
+ // TODO: add the wolvern as well when it has been added
if (($@FLUFFY_SPAWN > 0) && ($@FLUFFY_LVL > 70) && (rand(5 * $@FLUFFY_XMASCAKE + 3 * $@FLUFFY_CAKE + 10 * $@FLUFFY_LVL) > 600)) // Yeti
areamonster "033-1.gat", 79, 29, 88, 42, "", 1072, 1, "Kimarr::onPetDeath";
set $@FLUFFY_REDAPPLES, 0;
@@ -163,6 +165,7 @@ L_Hunting:
onFluffyDeath:
set $@FLUFFY_COUNTER, $@FLUFFY_COUNTER + 1;
+ //TODO: remove announce after debugging
mapannounce "033-1.gat", "fluffies killed: " + $@FLUFFY_COUNTER, 0;
if ($@FLUFFY_COUNTER >= $@FLUFFY_SPAWN) set $@FLUFFY_HUNTING, 1;
end;
@@ -174,7 +177,13 @@ L_DidntDrop:
L_GotOut:
npctalk "What a strange thing... " + $@FLUFFY_FIGHTER$ + " just disappeared!";
+ callsub S_Clean;
+ end;
+
+L_WarpedOut:
+ npctalk "What a strange thing... " + $@FLUFFY_FIGHTER$ + " just disappeared!";
goto L_CheckRecord;
+ end;
L_Died:
warp "033-1.gat", 77, 34;
@@ -206,22 +215,30 @@ S_Clean:
L_CheckRecord:
if ($@FLUFFY_COUNTER < $@FLUFFY_MIN) goto L_End;
+ set @loop, 0;
+ callsub S_FINDPLACE;
set @loop, 11;
set @place, 0;
-
-L_FindPlace:
- set @loop, @loop - 1;
- if ($FLUFFYGAME_NAME$[@loop] == strcharinfo(0)) set @currentposition, @loop;
- if (@loop == 0 || $@FLUFFY_COUNTER <= $FLUFFYGAME_PTS[@loop]) goto L_CheckPosition;
- set @place, @place + 1;
- goto L_FindPlace;
-
-L_CheckPosition:
+ callsub S_CHECKPOS;
if (@place == 0) goto L_End;
set @position, 11 - @place;
if (@currentposition == 0) goto L_RegisterName;
if (@currentposition < @position) goto L_End;
- if (@currentposition >= @position) goto L_HandleDuplicated;
+ if (@currentposition > @position) goto L_HandleDuplicated;
+ if (@currentposition == @position) goto L_Oldscore;
+ goto L_End;
+
+S_FINDPLACE:
+ set @loop, @loop + 1;
+ if ($FLUFFYGAME_NAME$[@loop] == strcharinfo(0)) set @currentposition, @loop;
+ if (@loop < 11) goto S_FINDPLACE;
+ return;
+
+S_CHECKPOS:
+ set @loop, @loop - 1;
+ if (@loop == 0 || $@FLUFFY_COUNTER <= $FLUFFYGAME_PTS[@loop]) return;
+ set @place, @place + 1;
+ goto S_CHECKPOS;
L_RegisterName:
callsub S_MOVE_NAME;
@@ -236,6 +253,11 @@ L_HandleDuplicated:
set $FLUFFYGAME_DATE$[@currentposition], "";
goto L_RegisterName;
+L_Oldscore:
+ set $FLUFFYGAME_PTS[@currentposition], $@FLUFFY_COUNTER;
+ set $FLUFFYGAME_DATE$[@currentposition], gettimestr("%d/%m/%Y-%H:%M:%S",21);
+ goto L_End;
+
S_MOVE_NAME:
set @i,10;
diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt
index 3ed5c6bc..4361e582 100644
--- a/world/map/npc/042-2/tanisha.txt
+++ b/world/map/npc/042-2/tanisha.txt
@@ -83,7 +83,8 @@ L_StatsRe:
next;
mes "\"Vitality gives you more hit points and more defense against physical attacks.\"";
next;
- mes "\"Intelligence is useful for magic attack and defense.\"";
+ mes "\"Intelligence is useful for magic attack and defense.";
+ mes "But as long as you don't know any magic, you shouldn't use your points on this.\"";
next;
mes "\"Dexterity is needed to hit monsters. It's also very important for the damage if you use a ranged weapon.\"";
next;
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-20 17:37:21 +0000