diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/battle.c | 2 | ||||
| -rw-r--r-- | src/map/battle.h | 1 | ||||
| -rw-r--r-- | src/map/skill.c | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 191608a3a..e83b1846b 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3552,6 +3552,7 @@ static const struct battle_data_short { { "exp_calc_type", &battle_config.exp_calc_type}, // [celest] { "min_skill_delay_limit", &battle_config.min_skill_delay_limit}, // [celest] { "default_skill_delay", &battle_config.default_skill_delay}, // [Skotlex] + { "no_skill_delay", &battle_config.no_skill_delay}, // [Skotlex] { "require_glory_guild", &battle_config.require_glory_guild}, // [celest] { "idle_no_share", &battle_config.idle_no_share}, // [celest], for a feature by [MouseJstr] { "party_even_share_bonus", &battle_config.party_even_share_bonus}, @@ -3975,6 +3976,7 @@ void battle_set_defaults() { battle_config.exp_calc_type = 1; battle_config.min_skill_delay_limit = 100; battle_config.default_skill_delay = 300; //Default skill delay according to official servers. + battle_config.no_skill_delay = BL_MOB; battle_config.require_glory_guild = 0; battle_config.idle_no_share = 0; battle_config.party_even_share_bonus = 0; diff --git a/src/map/battle.h b/src/map/battle.h index 57d574917..a4533395a 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -366,6 +366,7 @@ extern struct Battle_Config { unsigned short exp_calc_type;
unsigned short min_skill_delay_limit;
unsigned short default_skill_delay;
+ unsigned short no_skill_delay;
unsigned short require_glory_guild;
unsigned short idle_no_share;
unsigned short party_even_share_bonus;
diff --git a/src/map/skill.c b/src/map/skill.c index 8f16288c4..cfc4ccd4b 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -8300,8 +8300,8 @@ int skill_delayfix (struct block_list *bl, int skill_id, int skill_lv) nullpo_retr(0, bl); - if (bl->type == BL_MOB) - return 0; //Mobs have no delay other than the skill-specific delay in their skill db. [Skotlex] + if (bl->type&battle_config.no_skill_delay) + return battle_config.min_skill_delay_limit; // instant cast attack skills depend on aspd as delay [celest] if (time == 0) { |