022b55e937
Adds support for opening debug menu on MacOS ( #5142 )
2021-09-08 21:50:20 +03:00
d247cacbca
Added "in other cities" as a cityFilter ( #5131 )
2021-09-08 21:41:57 +03:00
3722fab38d
From the indstrial era onwards, things change in religion ( #5095 )
...
* Improved redability
* From the industrial era onwards, religion goes into 'second phase'
* Fixed tests
* Fixed formula for buying great prophets starting from the industrial era
* Added `getMatchingUniques`, `hasUnique` to `IHasUniques`, cleaned up some code
* Fix compilation errors
2021-09-08 21:24:26 +03:00
366ce4b89b
Kotlin 1.5 new warnings - partial ( #5121 )
2021-09-08 21:15:32 +03:00
1785c1f78e
No right-click on Android ( #5125 )
2021-09-08 21:13:43 +03:00
4cfdfee301
Added "Incompatible with [promotionName]" unique ( #5128 )
2021-09-08 21:12:57 +03:00
e2a1e44282
Fixed bugs with unit movement ( #5126 )
...
* Fixed bugs with unit movement
* Optimized function call
* Cleaning up some code
* Removed comments that are no longer applicable
2021-09-08 21:11:59 +03:00
7297139594
CS vulnerable to ally unhappiness ( #5134 )
2021-09-08 21:02:34 +03:00
ab5083173d
Kotlin 1.5 new warnings - partial ( #5120 )
2021-09-08 20:48:24 +03:00
8b6881c76b
checks for protection, delays ( #5133 )
2021-09-08 20:47:23 +03:00
e0fe788e28
Add a "Reset to defaults" button to the Newgame screen ( #5141 )
...
* Add a reset to defaults button to the new game screen
* Add a reset to defaults button to the new game screen - template
2021-09-08 20:46:18 +03:00
d1135f3d20
Fixes incorrect default paramter for starting era ( #5119 )
2021-09-08 20:44:50 +03:00
a1f7721878
Fixes #5113 ( #5122 )
...
* Fixed #5113
* Better check
2021-09-08 20:42:58 +03:00
9a29ce8422
Fixed all renamed units being called 'instanceName' ( #5140 )
...
* Fixed all renamed units being called 'instanceName'
* Removed extreneous square brackets resulting in incorrect translations
* Fixed translation problems
2021-09-08 20:42:27 +03:00
7118e9779c
GameStarter wrap and shape aware ( #5107 )
...
- Starting locations code aware of wrap and map shape
- RiverGenerator wrap aware
- RiverGenerator guard against endless loop
2021-09-06 18:32:12 +03:00
7f386da2bc
Kotlin 1.5 new warnings - partial ( #5108 )
...
* Kotlin 1.5 new warnings - partial
* Kotlin 1.5 new warnings - partial
2021-09-06 18:28:20 +03:00
2ca42a705f
Force ranking, bullying improvements ( #5102 )
...
* Proper demand tribute thresholds
* Proper calculation for Force rankings
* debug strings
* use new force ranking for AI threatAssessment
* use new force ranking for AI threatAssessment, pt 2
2021-09-06 15:50:39 +03:00
486e2a7a8a
Deprecate all mods without an eras.json file ( #4809 )
...
* Enforce the existence of an eras.json file for mods
* Merged `getEra()` and `getEraObject()`
* Hide mods we have deemed outdated
* Fixed compile errors that I didn't notice before
* Fixed unit tests
2021-09-06 14:50:38 +03:00
8079a8dc7b
Fix bugs ( #5103 )
...
* Fixed a bug where moving a unit through ancient ruins spawning another unit would duplicate units
* Fixed a bug where automatically exploring units upgrading from ancient ruins would not upgrade
* Fixed a bug where city state influence could go lower than the minimum
2021-09-06 14:35:31 +03:00
c7264556ea
City state intrusion anger ( #5090 )
...
* move functions, greece UP
* CS influence from killing barbs
* Greece healing in CS territory
* move diplomacy bonuses into CityStateFunctions.kt
* Split filter in Battle.kt, nicer code
2021-09-05 21:22:02 +03:00
f016012e39
Fixed a bug where no icon would display in city religion UI for pantheons ( #5094 )
2021-09-05 14:58:02 +03:00
5170a27e07
Fixed crash where deleting mods meant you could never start a game again
...
If the last game you created used a mod that you later removed from the the device it could never be removed from the new game parameters
Caught exceptions from quickstart failing
2021-09-05 14:57:21 +03:00
5f0afffe5a
Resolved #4344 - can no longer enter city-screen that is not yours
2021-09-05 14:04:49 +03:00
194c69a633
Deprecation
2021-09-05 13:18:51 +03:00
194eb5299e
Readability improvements
2021-09-05 12:53:12 +03:00
ad50e9d2fc
implement locale for proper sorting on certain screens ( #5082 )
...
* implement locale for sorting
* persian, centralize Collator.getInstance
* fall back to default instead of english
* fix failing build
2021-09-05 12:12:18 +03:00
a20baca7c2
You can now input distinct numbers when trading gold ( #5072 )
...
* Type amount of gold in trade requests
* Remove extraneous spaces in template.properties
* Implemented proposed changes
* Fixed tests
2021-09-05 12:10:57 +03:00
980f0f4611
Fixed crash when viewing the name of a religion ( #5092 )
2021-09-05 12:05:54 +03:00
f3a8188cb1
Kotlin 1.5.30 test ( #5089 )
...
* Kotlin bump to 1.5.30
* Needed change due to (correct!) new compile error
2021-09-05 00:28:21 +03:00
a1fdb612a9
Merge remote-tracking branch 'origin/master'
2021-09-04 21:40:41 +03:00
48092b09b1
Resolved #4478 - spectator cannot take over player diplomacy options
2021-09-04 21:40:30 +03:00
6bc58ab5a3
Tabbed options ( #5081 )
...
* Tabbed Options Screen
* Tabbed Options Screen - atlas
2021-09-04 21:30:39 +03:00
84f7d4f56b
Fix map setTransients throwing exception from map generator on some map sizes ( #5084 )
2021-09-04 21:27:13 +03:00
60abae5d1a
Better check for units with no unitType defined
2021-09-04 21:13:01 +03:00
2069f227c4
Newgame Mod incompatibility toast ( #5076 )
2021-09-03 12:26:38 +03:00
8cb464c9f7
Correct year shown when starting in later eras ( #5070 )
...
* json, getEquivalentTurn
* WorldScreenTopBar.kt
* affects shown year only
2021-09-03 00:13:58 +03:00
df853504ae
Great Prophets now always have your religion as their religion ( #5052 )
...
* Great Prophets now always have your religion as their religion
* Reworded unique for clarity
2021-09-02 20:52:24 +03:00
34eb4758ff
Rework City State functions into separate file ( #5043 )
...
* cut+paste new file
* rewrite functions
* wrapper functions
* rewrite function calls
* influenceGainedByGift
* keep instantiated CityStateFunctions as Transient
* use setter functions for influence
2021-09-02 20:50:18 +03:00
c116b9ba94
Linting
2021-09-02 20:48:29 +03:00
e418f1b8ca
Merge remote-tracking branch 'origin/master'
2021-09-02 20:38:16 +03:00
9575b5bf66
Implemented renaming of religions ( #5057 )
...
* Implemented renaming of religions
* Made AskForText display error on invalid input, implemented recommended changes
* Almost forgot the translatable strings in the new popup
2021-09-02 17:40:10 +03:00
15335f3f7c
Made city-state bonuses immutable to avoid future problems a la #5050
2021-09-02 17:37:52 +03:00
d0dbb27e00
Resolved crash due to evaluating distance to city state when we have no cities
2021-09-02 17:21:46 +03:00
fcc335b78a
Refactor more code, hopefully increasing maintainability ( #5062 )
...
* Fixed great person gift formula, confusing boolean, "great person" filter
* Refactored getRejectionReason to return a hashSet of reasons instead of a random one
2021-09-02 16:37:40 +03:00
2e43637144
Fixed a bug where cities founding after creating a pantheon would not have that pantheon ( #5053 )
2021-09-01 19:21:41 +03:00
186d06faf0
When spreading a religion with a great prophet, other religions are now removed ( #5055 )
2021-09-01 19:21:09 +03:00
b347366d50
Refactored some code and uniques ( #5051 )
...
* Refactored some code and uniques
* Fixed compilation errors, tests and crashes
* Moved influence bounds check from add to set
2021-09-01 19:20:04 +03:00
cffe8e441e
Finishing the later five policy trees now allows you to buy great people with faith ( #5038 )
2021-09-01 09:46:27 +03:00
634f4a3533
Added Religious wonders ( #5041 )
...
* Added Grand Temple and Great Mosque of Djenne buildings
* Added uniques for Grand Temple
* Added uniques for Mosque of Djenne, refactored ability uses system to count down isntead of up
2021-08-31 22:23:02 +03:00
cd7bd8fcfd
fix duplicated city-state bonus bug ( #5042 )
...
* fix city-state bug
* pt 2
2021-08-31 22:18:58 +03:00
