From a87322c72a27a3254e54eed173313d8526e91478 Mon Sep 17 00:00:00 2001
From: RecursiveVision <66801010+RecursiveVision@users.noreply.github.com>
Date: Tue, 19 Oct 2021 15:47:07 -0400
Subject: [PATCH] 1.1.1 release
Fix Diplomatic Marriage ability
---
43 Civs CP/43 Civs CP/43 Civs CP.civ5proj | 2 +-
Community Balance Patch/Community Balance Patch.civ5proj | 2 +-
Community Patch/Community Patch.civ5proj | 2 +-
CvGameCoreDLL_Expansion2/CvMinorCivAI.cpp | 7 +++----
.../CBP Compatibility Files.civ5proj | 2 +-
ISSUE_TEMPLATE | 2 +-
.../Mod Template1/No-EUI CBP Compatibility.civ5proj | 2 +-
7 files changed, 9 insertions(+), 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
index 8aa43e26da..2d6ceea5dd 100644
--- 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 @@
6521c02b-1c78-4826-a5b0-faed86235e98
1
Stable
- (1.1.0) Supports up to 43 Major Civilizations
+ (1.1.1) Supports up to 43 Major Civilizations
[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
index e7e10d26ac..5339de94d0 100644
--- a/Community Balance Patch/Community Balance Patch.civ5proj
+++ b/Community Balance Patch/Community Balance Patch.civ5proj
@@ -7,7 +7,7 @@
8411a7a8-dad3-4622-a18e-fcc18324c799
13
Stable
- (1.1.0) Unofficial Expansion and Rebalancing Project for Civilization V: Brave New World
+ (1.1.1) Unofficial Expansion and Rebalancing Project for Civilization V: Brave New World
Contains balance changes, gameplay improvements, and entirely new game systems to make Civ V a more enjoyable and exciting game.
Civfanatics Community Patch Project Team
diff --git a/Community Patch/Community Patch.civ5proj b/Community Patch/Community Patch.civ5proj
index e9a38e17c2..bba9766fac 100644
--- a/Community Patch/Community Patch.civ5proj
+++ b/Community Patch/Community Patch.civ5proj
@@ -7,7 +7,7 @@
d1b6328c-ff44-4b0d-aad7-c657f83610cd
94
Stable
- (1.1.0) Bugfixes, AI Improvements, Game Optimizations and API Extensions for Civ V
+ (1.1.1) Bugfixes, AI Improvements, Game Optimizations and API Extensions for Civ V
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.
The Community Patch Team
diff --git a/CvGameCoreDLL_Expansion2/CvMinorCivAI.cpp b/CvGameCoreDLL_Expansion2/CvMinorCivAI.cpp
index eefc64f006..9e430a6a3d 100644
--- 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
index cb7ee77307..bf8d909d76 100644
--- 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 @@
24923240-e4fb-4bf6-8f0e-6e5b6cf4d3c2
1
Stable
- (1.0.2) CBO Compatibility and LUA (EUI Version)
+ (1.1.1) CBO Compatibility and LUA (EUI Version)
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!
diff --git a/ISSUE_TEMPLATE b/ISSUE_TEMPLATE
index 759dc0c8a6..18377203a8 100644
--- 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
index a0361d8c1f..d94dfa2650 100644
--- 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 @@
828b5b4b-7c62-4afb-a43f-034b596ef5e4
1
Stable
- (1.0.2) Community Balance Overhaul - Compatibility Files (No EUI)
+ (1.1.1) Community Balance Overhaul - Compatibility Files (No EUI)
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.
Gazebo