Changeset 48 for trunk/src/hearthstone-world/GenericAI.cpp

Timestamp:

09/30/09 21:44:28 (3 years ago)

Author:

valroft

Message:

- Some work on bringing spell cast AI support to GenericAI.
- Removed unnecessary code.

Files:

• trunk/src/hearthstone-world/GenericAI.cpp (modified) (4 diffs)

trunk/src/hearthstone-world/GenericAI.cpp

@@ -24 +24 @@
         m_lastUpdateTime = 0;
         m_lastAttackTime = 0;
+        m_forceSpell = NULL;
 
         ai->GetMoveGenerator()->SetThreatReference(&m_threat);
@@ -142 +143 @@
 
         return true;
+}
+
+AI_Spell* GenericAI::GetNextSpell()
+{
+        uint32 msTime = getMSTime();
+        AISpellStorage::iterator itr = m_unit->GetAIInterface()->GetAvailableSpellsBegin();
+        for(; itr != m_unit->GetAIInterface()->GetAvailableSpellsEnd(); ++itr)
+        {
+                AI_Spell* sp = (*itr);
+                if( sp->cooldowntime > msTime ) // We're still on cooldown.
+                        continue;
+
+                if( sp->procChance < 100 && !Rand(sp->procChance) ) // It just ain't proccing.
+                        continue; 
+
+                // not enough mana?
+                if( sp->spell->manaCost && m_unit->GetUInt32Value(UNIT_FIELD_POWER1+POWER_TYPE_MANA) < sp->spell->manaCost )
+                        continue;
+
+                // not enough mana?
+                if( sp->spell->ManaCostPercentage && m_unit->GetManaPct() < sp->spell->ManaCostPercentage )
+                        continue;
+
+                ++sp->procCount;
+                sp->cooldowntime = msTime + sp->cooldown;
+
+                return sp;
+        }
+
+        return NULL;
 }
 
@@ -172 +203 @@
 
         // Attack our current target, if we have one.
-        if( m_threat.GetAttackTarget() && IsInAttackRange(m_threat.GetAttackTarget()) )
+        if( m_threat.GetAttackTarget() && CanMeleeAttack(m_threat.GetAttackTarget()) )
         {
                 // just because we're in range doesn't mean we are good to go.
@@ -199 +230 @@
 }
 
-bool GenericAI::IsInAttackRange(Unit *u)
-{
-        return m_unit->GetAIInterface()->IsInAttackRange(u);
+bool GenericAI::CanMeleeAttack(Unit *u)
+{
+        return m_unit->GetAIInterface()->IsInAttackRange(u) && !m_unit->GetCurrentSpell();
 }