Commit Graph

3695 Commits

Author SHA1 Message Date
SomeTroglodyte
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
Xander Lenstra
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
SomeTroglodyte
3e22a36bbf
Fix Civilopedia resource to Wonder links (#5011) 2021-08-28 22:27:25 +03:00
SomeTroglodyte
ef7fc36c80
Harden automateImprovementPlacer and detect Mod problems with these (#5010) 2021-08-28 22:26:00 +03:00
yairm210
8779ca7147 Mass deprecation 2021-08-28 22:21:35 +03:00
Xander Lenstra
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
Xander Lenstra
7dd7e0b278
Fixed a unique & better credits (#4998) 2021-08-27 16:27:17 +03:00
SomeTroglodyte
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
SomeTroglodyte
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
SomeTroglodyte
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
Xander Lenstra
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
yairm210
59f8a0eebf Hardcoded image atlases for it to work from within a .jar - #4993 2021-08-26 16:51:38 +03:00
SomeTroglodyte
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
SomeTroglodyte
5d95dd1c7b
Multiple Start Locations per tile nicer display (#4982) 2021-08-24 22:56:05 +03:00
SomeTroglodyte
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
SomeTroglodyte
a53cb82034
StartingLocation-Improvements-be-gone phase 2 (#4975) 2021-08-23 23:15:04 +03:00
yairm210
b157313bb9 Update city stats when finishing city-state quests - #4963 2021-08-23 22:31:41 +03:00
yairm210
6db92da52a Resolved #4960 - can now play as 2 separate civs with the same userId 2021-08-23 22:26:51 +03:00
yairm210
23cb4394a7 Converted all "1 + (value/100f)" to .toPercent() 2021-08-23 21:52:21 +03:00
yairm210
15a42dd8ea Resolved #4956 - fixed Krepost unique 2021-08-23 21:41:17 +03:00
Xander Lenstra
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
SomeTroglodyte
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
Xander Lenstra
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
SomeTroglodyte
7afffe3a89
getLastTerrain simple patch (#4971) 2021-08-23 20:18:54 +03:00
SomeTroglodyte
b4ad34988c
StartingLocation-Improvements-be-gone phase 1 (#4951) 2021-08-23 11:58:42 +03:00
Xander Lenstra
22be1c92e6
Fixes bug where upgrading units would no longer provide their default upgrades (#4948) 2021-08-22 14:07:50 +03:00
SimonCeder
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
SomeTroglodyte
5c51e3d38e
Fix crash at conquest, empty religion icon (#4927) 2021-08-21 21:00:59 +03:00
SomeTroglodyte
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
SomeTroglodyte
1aea1d53b9
Fix-Workers-Second-Turn (#4929)
* Fix-Workers-Second-Turn

* Fix-Workers-Second-Turn
2021-08-21 20:56:54 +03:00
SomeTroglodyte
0c2cdcfcff
Fix crash after upgrading a unit (uninitialized lateinit) (#4928) 2021-08-21 20:56:08 +03:00
yairm210
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
yairm210
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
Xander Lenstra
b2e6612c0e
Added a UI for viewing the religions inside a city (#4904)
* Added a UI for viewing the religions inside a city

* Rewrote large parts of the UI, implementing @SomeTroglodyte's great advice
2021-08-20 08:59:13 +03:00
SomeTroglodyte
970259a0ea
WorkerAutomation cached per Civ - BFS cached (#4868)
* WorkerAutomation cached per Civ - BFS cached

* WorkerAutomation cached per Civ - more linting
2021-08-20 01:25:41 +03:00
Xander Lenstra
d856efac06
Implemented almost all missing founder & follower beliefs (#4890)
* Implemented almost all missing founder & follower beliefs

* Added missing negator

* Implemented requested changes
2021-08-20 01:24:28 +03:00
yairm210
cb1c70f73b Resolved #4769 - City-states grant copies of their resources, even if they're in use 2021-08-19 23:43:32 +03:00
Xander Lenstra
a4e61d65c2
Fixes crashes from loading mods without an eras.json file (#4910) 2021-08-19 20:44:11 +03:00
yairm210
c7265c79b6 Reverted 6a32d6 2021-08-19 20:43:47 +03:00
yairm210
5223caf390 Resolved crash for mods with no eras defined 2021-08-19 20:41:26 +03:00
SomeTroglodyte
af92fdc1d2
Expander tab persist (#4905)
* ExpanderTabs remember state

* ExpanderTabs remember state - city constructions dynamic

* ExpanderTabs remember state - city screen portrait
2021-08-19 10:06:52 +03:00
SomeTroglodyte
0f5f3366ed
Small changes to city screen (#4902) 2021-08-19 09:51:26 +03:00
Arthur van der Staaij
ef5483e9d5
Removed the civ introduction trade option (#4888)
* Removed the civ introduction trade option

Left in the minimum amount of code to ensure that saves with a pending
introduction trade do not break (any such pending trades are cancelled).
The left-in introduction trade code can be fully removed in a later
version.

* Added back civ introduction trades as a mod option

Also made the gold value of introducation trades moddable.

* Made civ introduction trade invalid if receiver already knows the civ

This prevents players from sending two AI civs introduction trades for
each other in the same turn and profiting from both. This therefore
fixes #4272.

* Applied requested changes

* Removed a spurious space
2021-08-19 09:45:03 +03:00
Arthur van der Staaij
4114296cbe
Made water oil wells require the Refrigeration tech (#4889)
* Made water oil wells require the Refrigeration tech

Oil wells can now only be created on water with the refrigeration
technology.

This is not the ideal solution: it would be preferable to support
multiple improvements for a single resource, to add offshore platforms
as a separate improvement for coastal oil that requires refrigeration
and to disable building oil wells on coast. Allowing multiple
improvements for a resource would however be a much more significant
refactor.

* Added back "terrainsCanBeBuiltOn": ["Coast"]
2021-08-18 12:19:08 +03:00
SomeTroglodyte
b60c2c71dd
Unit action constants and worker unique cleanup (#4815)
* Unit action constants and worker unique cleanup

* Replace unit action constants with enum properties - patch1

* Replace unit action constants with enum properties - patch2
2021-08-18 12:18:02 +03:00
SomeTroglodyte
03981c6242
CityScreen Buy button rework (#4843)
* CityScreen Buy button rework
- e.g. "Buy" for Missionary
- Info pane staying even when building no longer offered
- Purchase Prompt a little prettier

* Urgent Fix - noMods switch default

* CityScreen Buy button rework - patch1
2021-08-18 12:17:40 +03:00
SomeTroglodyte
dcc6ad8562
updateNumberOfFollowers _is_ called one last time after a city has been raZed to the grOund (#4892) 2021-08-17 23:24:24 +03:00
SomeTroglodyte
8cc25a74a7
Urgent Fix - noMods switch default (#4893) 2021-08-17 23:23:31 +03:00
SomeTroglodyte
ecd6cd92a4
City screen purchasable constructions prettier (#4822)
* City screen purchasable constructions prettier

* City screen purchasable constructions prettier - patch1

* City screen purchasable constructions prettier - mad modder edition
2021-08-17 14:00:01 +03:00
Xander Lenstra
607e40a712
Fixed some bugs with spreading of religion (#4851)
* Fixed some bugs with spreading of religion

* Implemented requested changes
2021-08-17 13:58:19 +03:00