2 Hand Damage Bonus

[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.

[renoofturks1]

Ok, I have it tested and working, but I had to comment out part of the existing code, and I am not sure what it does.... Someone care to fill me in?

if (Weapon->ItemClass == ItemClassCommon)

What is ItemClassCommon? Barring that not being important...the below code is tested to work, and add the proper damage bonus(within two, rounding) after all AC calculations as it should. Now, if that little piece of code I commented out is important, I'll go back to the drawing board LOL

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;

		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);
                //reno-calc 2hand dmg bonus
		if (Weapon->Delay >= 42)
		{
			int levelint = 0;
			int delayint = 0;
			if (GetLevel() > 54)
				levelint++;
			if (GetLevel() > 56)
				levelint++;
			if (GetLevel() > 56)
				levelint++;
			if (GetLevel() > 58)
				levelint++;
			if (GetLevel() > 59)
				levelint++;
			if (GetLevel() > 66)
				levelint++;
			if (GetLevel() > 71)
				levelint++;
			if (Weapon->Delay > 42)
				delayint++;
			if (Weapon->Delay > 44)
				delayint++;
			return (((Weapon->Delay-37)/3) + ((GetLevel()-25)/5) + ((Weapon->Delay * ((GetLevel()-50) + levelint))/40) + delayint + BasicBonus);
			}
}

[renoofturks1]

Note: The formula for delay's UNDER 42 and ABOVE 28 is off. I will work on this one next

[trevius]

in eq_constants.h

/*
** Item types
**
*/
enum ItemClass
{
	ItemClassCommon		= 0,
	ItemClassContainer	= 1,
	ItemClassBook		= 2
};

So, ItemClassCommon is just checking to verify that the item is a normal item. I think your 1hs check should probably work fine to replace it. But, if you wanted to keep it in there just be be sure (since it was there before), it probably wouldn't hurt. I think you could just do something like this maybe:

	if ((Weapon->ItemClass == ItemClassCommon) && ((Weapon->ItemType == ItemType1HS) || (Weapon->ItemType == ItemTypePierce) || (Weapon->ItemType == ItemType1HB)))
		return BasicBonus;

That way you are checking for both things. I am no coder, but it makes sense that this should work to me.

[renoofturks1]

The problem was with the fact that, no matter what weapon I was wielding.

if (Weapon->ItemClass == ItemClassCommon)
      return BasicBonus;

Was always returning true, and never allowing anything but BasicBonus to be returned. Adding it as you stated should solve that problem. Thank you.

[renoofturks1]

This is a working tested version. It isn't perfect yet, but, this works for level 60+ accurately, and becomes less and less accurate as level decreases. Weapon's under 42 delay is still off, but closer. I'll work on it some more but if anyone cares to try it, or use it.

zone/attack.cpp - 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);
	
	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;

		if (Weapon->Delay <= 27)
			return (BasicBonus + 1);
		if (Weapon->Delay <= 39)
			return (BasicBonus + ((GetLevel()-25) / 5));
		if (Weapon->Delay <= 41)
			return (BasicBonus + ((GetLevel()-25) / 5) + 1);
		if (Weapon->Delay >= 42)
		{
			int levelint = 0;
			int delayint = 0;
			if (GetLevel() > 54)
				levelint++;
			if (GetLevel() > 56)
				levelint++;
			if (GetLevel() > 56)
				levelint++;
			if (GetLevel() > 58)
				levelint++;
			if (GetLevel() > 59)
				levelint++;
			if (GetLevel() > 66)
				levelint++;
			if (GetLevel() > 71)
				levelint++;
			if (Weapon->Delay > 42)
				delayint++;
			if (Weapon->Delay > 44)
				delayint++;
			return (((Weapon->Delay-37)/3) + ((GetLevel()-25)/5) + ((Weapon->Delay * ((GetLevel()-50) + levelint))/40) + BasicBonus);
			}
}

[renoofturks1]

Final version coming soon.....