diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-21 16:39:14 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-21 16:39:14 +0000 |
| commit | 8f40fa6af0e9e18b0fd48fc3da35f3de0b9ce5bd (patch) | |
| tree | 807e224c5b1bbd45909bbeb15ebcf6a318b3d47a /src/map/battle.c | |
| parent | 41f1a34c8593a40b4c5dc4178d7138e7e166eea0 (diff) | |
| download | hercules-8f40fa6af0e9e18b0fd48fc3da35f3de0b9ce5bd.tar.gz hercules-8f40fa6af0e9e18b0fd48fc3da35f3de0b9ce5bd.tar.bz2 hercules-8f40fa6af0e9e18b0fd48fc3da35f3de0b9ce5bd.tar.xz hercules-8f40fa6af0e9e18b0fd48fc3da35f3de0b9ce5bd.zip | |
- Added BL_HOM handling to battle_gettarget.
- Some cleaning in skill.c in regard to homun skills.
- Madness Canceller now stacks with other aspd bonuses, just like Berserk does.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8403 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index f1d51bb15..c645399e7 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -100,6 +100,8 @@ int battle_gettarget(struct block_list *bl) return ((struct mob_data*)bl)->target_id; case BL_PET: return ((struct pet_data*)bl)->target_id; + case BL_HOM: + return ((struct homun_data*)bl)->target_id; } return 0; } @@ -3043,7 +3045,6 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target, } } if (rdamage > 0) { //By sending attack type "none" skill_additional_effect won't be invoked. [Skotlex] - if(tsd && src != target) battle_drain(tsd, src, rdamage, rdamage, sstatus->race, is_boss(src)); battle_delay_damage(tick+wd.amotion, target, src, 0, 0, 0, rdamage, ATK_DEF, rdelay); @@ -4090,7 +4091,7 @@ void battle_set_defaults() { battle_config.equip_skill_break_rate = 100; // [Valaris], adapted by [Skotlex] battle_config.pk_mode = 0; // [Valaris] battle_config.pk_level_range = 0; // [Skotlex] - battle_config.manner_system = 1; // [Valaris] + battle_config.manner_system = 0xFFF; // [Valaris] battle_config.pet_equip_required = 0; // [Valaris] battle_config.multi_level_up = 0; // [Valaris] battle_config.max_exp_gain_rate = 0; // [Skotlex] |