[FIX] small fixes

civkoweLove · Dec 21, 2021 · a60bd25 · a60bd25
1 parent 2fe4cf8
commit a60bd25
Show file tree

Hide file tree

Showing 7 changed files with 280 additions and 62 deletions.
diff --git a/CvGameCore_Expansion2.dll b/CvGameCore_Expansion2.dll
diff --git a/CvGameCore_Expansion2.pdb b/CvGameCore_Expansion2.pdb
diff --git a/loveMod/CvGameCore_Expansion2.dll b/loveMod/CvGameCore_Expansion2.dll
diff --git a/loveMod/CvGameCore_Expansion2.pdb b/loveMod/CvGameCore_Expansion2.pdb
diff --git a/loveMod/Mods/Lua/Moors.lua b/loveMod/Mods/Lua/Moors.lua
@@ -1,7 +1,7 @@
 include( "Utility");
 
 local iCiv = GameInfoTypes["CIVILIZATION_MC_LITE_MOOR"]
-local iBuilding = GameInfoTypes["BUILDING_MOORS_TRAIT"]
+local iBuilding = GameInfoTypes["BUILDING_MOORS_TRAIT_MEDIEVAL"]
 local iEra = GameInfoTypes["ERA_MEDIEVAL"]
 local bIsActive = JFD_IsCivilisationActive(iCiv)
 
@@ -23,43 +23,64 @@ function Moors_CityCaptured(oldPlayerID, bCapital, iPlotX, iPlotY, newPlayerID)
     end
 end
 
-function Moors_TechLeave(iTeam, iTech, bAdopted)
+function Moors_TechEnter_Medival(iTeam, iTech, bAdopted)
 	for playerID, player in pairs(Players) do
 		local player = Players[playerID];
 
-		if player:GetCivilizationType() == iCiv  then
-			if player:GetCurrentEra() > iEra then
+		if player:GetCivilizationType() == iCiv then
+			if player:GetCurrentEra() == iEra then
 				for pCity in player:Cities() do
-					pCity:SetNumRealBuilding(iBuilding, 0);
+					pCity:SetNumRealBuilding(iBuilding, 1);
 				end
-				GameEvents.PlayerCityFounded.Remove(Moors_CityFounded)
-				GameEvents.CityCaptureComplete.Remove(Moors_CityCaptured)
-				GameEvents.TeamSetHasTech.Remove(Moors_TechLeave)
+				GameEvents.PlayerCityFounded.Add(Moors_CityFounded)
+				GameEvents.CityCaptureComplete.Add(Moors_CityCaptured)
+				GameEvents.TeamSetHasTech.Add(Moors_TechEnter_Renaissance)
+
+				iEra = GameInfoTypes["ERA_RENAISSANCE"]
+				GameEvents.TeamSetHasTech.Remove(Moors_TechEnter_Medival)
 			end
 		end
 	end
 end
 
-function Moors_TechEnter(iTeam, iTech, bAdopted)
+function Moors_TechEnter_Renaissance(iTeam, iTech, bAdopted)
 	for playerID, player in pairs(Players) do
 		local player = Players[playerID];
 
 		if player:GetCivilizationType() == iCiv then
 			if player:GetCurrentEra() == iEra then
+				for pCity in player:Cities() do
+					pCity:SetNumRealBuilding(iBuilding, 0);
+				end
+				iBuilding = GameInfoTypes["BUILDING_MOORS_TRAIT_RENAISSANCE"]
 				for pCity in player:Cities() do
 					pCity:SetNumRealBuilding(iBuilding, 1);
 				end
-				GameEvents.PlayerCityFounded.Add(Moors_CityFounded)
-				GameEvents.CityCaptureComplete.Add(Moors_CityCaptured)
 				GameEvents.TeamSetHasTech.Add(Moors_TechLeave)
 
-				GameEvents.TeamSetHasTech.Remove(Moors_TechEnter)
+				GameEvents.TeamSetHasTech.Remove(Moors_TechEnter_Renaissance)
 			end
 		end
 	end
 end
 
+function Moors_TechLeave(iTeam, iTech, bAdopted)
+	for playerID, player in pairs(Players) do
+		local player = Players[playerID];
+
+		if player:GetCivilizationType() == iCiv  then
+			if player:GetCurrentEra() > iEra then
+				for pCity in player:Cities() do
+					pCity:SetNumRealBuilding(iBuilding, 0);
+				end
+				GameEvents.PlayerCityFounded.Remove(Moors_CityFounded)
+				GameEvents.CityCaptureComplete.Remove(Moors_CityCaptured)
+				GameEvents.TeamSetHasTech.Remove(Moors_TechLeave)
+			end
+		end
+	end
+end
 
 if bIsActive then
-	GameEvents.TeamSetHasTech.Add(Moors_TechEnter)
+	GameEvents.TeamSetHasTech.Add(Moors_TechEnter_Medival)
 end