Technique of Master Wu AA

[AndMetal]

It looks like support for this was added in (http://eqemulator.cvs.sourceforge.net/eqemulator/EQEmuCVS/Source/zone/special_attacks.cpp?view=diff&r1=1.28&r2=1.29) a few weeks ago, however, it looks like there's a slight issue: if the check is successful, it adds another regular attack instead of the special attack used. Here's the current code:

80 if(max_damage > 0 && GetClass() == MONK && skill != THROWING)
81 {
82 int specl = GetAA(aaTechniqueofMasterWu) * 20;
83 if(specl == 100 || specl >= MakeRandomInt(0,100))
84 {
85 Attack(who);
86 if(20 > MakeRandomInt(0,100))
87 Attack(who);
88 }
89 }


If it's changed to this:

if(max_damage > 0 && GetClass() == MONK && skill != THROWING)
{
int specl = GetAA(aaTechniqueofMasterWu) * 20;
if(specl == 100 || specl >= MakeRandomInt(0,100))
{
who->Damage(this, max_damage, SPELL_UNKNOWN, skill, false);
if(20 > MakeRandomInt(0,100))
who->Damage(this, max_damage, SPELL_UNKNOWN, skill, false);
}
}

that should trigger the additional 1-2 special attacks (flying kick, etc).

[So_1337]

Had a pair of monks both mention this lately; I remember it being implemented awhile back, but never heard past that. Didn't even realize it was broken until they'd said so. Great work, hope this makes it in soon =)

[So_1337]

I see this stickied still, but I'm getting reports from our monks saying it's working perfectly for them. Did this go in with one of the recent revisions? Running revision 27.

[Derision]

I see this stickied still, but I'm getting reports from our monks saying it's working perfectly for them. Did this go in with one of the recent revisions? Running revision 27.

Looking at the ChangeLog, Cavedude incorporated this into Revision 2 on 25th September.

[So_1337]

Sorry. I'm blind, I guess. Thanks for the spare set of eyes, Derision.

In any case, it's working and getting great feedback, so great work AndMetal =)

/unsticky =P

[cavedude]

The stickies are handled by KLS to aid in getting the code into the official CVS.

[KLS]

It wasn't meant to go in because it doesn't handle both versions of AC correctly. Apparently we don't even consider such things anymore though.

Edit: Wow that sounded a lot more emo than I meant it too. Anyway I'd like to fix it for the old system. Are the hits supposed to be affected by melee avoidance or are they a guaranteed thing?

[Congdar]

This aa may need to be moved outside this method so that the second and possibly third stike 'with the special attack' can be properly calculated. this just adds 2 new attacks with the main hand. not special attack 'strikes'

[Congdar]

Technique of Master Wu
This is a passive ability; it does not need to be activated.
You may train 1 rank at each of the following levels: 61, 62, 63, 64, 65
Requirements: No previous ability requirements.

Under the tutelage of Wu, Monks are able to hone their skills to the point of being able to execute a second and sometimes even third strike when scoring a hit with their special attacks. This ability grants a 20 percent increase in the chance of scoring multiple special attacks, per rank.


Changing Attack to Damage just adds the same damage done by this special attack twice, maybe three times. Extra 'strikes' should be new 'strikes'.

[KLS]

Should be a fairly simple implementation.

[Congdar]

The MonkSpecialAttack() method is called three times in the source tree. Once for the Monk Return Kick AA and once for when a monk presses the button for a special attack and it's also called once for NPC Monks but I don't think NPC's get AA's.

existing Return Kick AA in attack.cpp at the bottom of the Mob::DoRiposte() method:

if(ReturnKickChance >= MakeRandomInt(0, 100)) {
mlog(COMBAT__ATTACKS, "Preforming a return kick (%d percent chance)", ReturnKickChance);
defender->MonkSpecialAttack(this, FLYING_KICK);
}

new:

if(ReturnKickChance >= MakeRandomInt(0, 100)) {
mlog(COMBAT__ATTACKS, "Preforming a return kick (%d percent chance)", ReturnKickChance);
defender->MonkSpecialAttack(this, FLYING_KICK);

int specl = GetAA(aaTechniqueofMasterWu) * 20;
if(specl == 100 || specl >= MakeRandomInt(0,100)) {
defender->MonkSpecialAttack(this, FLYING_KICK);
if(20 > MakeRandomInt(0,100)) {
defender->MonkSpecialAttack(this, FLYING_KICK);
}
}
}

existing special_attacks.cpp in Client::OPCombatAbility() method:

case MONK: {
ReuseTime = MonkSpecialAttack(target, ca_atk->m_skill) - 1;
if(ReuseTime < 100) {
//hackish... but we return a huge reuse time if this is an
// invalid skill, otherwise, we can safely assume it is a
// valid monk skill and just cast it to a SkillType
CheckIncreaseSkill((SkillType) ca_atk->m_skill);
}
break;
}

new:

case MONK: {
ReuseTime = MonkSpecialAttack(target, ca_atk->m_skill) - 1;

int specl = GetAA(aaTechniqueofMasterWu) * 20;
if(specl == 100 || specl >= MakeRandomInt(0,100)) {
ReuseTime = MonkSpecialAttack(target, ca_atk->m_skill) - 1;
if(20 > MakeRandomInt(0,100)) {
ReuseTime = MonkSpecialAttack(target, ca_atk->m_skill) - 1;
}
}
if(ReuseTime < 100) {
//hackish... but we return a huge reuse time if this is an
// invalid skill, otherwise, we can safely assume it is a
// valid monk skill and just cast it to a SkillType
CheckIncreaseSkill((SkillType) ca_atk->m_skill);
}
break;
}

[Congdar]

and the existing code needs to be deleted from special_attacks.cpp:

void Mob::DoSpecialAttackDamage(Mob *who, SkillType skill, sint32 max_damage, sint32 min_damage) {
//this really should go through the same code as normal melee damage to
//pick up all the special behavior there

sint32 hate = max_damage;
if(max_damage > 0) {
who->AvoidDamage(this, max_damage);
who->MeleeMitigation(this, max_damage, min_damage);
ApplyMeleeDamageBonus(skill, max_damage);
TryCriticalHit(who, skill, max_damage);
if(max_damage != 0)
{
who->AddToHateList(this, hate);
}
else
who->AddToHateList(this, 0);

if(max_damage > 0 && GetClass() == MONK && skill != THROWING)
{
int specl = GetAA(aaTechniqueofMasterWu) * 20;
if(specl == 100 || specl >= MakeRandomInt(0,100))
{
Attack(who);
if(20 > MakeRandomInt(0,100))
Attack(who);
}
}
}
who->Damage(this, max_damage, SPELL_UNKNOWN, skill, false);

if(max_damage == -3)
DoRiposte(who);
}

new:

void Mob::DoSpecialAttackDamage(Mob *who, SkillType skill, sint32 max_damage, sint32 min_damage) {
//this really should go through the same code as normal melee damage to
//pick up all the special behavior there

sint32 hate = max_damage;
if(max_damage > 0) {
who->AvoidDamage(this, max_damage);
who->MeleeMitigation(this, max_damage, min_damage);
ApplyMeleeDamageBonus(skill, max_damage);
TryCriticalHit(who, skill, max_damage);
if(max_damage != 0)
{
who->AddToHateList(this, hate);
}
else
who->AddToHateList(this, 0);
}
who->Damage(this, max_damage, SPELL_UNKNOWN, skill, false);

if(max_damage == -3)
DoRiposte(who);
}

[Congdar]

Something I noticed in the existing aa code looks like if the monk had no ranks in this aa they would still get a chance to do the extra attacks if the random returned a 0 so change >= to just >

old code in two places now:

int specl = GetAA(aaTechniqueofMasterWu) * 20;
if(specl == 100 || specl >= MakeRandomInt(0,100))

new:

int specl = GetAA(aaTechniqueofMasterWu) * 20;
if(specl == 100 || specl > MakeRandomInt(0,100))

[Congdar]

I missed this cut/paste error in the new Return Kick AA code:

int specl = GetAA(aaTechniqueofMasterWu) * 20;

should be:

int specl = defender->GetAA(aaTechniqueofMasterWu) * 20;

[So_1337]

Sorry, didn't mean to interfere with how things were being done around here. Just wanted to give a big thanks to AndMetal since I thought it was completed. Getting out of the way now =X

[AndMetal]

Sorry, didn't mean to interfere with how things were being done around here. Just wanted to give a big thanks to AndMetal since I thought it was completed. Getting out of the way now =X

It's all good :-) I play a monk on Storm Haven, so I've noticed quite a bit that each time you double/triple a special attack, it's always the same amount of damage. I meant to look into it, but it sounds like Congdar's got a handle on things :D

[Congdar]

This is in the svn now, so i guess can be unstickied? It didn't get in the return kick, cuz I guess you can't stack aa's?