Merge pull request #18 from Rushwind13/develop

0.10-alpha
Rushwind13 · Dec 10, 2017 · 920d966 · 920d966
2 parents 50c861f + 2718ff9
commit 920d966
Show file tree

Hide file tree

Showing 34 changed files with 3,482 additions and 1,271 deletions.
diff --git a/AIMgr.cpp b/AIMgr.cpp
@@ -1,6 +1,8 @@
 #include "AIMgr.h"
 #include "JMDefs.h"
 #include "Dungeon.h"
+#include "Player.h"
+#include "DisplayText.h"
 
 CAIMgr::CAIMgr()
 {
@@ -28,11 +30,11 @@ bool CAIMgr::Update( float fCurTime )
 		pLink = m_llAIBrains->GetNext(pLink);
 	}
 	return true;
-}
-
-void CAIMgr::DestroyBrain( CAIBrain *delete_me )
-{
-    m_llAIBrains->Remove(delete_me->m_pllLink);
+}
+
+void CAIMgr::DestroyBrain( CAIBrain *delete_me )
+{
+    m_llAIBrains->Remove(delete_me->m_pllLink);
 }
 
 
@@ -44,7 +46,7 @@ m_eBrainState(BRAINSTATE_INVALID)
 }
 
 bool CAIBrain::Update( float fCurTime )
-{
+{
     m_pParent->m_fColorChangeInterval += fCurTime;
 	switch( m_eBrainState )
 	{
@@ -98,14 +100,55 @@ bool CAIBrain::UpdateRest( float fCurTime )
 
 bool CAIBrain::UpdateGoToDest( float fCurTime )
 {
+    bool didWalk = false;
 	m_fStateTicks += fCurTime * m_fSpeed;
 
-	if( m_fStateTicks >= 1.0f )
+	while( m_fStateTicks >= 1.0f )
 	{
-		g_pGame->GetDungeon()->GetTile(m_vPos)->m_pCurMonster = NULL;
-		m_vPos += m_vVel;
-		g_pGame->GetDungeon()->GetTile(m_vPos)->m_pCurMonster = m_pParent;
-		SetState( BRAINSTATE_SEEK );
+        didWalk = true;
+        JVector vTryPos(m_vPos+m_vVel);
+        if( Util::IsInWorld(vTryPos) )
+        {
+            int dwCollideType = g_pGame->GetDungeon()->IsWalkableFor(vTryPos);
+            switch(dwCollideType)
+            {
+            case DUNG_COLL_NO_COLLISION:
+                g_pGame->GetDungeon()->GetTile(m_vPos)->m_pCurMonster = NULL;
+                m_vPos += m_vVel;
+                g_pGame->GetDungeon()->GetTile(m_vPos)->m_pCurMonster = m_pParent;
+                break;
+            case DUNG_COLL_PLAYER:
+                char szStatus[16];
+                float fDamageMult = 1.0f;
+                // TODO: make this use all the attacks, not just the first one
+                float fRoll = m_pParent->Attack();
+                bool bHit = g_pGame->GetPlayer()->Hit(fRoll);
+                if( bHit )
+                {
+                    // TODO: make this differ based on attack effect type
+                    sprintf(szStatus, "hits");
+                }
+                else
+                {
+                    sprintf(szStatus, "misses");
+                }
+                g_pGame->GetMsgs()->Printf( "The %s %s you.\n", m_pParent->GetName(), szStatus );
+
+                if(bHit)
+                {
+                    if( fRoll > 80.0f )
+                    {
+                        g_pGame->GetMsgs()->Printf( "(It was an excellent hit! (x2 damage)\n" );
+                        fDamageMult = 2.0f;
+                    }
+
+                    float fDamage = m_pParent->Damage(fDamageMult);
+                    g_pGame->GetPlayer()->TakeDamage(fDamage, m_pParent->GetName());
+                }
+                break;
+            }
+        }
+        m_fStateTicks -= 1.0f;
 	}
 	/*JVector delta;
 	delta *= (m_fSpeed * fCurTime);
@@ -115,7 +158,11 @@ bool CAIBrain::UpdateGoToDest( float fCurTime )
 	{
 		printf( "moving from <%f %f> to <%f %f>...\n", VEC_EXPAND(m_vPos), VEC_EXPAND(m_vPos+delta) );
 		m_vPos += delta;
-	}/* */
+     }/* */
+    if( didWalk )
+    {
+        SetState( BRAINSTATE_SEEK );
+    }
 
 	return true;
 }
@@ -132,17 +179,20 @@ bool CAIBrain::SetRandomDest(float fCurTime)
 
 	dest = m_vPos + delta;
 
-	if( Util::IsInWorld(dest) && (g_pGame->GetDungeon()->IsWalkableFor(dest) == DUNG_COLL_NO_COLLISION) )
-	{
-		//printf( "dest <%f %f> delta <%f %f>\n", VEC_EXPAND(dest), VEC_EXPAND(delta) );
-		//m_vDest = dest;
-		m_vVel = delta;
-	}
-	else
-	{
-		//printf( "velocity killed. dest <%f %f> delta <%f %f>\n", VEC_EXPAND(dest), VEC_EXPAND(delta) );
-		m_vVel.Init();
-	}
+	if( Util::IsInWorld(dest) )
+    {
+        int dwCollideType = g_pGame->GetDungeon()->IsWalkableFor(dest);
+        switch(dwCollideType)
+        {
+        case DUNG_COLL_NO_COLLISION:
+        case DUNG_COLL_PLAYER:
+            m_vVel = delta;
+            break;
+        default:
+            m_vVel.Init();
+            break;
+        }
+    }
 
 	return true;
 }