From 6196f0e6d34dba214a1598d7df7ab2f07b860a07 Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 16 Feb 2007 19:30:28 +0000 Subject: - Modified the "guardian" spawn script command, it no longer receives a "amount" argument (since that only leads to trouble), if the class is negative, it'll pick a random class the same way the monster spawn script command does, and if you pass a spawn position with coordinates equal or less to 0, a random spot in the map will be taken. However you can't use "this" as a map name anymore since these script commands do not need an attached player. - Guardian spawning will now fail if you attempt to spawn a guardian that already exists on the same position. - Collapsed clif_party_main_info and clif_party_join_info into a single function: clif_party_member_info - Collapsed config settings "sg_miracle_skill_min_duration" and "sg_miracle_skill_max_duration" into "sg_miracle_skill_duration", which defaults to an hour. - Miracle of the Sun, Moon and Stars can now retrigger to lenghten it's effect, and it is cancelled on warp/map-change. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9871 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'src/map/battle.c') diff --git a/src/map/battle.c b/src/map/battle.c index eb20c1c43..e1db71d4f 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3839,8 +3839,7 @@ static const struct battle_data_int { { "night_duration", &battle_config.night_duration }, // added by [Yor] { "max_heal", &battle_config.max_heal }, { "mob_remove_delay", &battle_config.mob_remove_delay }, - { "sg_miracle_skill_min_duration", &battle_config.sg_miracle_skill_duration_min }, - { "sg_miracle_skill_max_duration", &battle_config.sg_miracle_skill_duration_max }, + { "sg_miracle_skill_duration", &battle_config.sg_miracle_skill_duration }, { "hvan_explosion_intimate", &battle_config.hvan_explosion_intimate }, //[orn] }; @@ -4220,8 +4219,7 @@ void battle_set_defaults() { battle_config.mob_max_sc_def = 5000; battle_config.sg_miracle_skill_ratio=1; battle_config.sg_angel_skill_ratio=1; - battle_config.sg_miracle_skill_duration_min=3000000; - battle_config.sg_miracle_skill_duration_max=9000000; + battle_config.sg_miracle_skill_duration=3600000; battle_config.autospell_stacking = 0; battle_config.override_mob_names = 0; battle_config.min_chat_delay = 0; @@ -4398,18 +4396,7 @@ void battle_validate_conf() { if (battle_config.sg_miracle_skill_ratio > 10000) battle_config.sg_miracle_skill_ratio = 10000; - - if (battle_config.sg_miracle_skill_duration_min < 1000) - battle_config.sg_miracle_skill_duration_min = 1000; - - //Store duration variation in the max setting - battle_config.sg_miracle_skill_duration_max -= - battle_config.sg_miracle_skill_duration_min; - - if (battle_config.sg_miracle_skill_duration_max < 2000) - battle_config.sg_miracle_skill_duration_max = 2000; - if (battle_config.skill_steal_max_tries >= UCHAR_MAX) battle_config.skill_steal_max_tries = UCHAR_MAX; -- cgit v1.2.3-70-g09d2