From 634e31bc0f4d1efac4936619205e454dd39f2514 Mon Sep 17 00:00:00 2001 From: The Kandiman Date: Sat, 10 Sep 2011 14:10:36 -0400 Subject: Tab replacement and formatting project: Maps 014-1 to 021-2 complete. --- world/map/npc/020-1/KrickKrackKrock.txt | 2 +- world/map/npc/020-1/rockscissor.txt | 2 +- world/map/npc/020-1/soul-menhir.txt | 18 ++-- world/map/npc/020-1/well.txt | 167 +++++++++++++++++--------------- 4 files changed, 100 insertions(+), 89 deletions(-) (limited to 'world/map/npc/020-1') diff --git a/world/map/npc/020-1/KrickKrackKrock.txt b/world/map/npc/020-1/KrickKrackKrock.txt index 20b2d6c6..6cbe6ac8 100644 --- a/world/map/npc/020-1/KrickKrackKrock.txt +++ b/world/map/npc/020-1/KrickKrackKrock.txt @@ -3,7 +3,7 @@ //To enable: sed 's_^// __' -i npc/020-1/KrickKrackKrock.txt -// 020-1.gat,82,82,0 script Criker 192, { +// 020-1.gat,82,82,0|script|Criker|192,{ // L_Main: // //Var diff --git a/world/map/npc/020-1/rockscissor.txt b/world/map/npc/020-1/rockscissor.txt index 7ab9b42f..7a558014 100644 --- a/world/map/npc/020-1/rockscissor.txt +++ b/world/map/npc/020-1/rockscissor.txt @@ -11,7 +11,7 @@ //To enable: sed 's_^// __' -i npc/020-1/rockscissor.txt -// 020-1.gat,74,78,0 script Gobmel 189, { +// 020-1.gat,74,78,0|script|Gobmel|189,{ // //var // set @NPC_name$, "[Gobmel]"; // set @NPC_point, 0; diff --git a/world/map/npc/020-1/soul-menhir.txt b/world/map/npc/020-1/soul-menhir.txt index f6e52869..9139d884 100644 --- a/world/map/npc/020-1/soul-menhir.txt +++ b/world/map/npc/020-1/soul-menhir.txt @@ -1,12 +1,12 @@ // -020-1.gat,63,89,0 script Soul Menhir 144, { - callfunc "ClearVariables"; - set @map$, "020-1.gat"; - setarray @Xs, 62, 63, 64, 62, 64, 62, 63, 64; - setarray @Ys, 88, 88, 88, 89, 89, 90, 90, 90; - set @x, 0; - set @y, 0; - callfunc "SoulMenhir"; - close; +020-1.gat,63,89,0|script|Soul Menhir|144,{ + callfunc "ClearVariables"; + set @map$, "020-1.gat"; + setarray @Xs, 62, 63, 64, 62, 64, 62, 63, 64; + setarray @Ys, 88, 88, 88, 89, 89, 90, 90, 90; + set @x, 0; + set @y, 0; + callfunc "SoulMenhir"; + close; } diff --git a/world/map/npc/020-1/well.txt b/world/map/npc/020-1/well.txt index ed025a0f..da4aa86d 100644 --- a/world/map/npc/020-1/well.txt +++ b/world/map/npc/020-1/well.txt @@ -14,106 +14,117 @@ //# used variables: QUEST_Nivalis_state Nibble4 //############################################ -020-1.gat,99,83,0 script #Well 127, { +020-1.gat,99,83,0|script|#Well|127,{ - set @Q_MASK, NIBBLE_4_MASK; - set @Q_SHIFT, NIBBLE_4_SHIFT; + set @Q_MASK, NIBBLE_4_MASK; + set @Q_SHIFT, NIBBLE_4_SHIFT; set @Q_status, ((QUEST_Nivalis_state) & @Q_MASK) >> @Q_SHIFT; -if(@Q_status == 2) goto L_Finished; - set @item_ID, 0; - setarray @quote_item$, "Yuck! Who has thrown that on me?","Ouch! Who hurts me?","White powder!? What's going on up there?","Ahw! It's raining ","","",""; + if(@Q_status == 2) goto L_Finished; + set @item_ID, 0; + setarray @quote_item$, "Yuck! Who has thrown that on me?","Ouch! Who hurts me?","White powder!? What's going on up there?","Ahw! It's raining ","","",""; - mes "..."; - menu "Throw something in the well.", L_trew, - "Leave it alone.", -; - close; + mes "..."; + menu + "Throw something in the well.", L_trew, + "Leave it alone.", -; + close; L_trew: - mes "What do you want to throw?"; - menu "Maggot slime", -, - "A raw log", -, - "Pile of ash", -, - "Bottle of water", -, - "Leave it alone", L_Close; - - set @menu, @menu - 1; - - // little IF to do @quote$ & @Item_ID - set @quote$, @quote_item$[@menu]; - if(@menu == 0) set @item_ID, 505; - if(@menu == 1) set @item_ID, 569; - if(@menu == 2) set @item_ID, 701; - if(@menu == 3) set @item_ID, 541; - - if(countitem(@item_ID) < 1) goto L_NO_ITEM; - if(@menu == 3) getitem 540, 1; - delitem @item_ID, 1; - - mes "[Mysterious voice inside the well]"; - mes "\" "+ @quote$ +"\""; - next; - menu - "Who are you?", -, - "How did you get there?", -, - "Do you need help?", -; - - set @menu, @menu - 1; - if(@menu == 0) set @quote$, "I'll talk about who I am after leaving the well."; - if(@menu == 1) set @quote$, "Well, someone has pushed me in the well, I don't know who did that."; - if(@menu == 2) set @quote$, ""; - mes "[Mysterious voice inside the well]"; - mes "\" "+ @quote$ +". So if you can call help for me... please do so!\""; - set @Q_status, 1; - callsub S_Update_Var; - close; + mes "What do you want to throw?"; + menu + "Maggot slime", -, + "A raw log", -, + "Pile of ash", -, + "Bottle of water", -, + "Leave it alone", L_Close; + + set @menu, @menu - 1; + + // little IF to do @quote$ & @Item_ID + set @quote$, @quote_item$[@menu]; + if(@menu == 0) + set @item_ID, 505; + if(@menu == 1) + set @item_ID, 569; + if(@menu == 2) + set @item_ID, 701; + if(@menu == 3) + set @item_ID, 541; + + if(countitem(@item_ID) < 1) + goto L_NO_ITEM; + if(@menu == 3) + getitem 540, 1; + delitem @item_ID, 1; + + mes "[Mysterious voice inside the well]"; + mes "\" "+ @quote$ +"\""; + next; + menu + "Who are you?", -, + "How did you get there?", -, + "Do you need help?", -; + + set @menu, @menu - 1; + if (@menu == 0) + set @quote$, "I'll talk about who I am after leaving the well."; + if (@menu == 1) + set @quote$, "Well, someone has pushed me in the well, I don't know who did that."; + if (@menu == 2) + set @quote$, ""; + mes "[Mysterious voice inside the well]"; + mes "\" "+ @quote$ +". So if you can call help for me... please do so!\""; + set @Q_status, 1; + callsub S_Update_Var; + close; L_NO_ITEM: - mes "You don't have such an item... Come back when you have it."; - close; + mes "You don't have such an item... Come back when you have it."; + close; L_Finished: - mes "This is a well."; - close; + mes "This is a well."; + close; L_Close: - close; + close; S_Update_Var: set QUEST_Nivalis_state, - (QUEST_Nivalis_state & ~(@Q_MASK) + (QUEST_Nivalis_state & ~(@Q_MASK) | (@Q_status << @Q_SHIFT)); return; } -020-2.gat,100,28,0 script Miler 100, { - set @Q_MASK, NIBBLE_4_MASK; - set @Q_SHIFT, NIBBLE_4_SHIFT; - set @Q_status, ((QUEST_Nivalis_state) & @Q_MASK) >> @Q_SHIFT; - - mes "[Miler]"; - mes "\"Hello!\""; - if(@Q_status == 2) close; - if(@Q_status == 1) - menu - "Hello.", -, - "Hello, Can you help me?", L_HELP; - close; +020-2.gat,100,28,0|script|Miler|100,{ + set @Q_MASK, NIBBLE_4_MASK; + set @Q_SHIFT, NIBBLE_4_SHIFT; + set @Q_status, ((QUEST_Nivalis_state) & @Q_MASK) >> @Q_SHIFT; + + mes "[Miler]"; + mes "\"Hello!\""; + if(@Q_status == 2) close; + if(@Q_status == 1) + menu + "Hello.", -, + "Hello, Can you help me?", L_HELP; + close; + L_HELP: - mes "[Miler]"; - mes "\"What's the problem?\""; - menu "Someone has fallen in the well.", -; - mes "[Miler]"; - mes "\"Ho! I'll help him!\""; - getexp (BaseLevel * 111), 0; - set @Q_status, 2; - callsub S_Update_Var; - close; + mes "[Miler]"; + mes "\"What's the problem?\""; + menu "Someone has fallen in the well.", -; + mes "[Miler]"; + mes "\"Ho! I'll help him!\""; + getexp (BaseLevel * 111), 0; + set @Q_status, 2; + callsub S_Update_Var; + close; S_Update_Var: set QUEST_Nivalis_state, - (QUEST_Nivalis_state & ~(@Q_MASK) + (QUEST_Nivalis_state & ~(@Q_MASK) | (@Q_status << @Q_SHIFT)); return; -} - +} \ No newline at end of file -- cgit v1.2.3-60-g2f50