1.1.1 release

Fix Diplomatic Marriage ability
LoneGazebo · Oct 19, 2021 · a87322c · a87322c
1 parent a4870b1
commit a87322c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/43 Civs CP/43 Civs CP/43 Civs CP.civ5proj b/43 Civs CP/43 Civs CP/43 Civs CP.civ5proj
@@ -7,7 +7,7 @@
     <Guid>6521c02b-1c78-4826-a5b0-faed86235e98</Guid>
     <ModVersion>1</ModVersion>
     <Stability>Stable</Stability>
-    <Teaser>(1.1.0) Supports up to 43 Major Civilizations</Teaser>
+    <Teaser>(1.1.1) Supports up to 43 Major Civilizations</Teaser>
     <Description>[COLOR_POSITIVE_TEXT]MANUAL INSTALL INSTRUCTIONS:[ENDCOLOR]
 
 Delete the DLL in (1) CP.

diff --git a/Community Balance Patch/Community Balance Patch.civ5proj b/Community Balance Patch/Community Balance Patch.civ5proj
@@ -7,7 +7,7 @@
     <Guid>8411a7a8-dad3-4622-a18e-fcc18324c799</Guid>
     <ModVersion>13</ModVersion>
     <Stability>Stable</Stability>
-    <Teaser>(1.1.0) Unofficial Expansion and Rebalancing Project for Civilization V: Brave New World</Teaser>
+    <Teaser>(1.1.1) Unofficial Expansion and Rebalancing Project for Civilization V: Brave New World</Teaser>
     <Description>Contains balance changes, gameplay improvements, and entirely new game systems  to make Civ V a more enjoyable and exciting game.</Description>
     <Authors>Civfanatics Community Patch Project Team</Authors>
     <SpecialThanks>

diff --git a/Community Patch/Community Patch.civ5proj b/Community Patch/Community Patch.civ5proj
@@ -7,7 +7,7 @@
     <Guid>d1b6328c-ff44-4b0d-aad7-c657f83610cd</Guid>
     <ModVersion>94</ModVersion>
     <Stability>Stable</Stability>
-    <Teaser>(1.1.0) Bugfixes, AI Improvements, Game Optimizations and API Extensions for Civ V</Teaser>
+    <Teaser>(1.1.1) Bugfixes, AI Improvements, Game Optimizations and API Extensions for Civ V</Teaser>
     <Description>Contains core AI improvements and bugfixes for the Civ 5 BNW DLL. Also contains support for Whoward's PNM Mods as well as the Community Balance Patch.</Description>
     <Authors>The Community Patch Team</Authors>
     <SpecialThanks>

diff --git a/CvGameCoreDLL_Expansion2/CvMinorCivAI.cpp b/CvGameCoreDLL_Expansion2/CvMinorCivAI.cpp
@@ -14772,11 +14772,10 @@ void CvMinorCivAI::DoBuyout(PlayerTypes eMajor)
 	GET_PLAYER(eMajor).GetTreasury()->ChangeGold(-iBuyoutCost);
 	GET_PLAYER(eMajor).GetDiplomacyAI()->LogMinorCivBuyout(GetPlayer()->GetID(), iBuyoutCost, /*bSaving*/ false);
 
-	if (!bMarriage)
-	{
-		// Perform the transfer
+	if (bMarriage)
+		SetMajorMarried(eMajor, true);
+	else
 		iNumUnits = TransferUnitsAndCitiesToMajor(eMajor);
-	}
 
 	// Send out notifications to everyone
 	TeamTypes eBuyerTeam = GET_PLAYER(eMajor).getTeam();

diff --git a/EUI Compatibility Files/EUI Compatibility Files/CBP Compatibility Files.civ5proj b/EUI Compatibility Files/EUI Compatibility Files/CBP Compatibility Files.civ5proj
@@ -7,7 +7,7 @@
     <Guid>24923240-e4fb-4bf6-8f0e-6e5b6cf4d3c2</Guid>
     <ModVersion>1</ModVersion>
     <Stability>Stable</Stability>
-    <Teaser>(1.0.2) CBO Compatibility and LUA (EUI Version)</Teaser>
+    <Teaser>(1.1.1) CBO Compatibility and LUA (EUI Version)</Teaser>
     <Description>Contains compatibility files for CBO, CSD, C4DF and EUI - required if you intend to use any mod aside from the CP and CBO by themselves.
 
 NOTE: Make sure to delete the LUA folder in the CBO if you are using this!</Description>

diff --git a/ISSUE_TEMPLATE b/ISSUE_TEMPLATE
@@ -1,4 +1,4 @@
-_1. Mod version (X.Y.Z, e.g. 1.0.0):_
+_1. Mod version (X.Y.Z, e.g. 1.1.1):_
 
 
 _2. Mod list (if using Vox Populi only, leave blank):_

diff --git a/NoEUI Compatibility Files/Mod Template1/No-EUI CBP Compatibility.civ5proj b/NoEUI Compatibility Files/Mod Template1/No-EUI CBP Compatibility.civ5proj
@@ -7,7 +7,7 @@
     <Guid>828b5b4b-7c62-4afb-a43f-034b596ef5e4</Guid>
     <ModVersion>1</ModVersion>
     <Stability>Stable</Stability>
-    <Teaser>(1.0.2) Community Balance Overhaul - Compatibility Files (No EUI)</Teaser>
+    <Teaser>(1.1.1) Community Balance Overhaul - Compatibility Files (No EUI)</Teaser>
     <Description>LUA and mod compatibility files for CBO if not using EUI. Includes support for More Luxuries, CSD, and C4DF. Must use all three mods in order to use this mod.</Description>
     <Authors>Gazebo</Authors>
     <SpecialThanks>