Commit Graph

6514 Commits

Author SHA1 Message Date
05f9d3cb36 Clearer NotificationActions code (#9738) 2023-07-04 13:59:35 +03:00
fb3064dd4b Prevent activation of disabled actors via key shortcuts (#9736)
Avoid activation concurrent modification problems
2023-07-04 13:58:34 +03:00
8263d972ff Fix civilopedia gold cost (#9729)
* Fix exponent being applied wrong

* Format more consistent with rest of project

* Fix building gold cost in civilopedia and use slash instead of a comma

* Add INonPerpetualConstruction.getCivilopediaGoldCost()
2023-07-03 23:52:47 +03:00
afb30fb1ca Better support for lacking a capital (#9709)
* more getCapital null checks

* Move first city if no capital check to getCapital
2023-07-03 23:47:49 +03:00
86cde678b3 chore: Modernized TileImprovementConstructionTests 2023-07-03 23:43:03 +03:00
06377feaeb 4.7.6-patch2
Resolved crash when moving cities between civs, added tests to ensure future changes do not break city moving functionality
2023-07-03 14:13:31 +03:00
6726d2ce03 Keyboard bindings for Main Menu Screen (#9680)
* Main Menu keyboard bindings

* Make keyboard binding tooltips dynamic so user changes need no UI rebuild
2023-07-02 22:28:10 +03:00
6f0a51d6d8 4.7.6-patch1
Captured 'last city' capitals do not retain capital status
2023-07-02 17:36:38 +03:00
bfc2e3cd59 Version rollout (#9717)
* Bump version and create initial changelog entry

* Various new lines added, some minor corrections. (Dutch.properties) (#9713)

* Various new lines added, some minor corrections.

* Minor correction in placeholder

* Update Spanish.properties (#9702)

* Updated Brazilian_Portuguese.properties (#9696)

* Update French.properties (#9692)

* Update Italian.properties (#9688)

* Update Italian.properties

* Update Italian.properties

* Update Simplified_Chinese.properties (#9687)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Polish.properties (#9686)

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
2023-07-02 15:18:50 +03:00
0e8c960867 Check for triggers conditions (#9699)
* Check for triggers conditions

* removing shadowed names

* Move Conditional check to Uniques
2023-07-02 14:53:34 +03:00
753358c1f0 On City Raze, previous owner doesn't pay Road Maintenance (#9706) 2023-07-02 14:53:19 +03:00
589a9fa29f Fix when units can be purchased (#9715) 2023-07-02 14:53:06 +03:00
0edfa4841e Better image documentation for modders 2023-07-02 02:42:36 +03:00
bb22b1de72 Actually generated unique type documentation 2023-07-02 01:36:28 +03:00
d0643efe6b Added unique type documentation in wiki 2023-07-02 01:28:27 +03:00
fd2bfbdc10 Resolves #9561 - "Requires a [buildingFilter] in at least [amount] cities" works correctly with filters that aren't building names 2023-06-30 15:47:45 +03:00
947a1001c4 Resolves #9703 - AI only buys tiles contiguous to the current city tiles (was: contiguous to civ tiles) 2023-06-30 15:13:14 +03:00
1694a59fd2 Defense against circular references in Promotions (#9694)
* Promotion picker - working defense against circular references

* Mod checker - complain about circular references
2023-06-29 09:18:07 +03:00
6eeb630b6c chore: 'cityInfo' purge (changed to 'city' everywhere) 2023-06-28 23:38:01 +03:00
83270ddf8f Resolved #9689 - no city window on citybutton click 2023-06-28 19:08:52 +03:00
4a7f484900 Revert "Solved strange concurrency crashes due to players keypress-activating disabled buttons"
This reverts commit ee855b8d77.
2023-06-28 19:01:37 +03:00
4c28905e2c Undo Move button moved to far right, so other buttons stay in place 2023-06-28 13:23:22 +03:00
a8ec8f84ec Architectural update - Make animated menu reusable (#9685)
* Extract AnimatedMenuPopup from UnitUpgradeMenu to make its basic idea reusable

* Rebase UnitUpgradeMenu onto AnimatedMenuPopup

* Add SoundPlayer.playRepeated for future reusability

* Move UnitUpgradeMenu to popups package

* Reuse playRepeated in PromotionPickerScreen

* Reuse playRepeated in PromotionPickerScreen - clean up imports
2023-06-28 12:05:04 +03:00
f5d3f346b1 Version rollout (#9684)
* Bump version and create initial changelog entry

* Update Spanish.properties (#9682)

* Updated Brazilian_Portuguese.properties (#9677)

* Updated Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update German translation (#9675)

* Update French.properties (#9674)

* Update Russian.properties (#9672)

* Update Russian.properties

* Update Russian.properties

* Update Italian.properties (#9670)

* Update Polish.properties (#9668)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: JOGANfruit <77359522+JOGANfruit@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>
2023-06-28 11:05:23 +03:00
c45d3ecb7c Promotion picker allowing picking chains in one go (#9655)
* Try to allow chained promotion picking

* Reorg PromotionPickerScreen into own package

* Draft for new PromotionTree

* Change PromotionPickerScreen to use new tree (picking still not done)

* Finish new PromotionPickerScreen - code

* Finish new PromotionPickerScreen - assets and linting

* Finish new PromotionPickerScreen - polish positioning and lines

* Finish new PromotionPickerScreen - fix sound

* Finish new PromotionPickerScreen - little optimization

* Finish new PromotionPickerScreen - emphasize line along path

* Finish new PromotionPickerScreen - merge fix

* Finish new PromotionPickerScreen - address comments

* Finish new PromotionPickerScreen - fix sort and update wiki
2023-06-28 10:49:35 +03:00
d298f85099 Fixing workers dying in mountains bug for Carthage (#9665)
* Fixed workers dying in mountain tiles issue for Carthage

* Accounts for all damage dealing tiles

* Update WorkerAutomation.kt

* Update Tile.kt

* Update WorkerAutomation.kt

* Update WorkerAutomation.kt
2023-06-28 10:48:44 +03:00
73fa87e6b4 Check for trigger uniques when starting and recaluating population (#9673)
* Check for trigger uniques when starting and recaluating population

* Adding imports

* whoops

* Moved where starting techs are added, added a parameter, and fixed the check for GUI
2023-06-28 10:48:33 +03:00
ee855b8d77 Solved strange concurrency crashes due to players keypress-activating disabled buttons 2023-06-28 10:45:36 +03:00
bef1843cd9 chore: Removed vestigal city.apply{} for CityInfoConquestFunctions, for clarity on what is actually for the city and what is not
No logic changes
2023-06-28 10:34:29 +03:00
42a9c3af57 Resolved #9679 - 'liberate city and resurrect civ' no longer crashes
Kudos @SomeTroglodyte and @random271 for locating the problem :)
2023-06-28 10:27:09 +03:00
a6e4b72cf4 AI no longer purchases non-contiguous tiles 2023-06-26 23:07:53 +03:00
0536c5f24b Resolved #9669 - city name translation for conquered popup does not get icon 2023-06-26 22:08:41 +03:00
6a8f4914b8 More defensive coding of speedupWonderConstruction (#9671) 2023-06-25 19:24:30 +03:00
330fa6593b 4.7.4 2023-06-25 10:07:17 +03:00
14e1683db2 Version rollout (#9667)
* Bump version and create initial changelog entry

* Ukrainian translations (#9663)

* Update French.properties (#9662)

* Update French.properties

* Fix wrong key

* Update Spanish.properties (#9652)

* Update Spanish.properties

* Update Spanish.properties

* Brazilian_Portuguese.properties (#9649)

* Update Italian.properties (#9647)

* Update Italian.properties

* Update Italian.properties

* Update German.properties (#9646)

* Update German.properties

* Fixed missing [spyname]

---------

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

* Update Polish.properties + question (#9644)

* Update Polish.properties

* Update Polish.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@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>
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: Knirps1 <52383078+Knirps1@users.noreply.github.com>
Co-authored-by: Birk Birkner <birkner@bbirkner.de>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
2023-06-25 09:58:03 +03:00
0aca3c307b Notifications architectural update (#9605)
* Improved Notifications architecture

* Revert NotificationIcon as class hierarchy

* Improved Notifications architecture - migration roadmap first step
2023-06-25 09:47:50 +03:00
1a6d8d72bb Fix ruleset error crash (#9666)
* Harden NewGameScreen against exceptions from getComplexRuleset

* Miscellaneous tweaks to NewGameScreen - e.g. allow it to show last used custom map
2023-06-25 09:46:00 +03:00
abb0dcbaae Mod name defense attempt II (#9645)
* Improve Load game error label readability

* Fix threading on load game screen

* Miscellaneous tweaks

* Compatibility with Mods using trailing dashes on Windows
2023-06-25 09:38:18 +03:00
82ebb01a20 Zoom in/out of the history charts (#9660)
* Do not recreate the Line Chart every time

* Simplifed the Line Chart creation

* Do not create objects in draw(): VictoryScreenCivGroup table

* Do not create objects in draw(): Labels

* Create labels without negative Y

* Lift the X axis if there is an negative number

* Arbitrary number of -Y labels

* Autoscale by Y axis

* Zoom in/out by click

* Autoscale by X axis

* Unit tests for LineChart

* Rework of the line chart rendering
2023-06-25 09:37:08 +03:00
1285133884 Adding field for great person type (#9614)
* Adding Field for great person types

* Switching from unit field to unique

* Simplification and adding back in the old field for backward compatibility

* Deprecate old field for checking great person

* Fix error

* Fixes part 2. I probably should've waited
2023-06-25 09:36:33 +03:00
aa0fb9ed8b More unit unique tests (#9639) 2023-06-25 09:35:31 +03:00
bc3f1341e1 Tech column validation and removing crashes from undefined building costs (#9664)
* Add in tech column validation

* Negative Columns

* Forgot to add techColumns to the add and clear functiond

* Remove restrictive cokumn check

* bugfixing
2023-06-25 09:34:23 +03:00
650a43aa3b Make UncivGame.isInitialized inaccessible outside of the class hierarchy (#9651)
* Make UncivGame.isInitialized inaccessible outside of the class hierarchy

* Fix JvmName
2023-06-25 09:03:44 +03:00
a246baa333 Resolved #9638 - Removing old buildings on enemy capital (when not last city) no longer crashes 2023-06-23 10:17:45 +03:00
ee668710e2 Resolved #9637 - Concurrent modification fix for liberated city with multiple units in it 2023-06-23 09:54:33 +03:00
b7e4ca358c Resolved #9641 - Removed static wrapper functions from WorkerAutomation 2023-06-23 09:51:04 +03:00
66eed083f2 Fixed broken build 2023-06-23 09:26:53 +03:00
970cb3cf3d Version rollout (#9642)
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#9634)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Spanish.properties (#9628)

* Update French.properties (#9626)

* Update Italian.properties (#9624)

* Update German translation (#9623)

* Update Polish.properties (#9620)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Leslie Yu <32165704+leslieyu608@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@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: mape6 <mape6@posteo.de>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
2023-06-23 09:08:38 +03:00
38cf71a7ab Bug fix: Buildings not set to -1 by default correctly (#9635)
* Change the default cost of buildings and the default time of tile improvements

* Bugfix: default building cost is now set to -1 as intended
2023-06-23 08:52:47 +03:00
f78fd7e665 Move on water (#9622)
* Add in Move on water unique

* Small fixes

* Remove redundant check
2023-06-23 08:51:48 +03:00