pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 04:56:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into Warning_Cleanup

Browse Source
This commit is contained in:
Arthur Dene Ice
2014-05-23 14:27:12 -07:00
parent a5020ad844 5af47c5951
commit cb60c9404c
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/attack.cpp
+1 -1
View File
@@ -318,7 +318,7 @@ bool Mob::CheckHitChance(Mob* other, SkillUseTypes skillinuse, int Hand, int16 c
chancetohit = mod_hit_chance(chancetohit, skillinuse, attacker); chancetohit = mod_hit_chance(chancetohit, skillinuse, attacker);
// Chance to hit; Max 95%, Min 30% // Chance to hit; Max 95%, Min 30%
if(chancetohit > 1000) { if(chancetohit > 1000 || chancetohit < -1000) {
//if chance to hit is crazy high, that means a discipline is in use, and let it stay there //if chance to hit is crazy high, that means a discipline is in use, and let it stay there
} }
else if(chancetohit > 95) { else if(chancetohit > 95) {
zone/special_attacks.cpp
+5 -10
View File
@@ -351,19 +351,14 @@ void Client::OPCombatAbility(const EQApplicationPacket *app) {
//Live AA - Technique of Master Wu //Live AA - Technique of Master Wu
uint16 bDoubleSpecialAttack = itembonuses.DoubleSpecialAttack + spellbonuses.DoubleSpecialAttack + aabonuses.DoubleSpecialAttack; uint16 bDoubleSpecialAttack = itembonuses.DoubleSpecialAttack + spellbonuses.DoubleSpecialAttack + aabonuses.DoubleSpecialAttack;
if( bDoubleSpecialAttack && (bDoubleSpecialAttack >= 100 || bDoubleSpecialAttack > MakeRandomInt(0,100)) ) { if (bDoubleSpecialAttack && (bDoubleSpecialAttack >= 100 || bDoubleSpecialAttack > MakeRandomInt(0, 99))) {
int MonkSPA [5] = { SkillFlyingKick, SkillDragonPunch, SkillEagleStrike, SkillTigerClaw, SkillRoundKick }; int MonkSPA [5] = { SkillFlyingKick, SkillDragonPunch, SkillEagleStrike, SkillTigerClaw, SkillRoundKick };
MonkSpecialAttack(GetTarget(), MonkSPA[MakeRandomInt(0,4)]); MonkSpecialAttack(GetTarget(), MonkSPA[MakeRandomInt(0, 4)]);
int TripleChance = 25; // always 1/4 of the double attack chance, 25% at rank 5 (100/4)
if ((bDoubleSpecialAttack / 4) > MakeRandomInt(0, 99))
if (bDoubleSpecialAttack > 100) MonkSpecialAttack(GetTarget(), MonkSPA[MakeRandomInt(0, 4)]);
TripleChance += TripleChance*(100-bDoubleSpecialAttack)/100;
if(TripleChance > MakeRandomInt(0,100)) {
MonkSpecialAttack(GetTarget(), MonkSPA[MakeRandomInt(0,4)]);
}
} }
if(ReuseTime < 100) { if(ReuseTime < 100) {