diff --git a/CvGameCore_Expansion2.dll b/CvGameCore_Expansion2.dll deleted file mode 100644 index 70b987e..0000000 Binary files a/CvGameCore_Expansion2.dll and /dev/null differ diff --git a/CvGameCore_Expansion2.pdb b/CvGameCore_Expansion2.pdb deleted file mode 100644 index 8502e82..0000000 Binary files a/CvGameCore_Expansion2.pdb and /dev/null differ diff --git a/loveMod/CvGameCore_Expansion2.dll b/loveMod/CvGameCore_Expansion2.dll index b70f901..f49ecec 100644 Binary files a/loveMod/CvGameCore_Expansion2.dll and b/loveMod/CvGameCore_Expansion2.dll differ diff --git a/loveMod/CvGameCore_Expansion2.pdb b/loveMod/CvGameCore_Expansion2.pdb index f6f9f62..ae76326 100644 Binary files a/loveMod/CvGameCore_Expansion2.pdb and b/loveMod/CvGameCore_Expansion2.pdb differ diff --git a/loveMod/Mods/Lua/Moors.lua b/loveMod/Mods/Lua/Moors.lua index 4b15bf4..d3e45ba 100644 --- 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 \ No newline at end of file diff --git a/loveMod/Override/CIV5Units.xml b/loveMod/Override/CIV5Units.xml index b95f929..bf3d810 100644 --- a/loveMod/Override/CIV5Units.xml +++ b/loveMod/Override/CIV5Units.xml @@ -84979,6 +84979,7 @@ lithuania changes --> Trait -1 20 + 20 BUILDINGCLASS_MOORS_TRAIT MONUMENT 0 @@ -84994,6 +84995,7 @@ lithuania changes --> Trait -1 10 + 10 BUILDINGCLASS_MOORS_TRAIT MONUMENT 0 @@ -85338,21 +85340,139 @@ lithuania changes --> 1 - BUILDING_MALIAN_TREASURY - BUILDINGCLASS_IRONWORKS - 125 - true + BUILDING_MALIAN_TREASURY + TXT_KEY_BUILDING_MALIAN_TREASURY + TXT_KEY_CIV5_BUILDINGS_MALIAN_TREASURY_TEXT + TXT_KEY_BUILDING_MALIAN_TREASURY_STRATEGY + TXT_KEY_BUILDING_MALIAN_TREASURY_HELP + 0 + -1 + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + true + true + false + false + false + false + false + 125 + 0 + 0 + false + false + false 30 - TECH_MACHINERY - TXT_KEY_BUILDING_MALIAN_TREASURY - TXT_KEY_CIV5_BUILDINGS_MALIAN_TREASURY_TEXT - TXT_KEY_BUILDING_MALIAN_TREASURY_STRATEGY - TXT_KEY_BUILDING_MALIAN_TREASURY_HELP - ART_DEF_BUILDING_BANK - -1 - -1 - NQ_ATLAS - 3 + -1 + -1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + false + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + false + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + false + false + false + false + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + BUILDINGCLASS_IRONWORKS + ART_DEF_BUILDING_IRONWORKS + 0 + TECH_MACHINERY + 0 + 0 + 0 + 0 + 0 + false + 0 + 3 + R,T + NQ_ATLAS + false + false + false + 0 + 0 + 0 true @@ -298180,8 +298300,8 @@ lithuania changes --> PROMOTION_MACHINEGUN_VS_LAND - TXT_KEY_PROMOTION_ARMOR_VS_LAND - TXT_KEY_PROMOTION_ARMOR_VS_LAND_HELP + TXT_KEY_PROMOTION_MACHINEGUN_VS_LAND + TXT_KEY_PROMOTION_MACHINEGUN_VS_LAND_HELP 59 ABILITY_ATLAS 0 @@ -298305,7 +298425,7 @@ lithuania changes --> false false PEDIA_ATTRIBUTES - TXT_KEY_PROMOTION_ARMOR_VS_LAND_HELP + TXT_KEY_PROMOTION_MACHINEGUN_VS_LAND_HELP 0 false 0 @@ -307348,6 +307468,10 @@ lithuania changes --> UNIT_SCOUT PROMOTION_IGNORE_TERRAIN_COST + + UNIT_HORSE_SCOUT + PROMOTION_IGNORE_TERRAIN_COST + UNIT_HORSE_SCOUT PROMOTION_NO_CAPTURE @@ -308970,6 +309094,10 @@ lithuania changes --> UNIT_KHMER_WARELEPHANT PROMOTION_CITY_SIEGE_WEAK + + UNIT_KHMER_WARELEPHANT + PROMOTION_INDIRECT_FIRE + UNIT_IMPRENDITORE PROMOTION_EMBARKATIO @@ -332852,36 +332980,93 @@ lithuania changes --> UNIT_FLAG_ATLAS - UNITCLASS_COMPOSITE_BOWMAN - UNIT_MALIAN_SKIRMISHER - TECH_CONSTRUCTION - 8 - 12 - 86 - 172 - true - 2 - 2 - UNITCOMBAT_ARCHER - DOMAIN_LAND - UNITAI_RANGED - TXT_KEY_UNIT_MALIAN_SKIRMISHER - TXT_KEY_CIV5_MALIAN_SKIRMISHER_TEXT - TXT_KEY_UNIT_MALIAN_SKIRMISHER_STRATEGY - TXT_KEY_UNIT_HELP_MALIAN_SKIRMISHER - true - true - true - TECH_MACHINERY - UNITCLASS_CROSSBOWMAN - 20 - 3 - 3 - ART_DEF_UNIT_COMPOSITE_BOWMAN - NQ_UNIT_FLAG_ATLAS - 0 - NQ_ATLAS - 2 + UNIT_MALIAN_SKIRMISHER + TXT_KEY_UNIT_MALIAN_SKIRMISHER + TXT_KEY_CIV5_MALIAN_SKIRMISHER_TEXT + TXT_KEY_UNIT_MALIAN_SKIRMISHER_STRATEGY + TXT_KEY_UNIT_HELP_MALIAN_SKIRMISHER + 8 + 12 + 86 + 172 + true + false + false + 2 + false + 2 + 2 + UNITCLASS_COMPOSITE_BOWMAN + UNITCOMBAT_ARCHER + DOMAIN_LAND + UNITAI_RANGED + false + false + false + true + true + true + false + false + 0 + 0 + 0 + 0 + 0 + false + false + false + false + false + TECH_CONSTRUCTION + TECH_MACHINERY + UNITCLASS_CROSSBOWMAN + 0 + 20 + -1 + 0 + 0 + -1 + 0 + 0 + 0 + 0 + false + 0 + 0 + 0 + 0 + false + false + 0 + 0 + false + false + false + false + 100 + false + false + false + 0 + 0 + 3 + 3 + 0 + 0 + false + 0 + ART_DEF_UNIT_COMPOSITE_BOWMAN + false + false + 0 + false + true + BIPED + 0 + 2 + NQ_ATLAS + NQ_UNIT_FLAG_ATLAS diff --git a/loveMod/Override/CIV5Units_Mongol.xml b/loveMod/Override/CIV5Units_Mongol.xml index 5b1bdbe..d5e70a0 100644 --- a/loveMod/Override/CIV5Units_Mongol.xml +++ b/loveMod/Override/CIV5Units_Mongol.xml @@ -8,6 +8,18 @@ --> + + + + Bonus vs Land Units (25) + + + + + +25% [ICON_STRENGTH] Combat Strength against [COLOR_POSITIVE_TEXT]Land Units[ENDCOLOR]. + + + Skirmisher @@ -1324,7 +1336,7 @@ Hassan - During the Medival Era, all Cities have a 20% [ICON_PRODUCTION] Production boost towards buildings (except Wonders). + During the Medival Era, all Cities have a 20% [ICON_PRODUCTION] Production boost towards buildings. During the Renaissance Era, all Cities have a 10% [ICON_PRODUCTION] Production boost towards buildings @@ -135948,7 +135960,7 @@ The ship has weather'd every rack; the prize we sought is won." - The Dalai Lama is the Tibetan replacement for Great Prophet. It has 1 extra religion spread and 1 extra sight. Upon birth grants [ICON_PEACE] Faith equal to 15% of next Great Prophet cost. Any action that consumes this unit starts a 7 turn [ICON_GOLDEN_AGE] Golden Age. + The Dalai Lama is the Tibetan replacement for Great Prophet. It has 1 extra religion spread and 1 extra sight. Any action that consumes this unit starts a 4 turn [ICON_GOLDEN_AGE] Golden Age.