2 Hand Damage Bonus

[renoofturks1]

Yes, there is a 1handed bonus, which we already have calculated correctly in the file. The whole finished product would resemble....
Replacing lines 1935 through 1971

int Mob::GetWeaponDamageBonus(const Item_Struct* Weapon)
{
	// Kaiyodo - Calculate the damage bonus for a weapon on the main hand
	if (GetLevel() < 28)
		return(0);
	
	// Check we're on of the classes that gets a damage bonus
	if (!IsWarriorClass())
		return 0;
	
	int BasicBonus = ((GetLevel() - 25) / 3) + 1;
	
	if(!Weapon)
		return(BasicBonus);
	
	// If we have no weapon, or only a single handed weapon, just return the default
	// damage bonus of (Level - 25) / 3
	if (Weapon->ItemClass == ItemClassCommon)
		return BasicBonus;
	
	if ((Weapon->ItemType == ItemType1HS) || (Weapon->ItemType == ItemTypePierce) || (Weapon->ItemType == ItemType1HB))
		return BasicBonus;

	//begin Reno's untested code
        if (Weapon->Delay <=27)
	        return (BasicBonus + 1);
        if (Weapon->Delay <=39)
	        return (BasicBonus + ((GetLevel()-27)/4));
        if (Weapon->Delay <= 41)
	        return (BasicBonus + ((GetLevel()-27)/4) + 1);
        if (Weapon->Delay >= 42)
	        if (GetLevel() > 54)
		        int levelint = 1;
	        if (GetLevel() > 56)
		        levelint += 1;
	        if (GetLevel() > 58)
		        levelint += 1;
	        if (GetLevel() > 59)
		        levelint += 1;
	        if (GetLevel() > 66)
		        levelint += 1;
	        if (GetLevel() > 71)
		        levelint += 1;
	        if (Weapon->Delay > 42)
		        int delayint = 1;
	        if (Weapon->Delay >44)
		        delayint += 1;

	        return (((Weapon->Delay-37)/3) +  ((GetLevel()-25)/ 5) + ((Weapon->Delay * (GetLevel()-50 + levelint))/40) + delayint + BasicBonus);
}

[cavedude]

I see no harm in merging this into TGC when it comes back up. The worst that can happen is 2H players will own until I pull it out. Thanks Reno, nice to see you here! The only thing I am going to change is adding a 2H check to your changes, otherwise all weapons will return true and get the 2H bonus.

[renoofturks1]

Yes, I broke down and went to the EQEmu boards! I couldn't remember my login it's been so long, had to make a new account. I am testing it right now CD, Give me a bit and I'll let ya know how it works out...

As for the the 2h check, I assumed taht the previous 1h check would suffice to weed out the 1 hander's and saw no need for extra code, if avoidable.

[cavedude]

You're right, it returns BasicBonus; so 1 handers won't check the delay statements. I just always like to make absolutely sure what we want to happen does happen.

[renoofturks1]

Understandable, I'll see how it works out. I have a feeling I need to change the order that Damage Bonus is applied within the combat routine also, as it should be un-affected by AC and it currently is, I think.

[cavedude]

You forgot to define delayint and levelint. Just add:

int delayint;
int levelint;

before your first if statement.

[renoofturks1]

Aye, I tried to define them as they became needed. I see now, this wouldn't work. I'll have a revised tested version shortly here.