Bards and thier code changes

[Zuesrooster]

Your right! Thanks I replaced the 0x0A and the 0x10 with

action->unknown06 = GetInstrumentMod(spell_id);


and that did the trick! The numbers now match the server numbers as far as instrumnets mods go. Though they do seam a little of. I think how much you get per AA or the instrument mods is to high. if you have 3 skill in Singing mastery your singing songs get 6 TIMES as strong. I don't remember that on my eqlive bard. But at least instrument modifiers seam to be working. Thanks again.

[Zuesrooster]

I am doing this at work so I haven't really had a chance to test it out but I am 90% sure that replacing GetInstrumentMod with:

	if(GetClass() != BARD)
		return(10);
	
	int16 effectmod = 100;
	
	//this should never use spell modifiers...
	//if a spell grants better modifers, they are copied into the item mods
	//because the spells are supposed to act just like having the intrument.
	
	//item mods are in 10ths of percent increases
	switch(spells[spell_id].skill) {
		case PERCUSSION_INSTRUMENTS:
			if(itembonuses.percussionMod > spellbonuses.percussionMod)
				effectmod += itembonuses.percussionMod;
			else
				effectmod += spellbonuses.percussionMod;
			break;
		case STRINGED_INSTRUMENTS:
			if(itembonuses.stringedMod > spellbonuses.stringedMod)
				effectmod += itembonuses.stringedMod;
			else
				effectmod += spellbonuses.stringedMod;
			break;
		case WIND_INSTRUMENTS:
			if(itembonuses.windMod > spellbonuses.windMod)
				effectmod += itembonuses.windMod;
			else
				effectmod += spellbonuses.windMod;
			break;
		case BRASS_INSTRUMENTS:
			if(itembonuses.brassMod > spellbonuses.brassMod)
				effectmod += itembonuses.brassMod;
			else
				effectmod += spellbonuses.brassMod;
			break;
		case SINGING:
			if(itembonuses.singingMod > spellbonuses.singingMod)
				effectmod += itembonuses.singingMod;
			else
				effectmod += spellbonuses.singingMod;
			break;
		default:
			break;
	}
	
	if(spells[spell_id].skill == SINGING)
		effectmod += 20*GetAA(aaSingingMastery);
	else
		effectmod += 20*GetAA(aaInstrumentMastery);
	
	#if EQDEBUG >= 5
//		LogFile->write(EQEMuLog::Debug, "%s::GetInstrumentMod() spell=%d mod=%d\n", GetName(), spell_id, effectmod);
	#endif
	return(effectmod/10);

this should get instrument modifiers working like live. The issue with the old one is if a weapon had a 21% modifier it actually increased it by 2.1 times instead of .21, this will only increase it 20% since it is an int and for some reason it is expecting 10 instead of a 100 as the mod. But it gets instruments working much closer to live then before. I will play around some more with it this week or next week, if anyone has any ideas they are always welcome.

[Zuesrooster]

Tested it the only change is where it adds in the extra points for singing and instrument mastery it should be

if(IsClient())
	{
		if(spells[spell_id].skill == SINGING)
			effectmod += 20*this->CastToClient()->GetAA(aaSingingMastery);
		else
			effectmod += 20*this->CastToClient()->GetAA(aaInstrumentMastery);
	}

as stated on the first message, it only mods it by increments of 10%. Tried playing around with the struct, different values nothing i could make sense of resulted.

[fathernitwit]

hey, overall good job spotting this hole in the bard code. I will get most of it in.

I dont think your AA changes are needed, since GetAA is a virtual function, theres no need to cast to client to get the right version of GetAA called... unless you can prove me wrong.

[Zuesrooster]

All I know is when stepping through it, it called the Mob function instead of the client method. Wasn't binding to the right method, I haven't programmed much in C++ and consider myself a beginner in the language, so I can't really prove why you had to, just that I had to to make it work. Its very possible its something else that i might have done wrong.

Another Bard fix I tested in EQLive and crouching did not stop my singing so in client_packet.cpp Line #1689 I changed to

			if(!UseBardSpellLogic())
				InterruptSpell();