better hedgehog moves for AI

LoneGazebo · Dec 15, 2023 · a325bea · a325bea
1 parent c12b085
commit a325bea
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/CvGameCoreDLL_Expansion2/CvTacticalAI.cpp b/CvGameCoreDLL_Expansion2/CvTacticalAI.cpp
@@ -2035,10 +2035,10 @@ void CvTacticalAI::PlotHedgehogMoves(CvTacticalDominanceZone* pZone)
 {
 	ClearCurrentMoveUnits(AI_TACTICAL_HEDGEHOG);
 
-	// Attack priority unit targets
-	ExecuteDestroyUnitMoves(AI_TACTICAL_TARGET_HIGH_PRIORITY_UNIT, true);
-	ExecuteDestroyUnitMoves(AI_TACTICAL_TARGET_MEDIUM_PRIORITY_UNIT, true);
-	ExecuteDestroyUnitMoves(AI_TACTICAL_TARGET_LOW_PRIORITY_UNIT, true);
+	// Be careful with our units, we don't have so many
+	ExecuteDestroyUnitMoves(AI_TACTICAL_TARGET_HIGH_PRIORITY_UNIT, false, AL_LOW);
+	ExecuteDestroyUnitMoves(AI_TACTICAL_TARGET_MEDIUM_PRIORITY_UNIT, false, AL_LOW);
+	ExecuteDestroyUnitMoves(AI_TACTICAL_TARGET_LOW_PRIORITY_UNIT, false, AL_LOW);
 
 	// exception : early reinforcement before attacks in other zones are considered
 	PlotReinforcementMoves(pZone);

diff --git a/CvGameCoreDLL_Expansion2/CvTacticalAnalysisMap.cpp b/CvGameCoreDLL_Expansion2/CvTacticalAnalysisMap.cpp
@@ -479,7 +479,7 @@ eTacticalPosture CvTacticalDominanceZone::SelectPostureSingleZone(int iDominance
 	}
 	case TACTICAL_TERRITORY_FRIENDLY:
 	{
-		m_ePosture = TACTICAL_POSTURE_COUNTERATTACK;
+		m_ePosture = (eOverallDominance == TACTICAL_DOMINANCE_ENEMY) ? TACTICAL_POSTURE_HEDGEHOG : TACTICAL_POSTURE_COUNTERATTACK;
 		break;
 	}
 	}

diff --git a/CvGameCoreDLL_Expansion2/NatvisFile.natvis b/CvGameCoreDLL_Expansion2/NatvisFile.natvis
@@ -18,6 +18,9 @@
 	</Type>
 
 	<Type Name="CvUnit">
+		<DisplayString Condition="m_pUnitInfo->m_iDomainType==0">(id {m_iID}, C{m_iBaseCombat}R{m_iBaseRangedCombat}, M{m_iMoves}, P{m_eOwner}, at {m_iX}:{m_iY} SEA)</DisplayString>
+		<DisplayString Condition="m_pUnitInfo->m_iDomainType==1">(id {m_iID}, C{m_iBaseCombat}R{m_iBaseRangedCombat}, M{m_iMoves}, P{m_eOwner}, at {m_iX}:{m_iY} AIR)</DisplayString>
+		<DisplayString Condition="m_pUnitInfo->m_iDomainType==2">(id {m_iID}, C{m_iBaseCombat}R{m_iBaseRangedCombat}, M{m_iMoves}, P{m_eOwner}, at {m_iX}:{m_iY} LAND)</DisplayString>
 		<DisplayString>(id {m_iID}, C{m_iBaseCombat}R{m_iBaseRangedCombat}, M{m_iMoves}, P{m_eOwner}, at {m_iX}:{m_iY})</DisplayString>
 		<Expand>
 			<Item Name="m_iID">m_iID</Item>
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	case TACTICAL_TERRITORY_FRIENDLY:
     	{
-    		m_ePosture = TACTICAL_POSTURE_COUNTERATTACK;
+    		m_ePosture = (eOverallDominance == TACTICAL_DOMINANCE_ENEMY) ? TACTICAL_POSTURE_HEDGEHOG : TACTICAL_POSTURE_COUNTERATTACK;
     		break;
     	}
     	}
@@ Expand Down @@