- Added some new config settings: homunculus_autoloot, idle_no_autoloot, max_guild_alliance.

- Added a code to activate a Kill Steal protection and the required mapflags.
* (I will explain this later on forums).

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

5 files changed, 27 insertions, 0 deletions

diff --git a/conf/atcommand_athena.conf b/conf/atcommand_athena.conf
index 622ee3be6..c541b1308 100644
--- a/conf/atcommand_athena.conf
+++ b/conf/atcommand_athena.conf
@@ -131,6 +131,9 @@ jailtime: 1
 hominfo: 1
 homstats: 1
 
+// Kill Steal Protection
+noks: 1
+
 //---------------------------
 // 10: Super player+ commands
 
@@ -146,6 +149,9 @@ go: 10
 // Enables/disables autolooting from killed mobs.
 autoloot: 10
 
+// Enables/disables autolooting an item.
+alootid: 10
+
 // Allows you continue vending offline.
 autotrade: 10
 at: 10
@@ -278,6 +284,9 @@ gpvpon: 40
 gvgoff: 40
 gpvpoff: 40
 
+// Activate/Deactivate kill steal protection on a map
+allowks: 40
+
 // Modifies your HP/SP.
 heal: 40
 
diff --git a/conf/battle/guild.conf b/conf/battle/guild.conf
index 9fa3fb424..4f714f8ed 100644
--- a/conf/battle/guild.conf
+++ b/conf/battle/guild.conf
@@ -62,3 +62,8 @@ gvg_eliminate_time: 7000
 // and does changing emblems require it? (Note 1)
 // P.S: This skill is not implemented on official servers
 require_glory_guild: no
+
+// Limit Guild alliances. Value is 0 to 3.
+// If you want to change this value, clear the guild alliance table.
+// Default is 3
+max_guild_alliance: 3
diff --git a/conf/battle/homunc.conf b/conf/battle/homunc.conf
index 2acff0a5e..c57c9f9b0 100644
--- a/conf/battle/homunc.conf
+++ b/conf/battle/homunc.conf
@@ -43,3 +43,6 @@ hvan_explosion_intimate: 45000
 
 // Show stat growth to the owner when an Homunculus levels up
 homunculus_show_growth: no
+
+// If a monster is killed only by homunculus, can autoloot works?
+homunculus_autoloot: yes
diff --git a/conf/battle/monster.conf b/conf/battle/monster.conf
index 58111ab2d..2208d8da3 100644
--- a/conf/battle/monster.conf
+++ b/conf/battle/monster.conf
@@ -199,3 +199,9 @@ mob_clear_delay: 0
 // Type 0: On the player that did the most damage to the mob.
 // NOTE: This affects who gains the Castle when the Emperium is broken. 
 mob_npc_event_type: 1
+
+// Time in milliseconds to actitave protection against Kill Steal
+// Set to 0 to disable it.
+// If this is activated and a player is using @noks, damage from others players (KS) not in the party
+// will be reduced to 0.
+ksprotection: 0
diff --git a/conf/battle/player.conf b/conf/battle/player.conf
index 58f0f9bb1..b8c1544a5 100644
--- a/conf/battle/player.conf
+++ b/conf/battle/player.conf
@@ -135,3 +135,7 @@ bone_drop: 0
 // 3 = both Normal Classes on Peco have Big Size
 //	and Baby Classes on Peco have Medium Size
 character_size: 0
+
+// Idle characters can receive autoloot?
+// Set to the time in seconds where an idle character will stop receiving items from Autoloot.
+idle_no_autoloot: 120