Commit Graph

9943 Commits

Author SHA1 Message Date
Oskar Niesen
fe111edf30
Spectators can now see the diplomacy screen of the civ that they have selected (#10969) 2024-01-21 19:13:46 +02:00
SeventhM
b43fe8cdf8
Assume the relevant city for triggered uniques (#10979)
* Assume the relevant city for triggered uniques

* whoops

* whoops 2

* Missing bracket

* whoops 3. A PR I was planning on doint but will wait on
2024-01-21 19:13:31 +02:00
Oskar Niesen
bb969efc12
Checking if a tile is in work range now checks all cities (#10978) 2024-01-21 19:13:11 +02:00
Oskar Niesen
169ccf5d03
AI worker road priority rework (#10918)
* WorkerAutomation now caches the roads to use

* Workers now build roads differently

* Fixed error if unit movement is zero

* Fixed civ researching an unwanted tech in a test

* Fixed spelling

* Increased road building priority

* getRoadConnectionBetweenCities no longer does unnecessary sorting

* roadsToConnectCitiesCache no longer stores roads that are already built

* ChooseImprovement now builds roads on resource tiles!

* Fixed tryConnectingCities error related to using minByOrNull instead of firstOrNull

* Roads can't have a negative value if they are bigger
2024-01-21 19:12:14 +02:00
Yair Morgenstern
94256f7160 Resolved #10938 - 'cities auto-bombard at end of turn' is a user option 2024-01-21 18:59:32 +02:00
SomeTroglodyte
7f36b1e404
Wrong atlas list still interfering with new commits (#10965) 2024-01-20 21:58:04 +02:00
Yair Morgenstern
6b2f811d58 4.10.0 2024-01-19 12:34:05 +02:00
Yair Morgenstern
15ea7176b0
Version rollout (#10964)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#10960)

* Update Hungarian.properties (#10958)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update French.properties (#10957)

* Update Korean.properties (#10956)

* Update Dutch.properties (#10954)

* Update Italian.properties (#10946)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: AutumnPizazz <114050365+AutumnPizazz@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2024-01-19 12:28:01 +02:00
SeventhM
016bb80123
Fix conditionals being ignored for some triggers (#10839)
* Fix conditionals being ignored for some triggers

* Import StateForConditionals... again
2024-01-19 12:27:51 +02:00
Oskar Niesen
aba91c9167
AI worker amount increase (#10945)
* Increased the amount of workers the AI builds

* Changed the number of workers a little
2024-01-19 12:26:52 +02:00
SomeTroglodyte
4e67d9535f
The console key should be bindable? (#10952) 2024-01-19 12:07:15 +02:00
SeventhM
940cda3009
Treat all timed uniques as functioning as always true regardless of conditionals (#10940)
* Treat all timed uniques as functioning as always true regardless of conditionals

* use replaceFirst instead of replace
2024-01-19 12:05:28 +02:00
SomeTroglodyte
e5e86aa0d7
Avoid Civilopedia stumbling over missing Grassland (#10953)
* Avoid Civilopedia stumbling over missing Grassland

* A few wiki comments on Terrain

* Minor linting of my own crud

* Pedia linking PromotionPickerScreen

* Change actionTypeToFunctions signature to use Sequence
2024-01-19 11:59:58 +02:00
SomeTroglodyte
bfaf049b6a
Allow map editor to generate smaller than "tiny" Pangaea maps (#10894)
* Allow map editor to generate tiny Pangaea maps (instead of entering an infinite loop)

* rename variable & reword comment
2024-01-19 11:51:52 +02:00
Yair Morgenstern
8977f8f7cc Don't spawn nat wonders next to start location 2024-01-19 11:37:36 +02:00
Yair Morgenstern
a73b159498 Automated spectator in multiplayer games does nothing 2024-01-19 11:22:54 +02:00
Yair Morgenstern
b09354a042 Source object names for users unified 2024-01-15 21:09:46 +02:00
Yair Morgenstern
7f3be9dce2 #10846 - added removeroad command 2024-01-15 19:24:04 +02:00
Yair Morgenstern
06203bfe71 #10846 - Add console command to change city name 2024-01-15 19:19:50 +02:00
Yair Morgenstern
411d8c4a0f 4.9.19 2024-01-15 19:09:25 +02:00
Yair Morgenstern
0c460801c0
Version rollout (#10943)
* Bump version and create initial changelog entry

* Update Brazilian_Portuguese.properties (#10941)

* Update Italian.properties (#10935)

* Update Korean.properties (#10934)

* Update Hungarian.properties (#10925)

* Update Hungarian.properties

[...] -> (...)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Spanish.properties (#10920)

* Update Polish.properties (#10919)

* Update French.properties (#10916)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: yetanotherfossman <83962798+yetanotherfossman@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2024-01-15 19:06:32 +02:00
Oskar Niesen
59b8e9bd76
Spectators receive era notifications again (#10937) 2024-01-15 18:56:38 +02:00
Oskar Niesen
b9f44982b9
Temporarily disabled AI fort building (#10933)
* Half working fort building AI

* Disabled fort building so we can push a fix out

* Updated Uniques to not be hard coded
2024-01-15 18:56:22 +02:00
SomeTroglodyte
cf5eb02ce7
Fix Paradrop crossing World-wrap seam (#10936)
* Fix Paradrop crossing World-wrap seam problem

* Change MoveHereButton for Paradrop
2024-01-15 18:56:13 +02:00
SomeTroglodyte
351917709c
ImagePacker lint and allow it to run on an assets folder devoid of atlases (#10929) 2024-01-15 18:55:56 +02:00
Oskar Niesen
c3a4b5f7af
Worker remove feature AI fix (#10917)
* Workers now value the improvement that they want to build after removing a terrain feature

* Restructured getImprovementRanking
2024-01-15 18:55:45 +02:00
SomeTroglodyte
c829caf51a
ModManagementScreen gets a loading indicator (#10909) 2024-01-15 18:55:36 +02:00
Yair Morgenstern
0b5c2062b6 Modding: "Cannot be traded" unique accepts Civ conditionals 2024-01-15 18:48:43 +02:00
Yair Morgenstern
6998b8d3d1 Changed unitHeight and tileHeight from by lazy to transient vars, to allow updates in preparation for base terrain changes 2024-01-14 19:11:21 +02:00
Yair Morgenstern
6043a62353 Boni -> Bonuses, this is English 2024-01-14 10:03:02 +02:00
Ouaz
d69b458481
Add modified nation descriptions (#8261)
* Add modified nation descriptions

Original descriptions reworded and a bit shortened.

* Fix Greece description

* Add modified nation descriptions (vanilla)

* Improvements to Nation descriptions

Fixes and improvements by Yairm

* Improvements to Nations descriptions (vanilla)

Fixes and improvements by Yairm

* Improve startIntroPart2 for all nations

Also add fixes/improvements by Yairm.

* Improve startIntroPart2 for all nations (vanilla)

Also add fixes/improvements by Yairm.
2024-01-14 09:05:09 +02:00
Yair Morgenstern
0a274a28a8 build-multiplatform checks android only on java 17
And we don't need tests since we have a different way to test that
2024-01-13 22:18:20 +02:00
Yair Morgenstern
2937e88f09 Proper build tools version update 2024-01-13 22:01:25 +02:00
Yair Morgenstern
e30358bd7e Sign APK for Github release using new build-tools 2024-01-13 21:49:39 +02:00
Yair Morgenstern
332a2d0af3 Removed new shortestPath algorithm after we determined it to be objectively slower than the current one :( 2024-01-13 20:58:57 +02:00
Yair Morgenstern
b16450e002 Allow comment uniques on follower beliefs 2024-01-13 20:48:08 +02:00
Yair Morgenstern
42a8387646
Fix Github Actions pipelines (#10928)
* Updated setup-gradle in bid to fix install

* Try setup android SDK manually

* Increase java version to 17

* Remove Android SDK manual download, let's see if it works without

* Upgraded the rest of the pipelines to java 17

* Added the setup since it appears to be required to all steps
2024-01-13 19:47:27 +02:00
Yair Morgenstern
e53f27a847 4.9.18 2024-01-09 23:38:11 +02:00
Yair Morgenstern
5997dde157
Version rollout (#10907)
* Bump version and create initial changelog entry

* Update Simplified Chinese (#10905)

* Update Brazilian_Portuguese.properties (#10899)

* Update Korean.properties (#10892)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* ctrl+z

* Update Spanish.properties (#10890)

* Update French.properties (#10886)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2024-01-09 23:26:25 +02:00
Yair Morgenstern
7064f6a1ec Performance improvement for ruleset validation 2024-01-09 23:25:43 +02:00
Roman Kr
b9b0a63d64
Added unique MayBuyConstructionsInPupets (#10597)
* Uniques: added MayBuyConstructionsInPupets unique for a civ

Gives an ability to buy items (units and buildings) in puppet cities

* Uniques: clear unnecessary whitespaces

* Uniques: typo in a `puppet` word

* Uniques: use city's `getMatchingUniques` instead of civ's `hasUnique` during checking the unique
2024-01-09 22:26:07 +02:00
SomeTroglodyte
436809db81
Linting of GameStarter.addCivTechs (#10897)
* Linting

* Fix era number on turn 0

* Revert "Fix era number on turn 0"

This reverts commit 71e428e0c5.
2024-01-09 22:11:22 +02:00
SeventhM
bbba24baae
Reorder AddTechnology (#10901) 2024-01-09 22:11:11 +02:00
SomeTroglodyte
e34854bf7d
Prevent TranslationFileWriter from writing entries crippled by wrong nested brackets interpretation - when UniqueTyped (#10774) 2024-01-09 22:10:57 +02:00
Yair Morgenstern
7845aea440 Performance improvement for canPassThrough 2024-01-09 22:09:29 +02:00
SomeTroglodyte
975b2ba165
Unit test against unmatched placeholders in a translation (#10863) 2024-01-09 12:42:04 +02:00
Yair Morgenstern
6b469cb25b Final performance improvements for the new algotihm, before we say 'goodnight sweet prince' - it underperforms drastically compared to current 2024-01-09 12:31:37 +02:00
yairm210
7f37783006 4.9.17-patch2 2024-01-09 05:36:23 +00:00
dHannasch
597574f534
Fix NullPointerException on founding a pantheon (#10888)
* Update ReligionManager.kt

* Move religionState and trigger out of foundPantheon for symmetry

* Update ReligionManager.kt
2024-01-09 07:36:15 +02:00
SomeTroglodyte
7ec7d2a071
Fix the german line blocking #10863 (#10893) 2024-01-08 16:51:05 +02:00