Commit Graph

6210 Commits

Author SHA1 Message Date
Xander Lenstra
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
SomeTroglodyte
8cff3fda49
Start preference Avoid shown with red X (#5253) 2021-09-18 23:05:14 +03:00
yairm210
f02675c5b0 Merge remote-tracking branch 'origin/master' 2021-09-18 23:03:26 +03:00
yairm210
81a12920df Merge branch 'temp' 2021-09-18 23:03:00 +03:00
yairm210
807f175567 3.16.15-patch2 2021-09-18 23:02:35 +03:00
SimonCeder
803575665d fix bug on capturing capital (#5263)
(cherry picked from commit 47d1a5c009)
2021-09-18 23:02:04 +03:00
SimonCeder
47d1a5c009
fix bug on capturing capital (#5263) 2021-09-18 23:01:42 +03:00
SimonCeder
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
yairm210
7e05a56e37 Tile resource uniques now work to provide stat bonuses 2021-09-17 16:05:21 +03:00
yairm210
103f1daf36 tileResources unique -> uniques 2021-09-17 15:00:19 +03:00
yairm210
54ea0c89a8 Ruleset check finds errors in uniques of all kinds! 2021-09-17 14:47:03 +03:00
yairm210
b0a169cf01 Translation generation so translators won't have to merge conflicts 2021-09-17 14:12:08 +03:00
Yair Morgenstern
82104d89c1
Translations update (#5249)
* Update German translation (#5240)

* Update Swedish.properties (#5235)

* Update Swedish.properties

* Update Swedish.properties

* Update Indonesian.properties (#5225)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Spanish.properties (#5221)

* Update Russian.properties (#5232)

* Update Russian.properties

* Update Russian.properties

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: SapronovMaxim <msapronov89@gmail.com>
2021-09-17 14:11:03 +03:00
yairm210
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
SimonCeder
c2fa1366bb
Add a fixed base strength to motivationToAttack (#5248) 2021-09-17 13:23:03 +03:00
yairm210
38231bf937 More reorg, first unique with cityFilter 2021-09-17 10:53:03 +03:00
yairm210
55a77096c1 Added city filter as parameter type, some reorg 2021-09-17 10:48:16 +03:00
yairm210
2f8de2d196 Added Stats as unique parameter type 2021-09-17 10:43:03 +03:00
yairm210
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
yairm210
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
yairm210
fa939e15d9 getMatchingUnique for UniqueType - will allow us to convert most of the uniques painlessly 2021-09-17 09:55:57 +03:00
Yair Morgenstern
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
yairm210
65c8b40dfe Merge branch 'temp' 2021-09-17 09:17:24 +03:00
yairm210
f8f112441a 3.16.15-patch1 2021-09-17 09:16:22 +03:00
Xander Lenstra
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
Xander Lenstra
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
SomeTroglodyte
0e88ca978b
Oversized speaker (#5243)
* More modestly sized Sound Tab icon on the Options Screen

* More modestly sized Sound Tab icon on the Options Screen - atlas
2021-09-17 01:05:58 +03:00
SomeTroglodyte
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
SomeTroglodyte
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
SomeTroglodyte
a61efa65c9
Ask before resetting game setup to defaults (#5231) 2021-09-16 20:56:54 +03:00
Xander Lenstra
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
SomeTroglodyte
5fd04f6e32
Modmanager sort and filter (#5186)
* 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 sorts and filters - WIP 1

* Mod Manager sorts and filters - WIP 2

* Mod Manager sorts and filters - WIP 2a

* Mod Manager sorts and filters - WIP 3

* Mod Manager sorts and filters - atlas

* Mod Manager sorts and filters - tip
2021-09-16 20:54:47 +03:00
Yair Morgenstern
6d26a28619
Added basic functionality for uniques enum (#5222)
* 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
2021-09-16 20:52:06 +03:00
Xander Lenstra
51bfd927c1
Fixed crash when providing free buildings (#5230) 2021-09-15 16:56:43 +03:00
Xander Lenstra
f996103403
Update existing wonders to G&K stats, mostly providing faith instead of culture (#5217) 2021-09-15 14:46:33 +03:00
yairm210
ce8dd40c60 #4963 - All city-state influences recalculate ally civ, which recalculates resources, which recalculates stats. 2021-09-15 01:47:17 +03:00
yairm210
b7eb21b606 Merge remote-tracking branch 'origin/master' 2021-09-15 00:59:40 +03:00
yairm210
f60464201b Resolved #5162 - AI much less motivated to attack city-states 2021-09-15 00:59:28 +03:00
ravignir
827185148a
Update Mount Fuji stats (#5223)
I forgot about Mount Fuji stat change when i updated Natural Wonders, now i rectify that.
2021-09-15 00:45:03 +03:00
SimonCeder
672d2a3c34
Fix Khan unit (#5207)
* fix khan unique

* fix adjacent healing bonus

* plus

* Khan heals itself also

* nerf medic
2021-09-15 00:35:16 +03:00
SomeTroglodyte
86bbf54cc0
Civilopedia quickie: Units show other direction of upgrade path (#5209)
* Civilopedia quickie: Units show other direction of upgrade path

* Civilopedia quickie: Units show other direction of upgrade path - spacing
2021-09-15 00:34:20 +03:00
Xander Lenstra
fe60c100fa
Simplified check for enabled religion and added it in more places (#5218)
* Reworked `hasReligionEnabled`

* Added more checks for enabled religion

* Consistisized spelling
2021-09-14 17:34:04 +03:00
Xander Lenstra
fe3220299c
Fixed a few spots using the name of a religion instead of its displayName (#5216) 2021-09-14 17:33:06 +03:00
yairm210
f9e0c39021 3.16.15 2021-09-14 11:37:20 +03:00
Yair Morgenstern
02930fcbda
Translations update (#5213)
* Update Spanish.properties (#5208)

I'll check for grammar errors later. Hopefully there aren't anny nor a new release comes out today.

* Update Italian.properties (#5196)

* New polish translations (#5194)

* Update Polish.properties

Translated some unit names, and some other translations

* Update Polish.properties

Some random translations of short lines

* Update Polish.properties

Few random translations again

* Update Romanian.properties (#5191)

* Update German translation (#5189)

* Update German translation

* Update German translation

* Update German translation

Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: PLynx <pawelrys2011@gmail.com>
Co-authored-by: Vortexon <88623583+V0rtexon@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2021-09-14 11:12:18 +03:00
SimonCeder
7bd555ac95
City-States Influence rates; Wary status; Proximity calculations (#5198)
* Rates for natural influence change

* Minor civ wariness, proximity calculation

* CS can declare permanent war

* CS can in fact not declare permanent war

* adjustments, template.properties

* neater code

* fix failing test? .

* move proximity code, for reals fix failing check

* now?

* revisions

* BFS only once, better check for water map

* assign continents on pre-made maps as well

* now works on all pre-made maps
2021-09-14 11:01:43 +03:00
Interdice
297618706c
Adding religous city states to unciv! (#5136)
* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!
2021-09-14 10:49:38 +03:00
Xander Lenstra
0f805fbac4
Made CN tower functional, and free buildings are removed on capture (#5206)
* Refactored free buildings from civ.policies to civ.constructions

* Made CN tower function like in the base game

* Fixed random buildings being marked culture buildings
2021-09-14 10:12:08 +03:00
SomeTroglodyte
31f81288a8
Panzer can upgrade according to fandom wiki (#5210) 2021-09-14 09:44:40 +03:00
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