From 4b98ecfd974be6ef5f3ee64fd42d8733ad32eadf Mon Sep 17 00:00:00 2001
From: thatakkarin <thatakkarin@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Mon, 10 Sep 2012 09:28:25 +0000
Subject: * Updated 'mapwarp' in script_commands.txt to show missing params -
 Thanks to Emistry for pointing that out! * permissions.txt's current version
 should be the date an additional permission was created, not documented.
 Cross-referencing for the win. * Slight clean-up in woe_time_explanation.txt

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16768 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 doc/permissions.txt          |  2 +-
 doc/script_commands.txt      |  7 ++++++-
 doc/woe_time_explanation.txt | 14 +++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'doc')

diff --git a/doc/permissions.txt b/doc/permissions.txt
index e0e083f08..129d384f4 100644
--- a/doc/permissions.txt
+++ b/doc/permissions.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
-//= 20120718
+//= 20120606
 //===== Description: =========================================
 //= Player group permissions, configured in /conf/groups.conf.
 //============================================================
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 18abbfd2c..d60682401 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -6118,13 +6118,18 @@ Example(s):
 
 ---------------------------------------
 
-*mapwarp "<from map>","<to map>",<x>,<y>;
+*mapwarp "<from map>","<to map>",<x>,<y>,<type>,<ID for Type>;
 
+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.
 
+Example:
+
+// 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
diff --git a/doc/woe_time_explanation.txt b/doc/woe_time_explanation.txt
index 75dfaf09e..099a5a15e 100644
--- a/doc/woe_time_explanation.txt
+++ b/doc/woe_time_explanation.txt
@@ -12,7 +12,7 @@ There are 2 main commands that determine WoE times:
 OnClock<time>: and gettime(<type>).
 
 OnClock<time> triggers when <time> is reached.
-The format is HHMM, with H = hour, M = minute.
+The format is HHMM, where H = hour, M = minute.
 OnClock2350: would run at 23:50, server time.
 
 gettime(<type>) is a function that checks for certain
@@ -54,14 +54,14 @@ The first gettime() is checking for a type 4, the day of the week, and it's
 comparing it to the one desired, which is 2 (Tuesday). The function will
 return either 1 (true) or 0 (false).
 
-The second gettime is checking for a type 3, the hour, and it's comparing
-it to 21. If the first part is greater or equal (>=) than the second,
-the comparation will return 1.
+The second gettime is checking type 3, the hour, and it's comparing
+it to 21. If the first part is greater than or equal to (>=) the second part,
+the comparison will return 1.
 
 The third and last gettime is checking again for the hour, but the time has to be less
-than the said time (in this case, 23).
+than the specified time (in this case, 23).
 
-Now, look at the parentheses. Parentheses are very important when making comparations
+Now, look at the parentheses. Parentheses are very important when making comparisons
 and conditions. Check the order of these. I'll place dummy characters for this example:
 
 	if ((X && (Y && Z)) goto L_Start;
@@ -90,7 +90,7 @@ to see if it's in WoE time, hence why the hours have to be checked.
 
 -------------------------------------------------------------------------------
 
-Now a example of how to set the WoE so it starts on Monday, at 4 pm and ends up at 10 pm:
+An example of how to set the WoE so it starts on Monday, at 4 pm and ends up at 10 pm:
 
 	OnClock1600: // 16:00 = 4 pm
 	OnClock2200: // 22:00 = 10 pm
-- 
cgit v1.2.3-70-g09d2