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/020-1/KrickKrackKrock.txt | 243 ++++++++++++++++---------------- world/map/npc/020-1/rockscissor.txt | 170 +++++++++++----------- 2 files changed, 209 insertions(+), 204 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 b37dd0e1..20b2d6c6 100644 --- a/world/map/npc/020-1/KrickKrackKrock.txt +++ b/world/map/npc/020-1/KrickKrackKrock.txt @@ -1,121 +1,124 @@ -// author: Lien -// reviewed by Pjotr Orial and Jenalya -//020-1.gat,82,82,0 script Criker 192, { - -L_Main: -//Var - - set @NPC_NAME$, "[Criker]"; - set @BET, 50; -//lots of array ;( - setarray @KRICK$, "Krick", "Krack", "Krock"; - setarray @ITEM_RAND, 613, 537, 631, 775, 703, 640, 641, 4006, 700; - setarray @ITEM_HEALTH, 684, 685, 686, 687; - -//ends of var - - mes @NPC_NAME$; - mes "\"Hello " + strcharinfo(0) + ", do you want to play Krick-Krack-Krock?\""; -L_Menu: - menu - "Let's start!", L_Start, - "What's this?", L_info, - "Well, not for the moment.", -; - close; -L_Start: - mes @NPC_NAME$; - mes "\"Well, how many do you want to bet?\""; - input @BET; - if(@BET < 50 ) goto L_poor; - if(@BET > 2000) goto L_Too_rich; - if(zeny < @BET) goto L_No_Money; - set zeny, zeny - @BET; - - - - set @NPC_KRICK, rand(2); - mes "\"Choose Krick, Krack or Krock.\""; - menu - @KRICK$[0], -, - @KRICK$[1], -, - @KRICK$[2], -; - - //menu = min 1 & not 0 so I change it - set @menu, @menu - 1; - - mes @NPC_NAME$; - mes "\" "+ @KRICK$[@NPC_KRICK] +"!\""; - if( @menu == @NPC_KRICK ) goto L_Work; - mes @NPC_NAME$; - mes "\"Too bad! You were not lucky!\""; - close; -L_Work: - mes @NPC_NAME$; - mes "\"Wow amazing... What kind of present do you want?\""; - menu - "Money!", L_Money, - "An item!", L_Item, - "Some healing potions would be cool!", L_Health_item; - close; - -L_Money: - mes @NPC_NAME$; - mes "\"Here is your money.\""; - set zeny, zeny + (@BET*2); - close; -L_Item: -//item -getinventorylist; - if (@inventorylist_count == 100) goto L_Full_Inv; - - if( @BET > 50) getitem @ITEM_RAND[rand(1)], 1; - if( @BET > 200) getitem @ITEM_RAND[1 + rand(1)], 1; - if( @BET > 500) getitem @ITEM_RAND[2 + rand(1)], 1; - if( @BET > 1000) getitem @ITEM_RAND[3 + rand(1)], 1; - if( @BET > 1200) getitem @ITEM_RAND[4 + rand(1)], 1; - if( @BET > 1500) getitem @ITEM_RAND[5 + rand(1)], 1; - if( @BET == 2000) getitem @ITEM_RAND[6 + rand(1)], 1; - mes @NPC_NAME$; - mes "\"Here it is !\""; - close; - -L_Health_item: -// health item -getinventorylist; - if (@inventorylist_count == 100) goto L_Full_Inv; - -if( @BET > 50) getitem @ITEM_HEALTH[rand(1)], 1; -if( @BET > 200) getitem @ITEM_HEALTH[ 1 +rand(1)], 1 + rand(1); -if( @BET > 500) getitem @ITEM_HEALTH[2 + rand(1)], 1 + rand(3); -if( @BET > 1000) getitem @ITEM_HEALTH[3], 2 + rand(1); -if( @BET > 1500) getitem @ITEM_HEALTH[3], 3 + rand(2); -if( @BET == 2000) getitem @ITEM_HEALTH[3], 5 + rand(10); - mes @NPC_NAME$; - mes "\"Here it is !\""; - close; - -L_Full_Inv: - mes @NPC_NAME$; - mes "\"What are you doing? You have so much stuff with you, you can't carry what you won. Ha, well, then I will keep it!\""; - close; - -L_poor: - mes @NPC_NAME$; - mes "\"Erm... if you want to play you HAVE to bet, and you can't bet "+ @BET +" gold pieces. You need at least 50gp.\""; - close; -L_Too_rich: - mes @NPC_NAME$; - mes "\"Mh... I have to bet too. How will I get a present which is "+ @BET +"? No, that's too much.\""; - close; -L_No_Money: - mes @NPC_NAME$; - mes "\"Oh? You don't have "+ @BET +" gold pieces.\""; - close; -L_info: - mes @NPC_NAME$; - mes "\"Well, if you want to play Krick Krack Krock with me, you need to bet some money. We will both say a word (Krack, Krick or Krock). If we say the same, you can win double your money or an item worth what you bet. \""; - next; - mes "\"So, do you want to play? \""; - goto L_Menu; -} +//author: Lien +//reviewed by Pjotr Orial and Jenalya + +//To enable: sed 's_^// __' -i npc/020-1/KrickKrackKrock.txt + +// 020-1.gat,82,82,0 script Criker 192, { + +// L_Main: +// //Var + +// set @NPC_NAME$, "[Criker]"; +// set @BET, 50; +// //lots of array ;( +// setarray @KRICK$, "Krick", "Krack", "Krock"; +// setarray @ITEM_RAND, 613, 537, 631, 775, 703, 640, 641, 4006, 700; +// setarray @ITEM_HEALTH, 684, 685, 686, 687; + +// //ends of var + +// mes @NPC_NAME$; +// mes "\"Hello " + strcharinfo(0) + ", do you want to play Krick-Krack-Krock?\""; +// L_Menu: +// menu +// "Let's start!", L_Start, +// "What's this?", L_info, +// "Well, not for the moment.", -; +// close; +// L_Start: +// mes @NPC_NAME$; +// mes "\"Well, how many do you want to bet?\""; +// input @BET; +// if(@BET < 50 ) goto L_poor; +// if(@BET > 2000) goto L_Too_rich; +// if(zeny < @BET) goto L_No_Money; +// set zeny, zeny - @BET; + + + +// set @NPC_KRICK, rand(2); +// mes "\"Choose Krick, Krack or Krock.\""; +// menu +// @KRICK$[0], -, +// @KRICK$[1], -, +// @KRICK$[2], -; + +// //menu = min 1 & not 0 so I change it +// set @menu, @menu - 1; + +// mes @NPC_NAME$; +// mes "\" "+ @KRICK$[@NPC_KRICK] +"!\""; +// if( @menu == @NPC_KRICK ) goto L_Work; +// mes @NPC_NAME$; +// mes "\"Too bad! You were not lucky!\""; +// close; +// L_Work: +// mes @NPC_NAME$; +// mes "\"Wow amazing... What kind of present do you want?\""; +// menu +// "Money!", L_Money, +// "An item!", L_Item, +// "Some healing potions would be cool!", L_Health_item; +// close; + +// L_Money: +// mes @NPC_NAME$; +// mes "\"Here is your money.\""; +// set zeny, zeny + (@BET*2); +// close; +// L_Item: +// //item +// getinventorylist; +// if (@inventorylist_count == 100) goto L_Full_Inv; + +// if( @BET > 50) getitem @ITEM_RAND[rand(1)], 1; +// if( @BET > 200) getitem @ITEM_RAND[1 + rand(1)], 1; +// if( @BET > 500) getitem @ITEM_RAND[2 + rand(1)], 1; +// if( @BET > 1000) getitem @ITEM_RAND[3 + rand(1)], 1; +// if( @BET > 1200) getitem @ITEM_RAND[4 + rand(1)], 1; +// if( @BET > 1500) getitem @ITEM_RAND[5 + rand(1)], 1; +// if( @BET == 2000) getitem @ITEM_RAND[6 + rand(1)], 1; +// mes @NPC_NAME$; +// mes "\"Here it is !\""; +// close; + +// L_Health_item: +// // health item +// getinventorylist; +// if (@inventorylist_count == 100) goto L_Full_Inv; + +// if( @BET > 50) getitem @ITEM_HEALTH[rand(1)], 1; +// if( @BET > 200) getitem @ITEM_HEALTH[ 1 +rand(1)], 1 + rand(1); +// if( @BET > 500) getitem @ITEM_HEALTH[2 + rand(1)], 1 + rand(3); +// if( @BET > 1000) getitem @ITEM_HEALTH[3], 2 + rand(1); +// if( @BET > 1500) getitem @ITEM_HEALTH[3], 3 + rand(2); +// if( @BET == 2000) getitem @ITEM_HEALTH[3], 5 + rand(10); +// mes @NPC_NAME$; +// mes "\"Here it is !\""; +// close; + +// L_Full_Inv: +// mes @NPC_NAME$; +// mes "\"What are you doing? You have so much stuff with you, you can't carry what you won. Ha, well, then I will keep it!\""; +// close; + +// L_poor: +// mes @NPC_NAME$; +// mes "\"Erm... if you want to play you HAVE to bet, and you can't bet "+ @BET +" gold pieces. You need at least 50gp.\""; +// close; +// L_Too_rich: +// mes @NPC_NAME$; +// mes "\"Mh... I have to bet too. How will I get a present which is "+ @BET +"? No, that's too much.\""; +// close; +// L_No_Money: +// mes @NPC_NAME$; +// mes "\"Oh? You don't have "+ @BET +" gold pieces.\""; +// close; +// L_info: +// mes @NPC_NAME$; +// mes "\"Well, if you want to play Krick Krack Krock with me, you need to bet some money. We will both say a word (Krack, Krick or Krock). If we say the same, you can win double your money or an item worth what you bet. \""; +// next; +// mes "\"So, do you want to play? \""; +// goto L_Menu; +// } diff --git a/world/map/npc/020-1/rockscissor.txt b/world/map/npc/020-1/rockscissor.txt index d4a9d6f6..7ab9b42f 100644 --- a/world/map/npc/020-1/rockscissor.txt +++ b/world/map/npc/020-1/rockscissor.txt @@ -1,96 +1,98 @@ -// author: Lien -// reviewed by Pjotr Orial and Jenalya -//##################################### -//== NPC [Player] # -// anyone want to do a funny bet # -// ------------------------ # -// Rock-Paper-Scissors can be playing # -// I hope that'll make fun # -// ------------------------ # -//##################################### +//author: Lien +//reviewed by Pjotr Orial and Jenalya +//###################################### +//#== NPC [Player] # +//# anyone want to do a funny bet # +//# ------------------------ # +//# Rock-Paper-Scissors can be playing # +//# I hope that'll make fun # +//# ------------------------ # +//###################################### -//020-1.gat,74,78,0 script Gobmel 189, { - //var - set @NPC_name$, "[Gobmel]"; - set @NPC_point, 0; - set @PC_point, 0; - set @gamblerun, 0; - setarray @CHOOSE_PC$, "Scissors", "Paper", "Rock"; - setarray @CHOSE_ID, 0, 1, 2; - //0 : scissors; 1: Paper; 2: Rock; - // 0 cut 1 and 1 cover 3 and break 0 ... - //var ends +//To enable: sed 's_^// __' -i npc/020-1/rockscissor.txt - mes @NPC_name$; - mes "\"Hello " + strcharinfo(0) + "! Do you want to do a little party of Rock-Paper-Scissors and bet some gold?\""; - menu - "Yes, I want.", L_RPS, - "Well, maybe later.", -; - close; +// 020-1.gat,74,78,0 script Gobmel 189, { +// //var +// set @NPC_name$, "[Gobmel]"; +// set @NPC_point, 0; +// set @PC_point, 0; +// set @gamblerun, 0; +// setarray @CHOOSE_PC$, "Scissors", "Paper", "Rock"; +// setarray @CHOSE_ID, 0, 1, 2; +// //0 : scissors; 1: Paper; 2: Rock; +// // 0 cut 1 and 1 cover 3 and break 0 ... +// //var ends -L_RPS: +// mes @NPC_name$; +// mes "\"Hello " + strcharinfo(0) + "! Do you want to do a little party of Rock-Paper-Scissors and bet some gold?\""; +// menu +// "Yes, I want.", L_RPS, +// "Well, maybe later.", -; +// close; - mes @NPC_name$; - mes "\"How much money do you want to bet?\""; - input @MONEY_BET; - if(zeny < @MONEY_BET) goto L_poor; - set zeny, zeny - @MONEY_BET; +// L_RPS: -L_Start: - if(@gamblerun == 3) goto L_finish; - //what chose the NPC ? +// mes @NPC_name$; +// mes "\"How much money do you want to bet?\""; +// input @MONEY_BET; +// if(zeny < @MONEY_BET) goto L_poor; +// set zeny, zeny - @MONEY_BET; - set @CHOOSE_NPCID, rand(2); +// L_Start: +// if(@gamblerun == 3) goto L_finish; +// //what chose the NPC ? - mes @NPC_name$; - mes "[ " + @gamblerun + "/3 ]"; - mes "\"1... 2... 3...\""; - mes ""; - mes"[chose what sign you do]"; - mes ""; - menu - @CHOOSE_PC$[0], -, - @CHOOSE_PC$[1], -, - @CHOOSE_PC$[2], -; +// set @CHOOSE_NPCID, rand(2); - set @CHOSEN, @menu -1; - mes "Gobmal: " + @CHOOSE_PC$[@CHOOSE_NPCID]; - mes strcharinfo(0)+" " + strcharinfo(0)+ ": " +@CHOOSE_PC$[@CHOSEN]; - mes ""; - if(@CHOSEN == @CHOOSE_NPCID) goto L_Start; - if(@CHOSEN == 0 && @CHOOSE_NPCID == 2) goto L_Lost; - if(@CHOSEN == 1 && @CHOOSE_NPCID == 0) goto L_Lost; - if(@CHOSEN == 2 && @CHOOSE_NPCID == 1) goto L_Lost; -L_Win: - set @PC_point, @PC_point + 1; - set @gamblerun, @gamblerun + 1; - mes "Oh no! I have lost."; - mes ""; - next; - goto L_Start; +// mes @NPC_name$; +// mes "[ " + @gamblerun + "/3 ]"; +// mes "\"1... 2... 3...\""; +// mes ""; +// mes"[chose what sign you do]"; +// mes ""; +// menu +// @CHOOSE_PC$[0], -, +// @CHOOSE_PC$[1], -, +// @CHOOSE_PC$[2], -; -L_poor: - mes @NPC_name$; - mes "\"Go away from me...\""; - close; +// set @CHOSEN, @menu -1; +// mes "Gobmal: " + @CHOOSE_PC$[@CHOOSE_NPCID]; +// mes strcharinfo(0)+" " + strcharinfo(0)+ ": " +@CHOOSE_PC$[@CHOSEN]; +// mes ""; +// if(@CHOSEN == @CHOOSE_NPCID) goto L_Start; +// if(@CHOSEN == 0 && @CHOOSE_NPCID == 2) goto L_Lost; +// if(@CHOSEN == 1 && @CHOOSE_NPCID == 0) goto L_Lost; +// if(@CHOSEN == 2 && @CHOOSE_NPCID == 1) goto L_Lost; +// L_Win: +// set @PC_point, @PC_point + 1; +// set @gamblerun, @gamblerun + 1; +// mes "Oh no! I have lost."; +// mes ""; +// next; +// goto L_Start; -L_Lost: - set @NPC_point, @NPC_point + 1; - set @gamblerun, @gamblerun + 1; - mes "I have won!"; - mes ""; - next; - goto L_Start; +// L_poor: +// mes @NPC_name$; +// mes "\"Go away from me...\""; +// close; -L_finish: - if(@PC_point > @NPC_point ) goto L_Won; - mes @NPC_name$; - mes "\"Nice! I have won, give me your gp!\""; - close; -L_Won: - mes @NPC_name$; - mes "\"Here is my money.\""; - set zeny, zeny + @MONEY_BET*2; - close; -} +// L_Lost: +// set @NPC_point, @NPC_point + 1; +// set @gamblerun, @gamblerun + 1; +// mes "I have won!"; +// mes ""; +// next; +// goto L_Start; + +// L_finish: +// if(@PC_point > @NPC_point ) goto L_Won; +// mes @NPC_name$; +// mes "\"Nice! I have won, give me your gp!\""; +// close; +// L_Won: +// mes @NPC_name$; +// mes "\"Here is my money.\""; +// set zeny, zeny + @MONEY_BET*2; +// close; +// } -- cgit v1.2.3-60-g2f50