Commit Graph

2994 Commits

Author SHA1 Message Date
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
35ae2c749d 3.12.11-patch1 2021-01-31 21:57:28 +02:00
8016a64b97 Added mutually exclusive tech paths using "Incompatible with [otherTech]" unique for techs 2021-01-30 19:59:34 +02:00
bc4829a424 Translation updates for new cityFilter 2021-01-30 19:46:03 +02:00
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
1b19413736 Solved mod incompatability with Legalism issues 2021-01-29 12:30:36 +02:00
1a576539e0 Implemented Cultural Diplomacy policy 2021-01-29 12:06:16 +02:00
2f121983cf Implemented Scholasticism 2021-01-29 12:01:25 +02:00
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
9c725d74ae Parametrized "Maintenance on roads & railroads reduced by []%" 2021-01-29 10:35:01 +02:00
8e8215b5c4 Added 'replacementTextForUniques' parameter to buildings and units for custom text 2021-01-28 22:05:38 +02:00
bcab751f7c Linting 2021-01-28 16:21:25 +02:00
f11647d5fc Add a "Unlocked at [tech/era/policy]" unique to buildings and units 2021-01-28 15:11:05 +02:00
68498ec7ba "Save game" errors are now correctly caught and displayed to the user 2021-01-28 14:59:16 +02:00
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
0cba94dbcf Added mutually exclusive policy branches :) 2021-01-28 14:36:39 +02:00
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
6a266a6cac moveToTile can handle destinations that cannot be reached, for instance when exploring unknown areas 2021-01-28 11:58:53 +02:00
2cac1622c9 Deprecation of old uniques 2021-01-28 10:23:32 +02:00
30e5722c24 Added experimental movment which assumes unknown tiles are impassible - hopefully will resolve #3009 2021-01-27 17:59:07 +02:00
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
3199098ae8 Solved ANRs when loading large maps in map editor 2021-01-26 22:20:36 +02:00
83ecc9ee42 Hopefully mitigated some concurrency related crashes 2021-01-26 22:20:03 +02:00
0c89986af4 Resolved #3436 - parametrized "+[]% [] in all cities" 2021-01-25 20:47:50 +02:00
48f68c6bd0 Smoother map panning 2021-01-25 19:23:48 +02:00
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
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
8c0be488bc Avoid overflow of the health bar in the overkill situation (#3558) 2021-01-23 19:11:41 +02:00
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
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
385e5c8e68 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-01-19 20:55:59 +02:00
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
3b3be47ddb Resolved #3548 - defeated civs now stack correctly in overview>diplomacy 2021-01-18 21:20:47 +02:00
2d1113fc5a "Create improvement" works on water improvements as well :) 2021-01-17 21:05:32 +02:00
1863a7d214 Code cleanup 2021-01-17 21:04:16 +02:00
245e7de0a1 Can handle and detect mods where the requiredBuildingInAllRuleset does not exist in the ruleset 2021-01-16 21:22:15 +02:00
b27c744cd2 Retrieving the construction info in a different thread now works perfectly! 2021-01-16 21:12:55 +02:00
7e092fdf16 Linting 2021-01-16 21:07:53 +02:00
942aa981ba City stats update now accepts construction - simplifies the CityConstructions.turnsToConstruction function 2021-01-16 21:05:15 +02:00
6f8add77e8 Resolved ANRs for slow phones when loading the construction list 2021-01-15 15:12:14 +02:00
3a729874c2 Constructions table reorg - each piece has a self contained update 2021-01-15 14:55:09 +02:00
6c66600fce Unified construction button metadata / UI split 2021-01-15 14:50:10 +02:00
ab262da205 Construction button creation moved to DTO for later refactoring 2021-01-15 14:38:12 +02:00
d91f4752e0 Hopefully made some memory errors clearer to the user 2021-01-15 14:17:30 +02:00
0b7f45bba0 Problems when saving game are now user-visible 2021-01-15 13:29:50 +02:00
0800dbba51 Resolved #3533 - Added confirmation popup when saving over existing save 2021-01-15 13:28:29 +02:00
13e79ac37c Fixed "Unique great person is available from Great Person picker screen" bug 2021-01-13 22:08:12 +02:00
a666cfa320 Resolved #3526 - stats drilldown remains when moving between city screens 2021-01-13 21:38:28 +02:00
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
73c5811297 Buildings not displayed in civilopedia are not show to be obsoleted in tech tree either 2021-01-13 15:50:08 +02:00