Commit Graph

3114 Commits

Author SHA1 Message Date
dd4778495e Added "Provides yield without assigned population" uniques to tile improvements 2021-03-17 23:10:21 +02:00
755586eecd Added TileInfo.providsYield() - this will help us later 2021-03-17 22:47:21 +02:00
cdc7739784 overlaying existing terrainFeatures now (#3706) 2021-03-17 21:58:48 +02:00
5fa14b9533 More terrainFeature refactoring (#3695)
* call convertTerrainFeature on setTerrainTransients

setTransients doesn't get called on deserialization only setTerrainTransients and setUnitTransients...

* refactored terrainFeature in TileGroup

* rulesetIncompatibility support for multiple terrain features

+fixed typo IncompatAbility -> IncompatIbility

* Make use of TileSetStrings optimization

* Seperate multiple terrain features with "+"
2021-03-16 16:14:04 +02:00
cde1b150d3 Unit name is translated when unit has a unique name 2021-03-15 23:18:00 +02:00
3bbac04303 Deprecated uniques replaced in 3.12.10 2021-03-15 22:37:07 +02:00
c7bd528052 Shortened initial loading time by removing double loading of atlas 2021-03-15 22:13:55 +02:00
4fa0a2b4b8 Resolved #3401, Resolved #3598, possibly resolved #3643 - game can be instantly closed and reopened on Android
From a practical standpoint - Reset all GL objects upon create(), since they lose all relevance when we have a new GL context
2021-03-15 21:56:16 +02:00
d7214b7a46 Method getImprovementIcon can Setsize for all icon (#3685)
* Method getImprovementIcon can Setsize for all icon

* categoryButton doesn't change background-color if it's disabled
2021-03-15 21:00:09 +02:00
dc55d31a58 Remove tile improvements not in the current ruleset on normalizeTile
Mitigated mysterious crash in WorldMapHolder.updateTiles()
2021-03-15 20:54:41 +02:00
57f6c99d86 More terrainFeature refactors (#3694) 2021-03-13 23:38:11 +02:00
20f5672337 Resolved #3686 - world wrapped 'continents' map now separates continents properly 2021-03-13 23:02:57 +02:00
aab037b409 Resolved #3691 - 'new map' from map editor copies existing map parameters 2021-03-13 22:39:57 +02:00
a37ac74fa9 'in all coastal cities' now translated 2021-03-13 22:38:53 +02:00
309e29b922 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-13 22:38:25 +02:00
5564d4db7e Game no longer crashes due to incorrect building-improvement modding combinations 2021-03-13 22:35:24 +02:00
aa61fd0f40 multiple terrain features (TileInfo) (#3689)
* Changed getTerrainFeature to getTerrainFeatures

* Changed equals to contains

for getHeight and forestOrJungleIsRoads

* Changed equal to contains

for matchesUniqueFilter

* Last changes in TileInfo for now

* make sure terrainFeature field is null

we cant be certain if setTransients got called so we have make sure we set field = null inside the getter
2021-03-13 22:23:29 +02:00
b658e04048 Fix the Military Caste policy (#3692) 2021-03-13 22:16:54 +02:00
fd177b1200 remove transient (#3688)
since it not only blocks serialization it also blocks deserialization
2021-03-12 13:43:14 +02:00
d1df2fd128 Adding convert Function (#3687)
* Adding convert Function

* field = null to be safe
2021-03-12 12:20:55 +02:00
02cd1a2ef3 More multiple terrain feature changes 2021-03-11 23:09:05 +02:00
01877fee7c Fixed Great Barrier Reef spawn rules 2021-03-11 22:17:59 +02:00
9eaf4f4826 Copy all terrain features on clone(), not just first
Use terrainFeatures in naturalWonderGenerator
2021-03-11 21:58:24 +02:00
c7e424d661 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-11 21:58:19 +02:00
b3a62f4b1a Withdraw before melee is the same as original game (#3674) 2021-03-11 21:40:44 +02:00
972bf2ba1c Resolved #3681 - translation fix, "in every city" -> "in all cities" 2021-03-11 21:08:48 +02:00
1286fc1dff Support for multiple terrain features Part 1 (#3678)
* Adding terrainFeatures ArrayList

* fixed existing save loses all terrainFeatures
2021-03-11 19:07:44 +02:00
7bb2c70245 Mods with no techs should work again 2021-03-10 20:27:37 +02:00
7d3e2a4e78 Adding world wrap support to map editor (#3667)
* Adding world wrap support to MapEditor

* better readability
2021-03-08 22:19:55 +02:00
87c9729e52 Resolved #3663 - fixed settler automation bug 2021-03-08 22:05:59 +02:00
7eab616352 Added titles to mod management screen 2021-03-07 17:49:53 +02:00
011c1de102 Resolved #3635 - can remove natural wonders and roads/railroads in map editor 2021-03-07 11:41:09 +02:00
7ddcc58955 Can convert maps between different rulesets! 2021-03-07 10:02:19 +02:00
a654937ad3 ImageGetter.reload() is private, you should use ImageGetter.setRuleset() from outside 2021-03-07 10:01:51 +02:00
d15456baa8 Fixed hurry cost modifiers, and unit gold costs scaling according to game speed 2021-03-06 23:45:50 +02:00
43be37a3b8 Resolved #3651 - "Free great person" unique is compatible with techs even for Spectator 2021-03-06 23:10:48 +02:00
b9c6874a3f Removed deprecated "kotlin-android-extensions" reference 2021-03-06 23:02:13 +02:00
3bdff7dec3 Merge branch 'temp' 2021-03-06 22:30:46 +02:00
fd207d55c6 Game can handle resources "disappearing" between versions (esp. for mods) 2021-03-06 22:30:29 +02:00
9cdba66fd5 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-06 20:52:00 +02:00
d8093eb282 Resolved #3653 - Settler AI no longer aims for 'really far' tiles 2021-03-06 20:51:00 +02:00
d161e8393e Fixed wrapped tiles costing way to much gold (#3648) 2021-03-06 19:49:59 +02:00
d290ca3d33 Update translation and Android studio to 4.1.2 (#3642) 2021-03-04 18:56:05 +02:00
d3ae6d600c World Wrap Fixes (#3644)
* Citys Screen gets unwrapped now

When a city got build on the worlds edge the city screen displayed a non wrapped world

* Fixed CityBorder getting shifted

when city gets build on on the world's edge
2021-03-04 18:54:39 +02:00
0bf7c2e07e Fixed rectangular maps center point (#3646) 2021-03-04 18:50:34 +02:00
eb47272d09 Tech info can display more than one revealed resource 2021-03-03 23:49:57 +02:00
87e0dedaf4 "Obsolete with [techName]" unique works with improvements 2021-03-03 23:49:31 +02:00
0f109e31a0 Resolved #3639 - City states that can't be connected by land no longer assign road connection quests 2021-03-03 22:43:07 +02:00
9e98fb5b59 Added World Wrap as a game setting, so bleeding edge users can test it
Can now create maps as World Wrap maps and play with them :)
2021-03-03 22:30:06 +02:00
25db68fa2a World wrap Part 2 (#3609)
* Changed map generation for hex maps

* Adding WorldWrap UI

* Is now compileable again

* Changed map gen for rec maps

well that was easy

* Units can now move and see across wrap

* well this is smarter

* World wrap checkbox commented ou

should be available only after everything has been merged

* simplify WW gen conditions

* reduced indentation

* Refactoring for better readablity
2021-03-03 12:54:49 +02:00