diff --git a/android/Images/TileSets/FantasyHex/Tiles/Barringer Crater.png b/android/Images/TileSets/FantasyHex/Tiles/Barringer Crater.png deleted file mode 100644 index bac06caef6..0000000000 Binary files a/android/Images/TileSets/FantasyHex/Tiles/Barringer Crater.png and /dev/null differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Cerro de Potosi.png b/android/Images/TileSets/FantasyHex/Tiles/Cerro de Potosi.png deleted file mode 100644 index a63dc32308..0000000000 Binary files a/android/Images/TileSets/FantasyHex/Tiles/Cerro de Potosi.png and /dev/null differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/El Dorado.png b/android/Images/TileSets/FantasyHex/Tiles/El Dorado.png index 01884e7901..a0bac9465f 100644 Binary files a/android/Images/TileSets/FantasyHex/Tiles/El Dorado.png and b/android/Images/TileSets/FantasyHex/Tiles/El Dorado.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Fountain of Youth.png b/android/Images/TileSets/FantasyHex/Tiles/Fountain of Youth.png index 5fd5d0eded..25012867e6 100644 Binary files a/android/Images/TileSets/FantasyHex/Tiles/Fountain of Youth.png and b/android/Images/TileSets/FantasyHex/Tiles/Fountain of Youth.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Grand Mesa.png b/android/Images/TileSets/FantasyHex/Tiles/Grand Mesa.png deleted file mode 100644 index 08f390f57b..0000000000 Binary files a/android/Images/TileSets/FantasyHex/Tiles/Grand Mesa.png and /dev/null differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Great Barrier Reef.png b/android/Images/TileSets/FantasyHex/Tiles/Great Barrier Reef.png index b01ed763bd..cfba434b85 100644 Binary files a/android/Images/TileSets/FantasyHex/Tiles/Great Barrier Reef.png and b/android/Images/TileSets/FantasyHex/Tiles/Great Barrier Reef.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Krakatoa.png b/android/Images/TileSets/FantasyHex/Tiles/Krakatoa.png deleted file mode 100644 index ba41afafcc..0000000000 Binary files a/android/Images/TileSets/FantasyHex/Tiles/Krakatoa.png and /dev/null differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Mount Fuji.png b/android/Images/TileSets/FantasyHex/Tiles/Mount Fuji.png deleted file mode 100644 index 8127f2005c..0000000000 Binary files a/android/Images/TileSets/FantasyHex/Tiles/Mount Fuji.png and /dev/null differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Old Faithful.png b/android/Images/TileSets/FantasyHex/Tiles/Old Faithful.png index 56f8b24f28..c85a1d602e 100644 Binary files a/android/Images/TileSets/FantasyHex/Tiles/Old Faithful.png and b/android/Images/TileSets/FantasyHex/Tiles/Old Faithful.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Rock of Gibraltar.png b/android/Images/TileSets/FantasyHex/Tiles/Rock of Gibraltar.png deleted file mode 100644 index 4ffd21cf70..0000000000 Binary files a/android/Images/TileSets/FantasyHex/Tiles/Rock of Gibraltar.png and /dev/null differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index ebe0ed3801..2c8d1042c2 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -788,6 +788,20 @@ ImprovementIcons/Quarry orig: 100, 100 offset: 0, 0 index: -1 +ImprovementIcons/Railroad + rotate: false + xy: 206, 238 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/Railroad + rotate: false + xy: 206, 238 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 ImprovementIcons/Road rotate: false xy: 1736, 170 @@ -1707,7 +1721,7 @@ TechIcons/Radio index: -1 TechIcons/Railroad rotate: false - xy: 206, 238 + xy: 308, 238 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1789,6 +1803,20 @@ TileSets/Default/CityOverlay orig: 100, 100 offset: 0, 0 index: -1 +TileSets/Default/CrosshatchHexagon + rotate: false + xy: 583, 1800 + size: 273, 236 + orig: 273, 236 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/CrosshatchHexagon + rotate: false + xy: 583, 1800 + size: 273, 236 + orig: 273, 236 + offset: 0, 0 + index: -1 TileSets/Default/FalloutOverlay rotate: false xy: 308, 1054 @@ -1859,37 +1887,9 @@ TileSets/Default/OasisOverlay orig: 100, 100 offset: 0, 0 index: -1 -TileSets/Default/Railroad - rotate: false - xy: 2, 226 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ImprovementIcons/Railroad - rotate: false - xy: 2, 226 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/FantasyHex/CrosshatchHexagon - rotate: false - xy: 583, 1800 - size: 273, 236 - orig: 273, 236 - offset: 0, 0 - index: -1 -TileSets/Default/CrosshatchHexagon - rotate: false - xy: 583, 1800 - size: 273, 236 - orig: 273, 236 - offset: 0, 0 - index: -1 TileSets/FantasyHex/Railroad rotate: false - xy: 308, 238 + xy: 2, 226 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2950,6 +2950,20 @@ TechIcons/Writing orig: 100, 100 offset: 0, 0 index: -1 +TileSets/Default/road + rotate: false + xy: 410, 32 + size: 61, 11 + orig: 61, 11 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/road + rotate: false + xy: 410, 32 + size: 61, 11 + orig: 61, 11 + offset: 0, 0 + index: -1 TileSets/FantasyHex/Tiles/Academy rotate: false xy: 476, 64 @@ -4203,20 +4217,6 @@ TileSets/FantasyHex/Units/Work Boats orig: 32, 26 offset: 0, 0 index: -1 -TileSets/FantasyHex/road - rotate: false - xy: 410, 32 - size: 61, 11 - orig: 61, 11 - offset: 0, 0 - index: -1 -TileSets/Default/road - rotate: false - xy: 410, 32 - size: 61, 11 - orig: 61, 11 - offset: 0, 0 - index: -1 UnitIcons/Submarine rotate: false xy: 206, 410 diff --git a/android/assets/game.png b/android/assets/game.png index 7a6202724b..218526d7e7 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Terrains.json b/android/assets/jsons/Terrains.json index a25c0754e3..4708789e0f 100644 --- a/android/assets/jsons/Terrains.json +++ b/android/assets/jsons/Terrains.json @@ -139,8 +139,51 @@ defenceBonus: -0.1, occursOn:["Desert"] }, - + // Natural Wonders + { + name: "Great Barrier Reef", + type: "NaturalWonder", + food: 2, + production: 1, + gold: 1, + science: 2, + occursOn: ["Coast"], + impassable: true, + unbuildable: true, + weight: 10 + }, + /** Yukky tile images + { + name: "Krakatoa", + type: "NaturalWonder", + science: 5, + occursOn: ["Ocean"], + impassable: true, + unbuildable: true, + weight: 10 + }, + { + name: "Mount Fuji", + type: "NaturalWonder", + gold: 1, + culture: 5, + occursOn: ["Grassland","Plains"], + impassable: true, + unbuildable: true, + weight: 10 + }, + { + name: "Rock of Gibraltar", + type: "NaturalWonder", + food: 2, + gold: 5, + occursOn: ["Grassland"], + impassable: true, + unbuildable: true, + weight: 10 + }, + */ { name: "Barringer Crater", type: "NaturalWonder", @@ -161,37 +204,6 @@ unbuildable: true, weight: 10 }, - { - name: "Great Barrier Reef", - type: "NaturalWonder", - food: 2, - production: 1, - gold: 1, - science: 2, - occursOn: ["Coast"], - impassable: true, - unbuildable: true, - weight: 10 - }, - { - name: "Krakatoa", - type: "NaturalWonder", - science: 5, - occursOn: ["Ocean"], - impassable: true, - unbuildable: true, - weight: 10 - }, - { - name: "Mount Fuji", - type: "NaturalWonder", - gold: 1, - culture: 5, - occursOn: ["Grassland","Plains"], - impassable: true, - unbuildable: true, - weight: 10 - }, { name: "Old Faithful", type: "NaturalWonder", @@ -202,16 +214,6 @@ unbuildable: true, weight: 10 }, - { - name: "Rock of Gibraltar", - type: "NaturalWonder", - food: 2, - gold: 5, - occursOn: ["Grassland"], - impassable: true, - unbuildable: true, - weight: 10 - }, { name: "Cerro de Potosi", type: "NaturalWonder", diff --git a/core/src/com/unciv/logic/civilization/TechManager.kt b/core/src/com/unciv/logic/civilization/TechManager.kt index 56250d09fd..a0ec644c41 100644 --- a/core/src/com/unciv/logic/civilization/TechManager.kt +++ b/core/src/com/unciv/logic/civilization/TechManager.kt @@ -154,7 +154,10 @@ class TechManager { fun limitOverflowScience(overflowscience: Int): Int { // http://www.civclub.net/bbs/forum.php?mod=viewthread&tid=123976 - return min(overflowscience, max(civInfo.statsForNextTurn.science.toInt() * 5, costOfTech(currentTechnologyName()!!))) + // Apparently yes, we care about the absolute tech cost, not the actual calculated-for-this-player tech cost, + // so don't change to costOfTech() + return min(overflowscience, max(civInfo.statsForNextTurn.science.toInt() * 5, + getRuleset().Technologies[currentTechnologyName()]!!.cost)) } fun nextTurn(scienceForNewTurn: Int) { diff --git a/core/src/com/unciv/logic/map/MapGenerator.kt b/core/src/com/unciv/logic/map/MapGenerator.kt index 8d15c82114..049e854878 100644 --- a/core/src/com/unciv/logic/map/MapGenerator.kt +++ b/core/src/com/unciv/logic/map/MapGenerator.kt @@ -343,7 +343,7 @@ class MapGenerator { val wonder = ruleset.Terrains[Constants.GreatBarrierReef]!! val suitableLocations = mapToReturn.values.filter { it.resource == null && it.improvement == null && wonder.occursOn!!.contains(it.getLastTerrain().name) - && it.neighbors.none{ neighbor -> neighbor.getBaseTerrain().name != Constants.tundra} + && it.neighbors.none{ neighbor -> neighbor.getBaseTerrain().name == Constants.tundra } && it.neighbors.any { neighbor -> neighbor.getBaseTerrain().name != Constants.ocean && neighbor.getBaseTerrain().name != Constants.coast } && it.neighbors.any { neighbor -> neighbor.getBaseTerrain().name == Constants.coast