Update documentation on master

3 files changed, 84 insertions, 0 deletions

diff --git a/server/gm/atcommands.txt b/server/gm/atcommands.txt
index fdafb6c..18d3de4 100644
--- a/server/gm/atcommands.txt
+++ b/server/gm/atcommands.txt
@@ -1455,3 +1455,40 @@ Sets the intimacy level of your homunculus, with 1000 being "Loyal".
 Sets the hunger level of your homunculus, with 100 being "Stuffed".
 
 ---------------------------------------
+
+@cvcon
+
+Set the mapflag cvc on the map (Turn on Clans vs Clans mode)
+
+---------------------------------------
+
+@cvcoff
+
+Unset the mapflag cvc on the map (Turn off Clans vs Clans mode)
+
+---------------------------------------
+
+@claninfo
+
+Lists all informations of all clans
+
+---------------------------------------
+
+@joinclan <ClanID>
+
+Joins the Clan with the given ID if it exists.
+
+---------------------------------------
+
+@leaveclan
+
+Leaves the Clan if any.
+
+---------------------------------------
+
+@reloadclans
+
+Reloads the 'conf/clans.conf' file.
+Obs: it will reload 'db/clans.conf' too since it's included inside 'conf/clans.conf'
+
+---------------------------------------
diff --git a/server/scripts/evol_script_commands.txt b/server/scripts/evol_script_commands.txt
index 588b91a..f03675b 100644
--- a/server/scripts/evol_script_commands.txt
+++ b/server/scripts/evol_script_commands.txt
@@ -979,3 +979,14 @@ Example:
     setitemoptionbyindex(.@item, 0, VAR_MAXHPAMOUNT, 200);
     setitemoptionbyindex(.@item, 1, VAR_STRAMOUNT, 10);
     setitemoptionbyindex(.@item, 2, VAR_VITAMOUNT, -5);
+
+---------------------------------------
+
+*isinstance id;
+
+Return true if id is correct instance id.
+Return false if id is not instance id.
+
+Example:
+    .instid = 1;
+    mes(str(isinstance(.instid));
diff --git a/server/scripts/script_commands.txt b/server/scripts/script_commands.txt
index 5b89743..7394090 100644
--- a/server/scripts/script_commands.txt
+++ b/server/scripts/script_commands.txt
@@ -2402,6 +2402,7 @@ the invoking character. Whatever it returns is determined by type.
 (1) PC_PARTY	- The name of the party they're in if any.
 (2) PC_GUILD	- The name of the guild they're in if any.
 (3) PC_MAP		- The name of the map the character is in.
+(4) PC_CLAN   - The name of the clan they're in if any.
 
 If <GID> is passed, it will return the value of the specified player instead
 the attached player. If the player is not found, it will return
@@ -2543,6 +2544,7 @@ Type is the kind of associated ID number required:
 (2) CHAR_ID_GUILD - Guild ID number.
 (3) CHAR_ID_ACCOUNT - Account ID number.
 (4) CHAR_ID_BG - Battle ground ID
+(5) CHAR_ID_CLAN - Clan ID number.
 
 For most purposes other than printing it, a number is better to have than
 a name (people do horrifying things to their character names).
@@ -9967,3 +9969,37 @@ Changes the name of a unit.
 Supported Types - [ MOB | HOM | PET ].
 
 returns 1 on success, 0 on failure.
+
+---------------------------------------
+//=====================================
+13 - Clan System Related Commands
+//=====================================
+---------------------------------------
+
+*join_clan(<ClanID>{,<RID>})
+
+Joins a player into the given clan.
+If no RID is given, will run with the current attached player.
+
+returns true on success, false on failure.
+
+---------------------------------------
+
+*clan_leave({<RID>})
+
+Removes a player from its clan.
+If no RID is given, will run with the current attached player.
+
+returns true on success, false on failure.
+
+---------------------------------------
+
+*clan_master(<ClanID>)
+
+Enables the Emblem of the given Clan to the current NPC
+
+---------------------------------------
+//=====================================
+13 - End of Clan System Related Commands
+//=====================================
+---------------------------------------
\ No newline at end of file