Commit Graph

3737 Commits

Author SHA1 Message Date
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
248145cf8f Fixed bug making enhancing religions impossible (#5040) 2021-08-31 18:22:39 +03:00
9450fac423 Added UI to show what cities are holy cities to the player (#5039) 2021-08-31 16:55:29 +03:00
a7c4895985 Add Austrian civ (#5026)
* Json definition for nation, images

* Jsons, Hussar and Coffee House

* Diplomatic Marriage Button

* Implement Marriage

* AI Marriage

* template.properties

* Popups etc

* Strings

* reviews

* reviews pt 2
2021-08-30 23:21:02 +03:00
1771604a4a AI will now found & enhance religions -- minor improvement to civilian AI (#5031)
* AI will now found & enhance religions -- improvements to civilian AI

* This is a better order imo

* Implemented requested changes
2021-08-30 21:41:18 +03:00
06c7f049b7 Diplomacy Screen Nation relation indicator (#5032) 2021-08-30 20:25:13 +03:00
b0e3aa326b Mass deprecation 2021-08-30 19:52:57 +03:00
b554a6db93 Deprecated Stats as viable values for Great Person points 2021-08-30 19:35:50 +03:00
7e0b7f0007 units get promotions and xp bonuses from CS buildings (#5012)
* units get promotions and xp bonuses from CS buildings

* fix siam
2021-08-30 14:17:59 +03:00
a01a6270fc Demanding tribute from city states (#4976)
* tribute willingness calculations

* implement demanding gold and workers

* Revisions

* unit power calculation

* show modifiers in the diplo screen

* template.properties

* G&K modifiers

* promotions start at 0

* notiifications, AI

* conflict

* conflict?

* template and translation, failing test?

* another missing string

* missing space

* afraid relationship status

* missing space 2

* Slight optimization

* optimization pt 2

* reviews
2021-08-30 14:17:20 +03:00
9c3e621b15 Atlas reorg - packer to loader via json (#5014) 2021-08-29 23:29:24 +03:00
3b5489a3b4 Persistent new game setup (#5016)
* Persistent new game setup

* Persistent new game setup - comments
2021-08-29 20:40:13 +03:00
5a6a9c9759 Anti-Armor, negative tile yield, LoadScreen (#5018)
* Harden against negative yields, Anti-Armor

* Anti-Armor bad unitType, LoadScreen
2021-08-29 11:33:20 +03:00
1cc90a3953 Implemented the enhancing of religions (#4965)
* Generalize the concept of founding religions in preparation of enhancing

* Implemented enhancing religions

* Added all enhancer beliefs (mostly correctly, mostly tested)

* You can now found a religion without a pantheon, requiring you to choose a pantheon as well

* Parameterized 'enhance religion' action, fixed tests

* Implemented requested changes & simplified beliefContainer a lot

* Fixed rename

* Updated code to include features added in the meantime

* Merge branch 'master' into enhanceReligions

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-08-28 22:36:11 +03:00
3e22a36bbf Fix Civilopedia resource to Wonder links (#5011) 2021-08-28 22:27:25 +03:00
ef7fc36c80 Harden automateImprovementPlacer and detect Mod problems with these (#5010) 2021-08-28 22:26:00 +03:00
8779ca7147 Mass deprecation 2021-08-28 22:21:35 +03:00
85e4a68ea1 Submarines are now visible to adjacent units, and once turned visible, can be attacked by all enemy units (#5001)
* Submarines are now visible to adjacent units, and once turned visible, can attack be all enemy units

* Deprecation & translation of unique saving
2021-08-27 17:00:12 +03:00
7dd7e0b278 Fixed a unique & better credits (#4998) 2021-08-27 16:27:17 +03:00
7085ea95cc Fix: Legacy maps with starting locations not playable (#5000)
* Fix: legacy maps with starting locations not playable

* Fix: legacy maps with starting locations not playable - ruleset
2021-08-27 16:26:45 +03:00