Commit Graph

3845 Commits

Author SHA1 Message Date
8ef84d785e Music controller - Fix pause (#5307) 2021-09-24 10:00:46 +03:00
bae8bd2468 Mod error detection improvements!
Separated Warning vs Error, show "options only" warning in options only, color warnings by severity
2021-09-23 12:04:16 +03:00
2e8934af17 Newly Allied city states declare war on your enemies, even unmet ones (#5298)
* new allies dow, unmet civs meet first and then dow

* no gifts for bad people
2021-09-23 11:31:36 +03:00
4a83bed4ba Nation Picker visual help where to click (#5287)
* Nation Picker visual help where to click

* Nation Picker visual help where to click - circles
2021-09-23 11:23:40 +03:00
a5a8ea1338 Natural Wonders un-hardcoded (#5279)
* Natural Wonders un-hardcoded

* Natural Wonders un-hardcoded - oops testing change revert

* Natural Wonders un-hardcoded - tests OK

* Natural Wonders un-hardcoded - requests

* Natural Wonders un-hardcoded - hide from pedia

* Natural Wonders un-hardcoded - readable unique
2021-09-23 11:21:08 +03:00
8161da26de Texture pack/load for mods also distributes by Images.*X* (#5296) 2021-09-22 22:11:39 +03:00
66b0ddb25a Mod error detection improvements!
Separated Warning vs Error, show "options only" warning in options only, color warnings by severity
2021-09-22 21:28:19 +03:00
0bb565fdc6 Can't trade resources from other trades or city-states (#5252)
* can't trade resources from city-states

* display untradeable sources in trade screen

* Update template.properties

template string

* Update Swedish.properties

* Spelling, better buttons
2021-09-22 20:21:41 +03:00
98f14523ed Add all cityFilter strings from the 'source of truth', since many were missing from translation file 2021-09-22 19:47:31 +03:00
d1005327e7 Lint a few warnings and typos (#5293) 2021-09-22 19:32:25 +03:00
5d6765a879 Resolved crash in unit civilopedia lines that depended on unitType being initialized 2021-09-22 18:32:16 +03:00
5e4aff90e9 Music controller with fade-over and mod capabilities. (#5273)
* Music controller with fade-over and mod capabilities.
- Preparation for music following game situations
- Minimal in-game hooks for now
- Already allows mods providing music, will play randomly

* Music controller - template
2021-09-22 09:35:33 +03:00
b7467d3467 Added support for conditionals to some more uniques (#5280)
* Added support for conditionals to some more uniques

* Implemented a new conditional

* Added the new conditional to the translations file

* Fixed tests

* Implemented requested changes
2021-09-22 09:24:16 +03:00
4343137b82 Save the sources of uniques with the uniques themselves (#5281) 2021-09-21 20:26:14 +03:00
05394f627d Using reflection to find and report deprecated uniques (#5276)
* Using reflection to find and report deprecated uniques

* No kotlin reflection needed thank you very much
2021-09-21 20:26:05 +03:00
7a59cbcbe8 Fixed bug where a unit auto-exploring ancient ruins would in some cases disappear after upgrading (#5285) 2021-09-21 20:18:02 +03:00
eedfbe0235 Specify acceptable uses of this unique
Later we'll be able to check this in checkRuleset to warn against incorrect usages
2021-09-20 16:26:36 +03:00
ce5a82c763 Fix translation tests and wrongly translated conditionals (#5272) 2021-09-20 16:04:51 +03:00
bd7824cdb9 More UniqueType-ing, discovering an overlap this time 2021-09-19 21:33:26 +03:00
5fc7d1ce46 Gain free building uniqueType'D 2021-09-19 21:18:56 +03:00
bdefb7894c cityInfo.getMAtchingUniques accepts uniqueType 2021-09-19 21:15:26 +03:00
aee087ec01 tileResource unique fully replaceable by uniques 2021-09-19 20:58:17 +03:00
f47f427b05 Adds conditionals to most of the uniques currently in the enum (#5270)
* Moved uniques to their own folder

* Added support for conditionals to most of the uniques in the current enum

* Deprecation > removal, of course

* Fixed tests & added `.removeConditionals` before checking for placeholders
2021-09-19 18:43:32 +03:00
62e3dbe014 Moved uniques to their own folder (#5269) 2021-09-19 18:03:41 +03:00
cb4feb29ed Fixed a few bugs relating to earning great prophets (#5267)
* Fixed bug where great prophets gifted by city-states wouldn't have a religion

* Fixed bug where earning/buying great prophets whithout having founded a religion would result in great prophets of your pantheon, regardless of the religious state of the city
2021-09-19 17:56:38 +03:00
027057874d Update and generalize Siam UP (#5237)
* refactor and generalize Siam UP, display correct values in diplo screen

* enable preferred diplomatic victory

* allow compatibility mode

* revisions, restore timesInPlace

* don't change game.png

* don't change game.png

* objectify and enum city state bonuses

* objectify and enum city state bonuses

* template.properties

* refactored city state bonuses into Unique

* further enumization, fix toStringWithDecimals

* reviews
2021-09-19 06:28:10 +03:00
ba679191f8 Fixed intercept chance being invertes (#5259)
Edit made on mobile and as such untested
2021-09-18 23:42:10 +03:00
ec0801ccef Nation picker portraits (#5250)
* New game nation picker spruce-up

* New game nation picker spruce-up - Ctext icon control
2021-09-18 23:31:03 +03:00
01bfd17594 Implementation of conditionals, but better than before (#5187)
* Implementation of conditionals, but better than before

* Updated the unique while I was at it

* Fixed bug where conditionals would never apply

* Capitalization

* Minor code cleaning

* Better documentation & variable names

* Changed translation strategy

* Added missing import?
2021-09-18 23:07:53 +03:00
8cff3fda49 Start preference Avoid shown with red X (#5253) 2021-09-18 23:05:14 +03:00
81a12920df Merge branch 'temp' 2021-09-18 23:03:00 +03:00
803575665d fix bug on capturing capital (#5263)
(cherry picked from commit 47d1a5c009)
2021-09-18 23:02:04 +03:00
8eb24ac273 Carthage civ (#5224)
* Add Carthage

* Implement uniques

* performance improvement, better elephant

* AI avoids taking too much damage from mountains

* more performance

* better AI

* can't settle cities on mountains

* AI improvement

* AI improvement

* revisions, damagePerTurn in Terrains.json

* terrain damage stored as unique in json, damage also works for terrain features

* don't change game.png
2021-09-18 20:28:12 +03:00
7e05a56e37 Tile resource uniques now work to provide stat bonuses 2021-09-17 16:05:21 +03:00
54ea0c89a8 Ruleset check finds errors in uniques of all kinds! 2021-09-17 14:47:03 +03:00
fa462d830f Use enum to generate parameter names when translating - more accurate than auto-detect by parameter name! 2021-09-17 14:10:40 +03:00
c2fa1366bb Add a fixed base strength to motivationToAttack (#5248) 2021-09-17 13:23:03 +03:00
38231bf937 More reorg, first unique with cityFilter 2021-09-17 10:53:03 +03:00
55a77096c1 Added city filter as parameter type, some reorg 2021-09-17 10:48:16 +03:00
2f8de2d196 Added Stats as unique parameter type 2021-09-17 10:43:03 +03:00
af9e691102 Ease of deprecation, brought to you by unique types!
*Visible*, locatable deprecated uniques!
Stated replacement uniques!
2021-09-17 10:33:53 +03:00
1f05239275 Unit filtering actually comes in 2 flavors - one for "unit templates", BaseUnit, and one for "actual units in the field", MapUnit. This should be reflected in the parameter names. 2021-09-17 10:14:05 +03:00
fa939e15d9 getMatchingUnique for UniqueType - will allow us to convert most of the uniques painlessly 2021-09-17 09:55:57 +03:00
34cb48aa31 Unique enum compliance detection (#5226)
* Added basic functionality for uniques enum

* Added unique type to Unique class for faster enum comparisons

* And Elvis operator for unknown parameter type

* Resolved #5162 - AI much less motivated to attack city-states

* Whoops, wrong branch

* New unique checks, with enum.

* Fixed Trog's comments
2021-09-17 09:35:01 +03:00
b73b81a313 Fix bugs and crashes (#5245)
* Fixed crash when liberating city-states

* Fixed crash & building duplication from 'legalism' policy

(cherry picked from commit b0dff6a71c)
2021-09-17 09:13:39 +03:00
b0dff6a71c Fix bugs and crashes (#5245)
* Fixed crash when liberating city-states

* Fixed crash & building duplication from 'legalism' policy
2021-09-17 08:44:48 +03:00
340bedc7ea Implemented Unit Supply by r3versi, not by me (#5234)
* Implemented Unit Supply

Unit Supply is a soft cap to number of units. If the number of units of a civilization exceeds the total supply, a production malus (capped at 70%) is applied.

* Warning icon & message for supply deficit

* Implemented Unit Supply - atlas merge

* Unit Supply: Malus->Penalty, lint, sumOf

* Unit Supply: Fresh atlas

Co-authored-by: r3versi <fluo392@gmail.com>
2021-09-16 22:50:49 +03:00
3d9c5bcc34 Mod TranslationFileWriter re-work (#5219)
* Mod TranslationFileWriter re-work

* Mod TranslationFileWriter re-work - style and existing in base treatment

* Mod TranslationFileWriter re-work - style and existing in base treatment
2021-09-16 20:59:50 +03:00
a61efa65c9 Ask before resetting game setup to defaults (#5231) 2021-09-16 20:56:54 +03:00
eb665a9158 Embarked units only have 1 vision (except marines) (#5215)
* Embarked units only have 1 vision

* Embarked units always only have 1 vision, unless they don't
2021-09-16 20:55:33 +03:00