mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-15 18:28:42 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added ai unhappiness modifier to difficulty

Browse Source
This commit is contained in:
Yair Morgenstern
2018-07-27 10:03:44 +03:00
parent 1689005fef
commit 8b259a3db3
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
android/assets/jsons/Difficulties.json
View File

@ -7,7 +7,8 @@
aiCityGrowthModifier:1.6, // that is to say it'll take them 1.6 times as long to grow the city aiCityGrowthModifier:1.6, // that is to say it'll take them 1.6 times as long to grow the city
aiUnitMaintainanceModifier:1, aiUnitMaintainanceModifier:1,
aiConstructionModifier:0.6, // Replaces "Construction rate" and "Create rate" in original config aiConstructionModifier:0.6, // Replaces "Construction rate" and "Create rate" in original config
aiFreeTechs:[] aiFreeTechs:[],
aiUnhappinessModifier:1
}, },
{ {
name:"Chieftain", name:"Chieftain",
@ -17,7 +18,8 @@
aiCityGrowthModifier:1.3, aiCityGrowthModifier:1.3,
aiUnitMaintainanceModifier:1, aiUnitMaintainanceModifier:1,
aiConstructionModifier:0.75, aiConstructionModifier:0.75,
aiFreeTechs:[] aiFreeTechs:[],
aiUnhappinessModifier:1
}, },
{ {
name:"Warlord", name:"Warlord",
@ -27,7 +29,8 @@
aiCityGrowthModifier:1.1, aiCityGrowthModifier:1.1,
aiUnitMaintainanceModifier:1, aiUnitMaintainanceModifier:1,
aiConstructionModifier:0.9, aiConstructionModifier:0.9,
aiFreeTechs:[] aiFreeTechs:[],
aiUnhappinessModifier:1
}, },
{ {
name:"Prince", name:"Prince",
@ -37,7 +40,8 @@
aiCityGrowthModifier:1, aiCityGrowthModifier:1,
aiUnitMaintainanceModifier:0.85, aiUnitMaintainanceModifier:0.85,
aiConstructionModifier:1, aiConstructionModifier:1,
aiFreeTechs:[] aiFreeTechs:[],
aiUnhappinessModifier:1
}, },
{ {
name:"King", name:"King",
@ -47,7 +51,8 @@
aiCityGrowthModifier:0.9, aiCityGrowthModifier:0.9,
aiUnitMaintainanceModifier:0.8, aiUnitMaintainanceModifier:0.8,
aiConstructionModifier:1.15, aiConstructionModifier:1.15,
aiFreeTechs:["Pottery"] aiFreeTechs:["Pottery"],
aiUnhappinessModifier:0.9
}, },
{ {
name:"Emperor", name:"Emperor",
@ -57,7 +62,8 @@
aiCityGrowthModifier:0.85, aiCityGrowthModifier:0.85,
aiUnitMaintainanceModifier:0.75, aiUnitMaintainanceModifier:0.75,
aiConstructionModifier:1.25, aiConstructionModifier:1.25,
aiFreeTechs:["Pottery","Animal Husbandry"] aiFreeTechs:["Pottery","Animal Husbandry"],
aiUnhappinessModifier:0.85
}, },
{ {
name:"Immortal", name:"Immortal",
@ -67,7 +73,8 @@
aiCityGrowthModifier:0.75, aiCityGrowthModifier:0.75,
aiUnitMaintainanceModifier:0.65, aiUnitMaintainanceModifier:0.65,
aiConstructionModifier:1.5, aiConstructionModifier:1.5,
aiFreeTechs:["Pottery","Animal Husbandry","Mining"] aiFreeTechs:["Pottery","Animal Husbandry","Mining"],
aiUnhappinessModifier:0.75
}, },
{ {
name:"Deity", name:"Deity",
@ -77,6 +84,7 @@
aiCityGrowthModifier:0.6, aiCityGrowthModifier:0.6,
aiUnitMaintainanceModifier:0.5, aiUnitMaintainanceModifier:0.5,
aiConstructionModifier:2, aiConstructionModifier:2,
aiFreeTechs:["Pottery","Animal Husbandry","Mining","The Wheel"] aiFreeTechs:["Pottery","Animal Husbandry","Mining","The Wheel"],
aiUnhappinessModifier:0.6
} }
] ]

1
core/src/com/unciv/GameStarter.kt
View File

@ -35,6 +35,7 @@ class GameStarter(){
gameInfo.civilizations.add(barbarianCivilization)// second is barbarian civ gameInfo.civilizations.add(barbarianCivilization)// second is barbarian civ
for (civname in GameBasics.Civilizations.keys.filterNot { it=="Barbarians" || it==civilization }.take(numberOfCivs)) { for (civname in GameBasics.Civilizations.keys.filterNot { it=="Barbarians" || it==civilization }.take(numberOfCivs)) {
if(freeTiles.isEmpty()) break // we can't add any more civs.
val startingLocation = freeTiles.toList().getRandom().position val startingLocation = freeTiles.toList().getRandom().position
val civ = CivilizationInfo(civname, startingLocation, gameInfo) val civ = CivilizationInfo(civname, startingLocation, gameInfo)
civ.tech.techsResearched.addAll(playerCiv.getDifficulty().aiFreeTechs) civ.tech.techsResearched.addAll(playerCiv.getDifficulty().aiFreeTechs)

2
core/src/com/unciv/logic/city/CityStats.kt
View File

@ -101,6 +101,8 @@ class CityStats {
fun getCityHappiness(): LinkedHashMap<String, Float> { fun getCityHappiness(): LinkedHashMap<String, Float> {
val civInfo = cityInfo.civInfo val civInfo = cityInfo.civInfo
var unhappinessModifier = civInfo.getDifficulty().unhappinessModifier var unhappinessModifier = civInfo.getDifficulty().unhappinessModifier
if(!civInfo.isPlayerCivilization())
unhappinessModifier *= civInfo.gameInfo.getPlayerCivilization().getDifficulty().aiUnhappinessModifier
happinessList["Cities"] = -3f * unhappinessModifier happinessList["Cities"] = -3f * unhappinessModifier

1
core/src/com/unciv/models/gamebasics/Difficulty.kt
View File

@ -12,4 +12,5 @@ class Difficulty: INamed {
var aiUnitMaintainanceModifier = 1f var aiUnitMaintainanceModifier = 1f
var aiConstructionModifier = 1f var aiConstructionModifier = 1f
var aiFreeTechs = ArrayList<String>() var aiFreeTechs = ArrayList<String>()
var aiUnhappinessModifier = 1f
} }