* Optimized Splendide coin merchant and merged it to a template with Manuk's (merchants\coin_exchange.txt)

* Fixed and enabled a Manuk NPC (cities\manuk.txt)
* Other small changes and fixes.

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

1 files changed, 17 insertions, 11 deletions

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index d60682401..f9db3809b 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -3718,7 +3718,7 @@ Y 150
 By using ,0,0; as the destination coordinates it will take all the characters in 
 the affected area to a random set of co-ordinates on "place2".
 
-	areawarp "place",10,10,120,120,"place2",150,150,200,200;
+    areawarp "place",10,10,120,120,"place2",150,150,200,200;
 
 By using the optional x4 and y4 parameters, the destination coordinates will be a 
 random place within the defined x3/y3-x4/y4 square.
@@ -3892,9 +3892,9 @@ changing jobs, which can be checked for later in scripts.
 
 This command retrieves the name of the given job using the msg_athena entries 550->650.
 
-		mes "[Kid]";
-		mes "I never thought I'd met a "+jobname(Class)+" here of all places.";
-		close;
+	mes "[Kid]";
+	mes "I never thought I'd met a "+jobname(Class)+" here of all places.";
+	close;
 
 ---------------------------------------
 
@@ -6097,10 +6097,10 @@ Battle flags are the flags found in the battle/*.conf files and is also used in
 
 Example(s):
 
-//will set the base experience rate to 20x (2000%)
+// Will set the base experience rate to 20x (2000%)
 	setBattleFlag "base_exp_rate",2000;
 	
-//will return the value of the base experience rate (when used after the above example, it would print 2000).
+// Will return the value of the base experience rate (when used after the above example, it would print 2000).
 	mes getBattleFlag("base_exp_rate");
 
 ---------------------------------------
@@ -6113,23 +6113,29 @@ The mapname and second x and y is the target area of the warp portal.
 
 Example(s):
 
-//Will create a warp portal on the NPC's map at 150,150 leading to prontera, coords 150,180.
-	warpPortal 150,150,"prontera",150,180;
+// Will create a warp portal on the NPC's map at 150,150 leading to prontera, coords 150,180.
+	warpportal 150,150,"prontera",150,180;
 
 ---------------------------------------
 
-*mapwarp "<from map>","<to map>",<x>,<y>,<type>,<ID for Type>;
+*mapwarp "<from map>","<to map>",<x>,<y>{,<type>,<ID>};
 
-type: 0=everyone, 1=guild, 2=party
 This command will collect all characters located on the From map and warp them 
 wholesale to the same point on the To map, or randomly distribute them there if 
 the coordinates are zero. "Random" is understood as a special To map name and 
 will mean randomly shuffling everyone on the same map.
 
+Optionally, a type and ID can be specified. Available types are:
+
+ 0 - Everyone
+ 1 - Guild
+ 2 - Party
+
 Example:
 
-// Will warp all members of guild with ID 63 on map prontera to map alberta
+// Will warp all members of guild with ID 63 on map prontera to map alberta.
 	mapwarp "prontera","alberta",150,150,1,63;
+
 ---------------------------------------
 \\
 5,2.- Guild-related Commands