From fc400a183871aa1dd2bd4ff566400f284793f88c Mon Sep 17 00:00:00 2001
From: gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 2 Feb 2012 21:16:23 +0000
Subject: [PATCH] Removed `gvg_eliminate_time` battle config, as it was only
 used by scripts. Replaced its occurences in War of Emperium script with
 default value (7000ms) (bugreport:137).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15538 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 conf/battle/guild.conf      | 4 ----
 npc/guild/agit_template.txt | 4 ++--
 src/map/battle.c            | 1 -
 src/map/battle.h            | 1 -
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/conf/battle/guild.conf b/conf/battle/guild.conf
index cbd3fc07be..234c739944 100644
--- a/conf/battle/guild.conf
+++ b/conf/battle/guild.conf
@@ -42,10 +42,6 @@ gvg_misc_attack_damage_rate: 60
 // NOTE: It's %, not absolute, so 20 is -20% of your total flee
 gvg_flee_penalty: 20
 
-// When the emperium is broken during WoE, how long before the announcement
-// displaying the new castle-occupants? (in miliseconds)
-gvg_eliminate_time: 7000
-
 // Can the 'Glory of Guild' skill be learnt in the Guild window,
 // and does changing emblems require it? (Note 1)
 // P.S: This skill is not implemented on official servers
diff --git a/npc/guild/agit_template.txt b/npc/guild/agit_template.txt
index 34d5e7daeb..52d1d94c33 100644
--- a/npc/guild/agit_template.txt
+++ b/npc/guild/agit_template.txt
@@ -143,7 +143,7 @@ OnAgitBreak:
 	sleep 500; // Slow down script execution slightly.
 	if( agitcheck() )
 		donpcevent "Agit#"+strnpcinfo(2)+"::OnStartArena";
-	sleep getbattleflag("gvg_eliminate_time");
+	sleep 7000;
 	announce "The [" + getcastlename(strnpcinfo(2)) + "] castle has been conquered by the [" + getguildName(.@GID) + "] guild.",bc_all|bc_woe;
 	end;
 
@@ -165,7 +165,7 @@ OnGuildBreak:
 	disablenpc "Kafra Staff#"+strnpcinfo(2);
 	SetCastleData strnpcinfo(2),0,0;
 	// Wait before refreshing guild information.
-	sleep getbattleflag("gvg_eliminate_time");
+	sleep 7000;
 	Announce "Guild Base [" + GetCastleName(strnpcinfo(2)) + "] has been abandoned.",0;
 	GetCastleData strnpcinfo(2),0,strnpcinfo(0)+"::OnRecvCastle";
 	end;
diff --git a/src/map/battle.c b/src/map/battle.c
index a384b2f2a0..fe637a5ce0 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -4528,7 +4528,6 @@ static const struct _battle_data {
 	{ "player_cloak_check_type",            &battle_config.pc_cloak_check_type,             1,      0,      1|2|4,          },
 	{ "monster_cloak_check_type",           &battle_config.monster_cloak_check_type,        4,      0,      1|2|4,          },
 	{ "sense_type",                         &battle_config.estimation_type,                 1|2,    0,      1|2,            },
-	{ "gvg_eliminate_time",                 &battle_config.gvg_eliminate_time,              7000,   0,      INT_MAX,        },
 	{ "gvg_short_attack_damage_rate",       &battle_config.gvg_short_damage_rate,           80,     0,      INT_MAX,        },
 	{ "gvg_long_attack_damage_rate",        &battle_config.gvg_long_damage_rate,            80,     0,      INT_MAX,        },
 	{ "gvg_weapon_attack_damage_rate",      &battle_config.gvg_weapon_damage_rate,          60,     0,      INT_MAX,        },
diff --git a/src/map/battle.h b/src/map/battle.h
index 4b87b5c9b2..43c1d69ecf 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -267,7 +267,6 @@ extern struct Battle_Config
 	int gvg_magic_damage_rate;
 	int gvg_misc_damage_rate;
 	int gvg_flee_penalty;
-	int gvg_eliminate_time;
 	int pk_short_damage_rate;
 	int pk_long_damage_rate;
 	int pk_weapon_damage_rate;