mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-10 04:43:29 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,550 Commits 6 Branches 1,057 Tags 1.1 GiB
b0ffae0da0
Commit Graph

4204 Commits

Author SHA1 Message Date
will-ca
b0ffae0da0
Refactor and unify some buttons that have a label next to an icon. (#5992) 
* Take Actor instead of image String for String.toButton icon.

* Remove superfluous Group size wrapper.

* Builder-style configuration for string icon buttons.

* Add a function to the big unify picker screen option buttons.

* Unify unit action string icon button.

* Unify TabbedPager string icon buttons.

* Unify EmpireOverviewScreen string icon buttons.

* Unify CivilopediaScreen string icon buttons.

* Unify GreaterPersonPickerScreen string icon buttons.

* Unify PromotionPickerScreen string icon buttons.

* Unify ImprovementPickerScreen string icon buttons.

* Unify DiplomaticVotePickerScreen string icon buttons.

* Unify OffersListScroll string icon buttons. (Also moves icon to left.)

* Unify UnitOverviewTable string icon buttons.

* Turn IconTextButton into a class.

* Separate icon parameters.

* Remove outdated arg and comment.

* Remove obsolete generic.
 2022-01-19 14:16:08 +02:00
Yair Morgenstern
8846c158fb
Resolved #5988 - Allow modded improvements (#5989) 
Current worker automation assumes A LOT about the current ruleset.
This is only step 1, which allows skipping irrelevant improvements to reach actually useful improvements.
Comments welcome.
 2022-01-18 01:58:43 +00:00
yairm210
b4214baf1f Smaller stars on the promotions, so they don't 'leak' outside the promotion image 2022-01-16 22:07:44 +02:00
yairm210
e074ed7546 Added civ icon to Battle Table when attacking cities 2022-01-16 21:09:43 +02:00
yairm210
dd90b2bacc NewGameScreen threading normalized. 
The NewGameScreen was written by a past version of myself that had no idea how to handle threading, and thus was extremely strange. Checking an object _on render_ and if it's set then activate? Totally clueless.
 2022-01-16 19:10:30 +02:00
will-ca
9b121a478a
Clean up refactored pixel unit resolving. (#5979) 2022-01-16 18:43:49 +02:00
will-ca
f68c41e369
Explain when cities can't be razed. (#5976) 
* Explain when cities can't be razed.

* Light refactoring and reword.

* Add update notice in translation strings.
 2022-01-16 18:43:33 +02:00
ravignir
b1517f0cde
Made attacked civilians lose 40 hp as in civ5. (#5978) 
Is it the smallest commit ever? xD
 2022-01-16 18:39:41 +02:00
will-ca
ec59533f82
Tint colour and not alpha in CityTileGroup. (#5969) 2022-01-16 03:03:23 +01:00
will-ca
b7d3a6c581
Fix a tiny and limited memory leak. (#5968) 2022-01-16 03:03:06 +01:00
yairm210
f8e9b6912e Merge remote-tracking branch 'origin/master' 2022-01-15 23:16:42 +02:00
yairm210
790bfc10b7 Resolved #5980 - "Cannot be built with" catches building equivalents as well 2022-01-15 23:16:28 +02:00
itanasi
9584389864
Capturing Civilians Not an Attack (#5974) 
* Change to not count civilian attacks

* Change to not count civilian attacks

Co-authored-by: temurakami <spellman23@gmail.com>
 2022-01-15 22:43:11 +02:00
yairm210
a2f5941927 chore - Minor improvements to science and culture tutorial capitalization 2022-01-15 22:09:33 +02:00
Xander Lenstra
2986052397
Typed all tech uniques (#5967) 2022-01-14 17:44:53 +00:00
yairm210
8311e65120 Victory types capitalized 2022-01-14 12:21:53 +02:00
yairm210
e7042d24ea City state permutations normalized to "City-State" 
#5963
 2022-01-14 12:16:16 +02:00
yairm210
4dcb45408d Unique deprecation 2022-01-14 11:00:38 +02:00
Yair Morgenstern
6e95a07572
More unit unique typing (#5952) 
* There are so many of these my gosh

* Fixed, good thing we have tests :)

* Fixed
 2022-01-14 10:43:13 +02:00
Yair Morgenstern
398e7903ef
Resolved #5930 - removed extraneous stat icons + resolved sorting problem they caused in Civilopedia tutorials. (#5959) 2022-01-14 10:11:45 +02:00
Xander Lenstra
7cb58eb82d
Typed all policy uniques (#5955) 
* Typed all policy uniques

* Reworded golden age length
 2022-01-14 10:11:30 +02:00
Yair Morgenstern
826b8f4826
Handling for multiplayer download errors (#5958) 2022-01-14 10:09:10 +02:00
Yair Morgenstern
4cce74253d
Abstracted file storage from the multiplayer data retrieval - this should allow implementations of both #5866 and #2679 for other implementations of IFileStorage (#5960) 2022-01-13 16:33:21 +00:00
Xander Lenstra
74d3854e45
Very likely fixed a bug that occasionally placed hills on top of mountains (#5946) 2022-01-11 23:30:25 +00:00
Xander Lenstra
8b846f8087
Typed a few unit uniques (#5951) 
* Typed a few unit uniques

* Fixed tests

* Actually implemented a unique type :)
 2022-01-11 23:24:58 +00:00
Yair Morgenstern
4308ad44ed
Removed silly crash for unteneble mods, and a try/catch that due to changes no longer caught hat it should have. (#5950) 2022-01-11 23:17:41 +00:00
Xander Lenstra
d809f3a132
Made all the other constants determining the strength of cities moddable (#5940) 2022-01-10 13:55:22 -08:00
Xander Lenstra
93a109b082
Fixed a bug where citadels did not damage nearby units (#5941) 
* Fixed a bug where citadels did not damage nearby units

* Fixed tests
 2022-01-10 13:32:48 -08:00
Xander Lenstra
3e6a190ab4
Unit tests for uniques (#5945) 
* Added a unit test file for uniques

* Added a few tests
 2022-01-10 22:01:14 +02:00
yairm210
1999364b9e Chore - more typified unit uniques 2022-01-10 21:53:13 +02:00
yairm210
c6a9f6a857 Chore - typified unit uniques 2022-01-10 21:13:59 +02:00
Xander Lenstra
86f8dff39b
Fixed a crash when using conditionals in transient unit uniques (#5939) 2022-01-10 11:53:00 +02:00
Yair Morgenstern
598f39e567
Deprecation of requiredBuildingInAllCities (#5922) 
* Deprecation of requiredBuildingInAllCities

* Should be a warning not an error
 2022-01-09 21:40:47 +02:00
Xander Lenstra
fc287bd9f3
Added a way to add moddable constants (#5921) 
* Added a way to add moddable constants to unciv

* Fixed xp from barbarians problem

* Maybe I should test my code before pushing
 2022-01-09 21:40:41 +02:00
Yair Morgenstern
44b262ec52
Remove support for stat-named specialists (#5923) 2022-01-09 21:39:32 +02:00
Yair Morgenstern
513b37583f
Converted "Can construct [improvementName]" to a uniqueType (#5924) 2022-01-09 21:39:27 +02:00
Yair Morgenstern
5f5aca6780
Simplified conditional checks - where I felt it would make it more readable (#5927) 
* Simplified conditional checks - where I felt it would make it more readable.

Also added checks to ensure that era exists when checking era.

* Now passes tests

* Simplified unit tile checks
 2022-01-09 21:39:20 +02:00
Xander Lenstra
9639365fd8
Fixed 'cannot built on [strategic resource]' not working (#5933) 2022-01-09 21:39:07 +02:00
will-ca
24dfad696c
New crash handler screen Part 2: Threads, runnables, more informative reports. (#5810) 
* Add crashHandlingThread.

* Replace all uses of `thread` with `crashHandlingThread`.

* Add `postCrashHandlingRunnable`.

* Replace all uses of `Gdx.app.postRunnable` with `postCrashHandlingRunnable`.

* Remove CrashController and CrashReport; Strip down CrashReportSender to CrashReportSysInfo; Fold their functionality into CrashScreen.

* Typo in comments, rename `SafeCrashStage` to `CrashHandlingStage`.

* Tweak docs.

* Tweak docs, comments, text. Undo an accidentally recursive Replace All change.

* Remove replaced translations.

* More readable indentation handling in report template.
 2022-01-09 11:33:45 +02:00
Yair Morgenstern
5931853c37
Check parameter types of conditionals as well as the main unique (#5928) 2022-01-07 16:49:33 +00:00
Xander Lenstra
7f38118dd9
Expanded the buildingFilter to include options for national wonders (#5900) 
* Expanded the buildingFilter to include options national wonders

* Also instruct the translation file writer on the changes

* Typo

* Non-national -> World
 2022-01-07 13:41:53 +02:00
Xander Lenstra
c1a6e05da6
Disables '[cityState] is afraid of your military power' for spectators & other non-major civs (#5918) 
* Disables '[cityState] is afraid of your military power' for spectators

* Do the same for a few other similar notifications

* And more, for patronage complete policy
 2022-01-06 14:19:29 -08:00
Yair Morgenstern
45ee382fba
Resolved #5801 - detailed sources of battle modifiers (#5916) 2022-01-06 13:46:45 -08:00
Xander Lenstra
d6a99a7848
Fixed a bug where great improvements could not be repaired after being pillaged (#5913) 
* Fixed a bug where great improvements could not be repaired

* Formatting
 2022-01-06 13:29:59 -08:00
will-ca
a5bba8dfb0
Refactor pixel unit image resolving. (Includes ImageAttempter) (#5897) 
* Add ImageAttempter for finding available from candidate images.

* Remove zero-arg ImageAttempter constructor.

* Refactor pixel unit image resolving.
 2022-01-04 21:02:32 +01:00
will-ca
96beed4b3e
Add tileScale in TileSetConfig. (#5874) 
* Add `tileScale` in `TileSetConfig`.

* Right, KDoc.
 2022-01-04 10:18:13 -08:00
Yair Morgenstern
0e64ff5592
Performance improvements - inspired by ANR errors for this callstack (#5896) 2022-01-03 16:51:21 +00:00
Xander Lenstra
89d4c046d4
Added more yield icons to the city stats table (#5894) 
* Added more yield icons to the city stats table

* Replaced icons with Font.icon
 2022-01-02 17:50:27 +00:00
Xander Lenstra
cdbdda366b
Revamped nukes again to closer match the original (#5892) 2022-01-02 04:04:43 -08:00
Xander Lenstra
f06242ebe1
Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques (#5882) 2021-12-31 13:47:52 +02:00