mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-14 09:48:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added America civ

Browse Source
This commit is contained in:
Yair Morgenstern
2018-10-04 23:33:08 +03:00
parent 4280df329f
commit 50c2ad4573
5 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/ResourceIcons/Sugar.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
android/Images/TechIcons/Plastics.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

9
android/assets/jsons/Nations.json
View File

@ -72,6 +72,15 @@
"Aden","Yamama","Muscat","Mansura","Bukhara","Fez","Shiraz","Merw","Balkh","Mosul", "Aden","Yamama","Muscat","Mansura","Bukhara","Fez","Shiraz","Merw","Balkh","Mosul",
"Aydab","Bayt","Suhar","Taif","Hama","Tabuk","Sana'a","Shihr","Tripoli","Tunis"] "Aydab","Bayt","Suhar","Taif","Hama","Tabuk","Sana'a","Shihr","Tripoli","Tunis"]
}, },
{
name:"America",
mainColor:[ 28,51,119],
secondaryColor:[255,255,255],
unique:"All land military units have +1 sight, 50% discount when purchasing tiles",
cities:["Washington","New York","Boston","Philadelphia","Atlanta","Chicago","Seattle","San Francisco","Los Angeles","Houston",
"Portland","St. Louis","Miami","Buffalo","Detroit","New Orleans","Baltimore","Denver","Cincinnati","Dallas","Memphis",
"Cleveland","Kansas City","San Diego","Richmond","Las Vegas","Phoenix","Albuquerque","Minneapolis","Pittsburgh"]
},
{ {
name:"Barbarians", name:"Barbarians",
mainColor:[200,200,200], mainColor:[200,200,200],

4
core/src/com/unciv/logic/city/CityExpansionManager.kt
View File

@ -42,7 +42,9 @@ class CityExpansionManager {
val baseCost = 50 val baseCost = 50
val numTilesClaimed= cityInfo.tiles.size - 7 val numTilesClaimed= cityInfo.tiles.size - 7
val distanceFromCenter = tileInfo.arialDistanceTo(cityInfo.getCenterTile()) val distanceFromCenter = tileInfo.arialDistanceTo(cityInfo.getCenterTile())
val cost = baseCost * (distanceFromCenter-1) + numTilesClaimed*5 var cost = baseCost * (distanceFromCenter-1) + numTilesClaimed*5
if(cityInfo.civInfo.getNation().unique=="All land military units have +1 sight, 50% discount when purchasing tiles")
cost /= 2
return cost return cost
} }

3
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -76,6 +76,8 @@ class MapUnit {
var visibilityRange = 2 var visibilityRange = 2
visibilityRange += getUniques().count{it=="+1 Visibility Range"} visibilityRange += getUniques().count{it=="+1 Visibility Range"}
if(hasUnique("Limited Visibility")) visibilityRange-=1 if(hasUnique("Limited Visibility")) visibilityRange-=1
if(civInfo.getNation().unique=="All land military units have +1 sight, 50% discount when purchasing tiles")
visibilityRange += 1
val tile = getTile() val tile = getTile()
if (tile.baseTerrain == "Hill") visibilityRange += 1 if (tile.baseTerrain == "Hill") visibilityRange += 1
return tile.getViewableTiles(visibilityRange) return tile.getViewableTiles(visibilityRange)
@ -222,6 +224,7 @@ class MapUnit {
class YouCantGetThereFromHereException : Exception() class YouCantGetThereFromHereException : Exception()
if (!distanceToTiles.containsKey(otherTile)) if (!distanceToTiles.containsKey(otherTile))
throw YouCantGetThereFromHereException() throw YouCantGetThereFromHereException()
class CantEnterThisTileException : Exception() class CantEnterThisTileException : Exception()