Update opinion table tooltip for military promise

LoneGazebo · Jul 5, 2024 · 2bda8da · 2bda8da
1 parent 8cac442
commit 2bda8da
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/(1) Community Patch/Core Files/Text/CoreText_en_US.xml b/(1) Community Patch/Core Files/Text/CoreText_en_US.xml
@@ -3022,17 +3022,14 @@
 
 		<!-- Promises LUA -->
 		<Row Tag="TXT_KEY_DIPLO_MILITARY_PROMISE_TURNS">
-			<Text>You promised not to declare war on them for {1_Num} more {1_Num: plural 1?turn; other?turns;}.</Text>
+			<Text>You promised not to declare war on each other for {1_Num} more {1_Num: plural 1?turn; other?turns;}.</Text>
 		</Row>
 		<Row Tag="TXT_KEY_DIPLO_EXPANSION_PROMISE_TURNS">
 			<Text>You promised not to settle near them for {1_Num} more {1_Num: plural 1?turn; other?turns;}.</Text>
 		</Row>
 		<Row Tag="TXT_KEY_DIPLO_BORDER_PROMISE_TURNS">
 			<Text>You promised not to buy land near them for {1_Num} more {1_Num: plural 1?turn; other?turns;}.</Text>
 		</Row>
-		<Row Tag="TXT_KEY_DIPLO_AI_MILITARY_PROMISE_TURNS">
-			<Text>They promised not to declare war on you for {1_Num} more {1_Num: plural 1?turn; other?turns;}.</Text>
-		</Row>
 		<Row Tag="TXT_KEY_DIPLO_AI_EXPANSION_PROMISE_TURNS">
 			<Text>They promised not to settle near you for {1_Num} more {1_Num: plural 1?turn; other?turns;}.</Text>
 		</Row>

diff --git a/CvGameCoreDLL_Expansion2/Lua/CvLuaPlayer.cpp b/CvGameCoreDLL_Expansion2/Lua/CvLuaPlayer.cpp
@@ -14371,7 +14371,7 @@ int CvLuaPlayer::lGetOpinionTable(lua_State* L)
 		////////////////////////////////////
 
 		// Human Promises
-		iValue = pDiplo->GetNumTurnsMilitaryPromise(ePlayer);
+		iValue = pDiplo->GetNumTurnsMilitaryPromise(ePlayer); // This is a mutual promise and the turn counter will always be the same on both sides
 		if (iValue > 0)
 		{
 			Opinion kOpinion;
@@ -14399,15 +14399,6 @@ int CvLuaPlayer::lGetOpinionTable(lua_State* L)
 		}
 
 		// AI Promises
-		iValue = GET_PLAYER(ePlayer).GetDiplomacyAI()->GetNumTurnsMilitaryPromise(pkPlayer->GetID());
-		if (iValue > 0)
-		{
-			Opinion kOpinion;
-			kOpinion.m_iValue = 0;
-			kOpinion.m_str = GetLocalizedText("TXT_KEY_DIPLO_AI_MILITARY_PROMISE_TURNS", iValue);
-			aOpinions.push_back(kOpinion);
-		}
-
 		iValue = GET_PLAYER(ePlayer).GetDiplomacyAI()->GetNumTurnsExpansionPromise(pkPlayer->GetID());
 		if (iValue > 0)
 		{