From ab4ab2b1440dcd80dc6d8aaa962b05063a846451 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 3 Aug 2011 16:26:16 -0700 Subject: Completely comment out disabled scripts instead of just the first line This meant that every line would be parsed as a toplevel script, and could crash the server under some conditions. --- world/map/npc/027-2/testnpcs.txt | 259 ++++++++++++++++++++------------------- 1 file changed, 131 insertions(+), 128 deletions(-) (limited to 'world/map/npc/027-2/testnpcs.txt') diff --git a/world/map/npc/027-2/testnpcs.txt b/world/map/npc/027-2/testnpcs.txt index 57dc1f7b..69878744 100644 --- a/world/map/npc/027-2/testnpcs.txt +++ b/world/map/npc/027-2/testnpcs.txt @@ -1,145 +1,148 @@ +//contains debug scripts +//To enable: sed 's_^// __' -i npc/027-2/alacrius.txt + 027-2.gat,80,34,0 script Lovers 303,{ - mes "You see a man and a woman holding each other very tight."; - next; - mes "They are kissing and whispering things to each other you can't hear."; - next; - mes "Now the woman giggles. They don't notice you."; - next; - mes "Maybe it's better not to bother them."; - close; + mes "You see a man and a woman holding each other very tight."; + next; + mes "They are kissing and whispering things to each other you can't hear."; + next; + mes "Now the woman giggles. They don't notice you."; + next; + mes "Maybe it's better not to bother them."; + close; } -//027-2.gat,110,30,0 script Debug 305,{ - set @Graveyard_Inn_Woman_MASK, NIBBLE_0_MASK; - set @Graveyard_Inn_Woman_SHIFT, NIBBLE_0_SHIFT; - - set @woman, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Woman_MASK) >> @Graveyard_Inn_Woman_SHIFT); - - set @Graveyard_Inn_Lover_MASK, NIBBLE_1_MASK; - set @Graveyard_Inn_Lover_SHIFT, NIBBLE_1_SHIFT; - - set @Lover, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Lover_MASK) >> @Graveyard_Inn_Lover_SHIFT); - - set @Graveyard_Inn_Child_MASK, NIBBLE_2_MASK; - set @Graveyard_Inn_Child_SHIFT, NIBBLE_2_SHIFT; - - set @Child, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Child_MASK) >> @Graveyard_Inn_Child_SHIFT); - - set @Graveyard_Inn_Husband_MASK, NIBBLE_3_MASK; - set @Graveyard_Inn_Husband_SHIFT, NIBBLE_3_SHIFT; - - set @Husband, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Husband_MASK) >> @Graveyard_Inn_Husband_SHIFT); - - set @Graveyard_Inn_Golb_MASK, NIBBLE_4_MASK; - set @Graveyard_Inn_Golb_SHIFT, NIBBLE_4_SHIFT; - - set @Golb, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Golb_MASK) >> @Graveyard_Inn_Golb_SHIFT); - - mes "debug for the lovetriangle quest"; - menu - "reset all",-, - "reset reid " + @woman,L_Reid, - "reset lover " + @Lover,L_Lover, - "reset child " + @Child,L_Child, - "reset husband " + @Husband,L_Husband, - "reset golbanez " + @Golb,L_Golb, - "leave", L_Close; - -set QUEST_Graveyard_Inn, 0; -close; -L_Reid: - set @woman, 0; - callsub S_Update_Mask_Woman; - close; -L_Lover: - set @Lover, 0; - callsub S_Update_Mask_Lover; - close; -L_Child: - set @Child, 0; - callsub S_Update_Mask_Child; - close; -L_Husband: - set @Husband, 0; - callsub S_Update_Mask_Husband; - close; -L_Golb: - set @Golb, 0; - callsub S_Update_Mask_Golb; - close; -L_Close: - close; - -S_Update_Mask_Golb: - set QUEST_Graveyard_Inn, - (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_Golb_MASK)) - | (@Golb << @Graveyard_Inn_Golb_SHIFT); - return; - -S_Update_Mask_Husband: - set QUEST_Graveyard_Inn, - (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_Husband_MASK)) - | (@Husband << @Graveyard_Inn_Husband_SHIFT); - return; - -S_Update_Mask_Child: - set QUEST_Graveyard_Inn, - (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_Child_MASK)) - | (@Child << @Graveyard_Inn_Child_SHIFT); - return; - -S_Update_Mask_Lover: - set QUEST_Graveyard_Inn, - (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_Lover_MASK)) - | (@Lover << @Graveyard_Inn_Lover_SHIFT); - return; - -S_Update_Mask_Woman: - set QUEST_Graveyard_Inn, - (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_Woman_MASK)) - | (@woman << @Graveyard_Inn_Woman_SHIFT); - return; -} +// 027-2.gat,110,30,0 script Debug 305,{ +// set @Graveyard_Inn_Woman_MASK, NIBBLE_0_MASK; +// set @Graveyard_Inn_Woman_SHIFT, NIBBLE_0_SHIFT; + +// set @woman, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Woman_MASK) >> @Graveyard_Inn_Woman_SHIFT); + +// set @Graveyard_Inn_Lover_MASK, NIBBLE_1_MASK; +// set @Graveyard_Inn_Lover_SHIFT, NIBBLE_1_SHIFT; + +// set @Lover, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Lover_MASK) >> @Graveyard_Inn_Lover_SHIFT); + +// set @Graveyard_Inn_Child_MASK, NIBBLE_2_MASK; +// set @Graveyard_Inn_Child_SHIFT, NIBBLE_2_SHIFT; + +// set @Child, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Child_MASK) >> @Graveyard_Inn_Child_SHIFT); + +// set @Graveyard_Inn_Husband_MASK, NIBBLE_3_MASK; +// set @Graveyard_Inn_Husband_SHIFT, NIBBLE_3_SHIFT; + +// set @Husband, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Husband_MASK) >> @Graveyard_Inn_Husband_SHIFT); + +// set @Graveyard_Inn_Golb_MASK, NIBBLE_4_MASK; +// set @Graveyard_Inn_Golb_SHIFT, NIBBLE_4_SHIFT; + +// set @Golb, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Golb_MASK) >> @Graveyard_Inn_Golb_SHIFT); + +// mes "debug for the lovetriangle quest"; +// menu +// "reset all",-, +// "reset reid " + @woman,L_Reid, +// "reset lover " + @Lover,L_Lover, +// "reset child " + @Child,L_Child, +// "reset husband " + @Husband,L_Husband, +// "reset golbanez " + @Golb,L_Golb, +// "leave", L_Close; + +// set QUEST_Graveyard_Inn, 0; +// close; +// L_Reid: +// set @woman, 0; +// callsub S_Update_Mask_Woman; +// close; +// L_Lover: +// set @Lover, 0; +// callsub S_Update_Mask_Lover; +// close; +// L_Child: +// set @Child, 0; +// callsub S_Update_Mask_Child; +// close; +// L_Husband: +// set @Husband, 0; +// callsub S_Update_Mask_Husband; +// close; +// L_Golb: +// set @Golb, 0; +// callsub S_Update_Mask_Golb; +// close; +// L_Close: +// close; + +// S_Update_Mask_Golb: +// set QUEST_Graveyard_Inn, +// (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_Golb_MASK)) +// | (@Golb << @Graveyard_Inn_Golb_SHIFT); +// return; + +// S_Update_Mask_Husband: +// set QUEST_Graveyard_Inn, +// (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_Husband_MASK)) +// | (@Husband << @Graveyard_Inn_Husband_SHIFT); +// return; + +// S_Update_Mask_Child: +// set QUEST_Graveyard_Inn, +// (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_Child_MASK)) +// | (@Child << @Graveyard_Inn_Child_SHIFT); +// return; + +// S_Update_Mask_Lover: +// set QUEST_Graveyard_Inn, +// (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_Lover_MASK)) +// | (@Lover << @Graveyard_Inn_Lover_SHIFT); +// return; + +// S_Update_Mask_Woman: +// set QUEST_Graveyard_Inn, +// (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_Woman_MASK)) +// | (@woman << @Graveyard_Inn_Woman_SHIFT); +// return; +// } 027-2.gat,75,29,0 script Archibald 306,{ -// the broken grammar is intentional - mes "[Archibald]"; - mes "\"Me need to prepare the food. Me helping the chef cook.\""; - next; - mes "\"Person doesn't disturb me when me is making the food\""; - close; +//the broken grammar is intentional + mes "[Archibald]"; + mes "\"Me need to prepare the food. Me helping the chef cook.\""; + next; + mes "\"Person doesn't disturb me when me is making the food\""; + close; } 027-2.gat,77,40,0 script Darnel 308,{ - set @drunker, rand(4); - if (@drunker == 0) goto L_0; - if (@drunker == 1) goto L_1; - if (@drunker == 2) goto L_2; - if (@drunker == 3) goto L_3; - end; + set @drunker, rand(4); + if (@drunker == 0) goto L_0; + if (@drunker == 1) goto L_1; + if (@drunker == 2) goto L_2; + if (@drunker == 3) goto L_3; + end; L_0: - mes "[Darnel]"; - mes "\"zzzZZZzzz...\""; - close; + mes "[Darnel]"; + mes "\"zzzZZZzzz...\""; + close; L_1: - mes "[Darnel]"; - mes "\"Ish that a Zzombee?...\""; - close; + mes "[Darnel]"; + mes "\"Ish that a Zzombee?...\""; + close; L_2: - mes "[Darnel]"; - mes "\"Auuu... Hiccup... Don't byte mee... \""; - close; + mes "[Darnel]"; + mes "\"Auuu... Hiccup... Don't byte mee... \""; + close; L_3: - mes "[Darnel]"; - mes "\"Moar Bearr...Pleash!\""; - close; + mes "[Darnel]"; + mes "\"Moar Bearr...Pleash!\""; + close; } 027-2.gat,110,23,0 script Nigel 312,{ - mes "[Nigel]"; - mes "\"Ohh... My head is killing me! I have to stop " - + "drinking too much or I will lose my job... But " - + "being a waiter... oh I can't resist a drink or two!\""; - close; + mes "[Nigel]"; + mes "\"Ohh... My head is killing me! I have to stop " + + "drinking too much or I will lose my job... But " + + "being a waiter... oh I can't resist a drink or two!\""; + close; } -- cgit v1.2.3-70-g09d2