mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-10 15:27:27 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,448 Commits 7 Branches 1,036 Tags 1.1 GiB
2dfac21004
Commit Graph

9448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PLynx
2dfac21004
Added five new uniques (#10311) 
* Added two new Conditional Uniques

These are:
- <when above [amount] gold>
- <when below [amount] gold>

* Added Remove Building unique

It has two parameters: buildingFilter and cityFilter

* Minor example update

* Applied the corrections proposed by SomeTroglodyte

* Update uniques.md

* Slightly changed an unique text

Removed "in" word from the unique

* Updated the Stat Conditional to support more stats

Now supports more stockpileable Stats
- Gold
- Faith
- Culture
- Science

* Added the game speed-adjusted conditionals

Now there are 5 uniques in my pull request

* Integrated the Stat and Resource Conditionals

Requested by @yairm210

* Applied the suggestions of @yairm210

* Applied the suggestions of @yairm210 again

I hope my PR is ready to merge
 2023-10-23 10:02:42 +03:00
SomeTroglodyte
482900f07b
Fix android pause (#10318) 
* Fix MusicController Pause handling for Android's pause event

* Revert inadvertent instrumentation change
 2023-10-16 09:39:20 +03:00
SomeTroglodyte
9efefcce27
PolicyPickerScreen description links to Civilopedia (#10319) 2023-10-15 18:03:43 +03:00
SomeTroglodyte
c6f820b0f2
Remove UniqueTarget.Terrain from UniqueType.Stats as there is no implementation (#10321) 
* UniqueType.Stats has no implementation for Terrain, remove UniqueTarget

* Generated Docs
 2023-10-15 18:03:30 +03:00
Yair Morgenstern
31f3439f60 4.8.13 2023-10-13 11:48:33 +03:00
Yair Morgenstern
bfa64ea18d
Version rollout (#10312) 
* Bump version and create initial changelog entry

* Update Catalan.properties (#10310)

* Fix Manufactory name (#10306)

* Fix Manufactory name

Like, why on earth was it called the same as the factory??

* Update Spanish.properties

* Update Spanish.properties

* Update Japanese.properties (#10269)

* Update Japanese.properties

* Update Japanese.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: North Field <56919414+Harukin1030@users.noreply.github.com>
 2023-10-13 11:42:15 +03:00
SeventhM
e587f28a88
Fix auto assign production not working after a building is built (#10299) 
* Fix auto assign production not working after a building is built

* Fix issues in online multiplayer and remove validation in addbuiling
 2023-10-13 11:38:43 +03:00
SeventhM
3eff519264
Fix consuming resources not being affected by conditionals (#10270) 
* Fix consuming resources not being affected by condtionals

* Add requirements from buildings back in

* one too many parenthesis

* Whoops, forgot a bracket

* Fix Iconstruction

* Accidental font regression

* Address suggested changes
 2023-10-13 11:37:57 +03:00
SomeTroglodyte
249241247b
Allow games with zero researched techs to be 'before' the Ancient Era (#10309) 2023-10-12 20:38:36 +03:00
SomeTroglodyte
353a2c8153
Minor Fix: VictoryScreenIllustrations (#10298) 
* Fix VictoryScreenIllustrations

* Remove obsolete line
 2023-10-09 22:31:13 +03:00
SomeTroglodyte
13e3baac74
Split Fonts.kt (#10267) 
* Fix font "symbols" not showing

* Move Fonts.kt to sub-package

* Re-sort imports

* Move top-level constants to prepare split

* Split Fonts.kt each existing class to its own file

* Split off FontRulesetIcons

* Linting and comments
 2023-10-08 22:03:53 +03:00
SomeTroglodyte
6d4603431b
Fix font "symbols" not showing (#10266) 2023-10-08 21:38:23 +03:00
Yair Morgenstern
6dc7f0ec4c chore: 'use gold' automation from NextTurnAutomation 
Cleaned up Tile.kt a bit by moving single-use functions to where they are used
 2023-10-08 17:15:53 +03:00
Yair Morgenstern
dd67a7d3df chore: Extract city resource functions from City file 2023-10-08 13:06:48 +03:00
Yair Morgenstern
ee9f735e9f chore: Removed dead functions 2023-10-08 12:56:59 +03:00
Yair Morgenstern
8293d78ec5 chore: Split 'city state civ diplomacy table' from DiplomacyScreen 2023-10-08 12:44:48 +03:00
Yair Morgenstern
9c2a8a6406 chore: Split 'major civ diplomacy table' from DiplomacyScreen 2023-10-08 11:57:58 +03:00
Yair Morgenstern
2bd65f9f42 chore: Extracted all 'next turn' logic from DiplomacyManager to DiplomacyTurnManager 2023-10-08 11:48:33 +03:00
Yair Morgenstern
b2a29f1be2 4.8.12 2023-10-07 22:33:00 +03:00
Yair Morgenstern
e7aef72e93
Version rollout (#10264) 
* Bump version and create initial changelog entry

* Update Dutch.properties (#10260)

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update German translation (#10256)

* Update Spanish.properties (#10251)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: EmperorPinguin <99119424+EmperorPinguin@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
 2023-10-07 22:18:29 +03:00
Yair Morgenstern
d714b00dd7
Separate unit automation from other actions (#10248) 
* Separate unit automation from other actions

* Change field name
 2023-10-07 22:02:22 +03:00
Oskar Niesen
a81d5f0837
AI now uses free tech points (#10245) 
* AI now uses free tech points

* Refactored chooseTechToResearch

* Reverted combining lists to use a +
 2023-10-07 22:00:49 +03:00
SomeTroglodyte
49e2979427
Align ruleset icons in text to font metrics (#10233) 
* Try to respect actual font layout, so fontSizeMultiplier works for ruleset icons too

* Replace font-based nation symbol in top bar with statically sized actor

* Reuse getReadonlyPixmap in extractPixmapFromTextureRegion

* Tweak topbar selected civ vertical align to be more pleasing to the human eye

* FasterUIDevelopment missing implementation of FontMetricsCommon

* Address hardcoded pixel coordinates comment

* Readability and comment cleanup

* More readability changes
 2023-10-07 22:00:30 +03:00
SomeTroglodyte
5db8489bcb
Tweak FasterUIDevelopment to offer normal Scene2D debugging, and some linting (#10263) 2023-10-07 21:58:19 +03:00
SomeTroglodyte
459b00ee22
Pure package reorg: Widgets (#10261) 
* Move AutoScrollPane

* Move BorderedTable

* Move ColorMarkupLabel

* Move ExpanderTab

* Move KeyCapturingButton

* Move LanguageTable

* Move SortableGrid

* Move TabbedPager

* Move TranslatedSelectBox

* Move UncivSlider

* Move UnitGroup

* Move WrappableLabel

* Move ZoomableScrollPane
 2023-10-07 19:25:06 +03:00
Yair Morgenstern
8e7a467496 chore: Separated 'declare war' logic from DiplomacyManager 2023-10-05 10:55:17 +03:00
Yair Morgenstern
f5e10b4d44 4.8.11 2023-10-05 10:39:22 +03:00
Yair Morgenstern
7185fea243 chore: Split MapGenerationRandomness from MapGenerator 2023-10-05 10:38:47 +03:00
Yair Morgenstern
15c8f808c4
Version rollout (#10247) 
* Bump version and create initial changelog entry

* Update Russian.properties (#10243)

* Update French.properties (#10241)

* Update Polish.properties (#10231)

* Update Brazilian_Portuguese.properties (#10227)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Anoant <143289571+Anoant@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@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>
 2023-10-05 10:29:59 +03:00
SomeTroglodyte
5541407a3a
Fade in and out for City Ambiance Sounds (#10230) 
* Extend MusicController to allow one extra 'overlay' track

* Reduce CityAmbiencePlayer to a proxy for MusicController's 'overlay'

* Treat all the LongLine complaints
 2023-10-05 10:25:06 +03:00
SomeTroglodyte
a4e3617037
Fix Tutorial loader for mods on Android (#10229) 2023-10-05 10:24:54 +03:00
SomeTroglodyte
ed97c5b0ea
Notifications remove backward compatibility (#10228) 
* Remove backwards compatibility code from Notification serializer

* Notification constructor simplified

* One measly typo
 2023-10-05 10:24:27 +03:00
Oskar Niesen
8c6e046fc8
Defensive pact button shows on both sides when a DoF is about to end (#10237) 2023-10-05 10:24:19 +03:00
Oskar Niesen
8e355568e0
Defensive pact functionality is now canceled with otherCiv before calling in defensive pact allies (#10238) 2023-10-05 10:24:09 +03:00
SomeTroglodyte
b97339381a
Fix ai buy tiles (#10239) 
* Fix TriedToBuyNonContiguousTileException crash from NextTurnAutomation maybeBuyCityTiles

* Descriptive exceptions messages from buyTile
 2023-10-05 10:23:53 +03:00
SomeTroglodyte
815df1bcc4
Some religion stuff (#10242) 
* Enable HiddenWithoutReligion to work directly on a Tutorial

* Remove religious units from Vanilla

* Fix limited uses of Missionary and Prophet
 2023-10-05 10:23:25 +03:00
Yair Morgenstern
674b12a919 Resolved #10240 - Great Prophets spawn again 2023-10-05 10:22:53 +03:00
Yair Morgenstern
f812c828e5 chore: Split 'head towards enemy city' into subfunctions 
Quite complex for a seemingly simple task, that's why it gets its own object
 2023-10-04 23:22:16 +03:00
Yair Morgenstern
7503493d7d chore: Split civilian unit automation into separate file 
Also limited missile automation to air units only, doesn't make sense for land-based self-destructing units to follow missile automation
 2023-10-04 22:56:14 +03:00
Yair Morgenstern
f4b7822728 chore: Split SpecificUnitAutomation into air units and religious units, with the remainder being mostly great person automation but also a few 'others' so I'm not renaming it 2023-10-04 22:39:25 +03:00
Yair Morgenstern
f46b3fc62b chore: clarified double movement in movement cost 2023-10-04 22:06:17 +03:00
Yair Morgenstern
0d50b928ea chore: Separated movement cost from unit movement file 2023-10-04 22:00:37 +03:00
Yair Morgenstern
5b3c3f3aaf chore: move UnitMovement to subfolder, for splitting 2023-10-04 21:53:14 +03:00
Yair Morgenstern
701b8c3a52 Updated tech schema to answer modder questions 2023-10-04 21:49:26 +03:00
Yair Morgenstern
4e8b454284 fix broken links from capture reorg 2023-10-04 21:39:58 +03:00
Yair Morgenstern
510fd7927a chore: Separated capturing logic out from Battle 2023-10-04 21:00:09 +03:00
Yair Morgenstern
e3a5972648 Removed inspection for long lines 2023-10-04 20:39:49 +03:00
SomeTroglodyte
9e7fd9b067
Update build documentation (incl FasterUIDevelopment run config) (#10234) 2023-10-04 12:47:22 +03:00
Yair Morgenstern
bcd5c361df Civilian units can get promotions upon being built 
Promotions with no icon get default star icon
 2023-10-04 00:53:39 +03:00
Yair Morgenstern
c963191453 4.8.10 2023-10-03 13:19:26 +03:00