diff options
| -rw-r--r-- | db/const.txt | 1 | ||||
| -rw-r--r-- | doc/item_bonus.txt | 1 | ||||
| -rw-r--r-- | src/map/battle.c | 5 | ||||
| -rw-r--r-- | src/map/map.h | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 6 | ||||
| -rw-r--r-- | src/map/pc.h | 1 | ||||
| -rw-r--r-- | src/map/status.c | 2 |
7 files changed, 2 insertions, 16 deletions
diff --git a/db/const.txt b/db/const.txt index 82bd0ce87..60f183c04 100644 --- a/db/const.txt +++ b/db/const.txt @@ -490,7 +490,6 @@ bBreakWeaponRate 1068 bBreakArmorRate 1069 bAddStealRate 1070 bMagicDamageReturn 1071 -bRandomAttackIncrease 1072 bAllStats 1073 bAgiVit 1074 bAgiDexStr 1075 diff --git a/doc/item_bonus.txt b/doc/item_bonus.txt index 945738869..c6789775e 100644 --- a/doc/item_bonus.txt +++ b/doc/item_bonus.txt @@ -397,7 +397,6 @@ bonus2 bAddEff2,x,n; Adds a n/100% chance to cause status change x on self whe x: Eff_Blind, Eff_Sleep, Eff_Poison, Eff_Freeze, Eff_Silence, Eff_Stun, Eff_Curse, Eff_Confusion, Eff_Stone, Eff_Bleeding bonus bMagicDamageReturn,n; Adds a n% chance to reflect targetted magic spells back to the enemy that caused it. -bonus2 bRandomAttackIncrease,x,n; Adds a n% chance to inflict x% additional damage to the enemy with normal attack. bonus bPerfectHide,n; Hidden/cloaked character is no longer detected by monsters with 'detector' mode (n is meaningless). bonus bNoKnockback,n; Character is no longer knocked back by enemy skills with such effect (n is meaningless). bonus bClassChange,n; Gives a n/100% chance to change the attacked monster's class with normal attack. diff --git a/src/map/battle.c b/src/map/battle.c index 3fe4a23b0..9b79927da 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1515,10 +1515,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo skillratio += 100; } if( !skill_num ) - { // Random chance to deal multiplied damage - Consider it as part of skill-based-damage - if( sd && sd->random_attack_increase_add > 0 && sd->random_attack_increase_per && rand()%100 < sd->random_attack_increase_per ) - skillratio += sd->random_attack_increase_add; - + { ATK_RATE(skillratio); } else diff --git a/src/map/map.h b/src/map/map.h index bb75d57bb..afd7aa883 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -351,7 +351,7 @@ enum _sp { SP_SPLASH_RANGE,SP_SPLASH_ADD_RANGE,SP_AUTOSPELL,SP_HP_DRAIN_RATE,SP_SP_DRAIN_RATE, // 1058-1062 SP_SHORT_WEAPON_DAMAGE_RETURN,SP_LONG_WEAPON_DAMAGE_RETURN,SP_WEAPON_COMA_ELE,SP_WEAPON_COMA_RACE, // 1063-1066 SP_ADDEFF2,SP_BREAK_WEAPON_RATE,SP_BREAK_ARMOR_RATE,SP_ADD_STEAL_RATE, // 1067-1070 - SP_MAGIC_DAMAGE_RETURN,SP_RANDOM_ATTACK_INCREASE,SP_ALL_STATS,SP_AGI_VIT,SP_AGI_DEX_STR,SP_PERFECT_HIDE, // 1071-1076 + SP_MAGIC_DAMAGE_RETURN,SP_ALL_STATS=1073,SP_AGI_VIT,SP_AGI_DEX_STR,SP_PERFECT_HIDE, // 1071-1076 SP_NO_KNOCKBACK,SP_CLASSCHANGE, // 1077-1078 SP_HP_DRAIN_VALUE,SP_SP_DRAIN_VALUE, // 1079-1080 SP_WEAPON_ATK,SP_WEAPON_ATK_RATE, // 1081-1082 diff --git a/src/map/pc.c b/src/map/pc.c index d16c25b69..9d0868c19 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -2625,12 +2625,6 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) sd->weapon_coma_race[type2] += val; sd->special_state.bonus_coma = 1; break; - case SP_RANDOM_ATTACK_INCREASE: // [Valaris] - if(sd->state.lr_flag !=2){ - sd->random_attack_increase_add = type2; - sd->random_attack_increase_per += val; - } - break; case SP_WEAPON_ATK: if(sd->state.lr_flag != 2) sd->weapon_atk[type2]+=val; diff --git a/src/map/pc.h b/src/map/pc.h index 7f036d790..8a82a278a 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -293,7 +293,6 @@ struct map_session_data { int double_add_rate; int short_weapon_damage_return,long_weapon_damage_return; int magic_damage_return; // AppleGirl Was Here - int random_attack_increase_add,random_attack_increase_per; // [Valaris] int break_weapon_rate,break_armor_rate; int crit_atk_rate; int classchange; // [Valaris] diff --git a/src/map/status.c b/src/map/status.c index 8ebe4c022..41642e78f 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2145,8 +2145,6 @@ int status_calc_pc_(struct map_session_data* sd, bool first) + sizeof(sd->short_weapon_damage_return) + sizeof(sd->long_weapon_damage_return) + sizeof(sd->magic_damage_return) - + sizeof(sd->random_attack_increase_add) - + sizeof(sd->random_attack_increase_per) + sizeof(sd->break_weapon_rate) + sizeof(sd->break_armor_rate) + sizeof(sd->crit_atk_rate) |