Merge branch 'master' of github.com:KayenEQ/Server

Conflicts:
	changelog.txt

changelog.txt

@@ -1,6 +1,5 @@
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
-
 == 12/13/2013 ==
 Kayen: Implemented additional functionality for SE_CurrentHP utilizing base2 values. (ie limit to body type)
 Kayen: Implemented SE_MitigateMeleeDamageSP (Partial Melee Rune that only is lowered if melee hits are over X amount of damage)
@@ -8,6 +7,11 @@ Kayen: Implemented SE_SpellOnAmtDmgTaken (Effect is triggered when X amount of d
 Kayen: Fix for various spell triggers/procs to now properly use their resist modifier.
 Kayen: Fix to mob->ModSkillDmgTaken(skill_num, value), setting value to -1 will now properly effect all skills.
 
+=======
+== 12/11/2013 ==
+demonstar55: Fixed issue with crippling blow from berserker frenzy not actually doing anything
+demonstar55: Fix haste caps
+
 == 12/04/2013 ==
 demonstar55: Fixed SpellType_Charm case in AICastSpell
 

common/ruletypes.h

@@ -371,6 +371,8 @@ RULE_INT ( Combat, ClientStunLevel, 55) //This is the level where client kicks a
 RULE_INT ( Combat, QuiverWRHasteDiv, 3) //Weight Reduction is divided by this to get haste contribution for quivers
 RULE_BOOL ( Combat, UseArcheryBonusRoll, false) //Make the 51+ archery bonus require an actual roll
 RULE_INT ( Combat, ArcheryBonusChance, 50)
+RULE_INT ( Combat, BerserkerFrenzyStart, 35)
+RULE_INT ( Combat, BerserkerFrenzyEnd, 45)
 RULE_CATEGORY_END()
 
 RULE_CATEGORY( NPC )

zone/attack.cpp

@@ -1173,7 +1173,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b
 	if(weapon_damage > 0){
 
 		//Berserker Berserk damage bonus
-		if(berserk && GetClass() == BERSERKER){
+		if(IsBerserk() && GetClass() == BERSERKER){
 			int bonus = 3 + GetLevel()/10;		//unverified
 			weapon_damage = weapon_damage * (100+bonus) / 100;
 			mlog(COMBAT__DAMAGE, "Berserker damage bonus increases DMG to %d", weapon_damage);
@@ -4157,20 +4157,16 @@ void Mob::TryCriticalHit(Mob *defender, uint16 skill, int32 &damage, ExtraAttack
 	//Warning: Do not define these rules if you want live like critical hits.
 	critChance += RuleI(Combat, MeleeBaseCritChance);
 
-	if(IsClient())
+	if (IsClient()) {
 		critChance += RuleI(Combat, ClientBaseCritChance);
 
-	bool IsBerserk = false;
+		if ((GetClass() == WARRIOR || GetClass() == BERSERKER) && GetLevel() >= 12) {
-	if(((GetClass() == WARRIOR || GetClass() == BERSERKER) && GetLevel() >= 12 && IsClient()))
+			if (IsBerserk())
-	{
-		if(CastToClient()->berserk){
 				critChance += RuleI(Combat, BerserkBaseCritChance);
-			IsBerserk = true;
-		}
-
 			else
 				critChance += RuleI(Combat, WarBerBaseCritChance);
 		}
+	}
 
 	if(skill == SkillArchery && GetClass() == RANGER && GetSkill(SkillArchery) >= 65)
 		critChance += 6;
@@ -4209,10 +4205,11 @@ void Mob::TryCriticalHit(Mob *defender, uint16 skill, int32 &damage, ExtraAttack
 			//Crippling Blow Chance: The percent value of the effect is applied
 			//to the your Chance to Critical. (ie You have 10% chance to critical and you
 			//have a 200% Chance to Critical Blow effect, therefore you have a 20% Chance to Critical Blow.
-			if (CripplingBlowChance){
+			if (CripplingBlowChance || IsBerserk()) {
+				if (!IsBerserk())
 					critChance *= float(CripplingBlowChance)/100.0f;
 
-				if(MakeRandomFloat(0, 1) < critChance){
+				if (IsBerserk() || MakeRandomFloat(0, 1) < critChance) {
 					critMod = 400;
 					crip_success = true;
 				}
@@ -4221,8 +4218,7 @@ void Mob::TryCriticalHit(Mob *defender, uint16 skill, int32 &damage, ExtraAttack
 			critMod += GetCritDmgMob(skill) * 2; // To account for base crit mod being 200 not 100
 			damage = damage * critMod / 100;
 
-			if(IsBerserk || crip_success)
+			if (crip_success) {
-			{
 				entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, CRIPPLING_BLOW, GetCleanName(), itoa(damage));
 				// Crippling blows also have a chance to stun
 				//Kayen: Crippling Blow would cause a chance to interrupt for npcs < 55, with a staggers message.
@@ -4230,10 +4226,7 @@ void Mob::TryCriticalHit(Mob *defender, uint16 skill, int32 &damage, ExtraAttack
 					defender->Emote("staggers.");
 					defender->Stun(0);
 				}
-			}
+			} else {
-
-			else
-			{
 				entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, CRITICAL_HIT, GetCleanName(), itoa(damage));
 			}
 		}

zone/client.h

@@ -220,6 +220,7 @@ public:
 	virtual bool HasGroup() { return (GetGroup() ? true : false); }
 	virtual Raid* GetRaid() { return entity_list.GetRaidByClient(this); }
 	virtual Group* GetGroup() { return entity_list.GetGroupByClient(this); }
+	virtual inline bool IsBerserk() { return berserk; }
 
 	void	AI_Init();
 	void	AI_Start(uint32 iMoveDelay = 0);

zone/client_mods.cpp

@@ -1340,35 +1340,37 @@ int16 Client::CalcCHA() {
 }
 
 int Client::CalcHaste() {
-	int h = spellbonuses.haste + spellbonuses.hastetype2 + itembonuses.haste;
+	int h = spellbonuses.haste + spellbonuses.hastetype2;
 	int cap = 0;
+	int overhaste = 0;
 	int level = GetLevel();
-	/*
-	if(disc_inuse == discBlindingSpeed) {
-		if(!disc_elapse.Check(false)) {
-			h += 20;		//this ammount is completely unknown
-		} else {
-			disc_inuse = discNone;
-		}
-	} */
 
-	if(level < 30) { // Rogean: Are these caps correct? Will use for now.
+	// 26+ no cap, 1-25 10
-		cap = 50;
+	if (level > 25) // 26+
-	} else if(level < 50) {
+		h += itembonuses.haste;
-		cap = 74;
+	else // 1-25
-	} else if(level < 55) {
+		h += itembonuses.haste > 10 ? 10 : itembonuses.haste;
-		cap = 84;
+
-	} else if(level < 60) {
+	// 60+ 100, 51-59 85, 1-50 level+25
-		cap = 94;
+	if (level > 59) // 60+
-	} else {
 		cap = RuleI(Character, HasteCap);
-	}
+	else if (level > 50) // 51-59
+		cap = 85;
+	else // 1-50
+		cap = level + 25;
 
 	cap = mod_client_haste_cap(cap);
 
-	if(h > cap) h = cap;
+	if (h > cap)
+		h = cap;
 
-	h += spellbonuses.hastetype3;
+	// 51+ 25 (despite there being higher spells...), 1-50 10
+	if (level > 50) // 51+
+		overhaste = spellbonuses.hastetype3 > 25 ? 25 : spellbonuses.hastetype3;
+	else // 1-50
+		overhaste = spellbonuses.hastetype3 > 10 ? 10 : spellbonuses.hastetype3;
+
+	h += overhaste;
 	h += ExtraHaste;	//GM granted haste.
 
 	h = mod_client_haste(h);
@@ -1376,7 +1378,6 @@ int Client::CalcHaste() {
 	if (spellbonuses.inhibitmelee) {
 		if (h >= 0)
 			h -= spellbonuses.inhibitmelee;
-
 		else
 			h -= ((100 + h) * spellbonuses.inhibitmelee / 100);
 	}

zone/client_process.cpp

@@ -464,13 +464,13 @@ bool Client::Process() {
 		}
 
 		if (GetClass() == WARRIOR || GetClass() == BERSERKER) {
-			if(!dead && !berserk && this->GetHPRatio() < 30) {
+			if (!dead && !IsBerserk() && GetHPRatio() < RuleI(Combat, BerserkerFrenzyStart)) {
 				entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_START, GetName());
-				this->berserk = true;
+				berserk = true;
 			}
-			if (berserk && this->GetHPRatio() > 30) {
+			if (IsBerserk() && GetHPRatio() > RuleI(Combat, BerserkerFrenzyEnd)) {
 				entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_END, GetName());
-				this->berserk = false;
+				berserk = false;
 			}
 		}
 

zone/mob.cpp

@@ -2875,31 +2875,40 @@ uint32 Mob::GetZoneID() const {
 }
 
 int Mob::GetHaste() {
-	int h = spellbonuses.haste + spellbonuses.hastetype2 + itembonuses.haste;
+	int h = spellbonuses.haste + spellbonuses.hastetype2;
 	int cap = 0;
+	int overhaste = 0;
 	int level = GetLevel();
 
-	if(level < 30) { // Rogean: Are these caps correct? Will use for now.
+	// 26+ no cap, 1-25 10
-		cap = 50;
+	if (level > 25) // 26+
-	} else if(level < 50) {
+		h += itembonuses.haste;
-		cap = 74;
+	else // 1-25
-	} else if(level < 55) {
+		h += itembonuses.haste > 10 ? 10 : itembonuses.haste;
-		cap = 84;
+
-	} else if(level < 60) {
+	// 60+ 100, 51-59 85, 1-50 level+25
-		cap = 94;
+	if (level > 59) // 60+
-	} else {
 		cap = RuleI(Character, HasteCap);
-	}
+	else if (level > 50) // 51-59
+		cap = 85;
+	else // 1-50
+		cap = level + 25;
 
-	if(h > cap) h = cap;
+	if(h > cap)
+		h = cap;
 
-	h += spellbonuses.hastetype3;
+	// 51+ 25 (despite there being higher spells...), 1-50 10
+	if (level > 50) // 51+
+		overhaste = spellbonuses.hastetype3 > 25 ? 25 : spellbonuses.hastetype3;
+	else // 1-50
+		overhaste = spellbonuses.hastetype3 > 10 ? 10 : spellbonuses.hastetype3;
+
+	h += overhaste;
 	h += ExtraHaste;	//GM granted haste.
 
 	if (spellbonuses.inhibitmelee) {
 		if (h >= 0)
 			h -= spellbonuses.inhibitmelee;
-
 		else
 			h -= ((100 + h) * spellbonuses.inhibitmelee / 100);
 	}

zone/mob.h

@@ -126,6 +126,7 @@ public:
 	void ApplyMeleeDamageBonus(uint16 skill, int32 &damage);
 	virtual void MeleeMitigation(Mob *attacker, int32 &damage, int32 minhit, ExtraAttackOptions *opts = nullptr);
 	bool CombatRange(Mob* other);
+	virtual inline bool IsBerserk() { return false; } // only clients
 
 	//Appearance
 	void SendLevelAppearance();