diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-06-28 08:23:53 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-06-28 08:23:53 +0000 |
| commit | ac6e0a8cd56eaa51dc7e6cd68020d0ea7e9b5d96 (patch) | |
| tree | 85408fbe3187a3e4a3450b8db88d33374573c39c /src/map/battle.c | |
| parent | a6a08b1c5d2a955cbd586d5d3c7f777e69c215ff (diff) | |
| download | hercules-ac6e0a8cd56eaa51dc7e6cd68020d0ea7e9b5d96.tar.gz hercules-ac6e0a8cd56eaa51dc7e6cd68020d0ea7e9b5d96.tar.bz2 hercules-ac6e0a8cd56eaa51dc7e6cd68020d0ea7e9b5d96.tar.xz hercules-ac6e0a8cd56eaa51dc7e6cd68020d0ea7e9b5d96.zip | |
* Implemented script command "autobonus". [Inkfish]
- "autobonus" is similar to "bonusautoscript", however it has a timer of its own.
- Updated itemdb changing items bonus using "bonusautoscript + sc_start" mode to "autobonus + bonus" mode.
- Remove bonusautoscript and status changes that was needed by bonusautoscript and is no longer in use.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13915 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 17f052bb0..505d37373 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1786,12 +1786,6 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo } } - if( sc && sc->count && sc->data[SC_DEFRATIOATK] - && !is_boss(target) - && skill_num != PA_SACRIFICE && skill_num != CR_GRANDCROSS && skill_num != NPC_GRANDDARKNESS && skill_num != PA_SHIELDCHAIN - && !flag.cri ) - flag.pdef = flag.pdef2 = sc->data[SC_DEFRATIOATK]->val1; // Occult Impact Effect - if (!flag.idef || !flag.idef2) { //Defense reduction short vit_def; @@ -1806,19 +1800,10 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo { if( i > 100 ) i = 100; def1 -= def1 * i / 100; - // def2 -= def2 * i / 100; + def2 -= def2 * i / 100; } } - if( sc && sc->count && sc->data[SC_IGNOREDEF] - && !is_boss(target) - && skill_num != CR_GRANDCROSS && skill_num != NPC_GRANDDARKNESS ) - { - i = cap_value(sc->data[SC_IGNOREDEF]->val1,1,100); - def1 -= def1 * i / 100; - def2 -= def2 * i / 100; - } - if( battle_config.vit_penalty_type && battle_config.vit_penalty_target&target->type ) { unsigned char target_count; //256 max targets should be a sane max |