Commit Graph

6173 Commits

Author SHA1 Message Date
Yair Morgenstern
545ff0b944 Resolved #9887 - Improvement picker screen does not cause 'phantom' units to be assigned to civ 2023-08-04 13:35:41 +03:00
Yair Morgenstern
af49e8297f #9876 fix - Lock known city states before gaining influence to avoid altering the sequence we're iterating on 2023-08-04 09:29:34 +03:00
Yair Morgenstern
d9ceb9290d 4.7.12-patch1 2023-08-04 09:21:51 +03:00
Yair Morgenstern
5956f0ceb6 4.7.12 2023-08-03 13:17:31 +03:00
Yair Morgenstern
e49fda3b97
Version rollout (#9880)
* Bump version and create initial changelog entry

* Update Simplified_Chinese (#9879)

* Update Spanish.properties (#9877)

* Update Polish.properties (#9875)

* Update Brazilian_Portuguese.properties (#9867)

* Update German.properties (#9864)

* Update German.properties

Fixed a few mistakes and added more translations

* Fixed a few mistakes in German translation

---------

Co-authored-by: Birk Birkner <birkner@bbirkner.de>

* Update French.properties (#9862)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Knirps1 <52383078+Knirps1@users.noreply.github.com>
Co-authored-by: Birk Birkner <birkner@bbirkner.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2023-08-03 13:05:13 +03:00
Yair Morgenstern
c92afe0f04
Compare improvements by tile yield calculation (#9873)
* Compare improvements by tile yield calculation

* Docstring

* Explicit documentation for which functions in Stats are and are not mutating functions
2023-08-03 11:39:04 +03:00
SomeTroglodyte
bcb26b6d2a
Treat remaining untyped Uniques in default rulesets (#9763)
* Treat remaining untyped Uniques in default rulesets, make unit test catch them

* Change untyped filtering Uniques check to Validation by inclusion in GlobalUniques instead of UniqueType.AircraftMarker

* Wiki for untyped filtering Uniques

* Re-include the "Who knows" of Future Tech on the Tech picker
2023-08-03 11:38:50 +03:00
Yair Morgenstern
fc40da11d9
Added tests to ensure that resources from buildings behave as expected (#9860)
* Added tests to ensure that resources from buildings behave as expected

* More tests suggested by @SeventhM

* Caught an edge case - if you pillage your own tile improvement, your resources would not have updated!

* Actually every time an improvement changes you could have a resource change

* Update resources eon every improvement change because they could be providing resources via uniques
2023-08-03 11:38:36 +03:00
Oskar Niesen
15bfaa24a5
Transported units gifting fix (#9865)
* Gifting units containing transported units now gifts the transported units as well.

* Change transported units so that they can't be gifted.
2023-08-03 11:38:25 +03:00
SeventhM
0fe584700b
Allow free unit triggers for any location (#9870)
* Allow free unit triggers for any location

* Almost forgot this was broken

* Fix situation when tile is null, but therebis a city to place at
2023-08-03 11:38:14 +03:00
Yair Morgenstern
5e7f49dac8 Resolved #9874 - free buildings are converted to civ-specific replacements 2023-08-02 16:01:21 +03:00
Yair Morgenstern
8de47b4a62 Resolved #9871
Workers now remove fallout and similar stat-hindering terrains
2023-08-02 11:47:12 +03:00
SomeTroglodyte
ad75ad916b
Move Mod Manager to prepare class splits (#9863) 2023-07-31 21:54:55 +03:00
Yair Morgenstern
15577cb3c5 double-click on worked tile icon locks tile, for worked tiles as well! 2023-07-31 11:17:23 +03:00
Yair Morgenstern
b89611c953
Version rollout (#9859)
* Bump version and create initial changelog entry

* Update Dutch.properties (#9846)

* Update Dutch.properties

* Update Dutch.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@users.noreply.github.com>
2023-07-30 18:12:16 +03:00
SomeTroglodyte
52e756e9fb
Key bindings CityScreen (#9828)
* CityScreen keyboard bindings - ExpanderTab update

* CityScreen keyboard bindings - Linting

* CityScreen keyboard bindings - Main Keys

* CityScreen keyboard bindings - Queue

* CityScreen keyboard bindings - Fix Expander scroll-to
2023-07-30 17:40:05 +03:00
SeventhM
203ee77c8b
Clean up some differences between units that can move on water and other units (#9841)
* Clean up some differences between units that can move on water, water units, and land units

* Strangely no evidence this actually comes up?

* refernce the cache in more places

* Decided to change this back to match expected results

* Remove unnecessary parenthesis
2023-07-30 17:39:41 +03:00
SomeTroglodyte
b838d8ec5a
Overhaul NUKE code to behave closer to original (#9797)
* Overhaul NUKE code to behave closer to original

* Separate garrison protection of Bomb Shelter to its own Unique

* Reduce code duplication: getNukeBlastRadius

* Disallow nuking unknown civs

* Don't show Nuke attack table when the Nuke has just been selected

* World map display of nuke blast radius and friendly fire
2023-07-30 17:39:28 +03:00
SomeTroglodyte
443bf3afdb
Local mod folder names preserved. (#9844)
* Reduce conversion of local mod folder names to treat only ending spaces/dashes

* Wiki entry for GlobalUniques

* Missing originRuleset coverage

* Nicer RulesetValidator messages when name or originRuleset are missing
2023-07-30 17:38:33 +03:00
SomeTroglodyte
b992144ecd
Fix a few now flagged but working Unique targets (#9845)
* Allow a few working UniqueType-UniqueTarget combos in RulesetValidator

* RulesetValidator checks GlobalUniques

* Alternate Settlers and Workers recognized via Unique - same rules in RulesetValidator and GameStarter, wiki clarification
2023-07-30 17:38:26 +03:00
SeventhM
ae7ac6a063
Fix resources subtracting in an incorrect manner when they have the same source (#9858) 2023-07-30 17:38:00 +03:00
SomeTroglodyte
bb7c75840e
Simple Originating-Mod display in Civilopedia (#9850)
* Simple Originating-Mod display in Civilopedia

* Simple Originating-Mod display in Civilopedia - patch
2023-07-30 17:37:50 +03:00
Oskar Niesen
df7fd27b94
Spectator can now see all invisible units including submarines without fog of war. (#9852) 2023-07-30 17:37:36 +03:00
SeventhM
283edd0875
Fix free buildings from other buildings not showing up correctly (#9857)
* Rearrange order of actions when adding buildings

* Turns out you need to updateCivResources after adding in uniques. Whoops

* Mirror change to remove buildings as well
2023-07-30 17:37:24 +03:00
itanasi
488ec9f82f
Fix logic in Fog Busting (#9855) 2023-07-30 17:36:38 +03:00
alexban011
5f8c675512
Fix linting warnings (#9701)
* fix: VariableNaming warnings

* fix: MatchingDeclarationName warnings

* fix: SwallowedException warnings

* fix: UseRequire warnings

* Revert "fix: MatchingDeclarationName warnings"

This reverts commit 9475af5052.
2023-07-26 07:30:14 +03:00
Yair Morgenstern
48ad5780d9
Version rollout (#9843)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#9835)

* more Persian UN Translation (#9832)

* Update Persian_(Pinglish-UN).properties

Added and fixed some of the translations till line 1039.

* Update Persian_(Pinglish-UN).properties

- Fixed a few till 1039.
- Added and fixed some from 1039 till 1254.

* Update Persian_(Pinglish-UN).properties

Added and fixed some till 5000

* Update Persian_(Pinglish-UN).properties

* Update Persian_(Pinglish-UN).properties

* Update Dutch.properties (#9816)

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Updated Brazilian_Portuguese.properties (#9813)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: AutumnPizazz <114050365+AutumnPizazz@users.noreply.github.com>
Co-authored-by: Ilia <81512402+ilia-abbasi@users.noreply.github.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
2023-07-24 10:51:13 +03:00
Oskar Niesen
6dcad3add5
Fixed automated workers not replacing forts for AI civ. (#9837)
* Fixed automated workers not replacing forts for AI civ.

* Fixed double parenthesis.

* Removed repeat removing fort in progress code.

* Improved evaluateFortPlacement
2023-07-24 10:42:18 +03:00
Yair Morgenstern
97b80973d1 More BaseUnit unique-finding including type uniques 2023-07-21 15:18:39 +03:00
Yair Morgenstern
bc9b5615eb BaseUnit unique-finding always takes Type uniques into account 2023-07-21 15:09:14 +03:00
Yair Morgenstern
33ae13479d 4.7.9-patch1 2023-07-20 09:24:41 +03:00
SomeTroglodyte
383cb38c7d
NotificationAction compatibility patch (#9824)
* NotificationAction compatibility patch

* NotificationAction compatibility patch
2023-07-20 09:24:25 +03:00
SeventhM
4421a2a54e
Fix issues when adding/removing buildings (#9822) 2023-07-20 09:16:02 +03:00
Yair Morgenstern
d7b277b6b5 Memory performance improvement - don't create strings when you can instead hash the list! New ists are cheaper in-memory than new strings (only need to allocate "number of strings in list" pointers, and not "number of chars in all strings" chars) 2023-07-18 18:28:04 +03:00
Yair Morgenstern
ed74b03ff3
Version rollout (#9812)
* Bump version and create initial changelog entry

* Update Catalan.properties (#9807)

* Update Hungarian.properties (#9798)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Czech.properties (#9795)

* Update Czech.properties

* Update Czech.properties

* Missing brackets fix

* Update Spanish.properties (#9794)

* Update Simplified_Chinese (#9789)

* Update German translation (#9788)

* Update French.properties (#9786)

* Update Dutch.properties (#9785)

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Updated Brazilian_Portuguese.properties (#9784)

* Updated Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Polish.properties (#9783)

* Update Polish.properties

* Update Polish.properties

* Update Italian.properties (#9782)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2023-07-18 18:16:06 +03:00
SeventhM
b37aaeb3c6
Fix issues from gaining free beliefs (#9764)
* Fix issues from gaining free beliefs

* chooseBeliefs code I forgot

* Revert changes to next turn actions and allow for free beliefs while founding/expanding

* Missed a spot
2023-07-18 18:08:59 +03:00
SeventhM
1ca9766811
Fix issues when transferring capitals (#9801)
* Revert previous patches

* Fix the unit test, I guess
2023-07-18 18:08:30 +03:00
SomeTroglodyte
37465b5032
Prevent deserialization problem with Espionage (#9809)
* Prevent deserialization problem with Espionage

* Move comment and explain context a little better
2023-07-18 18:08:18 +03:00
SomeTroglodyte
0e64b8230f
Little Promotion UX improvements (#9808)
* Fix regression incorrectly allowing promotions from Unit Overview

* Autoclose PromotionPicker when all promotions chosen in one go

* Fix Unit Overview not showing new promotions when returning from PromotionPicker
2023-07-18 07:25:00 +03:00
SeventhM
1e66c2e131
Avoid built buildings (#9806)
* Removing most interactions with builtBuildings

* Might as well edit this too

* Fix issues and edit isBuilt

* Simplify isAllBuilt
2023-07-16 23:01:17 +03:00
SomeTroglodyte
a29cdc91e8
Unique target compliance test v2 (#9802)
* Split off some UniqueType helper classes, make regions work in Android Studio and linting

* Fix wrong UniqueType.Stats target

* Fix two Pantheon uniques

* BeliefType a little nicer to read

* More linting

* Implement UniqueTarget validation

* Validation of UniqueTypes allowed as conditionals
2023-07-15 22:06:12 +03:00
Yair Morgenstern
00e008b656 4.7.8-patch1
Resolves #9792 resolves #9791
2023-07-11 16:47:24 +03:00
Yair Morgenstern
bcd5ad6c69
Version rollout (#9781)
* Bump version and create initial changelog entry

* Update German translation (#9780)

* Update Catalan.properties (#9775)

* [Translation] Update Simplified Chinese (#9771)

* update Simplified_Chinese

* Update Simplified_Chinese

* Update Dutch.properties (#9769)

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Italian.properties (#9762)

* Update Polish.properties (#9759)

* Updated Brazilian_Portuguese.properties (#9758)

* Update French.properties (#9757)

* Update Dutch.properties (#9767)

* Update Dutch.properties

Completing Dutch translation part I

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: EmperorPinguin <99119424+EmperorPinguin@users.noreply.github.com>
2023-07-10 17:01:47 +03:00
Yair Morgenstern
4c5db52a5c Change default fallback to HexaRealm instead - it's been ready for a while :) 2023-07-10 16:28:54 +03:00
Yair Morgenstern
ee092a5851
City-level resources (#9774)
* City-level resources are...
- Not displayed in civ top bar
- Not considered civ-level resources (for trade, non-city conditionals, etc)
- Are explicitly treated in city conditionals
- ARE considered for constructing buildings requiring resource
- ARE NOT considered for construction units requiring resource

* getCityResources separates resources by origin so we need to sum them - kudos @SeventhM

* CR fixes

* Added new Civilization.getResourceAmount function

* More usages of civInfo.getResourceAmount()

* Don't add city resource table if it's empty
2023-07-10 16:24:50 +03:00
SomeTroglodyte
a737747284
Little Diplomatic Victory makeover (#9756)
* Linting and give two votes to UN owner

* Allow human player to abstain, show UN 2 votes

* More info on voting results

* AI won't vote for hated enemies

* Improve PopupAlert handling

* Translation templates

* One missing template
2023-07-10 15:25:59 +03:00
random271
8f761642f6
Added notification for destruction of tile improvements [via unit ability] (#9754)
* Added notification for desctruction of tile improvements [via unit ability]

* Modified template properties

* Update template.properties
2023-07-09 23:24:38 +03:00
Yair Morgenstern
3c56319640 Display resource uniques in civilopedia 2023-07-09 11:51:25 +03:00
Yair Morgenstern
31f6a406c2 Resolved #9745 - memory improvement, cache uniquemap for tiles with identical terrain 2023-07-09 10:12:16 +03:00
Yair Morgenstern
d229d45298
Version rollout (#9755)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#9744)

* Update Italian.properties (#9737)

* Update Italian.properties

* Update Italian.properties

* Update French.properties (#9733)

* Updated Brazilian_Portuguese.properties (#9732)

* Update Dutch.properties (#9730)

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Catalan.properties (#9728)

* Update German translation (#9723)

* Update Polish.properties (#9718)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: maxdu <d.darmax@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
2023-07-06 00:42:39 +03:00