Commit Graph

3782 Commits

Author SHA1 Message Date
ravignir
893f41a0ed
Add missing Natural Wonders (#5204)
* Add files via upload

* Add files via upload

* Add files via upload

* Update Terrains.json

* Update Constants.kt

* Update Constants.kt

* Update NaturalWonderGenerator.kt

* Update Constants.kt

* Update NaturalWonderGenerator.kt

* Natural Wonders generation fixes.
2021-09-13 20:49:46 +03:00
Xander Lenstra
9c66154a44
Updated piety policy tree (#5195)
* Added piety policy tree

* Misread an ability

* Fixed filter
2021-09-12 21:48:28 +03:00
Xander Lenstra
a4c520fd26
Added "Consumes [amount] [resource]" for improvements (#5129)
* Added "Consumes [amount] [resource]" for improvements

* It now also works for placeable improvements

* Made construction grayed out instead of disappear when no resources available
2021-09-12 21:21:46 +03:00
SomeTroglodyte
af20124e5d
Handle maps with invalid mapSize more gracefully (#5190)
* Handle maps with invalid mapSize more gracefully

* Handle maps with invalid mapSize more gracefully - new game exception handling

* Handle maps with invalid mapSize more gracefully - moved version save init
2021-09-12 19:15:21 +03:00
Xander Lenstra
03a7288656
Fixed sqrt of negative number (#5193) 2021-09-12 19:07:33 +03:00
Xander Lenstra
b002e53eba
Fixed some bugs (#5178)
* Fixed bug where moving a unit stopped automation

* Fixed bug where chosing an icon last in the religion screen would not enable the 'found religion' button

* Fixed bug where buying units with an increasing cost would deduct the wrong amount

* Fixed bug making it impossible to pick free techs
2021-09-11 23:09:43 +03:00
yairm210
db78bcf00d Fixed another crash when mod game had religion enabled but had no great prophet unit 2021-09-11 23:07:39 +03:00
yairm210
619dfc5e09 Fixed crash when mod game had religion enabled but had no great prophet unit
Also slight deprecation
2021-09-11 23:05:07 +03:00
SimonCeder
d59fe45f51
Proper implementation of pledge to protect (#5165)
* penalties for attacking

* proper timers on penalties

* template.properties

* space

* Player can pick sides when protected civs attacked/bullied
Protect gives resting point 10 for influence

* correct string
2021-09-11 21:10:45 +03:00
SomeTroglodyte
45e87688cf
Guard against crash in getNumThreateningBarbarians without barbs (#5173)
* Guard against crash in getNumThreateningBarbarians without barbs

* Guard against crash in getNumThreateningBarbarians without barbs - missing inits
2021-09-11 21:09:45 +03:00
yairm210
00e962c9ac Resolved #4977 - can no longer fast-tap to confuse the policy/construction screens 2021-09-10 13:51:01 +03:00
yairm210
66d7e8cbd0 Minor improvements 2021-09-10 13:42:37 +03:00
yairm210
3103984250 Merge remote-tracking branch 'origin/master' 2021-09-09 21:55:45 +03:00
yairm210
d8d94cb6bd Deprecation 2021-09-09 21:55:25 +03:00
SimonCeder
83050c2b11
Militaristic city states can give unique unit; refactor city state initialization (#5147)
* Pick unique unit for militaristic CS

* Provide unique unit when able

* refactor some code

* remove debug

* template.properties

* fix failing build

* Add variance to spawning rate, add ≈ to string, better formatting.
2021-09-09 21:30:12 +03:00
SomeTroglodyte
f1f4def7f0
Fix Denunceation typo, reorg compatibility code (#5156)
* Fix Denunceation typo, reorg compatibility code

* Fix Denunceation typo - lint
2021-09-09 21:29:13 +03:00
SimonCeder
cbd3c2910e
Icons for city states (#5160)
* Add city state icons

* Add the icons

* Get filename from cityStateType.name

* less padding

* Icon names in enum, icons in diplomacy screen
2021-09-09 21:28:30 +03:00
SomeTroglodyte
df5540442f
Fix crash entering mod management (#5158) 2021-09-09 20:06:37 +03:00
SomeTroglodyte
612ad0ab55
Fix era notification (#5161) 2021-09-09 20:03:51 +03:00
Xander Lenstra
7b6e57d3b5
Religion goes from alpha into beta: available from stat screen immediately (#5149) 2021-09-09 07:24:56 +03:00
SomeTroglodyte
bebfe92fb1
Mod manager portrait and auto scroll (#5138)
* Mod manager portrait mode

* Mod manager portrait and auto scroll

- MM switches to stacked expanders in portrait.
- Use AutoScrollPanes.
- Disable the enter/leave listener of AutoScrollPane in Pickers which disable the default ScrollPane to roll their own - helps all such pickers.
- No expander open/close persistence on purpose.
- PickerScreen a bit cleaned 'cuz I needed to understand something.
- Marked mods from the kill-list that are already installed.
- Button sync now OK when counterpart missing (deselects other column).

* Mod manager portrait - template
2021-09-09 07:24:00 +03:00
SomeTroglodyte
ffdc289611
Civilopedia remove migration-only interface elements (#5150) 2021-09-09 07:18:26 +03:00
Xander Lenstra
9c876ad84e
Wrote an extensive tutorial documenting most of religion (#5130)
* Wrote an extensive tutorial documenting most of religion

* Fixed spelling and improved clarity

* Fixed typo (Thanks for noticing!)

* Reworded and split up tutorials, fixed grammer/spelling mistakes

* Added missing quote mark
2021-09-09 06:22:43 +03:00
SomeTroglodyte
8b210fb798
Kotlin 1.5 new warnings - the rest (#5151) 2021-09-09 06:21:44 +03:00
ravignir
ac5122741b
deleting the annoying part of misimplemeted pledge to protect mechanic. (#5146)
Maybe poll this on discord.
2021-09-08 23:35:20 +03:00
yairm210
1530389507 3.16.13 2021-09-08 23:19:07 +03:00
Alex25820
022b55e937
Adds support for opening debug menu on MacOS (#5142) 2021-09-08 21:50:20 +03:00
Xander Lenstra
d247cacbca
Added "in other cities" as a cityFilter (#5131) 2021-09-08 21:41:57 +03:00
Xander Lenstra
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
SomeTroglodyte
366ce4b89b
Kotlin 1.5 new warnings - partial (#5121) 2021-09-08 21:15:32 +03:00
SomeTroglodyte
1785c1f78e
No right-click on Android (#5125) 2021-09-08 21:13:43 +03:00
Xander Lenstra
4cfdfee301
Added "Incompatible with [promotionName]" unique (#5128) 2021-09-08 21:12:57 +03:00
Xander Lenstra
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
SimonCeder
7297139594
CS vulnerable to ally unhappiness (#5134) 2021-09-08 21:02:34 +03:00
SomeTroglodyte
ab5083173d
Kotlin 1.5 new warnings - partial (#5120) 2021-09-08 20:48:24 +03:00
SimonCeder
8b6881c76b
checks for protection, delays (#5133) 2021-09-08 20:47:23 +03:00
SomeTroglodyte
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
Xander Lenstra
d1135f3d20
Fixes incorrect default paramter for starting era (#5119) 2021-09-08 20:44:50 +03:00
Xander Lenstra
a1f7721878
Fixes #5113 (#5122)
* Fixed #5113

* Better check
2021-09-08 20:42:58 +03:00
Xander Lenstra
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
SomeTroglodyte
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
SomeTroglodyte
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
SimonCeder
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
Xander Lenstra
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
Xander Lenstra
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
SimonCeder
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
Xander Lenstra
f016012e39
Fixed a bug where no icon would display in city religion UI for pantheons (#5094) 2021-09-05 14:58:02 +03:00
yairm210
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
yairm210
5f0afffe5a Resolved #4344 - can no longer enter city-screen that is not yours 2021-09-05 14:04:49 +03:00
yairm210
194c69a633 Deprecation 2021-09-05 13:18:51 +03:00