- Fixed the Pineapple_Juice (12320) should be 20 flee not 10. (bugreport:4074)

- Fixed the strnpcinfo's in halloween_2009. (bugreport:4106)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14260 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 16 insertions, 14 deletions

diff --git a/db/item_db.txt b/db/item_db.txt
index 77c4aa6ca..1c0bcd95c 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -4229,7 +4229,7 @@
 12317,Powder_Snow,Powder Snow,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12318,Little_Heart,Little Heart,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12319,Strawberry_Cake,Rune Strawberry Cake,0,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCATKRATE,6000000,5; sc_start SC_INCMATKRATE,6000000,5; },{},{}
-12320,Pineapple_Juice,Schwartzwald Pine Jubilee,0,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCHIT,6000000,10; sc_start SC_INCFLEE2,600000,10; },{},{}
+12320,Pineapple_Juice,Schwartzwald Pine Jubilee,0,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCHIT,6000000,10; sc_start SC_INCFLEE2,600000,20; },{},{}
 12321,Spicy_Sandwich,Arunafeltz Desert Sandwich,0,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCCRI,6000000,7; },{},{}
 12322,Chocolate_Pie,Chocolate Pie,0,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12323,N_Fly_Wing,Novice Fly Wing,11,1,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "AL_TELEPORT",1; },{},{}
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index dfcfa673f..bbeb8b9ef 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -1124,6 +1124,7 @@ of 'end' stops this, and ends the script.
 ---------------------------------------
 
 *set <variable>,<expression>;
+*set(<variable>,<expression>)
 
 This command will set a variable to the value that the expression results in. 
 This is the only way to set a variable directly.
@@ -2240,7 +2241,7 @@ Example:
 
 ---------------------------------------
 
-*getpartyleader(<party id>{,<type>});
+*getpartyleader(<party id>{,<type>})
 
 This function returns some information about the given party-id's leader.
 When type is ommitted, the default information retrieved is the leader's name.
@@ -2598,7 +2599,7 @@ Check sample in nps\sample\getiteminfo.txt
 
 ---------------------------------------
 
-*getequipcardid (<equipment slot>,<card slot>);
+*getequipcardid(<equipment slot>,<card slot>)
 
 Returns value from equipped item slot in the indicated slot:
 
@@ -2615,7 +2616,7 @@ when you want to check item cards or if it's signed. Useful for such quests as
 	
 ---------------------------------------
 
-*getitemslots (<item id>);
+*getitemslots(<item id>)
 
 Returns the amount of slots the item has.
 
@@ -2911,7 +2912,7 @@ the specified event as in a 'doevent' call.
 
 ---------------------------------------
 
-*getmapguildusers <mapname>,<guild id>;
+*getmapguildusers(<mapname>,<guild id>)
 
 Returns the amount of persons from the given guild that are on the given map.
 Example(s):
@@ -2919,7 +2920,7 @@ Example(s):
 //Will set the @persons variable to the amount of persons from the guild
 //which ID's = 10 and are at prontera.
 
-	set @persons,getMapGuildUsers "prontera",10;
+	set @persons,getMapGuildUsers("prontera",10);
 
 ---------------------------------------
 //
@@ -6483,7 +6484,8 @@ Example:
 
 Creates an invisible wall, an array of "setcell" starting from x,y and doing a
 line of the given size in the given direction. The difference with setcell is
-this one update client part too to avoid the glith problem.
+this one update client part too to avoid the glith problem. Directions are the 
+same as NPC sprite facing directions: 0=north, 1=northwest, 2=west, etc.
 
 ---------------------------------------
 
diff --git a/npc/events/halloween_2009.txt b/npc/events/halloween_2009.txt
index d2e28e1d9..463a2a023 100644
--- a/npc/events/halloween_2009.txt
+++ b/npc/events/halloween_2009.txt
@@ -96,9 +96,9 @@ prontera,152,192,5	script	Pumpkin Hat Researcher	712,{
 

 // Buffs - Trick or Treaters

 // =========================

--	script	Trick or Treater::09Treats	706,2,2,{	

+-	script	Trick or Treater::09Treats	706,2,2,{

 OnTouch:

-	hideoffnpc ""+strnpcinfo(0)+"";

+	hideoffnpc strnpcinfo(3);

 	initnpctimer;

 	mes "[Trick or Treater]";

 	mes "Hooray! hooray! Hooray!";

@@ -197,17 +197,17 @@ OnInit:
 	end;

 	

 OnEnableTreat:

-	enablenpc ""+strnpcinfo(0)+"";

-	hideonnpc ""+strnpcinfo(0)+"";

+	enablenpc strnpcinfo(3);

+	hideonnpc strnpcinfo(3);

 	end;

 	

 OnTimer15000:

-	hideonnpc ""+strnpcinfo(0)+"";

-	disablenpc ""+strnpcinfo(0)+"";

+	hideonnpc strnpcinfo(3);

+	disablenpc strnpcinfo(3);

 	end;

 		

 OnTimer300000:

-	donpcevent ""+strnpcinfo(0)+"::OnEnableTreat";

+	donpcevent strnpcinfo(3)+"::OnEnableTreat";

 	stopnpctimer;

 	end;

 }