wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source 
update
This commit is contained in:
YueR 2019-10-08 15:35:27 +08:00
commit 43cf084b9f
4 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/assets/jsons/Difficulties.json
View file

@ -8,6 +8,7 @@
buildingCostModifier:0.5,
policyCostModifier:0.5,
unhappinessModifier:0.4,
barbarianBonus:0.75,
aiCityGrowthModifier:1.6, // that is to say it'll take them 1.6 times as long to grow the city
aiUnitCostModifier:1.75,
aiBuildingCostModifier:1.6,
@ -28,6 +29,7 @@
buildingCostModifier:0.67,
policyCostModifier:0.67,
unhappinessModifier:0.6,
barbarianBonus:0.5,
aiCityGrowthModifier:1.3,
aiUnitCostModifier:1.3,
aiBuildingCostModifier:1.3,
@ -48,6 +50,7 @@
buildingCostModifier:0.85,
policyCostModifier:0.85,
unhappinessModifier:0.75,
barbarianBonus:0.4,
aiCityGrowthModifier:1.1,
aiUnitCostModifier:1.1,
aiBuildingCostModifier:1.1,
@ -68,6 +71,7 @@
buildingCostModifier:1,
policyCostModifier:1,
unhappinessModifier:1,
barbarianBonus:0.33,
aiCityGrowthModifier:1,
aiUnitCostModifier:1,
aiBuildingCostModifier:1,
@ -88,6 +92,7 @@
buildingCostModifier:1,
policyCostModifier:1,
unhappinessModifier:1,
barbarianBonus:0.25,
aiCityGrowthModifier:0.9,
aiUnitCostModifier:0.85,
aiBuildingCostModifier:0.85,
@ -108,6 +113,7 @@
buildingCostModifier:1,
policyCostModifier:1,
unhappinessModifier:1,
barbarianBonus:0.2,
aiCityGrowthModifier:0.85,
aiUnitCostModifier:0.8,
aiBuildingCostModifier:0.8,
@ -128,6 +134,7 @@
buildingCostModifier:1,
policyCostModifier:1,
unhappinessModifier:1,
barbarianBonus:0.1,
aiCityGrowthModifier:0.75,
aiUnitCostModifier:0.65,
aiBuildingCostModifier:0.65,
@ -148,6 +155,7 @@
buildingCostModifier:1,
policyCostModifier:1,
unhappinessModifier:1,
barbarianBonus:0,
aiCityGrowthModifier:0.6,
aiUnitCostModifier:0.5,
aiBuildingCostModifier:0.5,

9
core/src/com/unciv/logic/battle/BattleDamage.kt
View file

@ -92,9 +92,12 @@ class BattleDamage{
}
if (combatant.getCivInfo().policies.isAdopted("Honor") && enemy.getCivInfo().isBarbarian())
modifiers["vs Barbarians"] = 0.25f
if (enemy.getCivInfo().isBarbarian()) {
modifiers["Difficulty"] = combatant.getCivInfo().gameInfo.getDifficulty().barbarianBonus
if (combatant.getCivInfo().policies.isAdopted("Honor"))
modifiers["vs Barbarians"] = 0.25f
}
return modifiers
}

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

@ -12,6 +12,7 @@ class Difficulty: INamed {
var buildingCostModifier:Float = 1f
var policyCostModifier:Float = 1f
var unhappinessModifier:Float = 1f
var barbarianBonus:Float = 0f
var aiCityGrowthModifier:Float = 1f
var aiUnitCostModifier:Float = 1f
var aiBuildingCostModifier:Float = 1f

8
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View file

@ -52,6 +52,7 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
private val notificationsScroll: NotificationsScroll
var alertPopupIsOpen = false // if we have an alert popup and then we changed screens, the old one shouldn't affect us
var shouldUpdate=false
init {
topBar.setPosition(0f, stage.height - topBar.height)
@ -112,7 +113,6 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
}
tileMapHolder.setCenterPosition(tileToCenterOn,true)
update()
if(gameInfo.gameParameters.isOnlineMultiplayer && !gameInfo.isUpToDate)
isPlayersTurn = false // until we're up to date, don't let the player do anything
@ -121,6 +121,10 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
loadLatestMultiplayerState()
}, Actions.delay(10f)))) // delay is in seconds
}
// don't run update() directly, because the UncivGame.worldScreen should be set so that the city buttons and tile groups
// know what the viewing civ is.
shouldUpdate=true
}
fun loadLatestMultiplayerState(){
@ -409,8 +413,6 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
}
}
var shouldUpdate=false
override fun render(delta: Float) {
// This is so that updates happen in the MAIN THREAD, where there is a GL Context,