mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-21 01:37:39 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,159 Commits 6 Branches 1,039 Tags 1.2 GiB
619d02d2b6
Commit Graph

3276 Commits

Author SHA1 Message Date
Yair Morgenstern
ba51222841 Barbarians only heal by pillaging, simplified barbarian automation 2021-03-19 10:39:55 +02:00
Yair Morgenstern
a08a5a7435 Resolved #3713 - Fixed misspelled "fresh water" in farm unique check 2021-03-18 23:01:47 +02:00
Yair Morgenstern
87ff4c91f5 3.13.9 2021-03-18 20:59:42 +02:00
Yair Morgenstern
fa709d2944 Can now add leader portrait images to mods! 2021-03-18 18:37:27 +02:00
Yair Morgenstern
c98100f1a7 Added "permanent visual mods" option to mod management 2021-03-18 18:36:05 +02:00
GGGuenni
7ba12ad5c6
Adding fallout again (#3711) 2021-03-18 15:36:24 +02:00
GGGuenni
b12c5df28e
last refactoring of terrain feature (#3702) 
* last terrainFeature refactorings

* cut down terrainFeature as much as possible

* aerialDistanceTo fixed

wrapped distance should only be considered on wrapped worlds

* Adding spaces

* fixed tests not compiling

* prevent floodplains from spawning on oasis

* Check if terrain feature can be placed on tile in editor

* Adding reviewed changes
 2021-03-18 13:54:52 +02:00
GGGuenni
25ef92f3eb
fixed baseTerrain can differ from getBaseTerrain (#3710) 2021-03-18 13:19:02 +02:00
Yair Morgenstern
8472715509 Resolved #3614 - tileFilter works with natural wonders 2021-03-18 13:13:31 +02:00
Yair Morgenstern
37903435f5 Trade overview now more uniform 
"Gold" and "Gold per turn" are now correctly translated
 2021-03-18 13:08:59 +02:00
GGGuenni
1a4051fa3f
toast popup not screen blocking again (#3709) 2021-03-18 12:47:40 +02:00
Yair Morgenstern
57b1a01e2c Resolved #3705 - loading game popup stays until the game is loaded 2021-03-18 10:57:02 +02:00
Yair Morgenstern
dd4778495e Added "Provides yield without assigned population" uniques to tile improvements 2021-03-17 23:10:21 +02:00
Yair Morgenstern
755586eecd Added TileInfo.providsYield() - this will help us later 2021-03-17 22:47:21 +02:00
GGGuenni
cdc7739784
overlaying existing terrainFeatures now (#3706) 2021-03-17 21:58:48 +02:00
GGGuenni
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
Yair Morgenstern
cde1b150d3 Unit name is translated when unit has a unique name 2021-03-15 23:18:00 +02:00
Yair Morgenstern
3bbac04303 Deprecated uniques replaced in 3.12.10 2021-03-15 22:37:07 +02:00
Yair Morgenstern
c7bd528052 Shortened initial loading time by removing double loading of atlas 2021-03-15 22:13:55 +02:00
Yair Morgenstern
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
lishaoxia1985
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
Yair Morgenstern
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
GGGuenni
57f6c99d86
More terrainFeature refactors (#3694) 2021-03-13 23:38:11 +02:00
Yair Morgenstern
20f5672337 Resolved #3686 - world wrapped 'continents' map now separates continents properly 2021-03-13 23:02:57 +02:00
Yair Morgenstern
aab037b409 Resolved #3691 - 'new map' from map editor copies existing map parameters 2021-03-13 22:39:57 +02:00
Yair Morgenstern
a37ac74fa9 'in all coastal cities' now translated 2021-03-13 22:38:53 +02:00
Yair Morgenstern
309e29b922 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-13 22:38:25 +02:00
Yair Morgenstern
5564d4db7e Game no longer crashes due to incorrect building-improvement modding combinations 2021-03-13 22:35:24 +02:00
GGGuenni
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
absolutebull
b658e04048
Fix the Military Caste policy (#3692) 2021-03-13 22:16:54 +02:00
GGGuenni
fd177b1200
remove transient (#3688) 
since it not only blocks serialization it also blocks deserialization
 2021-03-12 13:43:14 +02:00
GGGuenni
d1df2fd128
Adding convert Function (#3687) 
* Adding convert Function

* field = null to be safe
 2021-03-12 12:20:55 +02:00
Yair Morgenstern
02cd1a2ef3 More multiple terrain feature changes 2021-03-11 23:09:05 +02:00
Yair Morgenstern
01877fee7c Fixed Great Barrier Reef spawn rules 2021-03-11 22:17:59 +02:00
Yair Morgenstern
9eaf4f4826 Copy all terrain features on clone(), not just first 
Use terrainFeatures in naturalWonderGenerator
 2021-03-11 21:58:24 +02:00
Yair Morgenstern
c7e424d661 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-11 21:58:19 +02:00
lishaoxia1985
b3a62f4b1a
Withdraw before melee is the same as original game (#3674) 2021-03-11 21:40:44 +02:00
Yair Morgenstern
972bf2ba1c Resolved #3681 - translation fix, "in every city" -> "in all cities" 2021-03-11 21:08:48 +02:00
GGGuenni
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
Yair Morgenstern
7bb2c70245 Mods with no techs should work again 2021-03-10 20:27:37 +02:00
GGGuenni
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
Yair Morgenstern
87c9729e52 Resolved #3663 - fixed settler automation bug 2021-03-08 22:05:59 +02:00
Yair Morgenstern
7eab616352 Added titles to mod management screen 2021-03-07 17:49:53 +02:00
Yair Morgenstern
011c1de102 Resolved #3635 - can remove natural wonders and roads/railroads in map editor 2021-03-07 11:41:09 +02:00
Yair Morgenstern
7ddcc58955 Can convert maps between different rulesets! 2021-03-07 10:02:19 +02:00
Yair Morgenstern
a654937ad3 ImageGetter.reload() is private, you should use ImageGetter.setRuleset() from outside 2021-03-07 10:01:51 +02:00
Yair Morgenstern
d15456baa8 Fixed hurry cost modifiers, and unit gold costs scaling according to game speed 2021-03-06 23:45:50 +02:00
Yair Morgenstern
43be37a3b8 Resolved #3651 - "Free great person" unique is compatible with techs even for Spectator 2021-03-06 23:10:48 +02:00
Yair Morgenstern
b9c6874a3f Removed deprecated "kotlin-android-extensions" reference 2021-03-06 23:02:13 +02:00
Yair Morgenstern
3bdff7dec3 Merge branch 'temp' 2021-03-06 22:30:46 +02:00
Yair Morgenstern
fd207d55c6 Game can handle resources "disappearing" between versions (esp. for mods) 2021-03-06 22:30:29 +02:00
Yair Morgenstern
9cdba66fd5 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-06 20:52:00 +02:00
Yair Morgenstern
d8093eb282 Resolved #3653 - Settler AI no longer aims for 'really far' tiles 2021-03-06 20:51:00 +02:00
GGGuenni
d161e8393e
Fixed wrapped tiles costing way to much gold (#3648) 2021-03-06 19:49:59 +02:00
lishaoxia1985
d290ca3d33
Update translation and Android studio to 4.1.2 (#3642) 2021-03-04 18:56:05 +02:00
GGGuenni
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
GGGuenni
0bf7c2e07e
Fixed rectangular maps center point (#3646) 2021-03-04 18:50:34 +02:00
Yair Morgenstern
eb47272d09 Tech info can display more than one revealed resource 2021-03-03 23:49:57 +02:00
Yair Morgenstern
87e0dedaf4 "Obsolete with [techName]" unique works with improvements 2021-03-03 23:49:31 +02:00
Yair Morgenstern
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
Yair Morgenstern
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
GGGuenni
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
GGGuenni
9a7e637891
World Wrap Part 1 (#3604) 
* Adding fake infinite scroll functionality

* improve scroll jump

* really smooth jump now

* World wrap has functionality now

This is not compileable on its own!
Needs branches WorldWrap-v1 and WorldWrap-v2 to be mergeable

* Mirror tiles rendering

* changed to run v2-alternative code

* Use generic type

* default worldWrap to false

* forward continousScrollingX as parameter

* added unit movement button for mirror tiles

* Add clickable tile layer

* Smooth wrap jump

* code a bit better to read

* Removed unnecessary overrides and catches

* mirrorTiles are stored in one HashMap now

instead of two seperate ones
 2021-03-03 12:54:21 +02:00
lishaoxia1985
f65de81c21
Fix when Trade Gold = 0 it also shows in offer. (#3637) 2021-03-02 19:32:24 +02:00
Yair Morgenstern
639be3b01d 3.13.4 2021-03-01 21:05:53 +02:00
david.howard
12e3005294
[663] Allow unit rename on promote (#3620) 
* Add nullable "instanceName" field to MapUnit to capture name for individual units
* Add "displayName" property to MapUnit which takes instanceName if set, name
  otherwise
* Add dialog to PromotionPicker to allow setting instanceName of unit, if not
  already set
 2021-03-01 20:52:46 +02:00
Yair Morgenstern
a390df8b36 Merged save map functionality into load map screen - now map saving is more streamlined! 2021-02-28 23:56:09 +02:00
Yair Morgenstern
29360938c6 Added color to map buttons in map loading screen 2021-02-28 23:33:55 +02:00
Yair Morgenstern
be7fd4cb01 Resolved #3626 - can rename multiplayer games now. 
Also organized multiplayer screens better.
 2021-02-28 23:21:12 +02:00
Yair Morgenstern
97546a7499 Resolved #3622 - Can no longer try to send air units into unexplored tiles 2021-02-28 23:03:12 +02:00
Yair Morgenstern
7eeeee5212 Strength bonus from capital is now part of the Palace bonuses to make it moddable 2021-02-28 22:40:54 +02:00
Yair Morgenstern
32ca9884ce 3.13.3-patch2 
Multiplayer auto-load working again
 2021-02-28 00:10:05 +02:00
Yair Morgenstern
ed8d642036 3.13.3-patch1 2021-02-27 23:47:08 +02:00
Yair Morgenstern
d6e75c7ea2 Solved crash for badly defined mods like REKmod 2021-02-25 19:25:04 +02:00
Jack Rainy
ff05fa601d
Translations update (#3618) 
* Translations update

* Minor changes to the translation
 2021-02-25 19:01:58 +02:00
Yair Morgenstern
e464ba5328 Map generation parameters are moddable, allowing players to create custom terrains for map generation! 2021-02-24 20:34:01 +02:00
Yair Morgenstern
53c919eef9 Custom mods with no water or grassland can now work! 2021-02-24 20:02:25 +02:00
Yair Morgenstern
c9a96358da Changed "Gold" resource to be called "Gold Ore" to not conflict with the yield type for translations - #2458 2021-02-23 20:05:00 +02:00
Yair Morgenstern
241aecb52f Maps incompatible with ruleset no longer popup errors when generating a new map 2021-02-22 23:31:18 +02:00
Yair Morgenstern
4bd40125b0 All resource stats from buildings converted to building uniques 2021-02-22 23:00:48 +02:00
Yair Morgenstern
0ef44fc4da Changed deprecated StringBuilder.appendln with .appendLine 2021-02-22 21:13:16 +02:00
Yair Morgenstern
737dcea4dc Should now be able to create tech trees with over 10 rows 2021-02-20 23:10:37 +02:00
Yair Morgenstern
a01b11484a Added mod check for 'provides free building' which does not exist 2021-02-20 23:04:06 +02:00
Yair Morgenstern
675e47868b Resolved #3601 - selected current tech no longer looks like unresearchable tech 2021-02-20 22:58:16 +02:00
Yair Morgenstern
5bac35d36d Cleaned up map editor 2021-02-20 22:23:17 +02:00
Yair Morgenstern
3d8e7fa99d tileFilter now works with resources for most uniques! 2021-02-18 16:22:15 +02:00
Yair Morgenstern
92b82b22b0 Resolved #3610 - city sorting in overview is now done by translated, not original, name 2021-02-18 13:22:36 +02:00
Yair Morgenstern
36949410a7 Resolved #3586 - Added 'Destroy' translation for capturing cities in one-city challenge 2021-02-18 13:20:49 +02:00
Yair Morgenstern
2b33bb9873 Map editor knows to remove resources that don't exist in mods 2021-02-16 20:10:36 +02:00
Yair Morgenstern
5fa08d9f2d Can now create as many tech rows as you wish in mods :) 2021-02-16 20:02:54 +02:00
Yair Morgenstern
105d9690ff Resolved #3600 - multiplayer game reloading and screen resize no longer reset map zoom and position 2021-02-16 20:00:47 +02:00
Yair Morgenstern
7c09663271 Resolved #3495 - Added scrollbars to civilopedia and picker screens 
Better Civilopedia layout
 2021-02-15 22:38:54 +02:00
Johannes Schreiber
1e981abe53
Display scroll position on minimap (#3593) 2021-02-14 11:48:57 +02:00
Yair Morgenstern
b7a6967fe6 Movement algorithm updated - can no longer see whether you can move to unknown tiles 2021-02-13 21:50:47 +02:00
Yair Morgenstern
e92a1dd088 Better tech descriptions for increased improvement stats 2021-02-12 14:13:11 +02:00
Yair Morgenstern
4876687e48 Solved "AI doesn't declare war" bug 2021-02-12 11:58:25 +02:00
Yair Morgenstern
fff22e66cd Mod-specific maps are go! :D 
Resolves #3517
 2021-02-12 11:16:54 +02:00
Yair Morgenstern
9db073ff25 getComplexRuleset now accepts list of mods and not gameParameters 2021-02-12 10:47:12 +02:00
Yair Morgenstern
c1a259ea7d Another change towards unified mod management 2021-02-12 10:45:18 +02:00
Yair Morgenstern
a9fe8c42d8 Simplified mod management, in preparation for mod information within the maps 2021-02-12 10:42:35 +02:00
Yair Morgenstern
efe36a673e Separated ModCheckboxTable from GameOptionsTable, so we can use it when creating a map 2021-02-11 22:54:01 +02:00
Yair Morgenstern
8b1778eea3 Removed Scenario Maps entirely - was not a well thought-out concept and caused more confusion than actual fun. 
Case in point - 0 mods are Scenario mods.
 2021-02-11 22:33:52 +02:00
Yair Morgenstern
8a9301f4d7 Catch for bug in new movement algorithm when you can't move to a unknown tile, but CAN pass through (but not move to) intermediate tiles. 2021-02-09 23:03:44 +02:00
Yair Morgenstern
9fd06638a3 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-02-09 22:57:24 +02:00
GGGuenni
5a4155b372
Game saves can now always be deleted (#3584) 2021-02-08 21:54:04 +02:00
Yair Morgenstern
004cc58e13 Units manually moved cancel existing move action 2021-02-08 21:48:37 +02:00
Yair Morgenstern
d7379508f0 Now get up to 100 mods in mod list (up from 30) - kudos @ravignir for noticing there were missing mods! 2021-02-07 21:04:12 +02:00
Yair Morgenstern
7d9b56e3b1 Fixed queue showing "Consumes 1" when no resource is consumed 
Plus linting
 2021-02-07 19:13:10 +02:00
Yair Morgenstern
71266b213e 3.12.13 2021-02-06 22:39:36 +02:00
Yair Morgenstern
4104f72729 Added "Consumes [amount] [resource]" unique to units 2021-02-06 21:27:41 +02:00
Yair Morgenstern
3d683c767a Added "Consumes [amount] [resourceName]" unique for buildings 2021-02-06 21:12:44 +02:00
Yair Morgenstern
9054480bf7 Solved concurrency problems in redownloadAllGames() 2021-02-06 20:34:02 +02:00
Yair Morgenstern
20cf0c9203 Linting 2021-02-06 20:21:41 +02:00
Yair Morgenstern
8e900a2503 Hopefully mitigated some weird crashes 2021-02-06 20:21:19 +02:00
Yair Morgenstern
ec7a898d64 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-02-06 20:14:11 +02:00
Yair Morgenstern
60fe8fc36b Game can handle mods removing tile features between versions 2021-02-06 19:42:14 +02:00
Yair Morgenstern
4d0f66e159 Solved "quantum tunneling" bug for new movement algorithm 2021-02-06 19:41:51 +02:00
Johannes Schreiber
effdf74bb6
Scroll indicators are displayed more consistently on the NewGameScreen (#3570) 2021-02-06 19:35:54 +02:00
Yair Morgenstern
b0bf18afa0 Added custom victory conditions 2021-02-05 16:06:58 +02:00
Yair Morgenstern
84c200bd32 New cityFilter for cities connected to capital 2021-02-05 15:34:20 +02:00
Yair Morgenstern
1e6c8dacff Deprecated old uniques 2021-02-05 12:22:47 +02:00
Yair Morgenstern
a27a28df67 Fixed tests 2021-02-05 10:34:42 +02:00
Yair Morgenstern
cfc337f6ef City-state allies are always considered to have open borders 2021-02-05 10:22:01 +02:00
Yair Morgenstern
95b7cd7a32 AI uses same calculation for declaring both war and peace - so it won't declare war only to immediately declare peace. 2021-02-05 10:15:49 +02:00
Yair Morgenstern
b0c9c797f6 3.12.12 2021-02-04 20:18:14 +02:00
GGGuenni
a07e3947d2
Refactoring of MultiplayerScreen (#3572) 
* Refactoring

- Removed unnecessary .tr()
- changed text case sensitivity
- changed popup to YesNoPopup
- combined multiplayerGames.remove and deleteSave into removeMultiplayerGame to reduce unnecessary try catch blocks

* Update case sensitivity translations

* adding "Game settings" entry
 2021-02-04 19:13:01 +02:00
GGGuenni
9d109d4e05
Avoid overflow of the construction bar (#3573) 2021-02-04 16:22:05 +02:00
SpacedOutChicken
72b917ca1f
Add "Land" as possible input to tile-related uniques (#3574) 
* no message

* Revert "no message"

This reverts commit 9ece60bd58.

* Renamed Haka War Dance effect to Intimidation, to make it more applicable to non-Maori Warrior units.

* no message

* Parameterized civUnique for extra experience from combat

* Update build.gradle.kts

* Update BattleDamage.kt

* Update Policies.json

* Update Battle.kt

* Fully parameterized nationwide XP gain

* New parameterized uniques for border expansion - "-[]% Gold cost of acquiring tiles []" and "-[]% Culture cost of acquiring tiles []"

* Parameterized uniques for acquiring new tiles via either culture or gold

* Parameterizing expansion unique - improved calculation method

* Improved parameterization for border expansion uniques

* Add "Land" as possible input to tile-related uniques
 2021-02-04 06:42:12 +02:00
Yair Morgenstern
c85137aaaf Added "Irremovable" unique to tile improvements 2021-02-03 21:18:38 +02:00
Yair Morgenstern
f05e0a6b25 Added Unsellable unique to buildings 2021-02-03 21:10:12 +02:00
Yair Morgenstern
9d647447bc Added improvement-constructing buildings 2021-02-03 21:09:29 +02:00
SpacedOutChicken
55b4298cec
New uniques for border expansion - "-[]% Gold cost of acquiring tiles []" and "-[]% Culture cost of acquiring tiles []" (#3565) 
* no message

* Revert "no message"

This reverts commit 9ece60bd58.

* Renamed Haka War Dance effect to Intimidation, to make it more applicable to non-Maori Warrior units.

* no message

* Parameterized civUnique for extra experience from combat

* Update build.gradle.kts

* Update BattleDamage.kt

* Update Policies.json

* Update Battle.kt

* Fully parameterized nationwide XP gain

* New parameterized uniques for border expansion - "-[]% Gold cost of acquiring tiles []" and "-[]% Culture cost of acquiring tiles []"

* Parameterized uniques for acquiring new tiles via either culture or gold

* Parameterizing expansion unique - improved calculation method

* Improved parameterization for border expansion uniques
 2021-02-03 13:06:53 +02:00
GGGuenni
aa1bd3cd7e
Adding resign function for multiplayer (#3567) 
* Adding give up function for multiplayer

* Update template.properties

* Reviewed changes

- Changed "give up" to "resign"
- Removed unnecessary and harmful translations
- Using YesNoPopup now

* Add missing space

* fixed first AI turn getting skipped
 2021-02-02 16:43:51 +02:00
Yair Morgenstern
35ae2c749d 3.12.11-patch1 2021-01-31 21:57:28 +02:00
Yair Morgenstern
8016a64b97 Added mutually exclusive tech paths using "Incompatible with [otherTech]" unique for techs 2021-01-30 19:59:34 +02:00
Yair Morgenstern
bc4829a424 Translation updates for new cityFilter 2021-01-30 19:46:03 +02:00
SpacedOutChicken
457588a2c9
Parameterize Civ Unique for increased XP gain (#3561) 
* no message

* Revert "no message"

This reverts commit 9ece60bd58.

* Renamed Haka War Dance effect to Intimidation, to make it more applicable to non-Maori Warrior units.

* no message

* Parameterized civUnique for extra experience from combat

* Update build.gradle.kts

* Update BattleDamage.kt

* Update Policies.json

* Update Battle.kt

* Fully parameterized nationwide XP gain
 2021-01-29 12:31:52 +02:00
Yair Morgenstern
1b19413736 Solved mod incompatability with Legalism issues 2021-01-29 12:30:36 +02:00
Yair Morgenstern
1a576539e0 Implemented Cultural Diplomacy policy 2021-01-29 12:06:16 +02:00
Yair Morgenstern
2f121983cf Implemented Scholasticism 2021-01-29 12:01:25 +02:00
Yair Morgenstern
4e2aaa76dc Started implementing Patronage branch. Parametrized some uniques, city-states can handle different resting points for different civs. 2021-01-29 11:54:23 +02:00
Yair Morgenstern
9c725d74ae Parametrized "Maintenance on roads & railroads reduced by []%" 2021-01-29 10:35:01 +02:00
Yair Morgenstern
8e8215b5c4 Added 'replacementTextForUniques' parameter to buildings and units for custom text 2021-01-28 22:05:38 +02:00
Yair Morgenstern
bcab751f7c Linting 2021-01-28 16:21:25 +02:00
Yair Morgenstern
f11647d5fc Add a "Unlocked at [tech/era/policy]" unique to buildings and units 2021-01-28 15:11:05 +02:00
Yair Morgenstern
68498ec7ba "Save game" errors are now correctly caught and displayed to the user 2021-01-28 14:59:16 +02:00
Yair Morgenstern
852c06ae07 Not that the destination is not always reached, changed headTowards to return the actual tile the unit reached 2021-01-28 14:50:24 +02:00
Yair Morgenstern
0cba94dbcf Added mutually exclusive policy branches :) 2021-01-28 14:36:39 +02:00
Yair Morgenstern
18f4d4e53e Added city filter, and gerenicised several uniques to work with the city filter. 
Deleted some deprecated uniques
 2021-01-28 14:26:42 +02:00
Yair Morgenstern
6a266a6cac moveToTile can handle destinations that cannot be reached, for instance when exploring unknown areas 2021-01-28 11:58:53 +02:00
Yair Morgenstern
2cac1622c9 Deprecation of old uniques 2021-01-28 10:23:32 +02:00
Yair Morgenstern
30e5722c24 Added experimental movment which assumes unknown tiles are impassible - hopefully will resolve #3009 2021-01-27 17:59:07 +02:00
Yair Morgenstern
894e520319 More concurrency problems avoided by creating a second cityStats to run the values on 
This should also help speed things up, since we don't need to run the update() again to revert it!
 2021-01-26 22:34:38 +02:00
Yair Morgenstern
3199098ae8 Solved ANRs when loading large maps in map editor 2021-01-26 22:20:36 +02:00
Yair Morgenstern
83ecc9ee42 Hopefully mitigated some concurrency related crashes 2021-01-26 22:20:03 +02:00
Yair Morgenstern
0c89986af4 Resolved #3436 - parametrized "+[]% [] in all cities" 2021-01-25 20:47:50 +02:00
Yair Morgenstern
48f68c6bd0 Smoother map panning 2021-01-25 19:23:48 +02:00
GGGuenni
3037ce4141
multiple game support for TurnChecker (#3540) 
* TurnChecker now checks every multiplayer game

Not just the currently open game

* Adding game saving to turn checker

so multiplayerScreen stays up to date

* remove unused imports

* removing unused functions
 2021-01-24 16:12:44 +02:00
k4zoo
26afb16b6b
Update TileInfo.kt (#3557) 
My first real pull request :P. I saw ResourceType.Luxury and ResourceType.Bonus being used in MapGenerator.kt so I thought why not make them accessible as a parameter for uniques?
 2021-01-23 19:12:15 +02:00
Jack Rainy
8c0be488bc
Avoid overflow of the health bar in the overkill situation (#3558) 2021-01-23 19:11:41 +02:00
Yair Morgenstern
e3187148f5 Improvements with 0 turns to build are 'placeable' improvements which can only be places by corresponding uniques 2021-01-21 20:38:02 +02:00
Duan Tao
6889a60605
Fixed : great people could not build improvement. (#3553) 
* Fixed : great people could not build improvement.

* Better check for buildable.

* Revert "Better check for buildable."

This reverts commit b9fa0efbae.

* Better check for buildable.
 2021-01-21 20:17:01 +02:00
Yair Morgenstern
385e5c8e68 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-01-19 20:55:59 +02:00
GGGuenni
0a54e914ee
Fixed Crash (#3549) 
the game crashed because the UncivShowableException thrown by GameInfo, when used mods are not installed anymore, did not get catched
 2021-01-19 12:36:47 +02:00
Yair Morgenstern
3b3be47ddb Resolved #3548 - defeated civs now stack correctly in overview>diplomacy 2021-01-18 21:20:47 +02:00
Yair Morgenstern
2d1113fc5a "Create improvement" works on water improvements as well :) 2021-01-17 21:05:32 +02:00
Yair Morgenstern
1863a7d214 Code cleanup 2021-01-17 21:04:16 +02:00
Yair Morgenstern
245e7de0a1 Can handle and detect mods where the requiredBuildingInAllRuleset does not exist in the ruleset 2021-01-16 21:22:15 +02:00
Yair Morgenstern
b27c744cd2 Retrieving the construction info in a different thread now works perfectly! 2021-01-16 21:12:55 +02:00
Yair Morgenstern
7e092fdf16 Linting 2021-01-16 21:07:53 +02:00
Yair Morgenstern
942aa981ba City stats update now accepts construction - simplifies the CityConstructions.turnsToConstruction function 2021-01-16 21:05:15 +02:00
Yair Morgenstern
6f8add77e8 Resolved ANRs for slow phones when loading the construction list 2021-01-15 15:12:14 +02:00
Yair Morgenstern
3a729874c2 Constructions table reorg - each piece has a self contained update 2021-01-15 14:55:09 +02:00
Yair Morgenstern
6c66600fce Unified construction button metadata / UI split 2021-01-15 14:50:10 +02:00
Yair Morgenstern
ab262da205 Construction button creation moved to DTO for later refactoring 2021-01-15 14:38:12 +02:00
Yair Morgenstern
d91f4752e0 Hopefully made some memory errors clearer to the user 2021-01-15 14:17:30 +02:00
Yair Morgenstern
0b7f45bba0 Problems when saving game are now user-visible 2021-01-15 13:29:50 +02:00
Yair Morgenstern
0800dbba51 Resolved #3533 - Added confirmation popup when saving over existing save 2021-01-15 13:28:29 +02:00
Yair Morgenstern
13e79ac37c Fixed "Unique great person is available from Great Person picker screen" bug 2021-01-13 22:08:12 +02:00
Yair Morgenstern
a666cfa320 Resolved #3526 - stats drilldown remains when moving between city screens 2021-01-13 21:38:28 +02:00
GGGuenni
470952ea89
Improving MultiplayerScreen loading speed (#3527) 
* Improve MultiplayerScreen Loading Speed

* Refactoring

- renamed multiplayerGameList to multiplayerGames because it's not a List
- changed content of map from <GameId, Filehandle> to <FileHandle, GameInfo> because GameId is an expensive Key

* i do as yairm guides
 2021-01-13 19:46:29 +02:00
Yair Morgenstern
73c5811297 Buildings not displayed in civilopedia are not show to be obsoleted in tech tree either 2021-01-13 15:50:08 +02:00
Yair Morgenstern
088c716321 Game can handle ongoing constructions "disappearing" between mod versions 2021-01-12 18:10:41 +02:00
Yair Morgenstern
a8e0f270a0 Game can handle policies "disappearing" between mod versions 
Added policy map to ruleset for simpler policy location
 2021-01-12 17:10:38 +02:00
Yair Morgenstern
09d44bfcd2 Resolved #3520 - picker screens go back on Back button / Esc 2021-01-12 16:34:13 +02:00
Yair Morgenstern
af326100fc Resolved #3519 - Added 'exit game from back button' to main menu screen 2021-01-11 23:56:33 +02:00
Yair Morgenstern
617e7aea93 Removed placeholder science and production boost from Computers tech 
New games start by default with city states
 2021-01-11 20:56:31 +02:00
Yair Morgenstern
18ffc2ea02 Resolved #3503 - Civilopedia and Overview show what 'panel' you're currently on 2021-01-11 17:59:28 +02:00
Yair Morgenstern
92f203c5e3 Added color to civilopedia buttons per #3503 2021-01-11 17:14:50 +02:00
Yair Morgenstern
ca6b09bed1 Merge branch 'temp' 2021-01-08 00:23:22 +02:00
Yair Morgenstern
6bf6560286 3.12.7-patch1 2021-01-08 00:15:55 +02:00
Yair Morgenstern
c4f33f9373 Resolved #3501 - Added city-state toggle to diplomacy overview, clicking on civ names in overview opens diplomacy screen 2021-01-07 23:38:26 +02:00
Yair Morgenstern
ecfa38e4e7 Resolved #3473 - show city's happiness drilldown 2021-01-06 22:52:26 +02:00
Yair Morgenstern
78735bcfad Better 'conflicting tech' check for mods 2021-01-06 22:41:00 +02:00
Yair Morgenstern
80b470e867 Resolved #3497 - city state quests always show correctly when diplomacy screen accessed from city button 
Added some scrollbars as per #3495
 2021-01-03 21:37:38 +02:00
Yair Morgenstern
17333ec0d3 Fixed crash when attempting to issue a 'connect to capital' quest for a civ with no capital 2021-01-03 19:15:27 +02:00
Yair Morgenstern
ae805284a6 3.12.6 2021-01-02 22:09:08 +02:00
9kgsofrice
65cc56b5d7
= 1F instead of += 1 (#3487) 2021-01-01 13:49:48 +02:00
Yair Morgenstern
908cae1881 Solved ANRs when loading big maps in editor screen 2021-01-01 13:40:31 +02:00
Yair Morgenstern
26c817a4a1 Resolved #3483 - settlers require at least 2 population to construct, as per Civ V 2021-01-01 13:29:03 +02:00