summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-18 14:26:26 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-18 14:26:26 +0000
commit424938aa953e6384f59eb593d6f5f377e007a443 (patch)
treef6d1c8d1c6697bfada6ebb91ec2a9439e4539ed6 /src/map/battle.c
parent67213795d8e2c020d0e7d743e98238b65b35630e (diff)
downloadhercules-424938aa953e6384f59eb593d6f5f377e007a443.tar.gz
hercules-424938aa953e6384f59eb593d6f5f377e007a443.tar.bz2
hercules-424938aa953e6384f59eb593d6f5f377e007a443.tar.xz
hercules-424938aa953e6384f59eb593d6f5f377e007a443.zip
- Added guild_aura (skill.conf) setting so you can specify when it works and if it works on the guild-master itself. Defaults to working all the time on everyone except GM.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8342 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 0441164b9..c481d0034 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3441,6 +3441,7 @@ static const struct battle_data_short {
{ "gtb_sc_immunity", &battle_config.gtb_sc_immunity},
{ "guild_max_castles", &battle_config.guild_max_castles },
{ "emergency_call", &battle_config.emergency_call },
+ { "guild_aura", &battle_config.guild_aura },
{ "death_penalty_type", &battle_config.death_penalty_type },
{ "death_penalty_base", &battle_config.death_penalty_base },
{ "death_penalty_job", &battle_config.death_penalty_job },
@@ -3864,7 +3865,8 @@ void battle_set_defaults() {
battle_config.gm_join_chat=0;
battle_config.gm_kick_chat=0;
battle_config.guild_max_castles=0;
- battle_config.emergency_call=2;
+ battle_config.emergency_call=15;
+ battle_config.guild_aura=31;
battle_config.skillfree = 0;
battle_config.skillup_limit = 0;
battle_config.wp_rate=100;