Go Back   EQEmulator Home > EQEmulator Forums > Development > Development::Server Code Submissions

Reply
 
Thread Tools Display Modes
  #1  
Old 09-13-2008, 05:46 AM
AndMetal
Developer
 
Join Date: Mar 2007
Location: Ohio
Posts: 648
Default Technique of Master Wu AA

It looks like support for this was added in 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:
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:
Code:
	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).
__________________
GM-Impossible of 'A work in progress'
A non-legit PEQ DB server
How to create your own non-legit server

My Contributions to the Wiki
Reply With Quote
  #2  
Old 09-26-2008, 08:52 PM
So_1337
Dragon
 
Join Date: May 2006
Location: Cincinnati, OH
Posts: 689
Default

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 =)
Reply With Quote
  #3  
Old 10-02-2008, 04:18 PM
So_1337
Dragon
 
Join Date: May 2006
Location: Cincinnati, OH
Posts: 689
Default

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.
Reply With Quote
  #4  
Old 10-02-2008, 04:34 PM
Derision
Developer
 
Join Date: Feb 2004
Location: UK
Posts: 1,540
Default

Quote:
Originally Posted by So_1337 View Post
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.
Reply With Quote
  #5  
Old 10-02-2008, 04:56 PM
So_1337
Dragon
 
Join Date: May 2006
Location: Cincinnati, OH
Posts: 689
Default

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
Reply With Quote
  #6  
Old 10-02-2008, 05:58 PM
cavedude's Avatar
cavedude
The PEQ Dude
 
Join Date: Apr 2003
Location: -
Posts: 1,988
Default

The stickies are handled by KLS to aid in getting the code into the official CVS.
Reply With Quote
  #7  
Old 10-02-2008, 06:33 PM
KLS
Administrator
 
Join Date: Sep 2006
Posts: 1,348
Default

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?

Last edited by KLS; 10-03-2008 at 02:53 AM..
Reply With Quote
  #8  
Old 10-02-2008, 07:27 PM
Congdar
Developer
 
Join Date: Jul 2007
Location: my own little world
Posts: 751
Default

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'
Reply With Quote
  #9  
Old 10-02-2008, 07:35 PM
Congdar
Developer
 
Join Date: Jul 2007
Location: my own little world
Posts: 751
Default

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'.
Reply With Quote
  #10  
Old 10-02-2008, 07:49 PM
KLS
Administrator
 
Join Date: Sep 2006
Posts: 1,348
Default

Should be a fairly simple implementation.
Reply With Quote
  #11  
Old 10-02-2008, 08:00 PM
Congdar
Developer
 
Join Date: Jul 2007
Location: my own little world
Posts: 751
Default

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:
Code:
			if(ReturnKickChance >= MakeRandomInt(0, 100)) {
				mlog(COMBAT__ATTACKS, "Preforming a return kick (%d percent chance)", ReturnKickChance);
				defender->MonkSpecialAttack(this, FLYING_KICK);
			}
new:
Code:
			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:
Code:
	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:
Code:
	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;
	}
Reply With Quote
  #12  
Old 10-02-2008, 08:08 PM
Congdar
Developer
 
Join Date: Jul 2007
Location: my own little world
Posts: 751
Default

and the existing code needs to be deleted from special_attacks.cpp:
Code:
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:
Code:
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);	
}
Reply With Quote
  #13  
Old 10-02-2008, 08:12 PM
Congdar
Developer
 
Join Date: Jul 2007
Location: my own little world
Posts: 751
Default

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:
Code:
			int specl = GetAA(aaTechniqueofMasterWu) * 20;
			if(specl == 100 || specl >= MakeRandomInt(0,100))
new:
Code:
			int specl = GetAA(aaTechniqueofMasterWu) * 20;
			if(specl == 100 || specl > MakeRandomInt(0,100))
Reply With Quote
  #14  
Old 10-02-2008, 09:11 PM
Congdar
Developer
 
Join Date: Jul 2007
Location: my own little world
Posts: 751
Default

I missed this cut/paste error in the new Return Kick AA code:
Code:
int specl = GetAA(aaTechniqueofMasterWu) * 20;
should be:
Code:
int specl = defender->GetAA(aaTechniqueofMasterWu) * 20;
Reply With Quote
  #15  
Old 10-02-2008, 10:32 PM
So_1337
Dragon
 
Join Date: May 2006
Location: Cincinnati, OH
Posts: 689
Default

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
Reply With Quote
Reply


Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off

Forum Jump

   

All times are GMT -4. The time now is 05:35 PM.


 

Everquest is a registered trademark of Daybreak Game Company LLC.
EQEmulator is not associated or affiliated in any way with Daybreak Game Company LLC.
Except where otherwise noted, this site is licensed under a Creative Commons License.
       
Powered by vBulletin®, Copyright ©2000 - 2024, Jelsoft Enterprises Ltd.
Template by Bluepearl Design and vBulletin Templates - Ver3.3