Commit Graph

3862 Commits

Author SHA1 Message Date
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
bf2ee91b67 Civilopedia Phase X (#5003)
* Civilopedia Phase X - Show Policies

* Civilopedia Phase X - Show City States

* Civilopedia - Loop-driven init and Cleanup

* Civilopedia - City States

* Civilopedia Phase X - Remove spurious comments
2021-08-27 16:24:23 +03:00
448b04fab8 Civilopedia - Tweaks (#4990)
- Icon for BeliefType.Founder
- Religion icons inverted in Civilopedia
- Terrain icons in links and entry header centered
2021-08-26 17:29:55 +03:00
86d1f143d9 Conquering a city destroys buildings inside the city (#4995)
* When conquering a city, some buildings are now destroyed

* Added missing translation for uniques
2021-08-26 17:09:55 +03:00
59f8a0eebf Hardcoded image atlases for it to work from within a .jar - #4993 2021-08-26 16:51:38 +03:00
9df58ed240 Stats rework part 2 (#4983)
- Nicer iterators
- Callers adapted to simpler syntax
- CityStats changed to non-serializable
2021-08-25 19:02:42 +03:00
5d95dd1c7b Multiple Start Locations per tile nicer display (#4982) 2021-08-24 22:56:05 +03:00
cdc63f71e8 Multi-Atlas / Image packer redo (#4959)
* Atlas reorg

* Atlas reorg - resulting atlases 1

* Atlas reorg - resulting atlases 2

* Atlas reorg - merge
2021-08-24 07:31:21 +03:00
a53cb82034 StartingLocation-Improvements-be-gone phase 2 (#4975) 2021-08-23 23:15:04 +03:00
b157313bb9 Update city stats when finishing city-state quests - #4963 2021-08-23 22:31:41 +03:00
6db92da52a Resolved #4960 - can now play as 2 separate civs with the same userId 2021-08-23 22:26:51 +03:00
23cb4394a7 Converted all "1 + (value/100f)" to .toPercent() 2021-08-23 21:52:21 +03:00
15a42dd8ea Resolved #4956 - fixed Krepost unique 2021-08-23 21:41:17 +03:00
89ea30af95 Implemented Inquisitors (#4909)
* Added inquisitor unit including image

* Inquisitor now blocks spreading of religions

* Added 'remove heresy' action

* Fixed tests

* Reworded remove heresy unique, updated sprites

* Fix Crash

* Implemented requested changes & fixed a few minor bugs

* Implemented requested changes
2021-08-23 20:26:37 +03:00
df1695f782 City keyboard buy construction and tile (#4958)
* City keyboard buy construction and tile

* City keyboard buy - a comment
2021-08-23 20:22:14 +03:00
15c4b67781 Implemented a cap for the production boost of great engineers (#4966)
* Implemented a cap for the production boost of great engineers

* Added a hybrid solution

* Adding production now shows the amount of production added
2021-08-23 20:21:28 +03:00
7afffe3a89 getLastTerrain simple patch (#4971) 2021-08-23 20:18:54 +03:00
b4ad34988c StartingLocation-Improvements-be-gone phase 1 (#4951) 2021-08-23 11:58:42 +03:00
22be1c92e6 Fixes bug where upgrading units would no longer provide their default upgrades (#4948) 2021-08-22 14:07:50 +03:00
33cba2eea9 can now raze non-original capitals at capture (#4903)
* can now raze non-original capitals at capture

* clearer code, equal for AI, get gold and reduce pop when liberating

* fix conflict??

* fix conflict????

* restore whitespace

* restore whitespace

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-08-22 09:12:29 +03:00
5c51e3d38e Fix crash at conquest, empty religion icon (#4927) 2021-08-21 21:00:59 +03:00
13365e5ad6 Ancient Ruins, Civilopedia and Translations (#4907)
* Ancient Ruins, Civilopedia and Translations
- TranslationFileWriter can process Ruins.json
- Hide Religion / Civilopedia uniques hardcoded String moved to Constants
- Civilopedia display of Ruins pulls actual json rewards in code
- Manually curated rewards description removed

* Ancient Ruins, Civilopedia and Translations
- Old rewards descriptions moved to names, color
- Code now recreates old output closely
- civilopediaText allowed additionally
- TranslationFileWriter tweaked accordingly

* Ancient Ruins, Civilopedia and Translations - fix stargazers
2021-08-21 20:57:39 +03:00
1aea1d53b9 Fix-Workers-Second-Turn (#4929)
* Fix-Workers-Second-Turn

* Fix-Workers-Second-Turn
2021-08-21 20:56:54 +03:00
0c2cdcfcff Fix crash after upgrading a unit (uninitialized lateinit) (#4928) 2021-08-21 20:56:08 +03:00
5779bdaa4f Upgraded mockito versions.
Instead of forcing reflection to depend on latest kotlin version, I have a feeling the dependency is due to older mockito depending on older reflection.
2021-08-20 15:45:46 +03:00
85ed8a27d3 Bumped sourceCompatibility to Java 7
Released in 2011 and by now technically out of support for 2 years.
Gotta roll with the times, but roll slowly.
2021-08-20 15:24:02 +03:00