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/alacrius.txt | 70 ++++++----- world/map/npc/027-2/alacrius2.txt | 171 ++++++++++++------------- world/map/npc/027-2/testnpcs.txt | 259 +++++++++++++++++++------------------- 3 files changed, 253 insertions(+), 247 deletions(-) (limited to 'world/map/npc/027-2') diff --git a/world/map/npc/027-2/alacrius.txt b/world/map/npc/027-2/alacrius.txt index 99714ebc..1e15769c 100644 --- a/world/map/npc/027-2/alacrius.txt +++ b/world/map/npc/027-2/alacrius.txt @@ -1,40 +1,42 @@ -// Starts the reaper quest +//Starts the reaper quest +//(incomplete, use alacrius2.txt instead) +//To enable: sed 's_^// __' -i npc/027-2/alacrius.txt //027-2.gat,107,29,0 script Alacrius 313,{ - // if started, go to started - // if fail go to failed - // if complete go to complete - // if cooldown go to cooldown +// // if started, go to started +// // if fail go to failed +// // if complete go to complete +// // if cooldown go to cooldown -// start quest section - mes "Hi, want to fight the reaper?"; - menu - "Let's go!",L_START, - "No, thank you.",-; - close; +// // start quest section +// mes "Hi, want to fight the reaper?"; +// menu +// "Let's go!",L_START, +// "No, thank you.",-; +// close; -L_START: - monster "027-4.gat",40,55,"Reaper Quest",1067,1,"Reaper::OnDead"; - enablenpc "#gatecontrol"; - enablenpc "#closedgate"; - disablenpc "#opengate"; -// Open doors to reaper level - warp "027-3.gat",41,70; - initnpctimer; - close; +// L_START: +// monster "027-4.gat",40,55,"Reaper Quest",1067,1,"Reaper::OnDead"; +// enablenpc "#gatecontrol"; +// enablenpc "#closedgate"; +// disablenpc "#opengate"; +// // Open doors to reaper level +// warp "027-3.gat",41,70; +// initnpctimer; +// close; -// 5 min mark for testing purposes, up it when finished. -OnTimer300000: - mapwarp "027-3.gat", "027-2.gat",104,41; - mapwarp "027-4.gat", "027-2.gat",104,41; - killmonsterall "027-4.gat"; - end; -OnTimer301000: - npctalk "You have failed the mission."; - end; +// // 5 min mark for testing purposes, up it when finished. +// OnTimer300000: +// mapwarp "027-3.gat", "027-2.gat",104,41; +// mapwarp "027-4.gat", "027-2.gat",104,41; +// killmonsterall "027-4.gat"; +// end; +// OnTimer301000: +// npctalk "You have failed the mission."; +// end; -// cooldown before the quest can be restarted -OnTimer360000: - // set quest var - end; -} +// // cooldown before the quest can be restarted +// OnTimer360000: +// // set quest var +// end; +// } diff --git a/world/map/npc/027-2/alacrius2.txt b/world/map/npc/027-2/alacrius2.txt index df1587ec..4e2be3fd 100644 --- a/world/map/npc/027-2/alacrius2.txt +++ b/world/map/npc/027-2/alacrius2.txt @@ -1,113 +1,114 @@ -// Starts the reaper quest +//Starts the reaper quest +//To enable: sed 's_^// __' -i npc/027-2/alacrius2.txt -//027-2.gat,107,29,0 script Alacrius 313,{ - if ($@FIGHT_ALACRIUS_STATUS != 0) goto L_Enjoy; +// 027-2.gat,107,29,0 script Alacrius 313,{ +// if ($@FIGHT_ALACRIUS_STATUS != 0) goto L_Enjoy; - mes "[Alacrius]"; - mes "\"Hello, I'm Alacrius. \""; - next; - mes "[Alacrius]"; - mes "\"A very long time ago, I figured a way to cheat death and the limits of time and space. You may think it is evil, but I did it because of true love... \""; - next; - mes "[Alacrius]"; - mes "\"The reaper kidnapped my beloved wife, and took her to the underworld. I had to find a way to stop him, and as time went by, I became what you can see now... But if you dare to cheat death, time and space you'll have to pay a high price... \""; - next; +// mes "[Alacrius]"; +// mes "\"Hello, I'm Alacrius. \""; +// next; +// mes "[Alacrius]"; +// mes "\"A very long time ago, I figured a way to cheat death and the limits of time and space. You may think it is evil, but I did it because of true love... \""; +// next; +// mes "[Alacrius]"; +// mes "\"The reaper kidnapped my beloved wife, and took her to the underworld. I had to find a way to stop him, and as time went by, I became what you can see now... But if you dare to cheat death, time and space you'll have to pay a high price... \""; +// next; - mes "[Alacrius]"; - mes "\"Being away from time and space doesn't allow me to try to save my beloved wife... I need your help. Do you think you have what it takes to handle the most powerful monsters over the world of Mana? \""; - next; +// mes "[Alacrius]"; +// mes "\"Being away from time and space doesn't allow me to try to save my beloved wife... I need your help. Do you think you have what it takes to handle the most powerful monsters over the world of Mana? \""; +// next; - menu - "Let's go!",L_PLAY_OK, - "No, thank you.",-; - close; +// menu +// "Let's go!",L_PLAY_OK, +// "No, thank you.",-; +// close; -L_PLAY_OK: +// L_PLAY_OK: - if ($@FIGHT_ALACRIUS_STATUS != 0) goto L_AlreadyStarted; - set $@FIGHT_ALACRIUS_STATUS, 1; - set $@MO_REAPER, 0; - startnpctimer; - set @PRIZE, 1; +// if ($@FIGHT_ALACRIUS_STATUS != 0) goto L_AlreadyStarted; +// set $@FIGHT_ALACRIUS_STATUS, 1; +// set $@MO_REAPER, 0; +// startnpctimer; +// set @PRIZE, 1; - goto L_Exit; +// goto L_Exit; -L_Enjoy: - if ($@MO_REAPER == 1) goto L_AllDead; - mes "[Alacrius]"; - mes "\"...Please hurry up, the time is running...\""; - goto L_Exit; +// L_Enjoy: +// if ($@MO_REAPER == 1) goto L_AllDead; +// mes "[Alacrius]"; +// mes "\"...Please hurry up, the time is running...\""; +// goto L_Exit; -L_AlreadyStarted: - mes "[Alacrius]"; - mes "\"The Reaper is alive.\""; - goto L_Exit; +// L_AlreadyStarted: +// mes "[Alacrius]"; +// mes "\"The Reaper is alive.\""; +// goto L_Exit; -L_Exit: - close; - end; +// L_Exit: +// close; +// end; -// Time to fight -OnTimer10000: +// // Time to fight +// OnTimer10000: - monster "027-2.gat",0,0,"Reaper Quest",1111,1,"Alacrius::OnDeadReaper"; - end; +// monster "027-2.gat",0,0,"Reaper Quest",1111,1,"Alacrius::OnDeadReaper"; +// end; -OnDeadReaper: - set $@MO_REAPER, $@MO_REAPER + 1; - killmonster "027-2.gat","All"; - end; +// OnDeadReaper: +// set $@MO_REAPER, $@MO_REAPER + 1; +// killmonster "027-2.gat","All"; +// end; -OnDeadLost: - set $@MO_LOST, $@MO_LOST + 1; - end; +// OnDeadLost: +// set $@MO_LOST, $@MO_LOST + 1; +// end; -OnTimer120000: +// OnTimer120000: - set $@MO_REAPER,0; - set $@FIGHT_ALACRIUS_STATUS, 0; - killmonster "027-2.gat","All"; - stopnpctimer; - setnpctimer 0; - set @PRIZE, 0; - npctalk "Oh my beloved wife, you could not be rescued! I will have to purge my mistakes again..."; - npctalk "Please, help my beloved wife!!"; +// set $@MO_REAPER,0; +// set $@FIGHT_ALACRIUS_STATUS, 0; +// killmonster "027-2.gat","All"; +// stopnpctimer; +// setnpctimer 0; +// set @PRIZE, 0; +// npctalk "Oh my beloved wife, you could not be rescued! I will have to purge my mistakes again..."; +// npctalk "Please, help my beloved wife!!"; - end; +// end; -OnDead: - end; +// OnDead: +// end; -L_AllDead: - if(@PRIZE == 0) goto L_NOHERO; +// L_AllDead: +// if(@PRIZE == 0) goto L_NOHERO; - getinventorylist; - if (@inventorylist_count == 100) goto L_TooMany; - getitem "CasinoCoins", 1; +// getinventorylist; +// if (@inventorylist_count == 100) goto L_TooMany; +// getitem "CasinoCoins", 1; - mes "[Alacrius]"; - mes "Thank you very much, you saved my love!! Here you are, a prize according to the dangers you've been exposed to."; - set @PRIZE , 0; - set $@MO_REAPER,0; - close; - end; +// mes "[Alacrius]"; +// mes "Thank you very much, you saved my love!! Here you are, a prize according to the dangers you've been exposed to."; +// set @PRIZE , 0; +// set $@MO_REAPER,0; +// close; +// end; -L_TooMany: - mes "[Alacrius]"; - mes "You have no room for the reward."; - close; +// L_TooMany: +// mes "[Alacrius]"; +// mes "You have no room for the reward."; +// close; -L_NOHERO: - mes "[Alacrius]"; - mes "Sorry, but you didn't save my love... Try it again when you're ready..."; - close; - end; -OnInit: - initnpctimer; - stopnpctimer; -} +// L_NOHERO: +// mes "[Alacrius]"; +// mes "Sorry, but you didn't save my love... Try it again when you're ready..."; +// close; +// end; +// OnInit: +// initnpctimer; +// stopnpctimer; +// } 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-60-g2f50