Fixed 2H Blunt Animation to match Live

Melee bots (with no mana) will now sit when not full HP and out of combat.
EQEmu · Mar 7, 2014 · 3ec1c89 · 3ec1c89
1 parent 057e460
commit 3ec1c89
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/zone/attack.cpp b/zone/attack.cpp
@@ -91,7 +91,7 @@ bool Mob::AttackAnimation(SkillUseTypes &skillinuse, int Hand, const ItemInst* w
 			case ItemType2HBlunt: // 2H Blunt
 			{
 				skillinuse = Skill2HBlunt;
-				type = anim2HWeapon;
+				type = anim2HSlashing; //anim2HWeapon
 				break;
 			}
 			case ItemType2HPiercing: // 2H Piercing
@@ -140,7 +140,7 @@ bool Mob::AttackAnimation(SkillUseTypes &skillinuse, int Hand, const ItemInst* w
 			}
 			case Skill2HBlunt: // 2H Blunt
 			{
-				type = anim2HWeapon;
+				type = anim2HSlashing; //anim2HWeapon
 				break;
 			}
 			case 99: // 2H Piercing // change to Skill2HPiercing once activated

diff --git a/zone/bot.cpp b/zone/bot.cpp
@@ -3151,9 +3151,9 @@ void Bot::SpellProcess()
 void Bot::BotMeditate(bool isSitting) {
 	if(isSitting) {
 		// If the bot is a caster has less than 99% mana while its not engaged, he needs to sit to meditate
-		if(GetManaRatio() < 99.0f)
+		if(GetManaRatio() < 99.0f || GetHPRatio() < 99.0f)
 		{
-			if(!IsSitting())
+			if (!IsEngaged() && !IsSitting())
 				Sit();
 		}
 		else