Commit Graph

4437 Commits

Author SHA1 Message Date
ea362a448b Fixed rejection reason texts not showing the instance's text - see #6131 2022-03-17 23:12:45 +02:00
f884f30226 Double Zoom Out Range (#6354)
* Simple dumb solution. Just make WorldMapHolder twice as big!

* A bunch of attempts

* Just change to max 4x size

Co-authored-by: itanasi <spellman23@gmail.com>
2022-03-17 22:25:24 +02:00
89e73ad7c5 Redesign EmpireOverviewScreen as TabbedPager (#6364) 2022-03-17 22:23:09 +02:00
c80db524b2 Cache 'library' helper classes of CivilizationInfo (#6363) 2022-03-17 22:22:54 +02:00
c117860d6f Worldscreen unit supply deficit icon now updates properly (#6362) 2022-03-17 22:22:43 +02:00
365cf0dc19 Close little loophole allowing promoting a unit after moving or attacking (#6361) 2022-03-17 22:22:25 +02:00
797ce09508 Global review of Constants use, linting, maxXPfromBarbarians (#6327)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-13 22:57:40 +02:00
4ffb21f525 Support more freely modded Worker-like units (#6339)
* TileImprovementTime UniqueType supports UniqueTarget.Unit

* Reduce UniqueType.ConstructImprovementConsumingUnit hardcoded Great People behaviour

* Some linting

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-13 22:49:54 +02:00
97787bd397 Resolved #6335 - now shows conditionals precluding construction of units (#6346)
* Resolved #6335 - now shows conditionals precluding construction of units

Built simply so that if we decide to expand the conditionals that should be shown it will simply be building a hashset of conditionalsToShow

* Added an instance wrapper, so the enum has the default values and the class has the actual values

* minor lint
2022-03-13 22:45:39 +02:00
cea63eb114 Multiplayer code cleanup (#6330)
* Fixed reviewed comments of PR 6273

* Cleanup of Dropbox.kt

- moved Dropbox.kt from ui\worldscreen\mainmenu to logic\multiplayer
- moved ServerMutex and OnlineMultiplayer to own files
- changed DropBoxFileConflictException to FileStorageConflictException to match FileStorage scheme
- merged FolderListEntry with DropboxMetaData as they were basicly the same
- introduced IFileMetaData to match FileStorage scheme and modified DropboxMetaData to use it
- removed some unused imports
2022-03-13 22:44:02 +02:00
d8e9563a7c Religion overview improved (#6303)
* Improve handling of Religion PickerScreen with long lists

* Fix mouseover graying Labels bug

* Update Pantheon chooser visuals

* Some Color.lerp simplification

* Religion pickers - Merge common stuff of Pantheon and Religion Pickers

* Religion pickers - Linting

* Religion pickers - Move ReligionOverviewTable extra lines capability to Belief, Fix FormattedLine link+center

* Religion pickers - Belief Civilopedia linked description

* Religion overview tweaked

* Religion overview tweaked - patch1
2022-03-13 22:43:40 +02:00
e4b0afb7e3 Update ModConstants and start its documentation (#6309)
* Update ModConstants

* Update ModConstants - revert Ice, tweak formula

* Update ModConstants - comment on predefined MapSizes
2022-03-13 22:43:23 +02:00
88ba48d7f1 Mod checker minor improvements (#6341)
* Enabled unique "spellcheck" flag to be passed down into complex check

* Allow mod checker to list untyped uniques, behind "secret" switch
2022-03-13 22:40:12 +02:00
c51f3b47de Fix 1 Spectator N AI games in seemingly endless loop (#6337) 2022-03-13 22:38:11 +02:00
877dedaa89 More unique cleanup 2022-03-13 16:43:56 +02:00
c3e345df27 Unique deprecation 2022-03-13 15:27:32 +02:00
a93d531b85 Religion/Pantheon pickers display selection Civilopedia-linked (#6302)
* Improve handling of Religion PickerScreen with long lists

* Fix mouseover graying Labels bug

* Update Pantheon chooser visuals

* Some Color.lerp simplification

* Religion pickers - Merge common stuff of Pantheon and Religion Pickers

* Religion pickers - Linting

* Religion pickers - Move ReligionOverviewTable extra lines capability to Belief, Fix FormattedLine link+center

* Religion pickers - Belief Civilopedia linked description
2022-03-10 19:46:15 +02:00
e5b36f5b9f Unique units abilities that should be inherited by upgrades (#6304)
* Unique units abilities that should be inherited by upgrades

* Unique units abilities that should be inherited by upgrades - xlt

* Unique units abilities that should be inherited by upgrades - wiki
2022-03-10 19:45:32 +02:00
e97c95b7aa Improve handling of Religion PickerScreen (#6287)
* Improve handling of Religion PickerScreen with long lists

* Fix mouseover graying Labels bug
2022-03-08 14:24:44 +02:00
12428835b3 Notifications location (#6282)
* LocationAction overhaul - groundwork

* LocationAction overhaul - instantiations, some simplifications

* LocationAction overhaul - ruin rewards can go to ruin ex-location

* LocationAction overhaul - obsolete construction refund simpler, notification points to city
2022-03-08 14:23:07 +02:00
e4607c9391 Added Server Sided Mutex (#5593)
* Added first iteration of server sided mutex

* Add Mutex-like interface for file locking in Multiplayer

* Fix my C++ habits

* Change retry interval to match Dropbox API guidelines

* Move lock implementation from OnlineMultiplayer to ServerMutex

* Removed unnecessary gameInfo to preview conversions

and fixed a problem regarding Dropbox fileNames

* Fixed wrongly named variable

* Check if lock is owned before unlocking

* Trying to implement forgotten lock release

but failed at Date.time ¯\_(ツ)_/¯

* Seems to be working now

* Updated to use FileStorage Interface

* Fixed missed fileStorage call

Co-authored-by: Colin Vanden Heuvel <colin.vandenheuvel@wisc.edu>
2022-03-08 14:20:17 +02:00
a4cb49ea63 Return Stacking Terrain Bonus to Civ5 Rules (#6249)
* Make multiple defense bonuses stack

* Switch to check base terrin and Natural Wonders using getAllTerrains()

* Improved Tile Defense stacking

* Change to using 0f since no other maths happening

Co-authored-by: itanasi <spellman23@gmail.com>
2022-03-08 14:19:13 +02:00
6391a5c881 Constants.minimumMovementEpsilon cleanup (#6285) 2022-03-08 14:18:57 +02:00
deafc96d82 Update Pantheon chooser visuals (#6291) 2022-03-08 14:18:44 +02:00
6a6c5184ec Some Color.lerp simplification (#6300) 2022-03-08 14:18:31 +02:00
ea2b26370a Some edits for fun getRejectionReasons in class building/unit and fun checkMod (#6165) 2022-03-08 14:18:15 +02:00
b779896332 Replace YesNoButton with Checkbox (#6297) 2022-03-08 14:17:17 +02:00
0a5223f721 Add "Starts with [policy] adopted" unique (#6296)
* Added "Starts with [policy] adopted" unique

* Polished "Starts with [policy] adopted"
2022-03-08 14:16:41 +02:00
906d770443 Fix isEmbarked() Crash (#6290)
* Correct logic for blocking Naval Melee from capturing Civilians on Land

* Even better solution now that we can move on to unguarded Civilian tiles. But still won't let us capture Civilians if we can't get there

* Make Embarked unable to capture Civilians

* Embarked can't capture Water Civilians

* Fix Gradle Test

* Better unit test without making variable not internal

* attempt not working

* Just make currentTile not internal

* remove debug

* erronious import

* Fix exception for when currentTile isn't initialized yet

* More precise solution

Co-authored-by: itanasi <spellman23@gmail.com>
2022-03-07 13:02:30 +02:00
fb7cb707e0 WLTK decorations (#6253)
* WLTK decoration png's and atlas

* UncivTooltip anchor to stage so tips won't get clipped by some ScrollPane

* Empire Overview Cities add WLTK column

* Make WLTK line on CityScreen stats box link to Civilopedia

* Make Civilopedia return to previous screen for _both_ ESC/Back and the Close Button

* Revive Civilopedia links in WorldScreen.TileInfoTable

* Festive decoration for WLTK day on CityScreen
2022-03-05 20:10:03 +02:00
20f34eb5f5 Block Embarked from capturing Civilians on Water (#6224)
* Correct logic for blocking Naval Melee from capturing Civilians on Land

* Even better solution now that we can move on to unguarded Civilian tiles. But still won't let us capture Civilians if we can't get there

* Make Embarked unable to capture Civilians

* Embarked can't capture Water Civilians

* Fix Gradle Test

* Better unit test without making variable not internal

* attempt not working

* Just make currentTile not internal

* remove debug

* erronious import

Co-authored-by: itanasi <spellman23@gmail.com>
2022-03-05 20:06:06 +02:00
70517b9c3d Sort maps & accelerate playing a newly edited map (#6267)
* Sort map file lists

* Pre-select custom map if saved within last 15min
2022-03-05 20:04:55 +02:00
617f801558 Improve Unique.getReplacementText (#6265) 2022-03-05 20:03:34 +02:00
2f980abd72 Locate Mod Errors choose base ruleset to do complex check against (#6263)
* Some Ruleset linting

* Mod-check display remove unnecessary FormattedLine

* Mod-check can run on selectable base ruleset instead of Vanilla only

* Mod-check show final severity on Expander

* Mod-check base selectbox translatable
2022-03-05 20:03:28 +02:00
9f9e8c33c5 Fix next turn button disabled after leaving sub-screens from menu (#6261) 2022-03-05 20:03:20 +02:00
e7fc1a565f Fix after-pillage display (#6255) 2022-03-05 20:03:09 +02:00
c503f840d1 Hide irrelevant items from CityInfoTable stats (#6254) 2022-03-05 20:02:54 +02:00
115a7f84bf Fix broken border display on the smallest possible maps (#6266) 2022-03-05 20:01:49 +02:00
0e26ea2cc8 Added deep link to multiplayer games (#6273) 2022-03-05 20:00:56 +02:00
1b9e496db5 Swap order on diplomatic victory: voting result _then_ victory (#6270) 2022-03-05 19:55:14 +02:00
0390ec225f Move automated units button was showing when it didn't do anything (#6271) 2022-03-05 19:54:54 +02:00
00c5ecb6a6 3.19.13 2022-02-28 22:49:11 +02:00
bca3d5645a Fix Spaceship production boni (and key binding) (#6247)
* Fix spaceship part boni

* Key binding for 'Add part to spaceship'
2022-02-28 19:42:02 +02:00
e2945687f2 Fix Ctrl-Letter key bindings (#6232) 2022-02-28 19:41:46 +02:00
9870003e33 Fix Petra and Garden not allowed in some cases (#6245) 2022-02-28 19:41:35 +02:00
651dcff581 Fix Polynesia's Wayfinding (#6238)
* Fix Polynesia's Wayfinding

* Fix mod option to use other unit filters with UnitsMayEnterOcean
2022-02-28 19:41:22 +02:00
f360eda047 Align (reduce) Embarked Defense Strength per Era (#6231)
* Change Embarked Defending Strength per era. Update Tutorial a little

* Use JSON implementation of EmbarkDefense

Co-authored-by: itanasi <spellman23@gmail.com>
2022-02-28 19:41:13 +02:00
8a6b4de84f Minor improvements from GPC 2022-02-28 19:39:44 +02:00
6bbab8a394 FINALLY removed CivInfo.getMatchingUniques(String)! 2022-02-27 16:57:21 +02:00
78f0ad768a Step 1 of resolving #6186 freshwater crisis - unify adjacency to a single function, only rivers are outliers (#6219) 2022-02-25 13:39:34 +02:00