summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-23 21:11:29 +0000
committereuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-23 21:11:29 +0000
commit62e0206df2df0d9b495f2c295689b39690366820 (patch)
treed19b95ca7c612307e3734fbcedf233c0359beb15
parent28df54873035f1ec11e8c60a6b218e318323b032 (diff)
downloadhercules-62e0206df2df0d9b495f2c295689b39690366820.tar.gz
hercules-62e0206df2df0d9b495f2c295689b39690366820.tar.bz2
hercules-62e0206df2df0d9b495f2c295689b39690366820.tar.xz
hercules-62e0206df2df0d9b495f2c295689b39690366820.zip
* Documented @refreshall (r17035), @breakguild, @hommutate (r17038).
* Follow-up r16972, fixed a naming mistake (bugreport:7038). * Edited format of default grf-files.txt. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17039 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--conf/grf-files.txt18
-rw-r--r--conf/groups.conf2
-rw-r--r--doc/atcommands.txt21
-rw-r--r--doc/script_commands.txt4
-rw-r--r--src/map/script.c2
5 files changed, 26 insertions, 21 deletions
diff --git a/conf/grf-files.txt b/conf/grf-files.txt
index 39cee544e..6af058575 100644
--- a/conf/grf-files.txt
+++ b/conf/grf-files.txt
@@ -1,12 +1,12 @@
//-----------------------------------------
-// GRF List
+// GRF Files
+// Add as many as needed.
//-----------------------------------------
-// grf: C:\path\to\RO\data.grf
-// You may add more in this format
-// grf: <data file path>
+//grf: C:\Program Files\Gravity\RO\rdata.grf
+//grf: C:\Program Files\Gravity\RO\data.grf
-//------ Others ---------------------------
-
-// Data Directory (without the actual data\ though)
-// the below example would use C:\path\to\RO\data\
-//data_dir: C:\path\to\RO\
+//-----------------------------------------
+// Data Directory
+// Use the base folder, not the data\ path.
+//-----------------------------------------
+//data_dir: C:\Program Files\Gravity\RO\
diff --git a/conf/groups.conf b/conf/groups.conf
index dabebe7a2..a243716e6 100644
--- a/conf/groups.conf
+++ b/conf/groups.conf
@@ -260,7 +260,7 @@ groups: (
level: 99
inherit: ( "Support", "Law Enforcement" )
commands: {
- /* not necessary due all_commands: true */
+ /* not necessary due to all_commands: true */
}
log_commands: true
permissions: {
diff --git a/doc/atcommands.txt b/doc/atcommands.txt
index 28bedfa1b..0446000aa 100644
--- a/doc/atcommands.txt
+++ b/doc/atcommands.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= rAthena Dev Team
//===== Current Version: =====================================
-//= 20121219
+//= 20121223
//===== Description: =========================================
//= List of available atcommands and their functions.
//============================================================
@@ -63,8 +63,10 @@ Server Uptime: 3 days, 8 hours, 6 minutes, 4 seconds.
---------------------------------------
@refresh
+@refreshall
Synchronizes the player's position on the client with the one stored on the server.
+Additionally, @refreshall will refresh all online players.
---------------------------------------
@@ -999,12 +1001,6 @@ Marries or divorces two players.
---------------------------------------
-@adopt <father> <mother> <child>
-
-Adopts a Novice into a family.
-
----------------------------------------
-
@request <message>
Sends a message to all connected GMs (via the GM whisper system).
@@ -1257,6 +1253,13 @@ Creates a new guild, with the attached character as guildmaster.
---------------------------------------
+@breakguild
+
+Breaks the guild of the attached character.
+You must be the guildmaster to use this command.
+
+---------------------------------------
+
@changegm <guild_member_name>
Changes the guildmaster of your guild to another member.
@@ -1356,8 +1359,10 @@ Creates the specified homunculus.
---------------------------------------
@homevolution
+@hommutate
-Evolves your homunculus, if possible.
+Evolves or mutates your homunculus, if possible.
+If it doesn't work, the /swt emotion is shown.
---------------------------------------
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 50c364de3..46583b95f 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -4315,7 +4315,7 @@ If the map name is given as "this", the map the invoking character is on will be
---------------------------------------
-*cleanfloor "<map name>",<x1>,<y1>,<x2>,<y2>;
+*cleanarea "<map name>",<x1>,<y1>,<x2>,<y2>;
*cleanmap "<map name>";
These commands will clear all items lying on the ground on the specified map, either
@@ -5412,7 +5412,7 @@ If it doesn't work, the /swt emotion is shown.
To evolve a homunculus, the invoking player must have a homunculus,
the homunculus must not be the last evolution and
-the homunculus must have above 91000 intimacy with it's owner.
+the homunculus must have above 91000 intimacy with its owner.
---------------------------------------
diff --git a/src/map/script.c b/src/map/script.c
index a949f8e96..26d70f4ce 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -17227,7 +17227,7 @@ BUILDIN_FUNC(getrandgroupitem) {
}
/* cleanmap <map_name>;
- * cleanfloor <map_name, <x0>, <y0>, <x1>, <y1>; */
+ * cleanarea <map_name>, <x0>, <y0>, <x1>, <y1>; */
static int atcommand_cleanfloor_sub(struct block_list *bl, va_list ap)
{
nullpo_ret(bl);