Fixed mercenary wandering, fixed minor civ tech rate

bptato · Apr 14, 2020 · 2801da2 · 2801da2
1 parent 750d921
commit 2801da2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/Assets/CvGameCoreDLL.dll b/Assets/CvGameCoreDLL.dll
diff --git a/CvGameCoreDLL/CvRFCProvince.cpp b/CvGameCoreDLL/CvRFCProvince.cpp
@@ -113,10 +113,20 @@ void CvRFCProvince::checkMercenaries() {
 	for(std::vector<CvRFCMercenary>::iterator it = mercenaries.begin(); it != mercenaries.end();) {
 		if(GC.getGame().getSorenRandNum(100, "Mercenary disband roll") < 5) {
 			if(GC.getGame().getSorenRandNum(100, "Mercenary wandering roll") < 60) {
+				int borderProvinces = 0;
 				for(int i = 0; i<GC.getRiseFall().getNumProvinces(); ++i) {
 					if(isBorderProvince(GC.getRiseFall().getRFCProvinceByID(i))) {
-						GC.getRiseFall().getRFCProvinceByID(i)->addMercenary(*it);
-						break;
+						++borderProvinces;
+					}
+				}
+				int rand = 0;
+				for(int i = 0; i<GC.getRiseFall().getNumProvinces(); ++i) {
+					if(isBorderProvince(GC.getRiseFall().getRFCProvinceByID(i))) {
+						rand += 100/borderProvinces;
+						if(100/borderProvinces<GC.getGame().getSorenRandNum(rand, "Border province selection roll")) {
+							GC.getRiseFall().getRFCProvinceByID(i)->addMercenary(*it);
+							break;
+						}
 					}
 				}
 			}

diff --git a/CvGameCoreDLL/CvTeam.cpp b/CvGameCoreDLL/CvTeam.cpp
@@ -881,7 +881,7 @@ void CvTeam::doTurn()
 
 	AI_doTurnPre();
 
-	if (isBarbarian())
+	if (isBarbarian() || isMinorCiv()) //bluepotato
 	{
 		for (iI = 0; iI < GC.getNumTechInfos(); iI++)
 		{
@@ -6344,4 +6344,4 @@ int CvTeam::getPlayerMemberListSize() const
 {
 	return m_aePlayerMembers.size();
 }
-//bluepotato end
+//bluepotato end
diff --git a/CvGameCoreDLL/CyPlot.cpp b/CvGameCoreDLL/CyPlot.cpp
@@ -649,8 +649,6 @@ bool CyPlot::isPeak()
 
 void CyPlot::setPlotType(PlotTypes eNewValue, bool bRecalculate, bool bRebuildGraphics)
 {
-	GC.logMsg("setPlotType eNewValue: %i, bRecalculate: %i, bRebuildGraphics: %i", (int)eNewValue, (int)bRecalculate, (int)bRebuildGraphics);
-
 	if (m_pPlot)
 		m_pPlot->setPlotType(eNewValue, bRecalculate, bRebuildGraphics);
 }