Commit Graph

10052 Commits

Author SHA1 Message Date
Yair Morgenstern
27d63f00f4 Added 'city addbuilding', 'city removebuilding' console commands 2024-02-27 13:22:10 +02:00
Yair Morgenstern
3689eed3aa Add unique to conditionally control construction costs 2024-02-27 11:13:26 +02:00
Yair Morgenstern
b4cb0e3d75 getProductionCost can receive city - this will allow us to control city-specific production cost changes! 2024-02-27 11:05:50 +02:00
Yair Morgenstern
fd428ce606 RemoveIf -> RemoveAll to avoid jvm dependencies 2024-02-27 11:00:39 +02:00
Yair Morgenstern
6448f8e47e Fix links in mod file structure - #11183 2024-02-26 22:53:28 +02:00
Yair Morgenstern
1101f42957 4.10.13 2024-02-26 22:47:43 +02:00
Yair Morgenstern
f34948d0c2
Version rollout (#11208)
* Bump version and create initial changelog entry

* Update French.properties (#11199)

* Update Italian.properties (#11198)

* Update Catalan.properties (#11197)

* Update Indonesian.properties (#11196)

Translated and fixed the translation of some words.

* Update Brazilian_Portuguese.properties (#11194)

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: M792003 <158552928+M792003@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
2024-02-26 22:39:43 +02:00
SomeTroglodyte
a899a11ad2
New notifications bell icon with actual count (#11205)
* Refactor OtherIcons/Circle handling

* New "Bell" icon for Notifications

* Remove "todo" line
2024-02-26 22:20:40 +02:00
PLynx
91bfcbab2f
Added ConditionalAboveHappiness unique (#11207) 2024-02-26 22:20:34 +02:00
SomeTroglodyte
d7a2af5ced
Fix TabbedPager geometry - the cell for the close button needs to be ignored in the rest of the Table! (#11204) 2024-02-26 22:20:26 +02:00
Yair Morgenstern
a0f710b885 Resolved #11200 - Add AI for land-based nukes 2024-02-26 22:13:20 +02:00
Yair Morgenstern
e6a132a9d7 Fixed game load, removed extraneous getBaseUnit() function 2024-02-26 21:30:29 +02:00
Yair Morgenstern
2d49838f13 changed requiredTech to revealedBy in tileResources json schema, added deposit amounts and improvedBy 2024-02-25 23:36:57 +02:00
Yair Morgenstern
46dacd2991 Added resourceType field to tileResources json schema 2024-02-25 23:31:24 +02:00
Yair Morgenstern
cba867bb7e json schema for tileResources 2024-02-25 23:27:23 +02:00
Yair Morgenstern
4dbed12e45 Keep opened mods open and at top of list when reloading mods in 'locate mod errors' tab 2024-02-25 23:07:02 +02:00
Yair Morgenstern
83655bbd34 Resolves #11193 - above/below HP conditionals work outside of combat 2024-02-25 22:45:21 +02:00
Yair Morgenstern
72fa2a3f48 Resolves #11193 - update uniques upon taking damage and other situations 2024-02-25 21:42:05 +02:00
Yair Morgenstern
2494b1dcbc Move takeDamage function from MapUnitCombatant to MApUnit where it belongs 2024-02-25 21:35:08 +02:00
Yair Morgenstern
adccee0b2e 'cached unique' documentation is within collapsible block 2024-02-25 21:25:01 +02:00
Yair Morgenstern
8675a8a747 4.10.12 2024-02-25 00:35:00 +02:00
Yair Morgenstern
f5d80c5463
Version rollout (#11191)
* Bump version and create initial changelog entry

* Update French.properties (#11171)

* Update Italian.properties (#11168)

* Update Indonesian.properties (#11166)

* Update Indonesian.properties

Added and fixed some translation.

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: M792003 <158552928+M792003@users.noreply.github.com>
2024-02-24 22:51:54 +02:00
SomeTroglodyte
4a138478f6
Right-click/longpress for World screen city buttons (#10771)
* City buttons support right-click / long-press to enter CityScreen directly

* City r-click: Rename helper and UI tips

* City capitalization follows getCurrentTutorialTask precedent

* City capitalization change applied to existing translation keys

* Revert "City capitalization change applied to existing translation keys"

This reverts commit c3638a0daf.

* Revert "City capitalization follows getCurrentTutorialTask precedent"

This reverts commit b618f4cae3.

* City capitalization in new text follows getCurrentTutorialTask precedent
2024-02-24 22:42:31 +02:00
SomeTroglodyte
dd1f0142f1
Unit actions from Uniques shouldn't be active at zero movement (#11188) 2024-02-24 22:41:39 +02:00
Oskar Niesen
04083de766
Added unit escorting formation!!! (#11057)
* Added escort button

* Added basic escort movement

* Improved escort movement

* Swapping breaks escorting

* Added stop escorting button

* Added link icon to unit

* getDistanceToTiles() now automatically includes escorting

* Multi-turn movement with different units works somewhat

* Escorting units persist to escort across saves

* Escorting units are only idle if their partner unit is idle as well

* Fixed multi-turn escort movement where one unit has more movement points left over

* Added basic tests

* Added a test for formation idle units

* Added some basic movement tests

* Added some canMoveTo tests

* getDistanceToTiles only caches when includeEscort is true

* added getDistanceToTiles test

* An entire commit to remove one line of white space just for you! And yes, there are no semi-colons;

* Added translations

* Added more stopEscorting() calls when the unit is removed

* Added extra comments and refactoring

* Refactored removeAllTilesNotInSet to use a mutableIterator

* Refactored code based on review

* Refactored removing tiles in PathsToTilesWithinTurn that aren't in another PathsToTilesWithinTurn
2024-02-24 22:39:04 +02:00
SeventhM
54201c381c
Allow conditional timed triggers for unit actions or most other trigger conditionals (#11181)
* Allow conditional timed triggers to be visible from all uniqueMaps

* Whoops
2024-02-24 22:38:32 +02:00
SpacedOutChicken
b17f162be9
Allow Barbarians to make set-up ranged units (#11173)
Allow Barbarians to create units that must set up to ranged attack, unless specifically forbidden by the relevant unique

Since we have a unique for this explicit purpose, we no longer need this extra prevention for Barbarian unit types.
2024-02-24 22:38:22 +02:00
SomeTroglodyte
bebe0c67da
Fix double "close" action from Overview ESC key (#11185) 2024-02-24 22:38:12 +02:00
SomeTroglodyte
84902b7957
Fix a few applications of the "hidden from users" modifer (#11186)
* Respect hidden modifier in a nation's unique improvements display

* Respect hidden modifier in the Unhappiness stat overview

* No auto-icons for an ExpanderTab title
2024-02-24 22:38:02 +02:00
SomeTroglodyte
6092702f96
Fix fortified units upgraded to ones that can't fortify still keeping their fortification (#11187) 2024-02-24 22:37:53 +02:00
Yair Morgenstern
5b04d1b0d6 Make terraform unique triggerable from improvements 2024-02-23 10:53:17 +02:00
SomeTroglodyte
52eae2a3f9
Fix options setting for the notifications scroll visibility being wrong for new installs (#11177) 2024-02-22 17:34:29 +02:00
SomeTroglodyte
382d966696
Change EmpireOverviewScreen closing to use the same button and UX as Civilopedia (#11169)
* Centralize a "round X" close button factory with global scope

* Change EmpireOverviewScreen closing to use the same button and UX as Civilopedia
2024-02-22 17:33:26 +02:00
SomeTroglodyte
3047c1abad
Normalize TNP 'search' links, fix a few broken or incomplete attributions (#11178) 2024-02-22 17:32:07 +02:00
Yair Morgenstern
e2df543778 4.10.11 2024-02-20 23:49:28 +02:00
Yair Morgenstern
5cba78cd9b
Version rollout (#11164)
* Bump version and create initial changelog entry

* Update Simplified Chinese (#11161)

* Update French.properties (#11153)

* Update Indonesian.properties (#11151)

* Update Indonesian.properties

Added translation for vanilla civ introduction.

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#11150)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: M792003 <158552928+M792003@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2024-02-20 23:43:12 +02:00
Yair Morgenstern
23edf07a41
Terraforming! (#11152)
* Terraforming!

* comment

* whoops

* And better tests, that actually output text.

* SomeTrog caught this doc error :)

* Fix natural wonder placement, it better belongs with base terrain
Also, normalize tiles to ruleset after plonking a new terrain

* Out Of Cheese Error, Redo From Start

- Only terrains, no improvements - one problem at a time
- Fit new functional trigger format
- Respect occursOn
- Teleport units out of tiles if they can't pass through (nat wonders for example)
- No need for terrainFeature unique parameter
- Tested with "Turn this tile into a [Grand Mesa] tile <for [0] movement>", "Turn this tile into a [Forest] tile <for [0] movement>" uniques

* Don't allow city tiles to turn into water/wonders etc kudos @SomeTrog
2024-02-20 23:38:23 +02:00
SomeTroglodyte
2c96c6f244
ConditionalWhileResearching as suggested by @woo1127 (#11156) 2024-02-20 23:25:16 +02:00
SeventhM
8eadaa9d8e
Fix victory focus being ignored (#11158)
* Fix victory focus being ignored

* Move to Civilization
2024-02-20 23:25:06 +02:00
SomeTroglodyte
7d17b9296d
External links: Right-click and some housecleaning (#11155)
* Right-click external links to copy url

* Add hint about right-clicking links to UI Tips tutorial

* Add wiki link to about and centralize repo/wiki external link bases
2024-02-20 23:24:54 +02:00
SeventhM
17abf7840b
Add unique for Personality to avoid building object (#11160)
* Add unique for Personality to avoid building object

* Switch civInfo with city

* Missed a spot

* baseUnitFilter instead of "unitFilter"
2024-02-20 23:23:56 +02:00
Yair Morgenstern
b80ab2d3e6 Fix timed uniques without further conditionals not getting type recognized 2024-02-20 14:49:26 +02:00
Yair Morgenstern
fc6d913204 Ensure that each uniquetype specified returns a value =- thank you amazing Kotlin compiler :) 2024-02-20 14:03:51 +02:00
Yair Morgenstern
3a7401a939 Only allow a trigger-based unit action if the trigger function is not null
Tested with "Adopt [Legalism] <for [0] movement>" - it allows me to click once, adopting the policy, but not a second time since the policy is already adopted thus the trigger function is null
2024-02-20 11:03:07 +02:00
Yair Morgenstern
27465425b0 Allow determining *if* a unique can trigger a triggerable effect, *without* actually doing so 2024-02-20 10:52:36 +02:00
SeventhM
d51d032e18
Fix Personality documentation (#11159) 2024-02-20 10:01:34 +02:00
SomeTroglodyte
4661ee2496
Fix Maya "Long Count" unlock translations (#11157)
* Mayan Long-Count unlock: Match translation template and existing translations to actual notification

* A TFW run adds another empty line at the end...
2024-02-19 21:48:50 +02:00
itanasi
d3356c94fd
Minor style updates (#11154)
* Properly Calculate Population based on Food Conversion to Prod
Trigger properly when Queue is changed

* Remove triggers

* Missed a trigger

* Add triggers in CityConstructionsTable so we can call cityScreen.update()

* Properly Calculate Population based on Food Conversion to Prod
Trigger properly when Queue is changed

* Remove triggers

* Missed a trigger

* Add triggers in CityConstructionsTable so we can call cityScreen.update()

* Minor style cleanups

* Properly Calculate Population based on Food Conversion to Prod
Trigger properly when Queue is changed

* Remove triggers

* Missed a trigger

* Properly Calculate Population based on Food Conversion to Prod
Trigger properly when Queue is changed

* Remove triggers

* Missed a trigger

* Minor style cleanups
2024-02-19 21:46:57 +02:00
Yair Morgenstern
6c87bef1cf 4.10.10 2024-02-17 23:12:03 +02:00
Yair Morgenstern
b2bbd8d145
Version rollout (#11149)
* Bump version and create initial changelog entry

* Update Brazilian_Portuguese.properties (#11143)

* Update Italian.properties (#11140)

* Update Italian.properties

* Update Italian.properties

* Fixed mistranslations and made the translation more natural (#11139)

Some of the diplomacy wording are clearly machine translated, so I improved it.

* Update Indonesian.properties (#11136)

* Update Indonesian.properties

Translated some words and fixed some mistranslated words.

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update French.properties (#11135)

* Update Spanish.properties (#11132)

* Update Spanish.properties

* Update Spanish.properties

---------

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: chenxing61 <70869440+chenxing61@users.noreply.github.com>
Co-authored-by: M792003 <158552928+M792003@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2024-02-17 23:09:51 +02:00