diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-04 19:30:15 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-04 19:30:15 +0000 |
| commit | bb78f61a194f92934784d108cb8e54e391c570aa (patch) | |
| tree | 2e49643974eca093697308c944ff3ba0622922ea /src/map/battle.c | |
| parent | 06387a85ce94281d1652ab4bc61c5b9c0971832a (diff) | |
| download | hercules-bb78f61a194f92934784d108cb8e54e391c570aa.tar.gz hercules-bb78f61a194f92934784d108cb8e54e391c570aa.tar.bz2 hercules-bb78f61a194f92934784d108cb8e54e391c570aa.tar.xz hercules-bb78f61a194f92934784d108cb8e54e391c570aa.zip | |
- Removed settings enemy_critical_rate, homun_critical_rate. Added settings enable_critical (defaults to specify only players), mob_critical_rate and critical_rate. The last applies to all non-mobs and non-players (battle/battle.conf)
- Removed settings mob_npc_warp, mob_warpportal. Replaced with setting mob_warp which specifies which types of warp can a mob step into (battle/monster.conf)
- Updated status_calc_misc so that it also handles the BL_PC case, removed redundant info from status_calc_pc, and moving the SNovice Max Hp bonus to status_base_pc_maxhp
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8135 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index c84fecffd..ec99f6116 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3449,8 +3449,9 @@ static const struct battle_data_short { unsigned short *val; } battle_data_short[] = { //List here battle_athena options which are type unsigned short! { "warp_point_debug", &battle_config.warp_point_debug }, - { "enemy_critical_rate", &battle_config.enemy_critical_rate }, - { "homun_critical_rate", &battle_config.homun_critical_rate }, + { "enable_critical", &battle_config.enable_critical }, + { "mob_critical_rate", &battle_config.mob_critical_rate }, + { "critical_rate", &battle_config.critical_rate }, { "enable_baseatk", &battle_config.enable_baseatk }, { "enable_perfect_flee", &battle_config.enable_perfect_flee }, { "casting_rate", &battle_config.cast_rate }, @@ -3618,8 +3619,7 @@ static const struct battle_data_short { { "display_delay_skill_fail", &battle_config.display_delay_skill_fail }, { "display_snatcher_skill_fail", &battle_config.display_snatcher_skill_fail }, { "chat_warpportal", &battle_config.chat_warpportal }, - { "mob_warpportal", &battle_config.mob_warpportal }, - { "mob_npc_warp", &battle_config.mob_npc_warp }, + { "mob_warp", &battle_config.mob_warp }, { "dead_branch_active", &battle_config.dead_branch_active }, { "show_steal_in_same_party", &battle_config.show_steal_in_same_party }, { "party_hp_mode", &battle_config.party_hp_mode }, @@ -3845,8 +3845,9 @@ int battle_get_value(char *w1) { void battle_set_defaults() { battle_config.warp_point_debug=0; - battle_config.enemy_critical_rate=0; - battle_config.homun_critical_rate=0; + battle_config.enable_critical=BL_PC; + battle_config.mob_critical_rate=100; + battle_config.critical_rate=100; battle_config.enable_baseatk = BL_ALL; battle_config.enable_perfect_flee = BL_PC|BL_PET; battle_config.cast_rate=100; @@ -4033,8 +4034,7 @@ void battle_set_defaults() { battle_config.display_delay_skill_fail = 1; battle_config.display_snatcher_skill_fail = 1; battle_config.chat_warpportal = 0; - battle_config.mob_warpportal = 0; - battle_config.mob_npc_warp = 0; + battle_config.mob_warp = 0; battle_config.dead_branch_active = 0; battle_config.vending_max_value = 10000000; battle_config.show_steal_in_same_party = 0; |