mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-10 02:47:24 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,082 Commits 6 Branches 1,050 Tags 1.1 GiB
ee092a5851
Commit Graph

6129 Commits

Author SHA1 Message Date
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
Yair Morgenstern
8042402c1c Fixed tile filter for civ-related conditions for "upon ending a turn in a [tileFilter] tile" trigger 2023-07-06 00:39:04 +03:00
SeventhM
5ea1d5722b
Fix buildings/units not triggering and golden age stat updates (#9731) 
* Fix buildings not triggering, golden age stat updates, and units not triggering

* Forgot import, whoops

* uodate resources and city connection when removing a building

* Move building triggers to function, added unit notification to translations

* Quick edits without android studio sucks

* Add unitActionModifier check back to hasTriggerConditional

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2023-07-06 00:36:43 +03:00
SeventhM
d2dac66f40
Avoid crashes with incorrect condtionals (#9753) 2023-07-05 22:57:06 +03:00
Yair Morgenstern
fdb07b06c1 Resolved #9740 - incorrect ruleset combos for 'buy building with stat' no longer crash 2023-07-05 21:59:01 +03:00
Yair Morgenstern
103234a6b8 Keep track of what mod each ruleset object comes from, for debug and civilopedia purposes 2023-07-05 21:55:57 +03:00
SomeTroglodyte
6a6a8a0c94
Minimal support for Alpha Frontier-like Workers (#9690) 
* Linting

* Cache hasUnique(UniqueType.CreateWaterImprovements)

* Move automateWorkBoats to WorkerAutomation - for readability and better chances to create synergies

* Add a chance for automated Alpha Frontier Workers to create Water improvements

* Reorg random271's Lemming code a little

* Tune Worker automation for buildable Water improvements
 2023-07-05 21:11:17 +03:00
Yair Morgenstern
19bf15558d Fixed India's 'double unhappiness' unique 2023-07-05 21:10:22 +03:00
SeventhM
08a280c29d
Scaling purchase costs for faith/culture/science/etc. with speed (#9721) 
* Scaling with speed

* Changing to float, and allowing a unique to set a gold price
 2023-07-04 20:16:48 +03:00
SomeTroglodyte
ad0af51020
Explain the invoke trick as well (#9739) 2023-07-04 15:12:30 +03:00
SomeTroglodyte
05f9d3cb36
Clearer NotificationActions code (#9738) 2023-07-04 13:59:35 +03:00
SomeTroglodyte
fb3064dd4b
Prevent activation of disabled actors via key shortcuts (#9736) 
Avoid activation concurrent modification problems
 2023-07-04 13:58:34 +03:00
Skekdog
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
SeventhM
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
Yair Morgenstern
86cde678b3 chore: Modernized TileImprovementConstructionTests 2023-07-03 23:43:03 +03:00
Yair Morgenstern
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
SomeTroglodyte
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
Yair Morgenstern
6f0a51d6d8 4.7.6-patch1 
Captured 'last city' capitals do not retain capital status
 2023-07-02 17:36:38 +03:00
Yair Morgenstern
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
SeventhM
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
itanasi
753358c1f0
On City Raze, previous owner doesn't pay Road Maintenance (#9706) 2023-07-02 14:53:19 +03:00
SeventhM
589a9fa29f
Fix when units can be purchased (#9715) 2023-07-02 14:53:06 +03:00
Yair Morgenstern
0edfa4841e Better image documentation for modders 2023-07-02 02:42:36 +03:00
Yair Morgenstern
bb22b1de72 Actually generated unique type documentation 2023-07-02 01:36:28 +03:00
Yair Morgenstern
d0643efe6b Added unique type documentation in wiki 2023-07-02 01:28:27 +03:00
Yair Morgenstern
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
Yair Morgenstern
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
SomeTroglodyte
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
Yair Morgenstern
6eeb630b6c chore: 'cityInfo' purge (changed to 'city' everywhere) 2023-06-28 23:38:01 +03:00
Yair Morgenstern
83270ddf8f Resolved #9689 - no city window on citybutton click 2023-06-28 19:08:52 +03:00
Yair Morgenstern
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
Yair Morgenstern
4c28905e2c Undo Move button moved to far right, so other buttons stay in place 2023-06-28 13:23:22 +03:00
SomeTroglodyte
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
Yair Morgenstern
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
SomeTroglodyte
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
random271
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
SeventhM
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
Yair Morgenstern
ee855b8d77 Solved strange concurrency crashes due to players keypress-activating disabled buttons 2023-06-28 10:45:36 +03:00
Yair Morgenstern
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
Yair Morgenstern
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
Yair Morgenstern
a6e4b72cf4 AI no longer purchases non-contiguous tiles 2023-06-26 23:07:53 +03:00
Yair Morgenstern
0536c5f24b Resolved #9669 - city name translation for conquered popup does not get icon 2023-06-26 22:08:41 +03:00
SomeTroglodyte
6a8f4914b8
More defensive coding of speedupWonderConstruction (#9671) 2023-06-25 19:24:30 +03:00
Yair Morgenstern
330fa6593b 4.7.4 2023-06-25 10:07:17 +03:00
Yair Morgenstern
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