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

update

Browse Source
This commit is contained in:
YueR 2019-10-04 20:08:06 +08:00
parent 51a3e24912
commit 9060981709
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
android/assets/game.atlas
View File

@ -426,7 +426,7 @@ BuildingIcons/Paper Maker
index: -1
BuildingIcons/Pentagon
rotate: false
xy: 2144, 514
xy: 308, 503
size: 100, 100
orig: 100, 100
offset: 0, 0
@ -860,21 +860,21 @@ ImprovementIcons/Quarry
index: -1
ImprovementIcons/Railroad
rotate: false
xy: 1532, 412
xy: 1634, 412
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
TileSets/Default/Railroad
rotate: false
xy: 1532, 412
xy: 1634, 412
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
TileSets/FantasyHex/Railroad
rotate: false
xy: 1532, 412
xy: 1634, 412
size: 100, 100
orig: 100, 100
offset: 0, 0
@ -1098,7 +1098,7 @@ OtherIcons/MenuIcon
index: -1
OtherIcons/Pentagon
rotate: false
xy: 308, 503
xy: 2144, 514
size: 100, 100
orig: 100, 100
offset: 0, 0
@ -2169,7 +2169,7 @@ TechIcons/Radio
index: -1
TechIcons/Railroad
rotate: false
xy: 1634, 412
xy: 1532, 412
size: 100, 100
orig: 100, 100
offset: 0, 0

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1008 KiB

After

Width:  |  Height:  |  Size: 1008 KiB

4
core/src/com/unciv/logic/battle/CityCombatant.kt
View File

@ -49,9 +49,9 @@ class CityCombatant(val city: CityInfo) : ICombatant {
// Industrial - 32.4, Modern - 51, Atomic - 72.5, All - 118.3
// 100% of the way through the game provides an extra 50.00
// Garrisoned unit gives up to 20% of strength to city, in original game strengh of unit has nothing to do with health, health only is related to damage.
// Garrisoned unit gives up to 20% of strength to city, health-dependant
if(cityTile.militaryUnit!=null)
strength += cityTile.militaryUnit!!.baseUnit().strength / 5f
strength += cityTile.militaryUnit!!.baseUnit().strength * (cityTile.militaryUnit!!.health / 100f) * 0.2f
var buildingsStrength = city.cityConstructions.getBuiltBuildings().sumBy{ it.cityStrength }.toFloat()
if(getCivInfo().containsBuildingUnique("Defensive buildings in all cities are 25% more effective"))