From c0ba38cd4b68491e28e467889804ebc09c9c002e Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 2 Apr 2014 11:06:32 -0700 Subject: Clean up main scripts --- world/map/npc/033-1/barbarianinit.txt | 3 +++ world/map/npc/033-1/birrod.txt | 8 ++++++-- world/map/npc/033-1/kimarr.txt | 23 ++++++++++++++++------- world/map/npc/033-1/yerrnk.txt | 16 ++++++---------- 4 files changed, 31 insertions(+), 19 deletions(-) (limited to 'world/map/npc/033-1') diff --git a/world/map/npc/033-1/barbarianinit.txt b/world/map/npc/033-1/barbarianinit.txt index 09c7b1f0..f8a1423a 100644 --- a/world/map/npc/033-1/barbarianinit.txt +++ b/world/map/npc/033-1/barbarianinit.txt @@ -1,5 +1,7 @@ -|script|#barbarian033_1init|-1, { + end; + OnInit: set $@Q_Barbarians_MASK, NIBBLE_0_MASK; set $@Q_Barbarians_SHIFT, NIBBLE_0_SHIFT; @@ -20,4 +22,5 @@ OnInit: set $@Q_Barbarians_Ambush12_flag, 0x00001000; set $@Q_Barbarians_Ambush13_flag, 0x00002000; set $@Q_Barbarians_Ambush14_flag, 0x00004000; + end; } diff --git a/world/map/npc/033-1/birrod.txt b/world/map/npc/033-1/birrod.txt index b2af19a0..de0eecdd 100644 --- a/world/map/npc/033-1/birrod.txt +++ b/world/map/npc/033-1/birrod.txt @@ -83,9 +83,11 @@ L_Questions: mes "[Birrod]"; mes "\"" + strcharinfo(0) + ", are you ready to become a full-fledged member of our tribe, the Mangarr?\""; menu - "Yes, what do I need to do?",-, - "That's why I'm here.",-, + "Yes, what do I need to do?",L_Next, + "That's why I'm here.",L_Next, "Sorry, I have to go. See you.",L_No_Member; + +L_Next: mes "Birrod nods earnestly."; mes "[Birrod]"; mes "\"I will ask you some questions."; @@ -169,6 +171,7 @@ L_Success42: mes "[Birrod]"; mes "\"An honorable goal.\""; next; + goto L_Success4; L_Success4: mes "\"What do you think is a good reason to fight and kill?\""; menu @@ -189,6 +192,7 @@ L_Success52: mes "[Birrod]"; mes "\"Yes, that's the most honorable reason.\""; next; + goto L_Success5; L_Success5: getexp @minigame_exp, 0; setskill SKILL_RAGING, 1; diff --git a/world/map/npc/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt index 6614f273..183d3651 100644 --- a/world/map/npc/033-1/kimarr.txt +++ b/world/map/npc/033-1/kimarr.txt @@ -50,23 +50,26 @@ next; mes "\"You are very small and must be careful in these snowy mountains. It is cold, and dangerous monsters are here.\""; menu - "Hello, my name is " + strcharinfo(0) + " and I'm not small. I'm a great warrior!",-, - "I'm " + strcharinfo(0) + ", don't underestimate me. I'm an experienced adventurer!",-, - "I'm the legendary " + strcharinfo(0) + ", I've fought countless battles.",-; + "Hello, my name is " + strcharinfo(0) + " and I'm not small. I'm a great warrior!",L_Next, + "I'm " + strcharinfo(0) + ", don't underestimate me. I'm an experienced adventurer!",L_Next, + "I'm the legendary " + strcharinfo(0) + ", I've fought countless battles.",L_Next; +L_Next: mes "Kimarr seems to be amused."; mes "[Kimarr]"; mes "\"Really? Do you want to prove it?\""; menu - "Sure! What shall I do?",-, + "Sure! What shall I do?",L_Continue, "No, I don't need to prove anything.",L_Close; +L_Continue: mes "\"Every young member of our tribe proves his or her worth by hunting monsters.\""; next; mes "\"The first monsters to hunt are Fluffies. Fluffies give a good meal for a young person and the fur can be used to make clothes and blankets.\""; next; set @state, 1; callsub S_Update_Mask; + goto L_Explain_Game; L_Explain_Game: mes "[Kimarr]"; @@ -82,6 +85,7 @@ L_Explain_Game: next; mes "\"Drop more food when no Fluffies are left.\""; next; + goto L_Ask; // dialog starts here if you've asked about it but not done it (@state == 1) L_Ask: @@ -91,8 +95,7 @@ L_Ask: "Yeah, let's start!",L_Game, "Could you explain again?",L_Explain_Game, "Can you tell me who were the most successful Fluffy hunters?",L_ShowRecord, - "Maybe later.",-; - goto L_Close; + "Maybe later.",L_Close; L_AlreadyGotReward: npctalk strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and has once again proven to be a good hunter."; @@ -256,6 +259,7 @@ L_BeginHunting: set $@Fluffy_Spawn, 100 - $@Fluffy_Alive; if ($@Fluffy_Spawn <= 0) goto L_ContinueTimer; + goto L_SpawnFluffies; L_SpawnFluffies: areamonster "033-1.gat", 79, 29, 88, 42, "", 1089, $@Fluffy_Spawn, "Kimarr::OnFluffyDeath"; @@ -311,7 +315,6 @@ OnFluffyDeath: if (attachrid($@Fluffy_FighterID) == 1) goto L_Killedall; goto L_GotOut; - end; L_Punish: if (@MobID == 1089) @@ -354,6 +357,8 @@ L_MaybeRecordScore: if ($@Fluffy_Kills < $@Fluffy_Min) goto L_NotGoodEnough; set @rank, 0; + goto L_MaybeInsertNext; + L_MaybeInsertNext: if ($@Fluffy_Kills > $Record_Fluffy_Kills[@rank]) goto L_InsertScore; @@ -367,6 +372,8 @@ L_MaybeInsertNext: L_InsertScore: set @loop, @rank; + goto L_FindLastScore; + L_FindLastScore: // comment this out to allow the player to be in the list more than once // though actually, it might be better just to assume the list is full @@ -405,6 +412,8 @@ L_NotGoodEnough: L_ShowRecord: set @rank, 0; set @loop, 0; + goto L_ShowNextRecord; + L_ShowNextRecord: if ($Record_Fluffy_Kills[@loop] == 0) goto L_Close; diff --git a/world/map/npc/033-1/yerrnk.txt b/world/map/npc/033-1/yerrnk.txt index c2ae904b..e04a8610 100644 --- a/world/map/npc/033-1/yerrnk.txt +++ b/world/map/npc/033-1/yerrnk.txt @@ -52,6 +52,7 @@ L_Sorrow: mes "\"I noticed that you're getting along with Kimarr and Birrod very well. That's good.\""; mes "He smiles, but then an expression of worry returns to his face."; next; + goto L_Mission; L_Mission: mes "[Yerrnk]"; @@ -85,29 +86,26 @@ L_Birrod: goto L_Not_Ready; mes "\"Please talk to Birrod to receive the initiation rite to become a warrior of the Mangarr.\""; menu - "Alright.",-, + "Alright.",L_Close, "Can you tell me again what you are here for?",L_Mission; - goto L_Close; L_Not_Ready: mes "[Yerrnk]"; mes "\"But you're not yet ready to become a fully accepted warrior of our tribe."; mes "You should travel the world to gain the ability to focus on your inner strength.\""; menu - "Alright.",-, + "Alright.",L_Close, "What are you doing down here?",L_Mission; - goto L_Close; L_Warrior: mes "[Yerrnk]"; mes "\"" + strcharinfo(0) + ", welcome back!"; mes "Do you have any question?\""; menu - "Everything's all right, thanks.",-, + "Everything's all right, thanks.",L_Close, "What are you doing down here?",L_Mission, "Can you explain the Raging ability to me?",L_Skill, "Do you have a task for me?",L_Task; - goto L_Close; L_Skill: mes "[Yerrnk]"; @@ -148,10 +146,9 @@ L_Hunt_Yeti: mes "\"That Yeti is still roaming in the forest west of here."; mes "To find the house it's prowling around, enter the forest and then go first south and then west.\""; menu - "I'm on it.",-, + "I'm on it.",L_Close, "What are you doing down here?",L_Mission, "Can you explain the Raging ability to me?",L_Skill; - goto L_Close; L_Yeti_Success: mes "[Yerrnk]"; @@ -169,8 +166,7 @@ L_Done: menu "What's the reason you came here?",L_Mission, "Can you explain the raging ability to me?",L_Skill, - "(Leave)",-; - goto L_Close; + "(Leave)",L_Close; L_Close: set @state, 0; -- cgit v1.2.3-60-g2f50