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

Preparation for hill as terrain feature (#3784)

Browse Source 
* ensure backwards compatibility

* Added new Hill.png

* Added temp TileSetConfig to support new hill sprite

* Added missing Ancient ruins tiles
This commit is contained in:
GGGuenni 2021-04-13 21:05:06 +02:00 committed by GitHub
parent 0440a70a9c
commit 00ec000d50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 398 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/TileSets/FantasyHex-New/Tiles/Hill.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 771 B

After

Width:  |  Height:  |  Size: 720 B

682
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 887 KiB

After

Width:  |  Height:  |  Size: 888 KiB

1
android/assets/jsons/Civ V - Vanilla/Terrains.json
View File

@ -65,6 +65,7 @@
"type": "Land",
"production": 2,
"movementCost": 2,
"overrideStats": true,
"defenceBonus": 0.25,
"RGB": [105,125,72],
"rough": true

55
android/assets/jsons/TileSets/FantasyHex-New.json Normal file
View File

@ -0,0 +1,55 @@
{
"useColorAsBaseTerrain": "false",
"ruleVariants": {
"Hill": ["Grassland","Hill"],
"Hill+Ancient ruins": ["Grassland","Hill","Ancient ruins"],
"Hill+Sheep": ["Grassland","Hill","Sheep"],
"Hill+Sheep+Ancient ruins": ["Grassland","Hill","Sheep","Ancient ruins"],
"Hill+Sheep+Pasture": ["Grassland","Hill","Sheep+Pasture"],
"Hill+Horses": ["Grassland","Hill","Horses"],
"Hill+Horses+Ancient ruins": ["Grassland","Hill","Horses","Ancient ruins"],
"Hill+Horses+Pasture": ["Grassland","Hill","Horses+Pasture"],
"Hill+Deer": ["Grassland","Hill","Deer"],
"Hill+Deer+Ancient ruins": ["Grassland","Hill","Deer","Ancient ruins"],
"Hill+Deer+Camp": ["Grassland","Hill","Deer+Camp"],
"Hill+Iron": ["Grassland","Hill","Iron"],
"Hill+Iron+Ancient ruins": ["Grassland","Hill","Iron","Ancient ruins"],
"Hill+Iron+Mine": ["Grassland","Hill","Iron","Mine"],
"Hill+Aluminum": ["Grassland","Hill","Aluminum"],
"Hill+Aluminum+Ancient ruins": ["Grassland","Hill","Aluminum","Ancient ruins"],
"Hill+Aluminum+Mine": ["Grassland","Hill","Aluminum","Mine"],
"Hill+Uranium": ["Grassland","Hill","Uranium"],
"Hill+Uranium+Ancient ruins": ["Grassland","Hill","Uranium","Ancient ruins"],
"Hill+Uranium+Mine": ["Grassland","Hill","Uranium","Mine"],
"Hill+Coal": ["Grassland","Hill","Coal"],
"Hill+Coal+Ancient ruins": ["Grassland","Hill","Coal","Ancient ruins"],
"Hill+Coal+Mine": ["Grassland","Hill","Coal","Mine"],
"Hill+Silver": ["Grassland","Hill","Silver"],
"Hill+Silver+Ancient ruins": ["Grassland","Hill","Silver","Ancient ruins"],
"Hill+Silver+Mine": ["Grassland","Hill","Silver","Mine"],
"Hill+Gold Ore": ["Grassland","Hill","Gold Ore"],
"Hill+Gold Ore+Ancient ruins": ["Grassland","Hill","Gold Ore","Ancient ruins"],
"Hill+Gold Ore+Mine": ["Grassland","Hill","Gold Ore","Mine"],
"Hill+Marble": ["Grassland","Hill","Marble"],
"Hill+Marble+Ancient ruins": ["Grassland","Hill","Marble","Ancient ruins"],
"Hill+Marble+Quarry": ["Grassland","Hill","Quarry+Marble"],
"Hill+Gems": ["Grassland","Hill","Gems"],
"Hill+Gems+Ancient ruins": ["Grassland","Hill","Gems","Ancient ruins"],
"Hill+Gems+Mine": ["Grassland","Hill","Gems","Mine"],
"Hill+Dyes": ["Grassland","Hill","Dyes"],
"Hill+Dyes+Ancient ruins": ["Grassland","Hill","Dyes","Ancient ruins"],
"Hill+Dyes+Plantation": ["Grassland","Hill","Dyes+Plantation"],
"Hill+Spices": ["Grassland","Hill","Spices"],
"Hill+Spices+Ancient ruins": ["Grassland","Hill","Spices","Ancient ruins"],
"Hill+Spices+Plantation": ["Grassland","Hill","Spices+Plantation"],
"Hill+Silk": ["Grassland","Hill","Silk"],
"Hill+Silk+Ancient ruins": ["Grassland","Hill","Silk","Ancient ruins"],
"Hill+Silk+Plantation": ["Grassland","Hill","Silk+Plantation"],
"Hill+Furs": ["Grassland","Hill","Furs"],
"Hill+Furs+Ancient ruins": ["Grassland","Hill","Furs","Ancient ruins"],
"Hill+Furs+Camp": ["Grassland","Hill","Furs+Camp"]
}
}

2
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -74,7 +74,7 @@ open class TileInfo {
var roadStatus = RoadStatus.None
var turnsToImprovement: Int = 0
fun isHill() = baseTerrain == Constants.hill
fun isHill() = baseTerrain == Constants.hill || terrainFeatures.contains(Constants.hill)
var hasBottomRightRiver = false
var hasBottomRiver = false