From af937c6f932cdea5b56f0ee7c4976c7706e986a8 Mon Sep 17 00:00:00 2001 From: Stefan Dombrowski Date: Mon, 16 Jan 2012 22:12:16 +0100 Subject: Some fixes to the Barbarian quests --- world/map/npc/033-1/birrod.txt | 6 +++--- world/map/npc/033-1/kimarr.txt | 36 ++++++++++++++++++------------------ world/map/npc/033-1/yerrnk.txt | 6 +++--- 3 files changed, 24 insertions(+), 24 deletions(-) (limited to 'world/map/npc/033-1') diff --git a/world/map/npc/033-1/birrod.txt b/world/map/npc/033-1/birrod.txt index df541727..5bcd4f96 100644 --- a/world/map/npc/033-1/birrod.txt +++ b/world/map/npc/033-1/birrod.txt @@ -46,11 +46,11 @@ L_Hunting: mes "\"Hello, " + strcharinfo(0) + "! Would you like to prove your hunting skills again?\""; next; mes "\"I noticed some groups of wolverns in the forest west of here which are unusually aggressive."; - mes "This makes dangerous to all the small people from the town nearby to go there.\""; + mes "This makes it dangerous for all the small people from the town nearby to go there.\""; next; mes "\"To prove your skills, go to the forest and hunt down " + @wolvern_amount + " of the very aggressive wolverns.\""; next; - mes "\"There are also some wolverns that behave normally attacking you when you come to close to them."; + mes "\"There are also some wolverns that behave normally and attack you only when you come too close to them."; mes "Those are not the ones I mean, but those that seek the battle themselves.\""; set @state, 4; callsub S_Update_Mask; @@ -120,7 +120,7 @@ L_Success11: "Try to hold them back until everyone is safe, then retreat.",L_Success21; L_Fail21: mes "[Birrod]"; - mes "\"You will never get a accepted member of our tribe with that attitude.\""; + mes "\"You will never become an accepted member of our tribe with that attitude.\""; next; goto L_No_Member; L_Fail22: diff --git a/world/map/npc/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt index a4e3f6f2..0070089c 100644 --- a/world/map/npc/033-1/kimarr.txt +++ b/world/map/npc/033-1/kimarr.txt @@ -77,7 +77,7 @@ L_Explain_Game: next; mes "\"I also saw one of them getting excited about one of that sweet things you call 'cake'.\""; next; - mes "\"You should be careful, other monsters living here might like the food as well\""; + mes "\"You should be careful, other monsters living here might like the food as well.\""; next; mes "\"Go to the cave entrance and throw food on the floor to make them come out.\""; next; @@ -97,8 +97,9 @@ L_Ask: goto L_Close; L_AlreadyGotReward: + npctalk strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and has once again proven to be a good hunter."; + message strcharinfo(0), "Kimarr: Once again you prove you are worth as a hunter! You killed " + $@Fluffy_Kills + " Fluffies."; callsub S_Clean; - mes "Once again you prove you are worth as a hunter, " + strcharinfo(0) + "."; goto L_Close; L_Reward1: @@ -109,14 +110,16 @@ L_Reward1: if (@state >= 2) goto L_AlreadyGotReward; - set @state, 2; - callsub S_Update_Mask; - callsub S_Clean; + npctalk "Hooray! " + strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and is now a worthy hunter."; // as far as I can tell, this fails because it won't resume from the "next" // when the script is executed via the "OnFluffyDeath" callback // (I haven't tried via the 301st call of OnTimer1000) - message strcharinfo(0), "Kimarr: Talk to me for your reward."; + message strcharinfo(0), "Kimarr: Hooray! You hunted " + $@Fluffy_Kills + " Fluffies. Talk to me for your reward."; + + set @state, 2; + callsub S_Update_Mask; + callsub S_Clean; goto L_Close; // this label is reached on completion of the quest, or, if you inventory was @@ -234,9 +237,6 @@ L_TimeOver: goto L_MaybeRecordScore; L_CheckDrops: - if ($@Fluffy_Alive >= 100) - goto L_TooManyFluffies; - set @Fluffy_Toomany, 0; set @Fluffy_RedApple, getareadropitem("033-1.gat", 79, 29, 88, 42, "RedApple", 1); set @Fluffy_XmasCake, getareadropitem("033-1.gat", 79, 29, 88, 42, "XmasCake", 1); set @Fluffy_Cake, getareadropitem("033-1.gat", 79, 29, 88, 42, "Cake", 1); @@ -245,19 +245,17 @@ L_CheckDrops: goto L_BeginHunting; goto L_ContinueTimer; -L_TooManyFluffies: - if (@Fluffy_Toomany) - goto L_ContinueTimer; - message strcharinfo(0), "Wow, calm down, there are already too many fluffies around here."; - set @Fluffy_Toomany, 1; - goto L_ContinueTimer; - L_BeginHunting: set $@Fluffy_Spawn, @Fluffy_RedApple + 5 * @Fluffy_XmasCake + 3 * @Fluffy_Cake + @Fluffy_GreenApple; // limit the number of monsters that can be spawned, to prevent people creating lag with massive amount of monsters - if ($@Fluffy_Spawn > 100) - set $@Fluffy_Spawn, 100; + if (($@Fluffy_Spawn + $@Fluffy_Alive) <= 100) + goto L_SpawnFluffies; + message strcharinfo(0), "Wow, calm down, there are already too many fluffies around here."; + set $@Fluffy_Spawn, 100 - $@Fluffy_Alive; + if ($@Fluffy_Spawn <= 0) + goto L_ContinueTimer; + L_SpawnFluffies: areamonster "033-1.gat", 79, 29, 88, 42, "", 1089, $@Fluffy_Spawn, "Kimarr::OnFluffyDeath"; set $@Fluffy_Extra, 5 * @Fluffy_XmasCake + 3 * @Fluffy_Cake + 12 * ($@Fluffy_Alive + $@Fluffy_Spawn) + 7 * BaseLevel; @@ -399,6 +397,8 @@ L_FinallyInsertMe: goto L_Reward1; L_NotGoodEnough: + npctalk "What a disapointment, " + strcharinfo(0) + " hunted only " + $@Fluffy_Kills + " Fluffies."; + message strcharinfo(0), "Kimarr: What a disapointment, you hunted only " + $@Fluffy_Kills + " Fluffies."; callsub S_Clean; end; diff --git a/world/map/npc/033-1/yerrnk.txt b/world/map/npc/033-1/yerrnk.txt index e9c79593..749350af 100644 --- a/world/map/npc/033-1/yerrnk.txt +++ b/world/map/npc/033-1/yerrnk.txt @@ -44,7 +44,7 @@ L_Duty: next; mes "\"You passed the inition ritus for hunters of our tribe. That means now you are a hunter of our tribe, with all the rights and duties that come along with that.\""; next; - mes "\"So you'll have to obey our laws and traditiones, protect and help any member of our tribe that is in need and never show weakness nor fear in battle.\""; + mes "\"So you'll have to obey our laws and traditions, protect and help any member of our tribe that is in need and never show weakness nor fear in battle.\""; next; mes "\"Keep this in mind. If you fail you'll have to recieve the elders judgement.\""; goto L_Close; @@ -108,9 +108,9 @@ L_Warrior: L_Skill: mes "[Yerrnk]"; mes "\"As a warrior of our tribe it should be the most important thing to you to defend weaker members of the tribe."; - mes "To achieve this goal our warriors are training the skill to stand the pain of being hit and even use it to get into a state of rage."; + mes "To achieve this goal our warriors are training the skill to stand the pain of being hit and even use it to get into a state of rage.\""; next; - mes "It only works in a melee fight, when you hear your opponent gasping, smell his sweat, feel the heat of his body, -\""; + mes "\"It only works in a melee fight, when you hear your opponent gasping, smell his sweat, and feel the heat of his body.\""; next; mes "Yerrnk gets excited, then he pauses a moment calming down."; mes "\"Basically its a neglect of your own defense but therefor being able to hit the enemy with outstanding might.\""; -- cgit v1.2.3-70-g09d2