diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-28 20:34:22 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-28 20:34:22 +0000 |
| commit | 9deed641d8c485b858360e8f91b2fcb83368ec14 (patch) | |
| tree | b61e629da44b8a6a767af5c8dfd06fec24528bb4 /src/map/battle.c | |
| parent | 4a2c014e4eb9229ff61c3ff762c44d3bd21b7f7c (diff) | |
| download | hercules-9deed641d8c485b858360e8f91b2fcb83368ec14.tar.gz hercules-9deed641d8c485b858360e8f91b2fcb83368ec14.tar.bz2 hercules-9deed641d8c485b858360e8f91b2fcb83368ec14.tar.xz hercules-9deed641d8c485b858360e8f91b2fcb83368ec14.zip | |
Resubmitting changes from /trunk to /branches/stable =p
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@405 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 24547762d..00ca5a9e0 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2057,8 +2057,9 @@ static struct Damage battle_calc_pet_weapon_attack( damage2 = damage2*(100+ 40*skill_lv)/100; break; case MO_FINGEROFFENSIVE: //Žw’e - damage = damage * (100 + 50 * skill_lv) / 100; + damage = damage * (125 + 25 * skill_lv) / 100; div_ = 1; + flag=(flag&~BF_RANGEMASK)|BF_LONG; //orn break; case MO_INVESTIGATE: // ” ™¤ if(def1 < 1000000) @@ -2549,8 +2550,9 @@ static struct Damage battle_calc_mob_weapon_attack( damage2 = damage2*(100+ 40*skill_lv)/100; break; case MO_FINGEROFFENSIVE: //Žw’e - damage = damage * (100 + 50 * skill_lv) / 100; + damage = damage * (125 + 25 * skill_lv) / 100; div_ = 1; + flag=(flag&~BF_RANGEMASK)|BF_LONG; //orn break; case MO_INVESTIGATE: // ” ™¤ if(def1 < 1000000) @@ -3329,15 +3331,16 @@ static struct Damage battle_calc_pc_weapon_attack( break; case MO_FINGEROFFENSIVE: //Žw’e if(battle_config.finger_offensive_type == 0) { - damage = damage * (100 + 50 * skill_lv) / 100 * sd->spiritball_old; - damage2 = damage2 * (100 + 50 * skill_lv) / 100 * sd->spiritball_old; + damage = damage * (125 + 25 * skill_lv) / 100 * sd->spiritball_old; + damage2 = damage2 * (125 + 25 * skill_lv) / 100 * sd->spiritball_old; div_ = sd->spiritball_old; } else { - damage = damage * (100 + 50 * skill_lv) / 100; - damage2 = damage2 * (100 + 50 * skill_lv) / 100; + damage = damage * (125 + 25 * skill_lv) / 100; + damage2 = damage2 * (125 + 25 * skill_lv) / 100; div_ = 1; } + flag=(flag&~BF_RANGEMASK)|BF_LONG; //orn break; case MO_INVESTIGATE: // ” ™¤ if(def1 < 1000000) { @@ -5418,7 +5421,7 @@ void battle_set_defaults() { battle_config.ban_spoof_namer = 5; // added by [Yor] (default: 5 minutes) battle_config.hack_info_GM_level = 60; // added by [Yor] (default: 60, GM level) battle_config.any_warp_GM_min_level = 20; // added by [Yor] - battle_config.packet_ver_flag = 63; // added by [Yor] + battle_config.packet_ver_flag = 511; // added by [Yor] battle_config.min_hair_style = 0; battle_config.max_hair_style = 20; battle_config.min_hair_color = 0; @@ -5548,8 +5551,8 @@ void battle_validate_conf() { battle_config.any_warp_GM_min_level = 100; // at least 1 client must be accepted - if ((battle_config.packet_ver_flag & 63) == 0) // added by [Yor] - battle_config.packet_ver_flag = 63; // accept all clients + if ((battle_config.packet_ver_flag & 511) == 0) // added by [Yor] + battle_config.packet_ver_flag = 511; // accept all clients if (battle_config.night_darkness_level > 10) // Celest battle_config.night_darkness_level = 10; |