Commit Graph

5321 Commits

Author SHA1 Message Date
Yair Morgenstern
154c083d3f Update unit uniques when entering moving to new tiles 2022-12-11 22:48:11 +02:00
Yair Morgenstern
aa49e47ca0 fix: Fix build 2022-12-11 19:15:43 +02:00
Yair Morgenstern
66c0f269d2 Simplified temporary uniques 2022-12-11 13:57:06 +02:00
nacro711072
aaaa84a00f
update score icon. (#8118) 2022-12-11 13:08:34 +02:00
Md. Touhidur Rahman
1da08994df
fix UncivServer.xyz not working (#8104)
Normally this is auto-fixed but a `/` at the end of the URL does not work. Because in API you do requests like `GET /file/:filename` and if you also put a `/` at the end of the server URL, it becomes something like this `https://example.com//files/filename`. Since the auto-fix happens only when typing a new URL from `Options` > `Multiplayer`, the default value doesn't get auto-fixed and shows errors.
I tested on a new installation and as expected it shows the `Couldn't upload game` error.
This pr fixes this.
2022-12-10 18:38:53 +02:00
Yair Morgenstern
32d46b24df
Version rollout (#8103)
* Bump version and create initial changelog entry

* Update Italian.properties (#8100)

* Update German translations (#8097)

* Update French.properties (#8096)

* Update Spanish.properties (#8095)

* Updated Brazilian_Portuguese.properties (#8094)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
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>
2022-12-09 12:52:38 +02:00
vegeta1k95
58c57d6626
UnitActions seprated into own atlas (#8102)
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-09 12:46:46 +02:00
Yair Morgenstern
d9d0414477 Resolved #7712 - 'loading' popup between turns only appears if there's a significant delay 2022-12-09 12:46:11 +02:00
Yair Morgenstern
dbeb063e2f Auto-Screenshot for f-droid as well 2022-12-08 13:27:29 +02:00
Yair Morgenstern
309aaf99d4 xyz server as default multiplayer server 2022-12-08 13:27:29 +02:00
alexban011
ccb1d769f1
added button to paste from clipboard when downloading a mod (#8101) 2022-12-07 21:14:54 +02:00
Yair Morgenstern
ff25014a54 Automated screenshots! :D 2022-12-07 21:01:39 +02:00
Yair Morgenstern
8ec2ada740 Fixes for Repair 2022-12-05 22:42:39 +02:00
Yair Morgenstern
b351d4a4e2 Fixed all CSs getting unique units and unique luxuries 2022-12-05 20:26:47 +02:00
Yair Morgenstern
0063b92e07
Version rollout (#8093)
* Bump version and create initial changelog entry

* update traditional_chinese.properties (#8092)

* Update German translation (#8089)

* Update Filipino.properties (#8082)

* Update Simplified_Chinese.properties (#8079)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Brazilian_Portuguese.properties (#8078)

* Update Italian.properties (#8076)

* Update French.properties (#8075)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@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: Ouaz <Ouaz@users.noreply.github.com>
2022-12-05 19:20:36 +02:00
Yair Morgenstern
11e26c74ad Resolved #8088 - Single turn repair, repair turn inconsistencies 2022-12-05 19:03:17 +02:00
Yair Morgenstern
454f999948 Resolved #8090 - Replaces misunderstood 'virtual resolutions' with more intuitive 'screen size' 2022-12-05 18:56:47 +02:00
nacro711072
220c465a18
fix civilopedia category bug. (#8084)
* fix civilopedia category bug.

* fix negative index.
2022-12-04 18:04:16 +02:00
Yair Morgenstern
1d5d445c19 After-combat notification for promotable units - see #4697 2022-12-03 23:12:01 +02:00
Yair Morgenstern
c9ed9d5d74 modding: Double Happiness from Natural Wonders -> [stats] from every known Natural Wonder 2022-12-02 11:50:11 +02:00
Yair Morgenstern
dceaf832b9
Version rollout (#8074)
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#8072)

* Update Filipino.properties (#8071)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Dutch.properties (#8067)

* Update Dutch.properties

* Update Dutch.properties

* Update Simplified_Chinese.properties (#8066)

* Update Spanish.properties (#8062)

* Update French.properties (#8060)

* Fix tests

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartijnCBV <49876349+MartijnCBV@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@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>
2022-11-30 18:03:20 +02:00
Yair Morgenstern
cdc8afb56d Made yields smaller so heavy yields looks better on tiles 2022-11-28 22:24:56 +02:00
Yair Morgenstern
1eb1976c4e Made yields smaller so heavy yields looks better on tiles 2022-11-28 21:45:56 +02:00
Yair Morgenstern
cfda54917f Modding: buildingName -> buildingFilter in all possible unique types 2022-11-28 19:19:40 +02:00
Yair Morgenstern
d223614067 Modding: improvement uniques can be assigned to tilefilter 2022-11-28 19:10:57 +02:00
Yair Morgenstern
d21e0d91b7 4.3.4-patch1 2022-11-28 19:00:15 +02:00
itanasi
37d808936a
Fix Repair Crash (#8065)
* Add Hammer Icon to Repair Civilopedia Entry

* Fix crash from logic bug in getRepairTurns
2022-11-28 16:11:26 +02:00
Yair Morgenstern
515bfcbb6f Moved updateProximity to civ transient updater 2022-11-28 11:16:10 +02:00
Yair Morgenstern
b8da124263 Added hasExplored and explore() functions to civinfo to mask exploredTiles 2022-11-28 11:12:53 +02:00
Yair Morgenstern
da5948364e Added hasExplored function to civinfo to mask exploredTiles 2022-11-28 09:22:13 +02:00
Yair Morgenstern
166b8ff2bf Simplified automated unit order 2022-11-27 23:46:52 +02:00
Yair Morgenstern
1b8c98eed3 Resolved #8050 - "Occurs at temperature between [amount] and [amount] and humidity between [amount] and [amount]" now applicable to resources 2022-11-27 20:02:05 +02:00
Yair Morgenstern
b95daa0865
Bump version and create initial changelog entry (#8056)
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
2022-11-27 19:17:31 +02:00
Leonard Günther
99b6a2254d
Changes to moddable UI (#8055)
* Replaced all occurrences of deprecated NinePatch

function calls

This makes a lot of UI elements already moddable but documentation is still missing

* Added "How to create a UI skin for Unciv" to wiki

* Added image

* Fixed two typos and updated directory image

Old image was missing a folder

* Added clear color to skin config

to support picker screen backgrounds

* Removed deprecated functions in ImageGetter

* Fixed lowercase ui element names

they should always be UpperCamelCase to be consistent

* Added UiElementDocsWriter

to modify the docs for UI elements automatically

* Added default shape to UiElementsDocsWriter.kt

* Revert unintended merge errors

* Rerun file auto generation
2022-11-27 19:14:56 +02:00
itanasi
16a7eed4ff
Add Repair and Pillaging Roads (#8015)
* Reapply Changes

* Logic clean up

* Adding getImprovementToPillage() and getRepairableImprovement()

* Cleaning up Unit Actions

* getImprovementToPillage() needs to check for Unpillagable

* Remove redundant logic since canBuildImprovement() returns true if currently repairing

* More redundant logic

* Prevent City Center from being Pillage status
addRepairAction will not show a Repair Action
Adding the improvement to be repaired/pillaged in button text
Utilizing getImprovementToPillage() more

* Some import cleanup
Add Irremovable to blockers
More consolidation of code

* More translation files

* When improvements/roads are built/removed, pillaged flag set to False

* Better and more consistent logic

* Fix dumb logic bug
2022-11-27 19:12:26 +02:00
Yair Morgenstern
51985622f2 Added conditional to apply uniques only if the game starts in a specific era 2022-11-26 22:06:40 +02:00
Yair Morgenstern
545b4afc5a Generalized "Stats per policies" unique 2022-11-26 21:39:26 +02:00
Yair Morgenstern
8ff606acd6 Deprecated old-form city-state uniques 2022-11-24 20:57:03 +02:00
Yair Morgenstern
4fb3d4a191 Do not translate city-state uniques - there should be no arbitrary ones! 2022-11-24 11:36:21 +02:00
Yair Morgenstern
98900d9162
Version rollout (#8048)
* Bump version and create initial changelog entry

* Update Spanish.properties (#8043)

?

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2022-11-24 11:33:25 +02:00
Yair Morgenstern
7a76f24770 Resolved #8047 - 'impossible' worked tiles not under your control are now cleaned up 2022-11-24 10:41:29 +02:00
Yair Morgenstern
4fff3a395e Resolved #8044 - corner case where entire path to destination is full and destination is unenterable 2022-11-24 09:53:38 +02:00
Julien Muchembled
002dcd763b
Fix policy counting in global politics (#8045)
Counting of social policies was only correct for completed branches: 6
Incompleted branches with only 1 SP were hidden,
and those with N>1 SP displayed N-1.
2022-11-23 22:09:55 +02:00
Yair Morgenstern
f3ce1c4dc5 Resolved #8036 - resolved map latency when city-states exist 2022-11-23 20:06:41 +02:00
Yair Morgenstern
c20ffb03a3 Resolved #8046 - city-state type in civilopedia 2022-11-23 19:39:40 +02:00
Yair Morgenstern
551c6c562e 4.3.2 2022-11-22 23:39:07 +02:00
Yair Morgenstern
ee8c190c06
Version rollout (#8042)
* Bump version and create initial changelog entry

* Update Indonesian.properties (#8039)

* Update Greek.properties (#8038)

* Update Greek.properties

* Translating to Greek for unciv.

* Update Simplified_Chinese.properties (#8037)

* Update German.properties (#8035)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: RA1DEN-cyborg <73561839+RA1DEN-cyborg@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
2022-11-22 23:11:57 +02:00
Yair Morgenstern
19d591dd89 Fixed json tests 2022-11-22 00:17:10 +02:00
Yair Morgenstern
5ba8e05079 Fixed city state tests 2022-11-22 00:13:05 +02:00
Yair Morgenstern
e83e733104 Added validations for city-state uniques 2022-11-21 23:03:52 +02:00
Yair Morgenstern
ee2ab74715 Converted all era uniques to conditional uniques for city-states 2022-11-21 22:46:32 +02:00
Yair Morgenstern
4ab0b62a7f Removed old deprecated bits and pieces 2022-11-21 20:49:34 +02:00
Yair Morgenstern
e09b2f9637 Removed old deprecated parts 2022-11-21 20:41:41 +02:00
Yair Morgenstern
525a06e058 cityStateType no longer causes crash 2022-11-21 20:37:06 +02:00
Yair Morgenstern
2e5e221158 CityStateType overhaul!!!! 2022-11-21 20:30:52 +02:00
Yair Morgenstern
7d9db1e119 CityStateType deprecation p1 2022-11-21 20:03:05 +02:00
Yair Morgenstern
6976360da6 Added CityStateTypes into rulesets! Not in use yet 2022-11-21 19:59:55 +02:00
Yair Morgenstern
cf7966d84a Separated ruleset validation to its own file 2022-11-21 19:29:53 +02:00
Yair Morgenstern
8530de7de1 Can now use [stats] unique to add happiness globally 2022-11-21 11:33:29 +02:00
Yair Morgenstern
0cf5c33475 Can now use [stats] unique for e.g. techs, policies, etc, to add gold/faith/culture/science to the global pool 2022-11-21 11:21:42 +02:00
Yair Morgenstern
2d37f3c473
Version rollout (#8034)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#8033)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update French.properties (#8032)

* Update Catalan.properties (#8031)

* Update Catalan.properties

* ca-ES: Change some hyphens with dashes.

* Update Italian.properties (#8030)

* Update Italian.properties

* Update Italian.properties

* "Updated Brazilian Translation" (#8029)

* Update German translation (#8027)

* Update Indonesian.properties (#8025)

* Update Spanish.properties (#8024)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2022-11-20 23:22:31 +02:00
Yair Morgenstern
76920d1307 Removed single-pixel gap in top bar 2022-11-20 23:13:51 +02:00
Yair Morgenstern
9d6e91d922 Added conditional support to 'CS gift military units' unique 2022-11-20 18:59:53 +02:00
Yair Morgenstern
c5bde45c5d Moved city state icons to separate folder 2022-11-20 18:48:28 +02:00
Yair Morgenstern
61b98120a8 Fixed tests failing due to removing "crutches" 2022-11-20 00:24:59 +02:00
Yair Morgenstern
933131084b Removed backwards compatibility for missing city-state uniques 2022-11-20 00:01:02 +02:00
Yair Morgenstern
e5fbb472b0 Moddable quest weighting for city-states 2022-11-19 23:54:16 +02:00
Yair Morgenstern
2d5536e8be
Allowed adding arbitrary global uniques to city state bonuses (#8028)
* Allowed adding arbitrary global uniques to city state bonuses

* Added conditional support for city-state uniques
2022-11-19 19:16:24 +02:00
Yair Morgenstern
7f5d8481d3 Fixed 'friendly territory' using correct open borders - see 4dca183
Also added comment on openBorders so it's clearer who can enter who
2022-11-18 12:22:32 +02:00
Yair Morgenstern
4038d75035
Version rollout (#8023)
* Bump version and create initial changelog entry

* Update German translation (#8020)

* Update Spanish.properties (#8019)

* Update French.properties (#8018)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-11-17 22:22:33 +02:00
Yair Morgenstern
32f582d0f4 Resolved #8017 - units now recieve correct healing in friendly territory 2022-11-16 23:03:29 +02:00
Yair Morgenstern
4dca183635 Tile info table no longer reveals hidden units - see #7670 2022-11-16 22:53:08 +02:00
Yair Morgenstern
45ea73379d Resolved #7740 - AI no longer nukes if as consequence it will mean declaring war on someone 2022-11-16 21:50:28 +02:00
Yair Morgenstern
5f5309dbac Resolved #7889 - empire overview screen updates after changing info in city screen 2022-11-16 21:21:30 +02:00
Yair Morgenstern
bf4172dba0
Version rollout (#8014)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#8013)

* Update Filipino.properties (#8012)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#8009)

* Update German translation (#8008)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
2022-11-15 18:58:13 +02:00
Yair Morgenstern
bb541715ba
Merge pull request #8005 from yairm210/hide-unexplored
Resolve #7817 - don't show unexplored tiles at all
2022-11-15 18:55:35 +02:00
Yair Morgenstern
0c76ad7ddd Resolved #7936 - automated workers no longer try to improve enemy tiles 2022-11-15 18:54:36 +02:00
Yair Morgenstern
6807efd870 Resolved #8011 - white lines in menus no longer change width when changing display settings 2022-11-15 18:31:51 +02:00
Yair Morgenstern
1770d40b97 Resolved #8001 - set 'text/plain' content type for multiplayer server requests 2022-11-15 18:24:25 +02:00
Yair Morgenstern
67f33c8ac6 Renamed AbsoluteUnits unitset @letstalkaboutdune - see #7980 2022-11-13 00:34:51 +02:00
Yair Morgenstern
76e58c4292 Resolve #7817 - don't show unexplored tiles at all 2022-11-12 23:57:39 +02:00
Yair Morgenstern
76f25e5fde
Version rollout (#8004)
* Bump version and create initial changelog entry

* Update Catalan.properties (#8002)

* update (#7999)

* Update Spanish.properties (#7998)

* Update French.properties (#7997)

* Update Italian.properties (#7996)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: vvinam <vvinam@gmail.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>
2022-11-12 21:22:45 +02:00
Yair Morgenstern
33ec4b9e2a Added diplomatic repercussions for attacking your own ally city-state, and discouraged AIs from doing so 2022-11-12 21:08:38 +02:00
Yair Morgenstern
0dfdf72686 Fixed promotions for mods conflicting with base ruleset promotions 2022-11-12 20:05:14 +02:00
Leonard Günther
2f69ab0fad
Added unitset selection to options menu (#7980)
* Added unitset selection to options menu

* Added None type to unitset selection

+ added logic to switch unitset when changing tileset as long as one with the same name exists and both are selected

* Updated default unitset to be HexaRealm
2022-11-10 17:06:47 +02:00
Yair Morgenstern
f3d7524dcd 4.2.18 2022-11-09 14:06:41 +02:00
Yair Morgenstern
83f2c7825f
Version rollout (#7995)
* Bump version and create initial changelog entry

* Update Filipino.properties (#7993)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
2022-11-09 14:01:01 +02:00
Yair Morgenstern
c475fb1d55 Fixed mod promotions conflicting with existing promotion locations 2022-11-09 13:55:36 +02:00
Yair Morgenstern
d748d489e2 Fixed rare thread crashes 2022-11-08 23:49:53 +02:00
Yair Morgenstern
c98a36c10f Added before/after X turns conditionals - see #3242 2022-11-07 22:56:58 +02:00
Yair Morgenstern
3e05b875bd Added before/after Pantheon conditionals - see #3242 2022-11-07 22:39:55 +02:00
Yair Morgenstern
6d831be942 Added "only available when" limitations to Ruins - see #3242 2022-11-07 22:21:47 +02:00
Yair Morgenstern
ba10873390 Deprecated old unique 2022-11-07 20:42:21 +02:00
Yair Morgenstern
e57c3018ef Resolved #7982 - Misspelling replacement text contains conditionals 2022-11-07 20:28:02 +02:00
Yair Morgenstern
f779221f93 Resolved #7989 - Get entire repo data for manually downloaded mods 2022-11-07 20:13:37 +02:00
Yair Morgenstern
b0c84f5eea 4.2.17 2022-11-07 18:20:19 +02:00
Yair Morgenstern
01d95652c0
Version rollout (#7992)
* Bump version and create initial changelog entry

* Update Filipino.properties (#7983)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Catalan.properties (#7979)

* little amend

* Update Catalan.properties

* Translate vietnamese (#7978)

* update vietnam

* update Vietnamese.properties

* Update Bulgarian.properties (#7974)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Dob <100198047+dobval@users.noreply.github.com>
2022-11-07 18:15:36 +02:00
Yair Morgenstern
803062781c
Resolves #7985 - Added layout for promotions (#7991)
* Converted existing promotions to table layout

* Added col/row to G&K promotions

* Added ruleset error tests for promotion locations
2022-11-07 17:53:42 +02:00
Leonard Günther
4522ab4c6b
Added "How to create a UI skin for Unciv" to wiki (#7976)
* Replaced all occurrences of deprecated NinePatch

function calls

This makes a lot of UI elements already moddable but documentation is still missing

* Added "How to create a UI skin for Unciv" to wiki

* Added image

* Fixed two typos and updated directory image

Old image was missing a folder
2022-11-06 22:53:55 +02:00
MindaugasRumsa51
139bf0af68
Update GameInfo.kt (#7986) 2022-11-04 13:46:17 +02:00
Yair Morgenstern
4a3da8fcfd
Version rollout (#7973)
* Bump version and create initial changelog entry

* Update German translation (#7961)

* Update Filipino.properties (#7960)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Provide some of the missing Ukrainian translations (#7958)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update French.properties (#7955)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-10-29 22:16:01 +03:00
nacro711072
211b9ea914
fix wrong glyph when switch between different mod. (#7970) 2022-10-29 22:10:00 +03:00
Yair Morgenstern
ac557f36dd Resolve #7937 - Automated workers no longer improve unworkable tiles 2022-10-27 20:33:39 +03:00
Yair Morgenstern
77c3aac931 Resolve #7959 - improved construction AI choices 2022-10-27 20:16:14 +03:00
nacro711072
8ab716a429
fix memory leak due to Pixmap don't be released. (#7964)
* fix memory leak due to Pixmap don't be released.

* dispose pixmap early.
2022-10-27 19:15:44 +03:00
nacro711072
ef1c81bef7
check whether the city has been a puppet in "Pick construction" action. (#7963) 2022-10-27 10:05:33 +03:00
Yair Morgenstern
2f693547b4 Fixed spearman not being to be able to upgrade to anything after Gunpowder and before Metallurgy 2022-10-24 20:51:52 +03:00
Yair Morgenstern
3246b82531
Version rollout (#7954)
* Bump version and create initial changelog entry

* Update Filipino.properties (#7950)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Improve Ukrainian translations a tad (#7949)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Brazilian_Portuguese.properties (#7948)

* Update Polish.properties (#7945)

* Update Spanish.properties (#7943)

* Update Indonesian.properties (#7942)

* Update Italian.properties (#7941)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: pyotr_p <pyotr.pietrzak@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-10-24 20:16:17 +03:00
Yair Morgenstern
adeac67dce Fixed Great Person Picker screen not responding 2022-10-23 19:31:03 +03:00
Yair Morgenstern
1749efa50a Fixed stat conversion constructions (Science, Gold) not appearing 2022-10-23 19:18:46 +03:00
Yair Morgenstern
fd4a0fc781 Resolved #7876 - fixed memory leak from screenshots 2022-10-22 22:04:16 +03:00
Yair Morgenstern
3f1a385747 Simplified init resources on new game 2022-10-22 21:38:46 +03:00
Yair Morgenstern
7c6df3db7e
Version rollout (#7940)
* Bump version and create initial changelog entry

* Update Vietnamese.properties (#7932)

* One hungarian update (#7928)

I'm back, tried my best with this one.

* Update German translation (#7927)

* Update Spanish.properties (#7924)

* Update Japanese.properties (#7923)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* update Vietnamese (#7922)

* Update Traditional_Chinese.properties (#7921)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update French.properties (#7919)

* Update Filipino.properties (#7918)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Russian.properties (#7917)

* Update Russian.properties

* Update Russian.properties

* Update Traditional_Chinese.properties (#7916)

* Update Brazilian_Portuguese.properties (#7915)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Thienanbad <89069988+Thienanbad@users.noreply.github.com>
Co-authored-by: JurDan | Led Cut <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: K0baU <63403741+K0baU@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: 羅少希 <83118946+Tab-Etuc@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
2022-10-22 20:24:46 +03:00
itanasi
55e6541ee0
Add Temperature Offset Slider (#7891)
* Add slider
Align spawnIce latitude and offset code to applyHumidityAndTemperature

* A bunch of debug code
Make default Water Level -0.05 for Default

* Remove debug println
Fix Desert at 0.9-1.0 temp and <0.2 humidity

* Disable reseed for debug comparison
Reset Plains/Grassland for high temp. Adjust max humidity for safety of Grasslands
Humidity debugger
Better slider

* Remove all debug code

* Undo Desert temp setting
2022-10-22 20:12:57 +03:00
itanasi
c39aca7a31
Change Default Map Generation to Perlin (#7856)
* Changes

* Slight adjustment to MainMenuScreen

* Make default waterThreshold for Default to be -0.05

* blip

* blip

* Rename cellular automata to Smoothed Random
2022-10-22 20:11:55 +03:00
Yair Morgenstern
69d7f48893 Resolved #7115 - incorrect tile yields due to caching conditional uniques 2022-10-21 16:10:17 +03:00
qwerty
b0de127a07
BlockedHolyCity other way around (#7930) 2022-10-19 10:59:34 +03:00
Yair Morgenstern
24e8401fad Error deprecated uniques 2022-10-14 10:13:45 +03:00
MindaugasRumsa51
22a97855b1
show wars in global politics (#7887)
* Update GlobalPoliticsOverviewTable.kt

* Update GlobalPoliticsOverviewTable.kt
2022-10-13 23:05:43 +03:00
Yair Morgenstern
f0ad7581bc Resolved crash when mods make 2 techs require each other 2022-10-13 22:55:12 +03:00
Yair Morgenstern
f3b4db9d64 Hopefully resolved ANRs from WorldScreen updates 2022-10-13 21:18:34 +03:00
Yair Morgenstern
95205893b7 Deprecated old uniques 2022-10-13 20:46:48 +03:00
Yair Morgenstern
fdd5d0c796
Version rollout (#7914)
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#7913)

* Update Brazilian_Portuguese.properties (#7911)

fixing brazilian portuguese wrong translation

* Update Lithuanian.properties (#7909)

* Update Catalan.properties (#7908)

* Update Indonesian.properties (#7907)

* Update Italian.properties (#7906)

* Update Ukrainian.properties (#7905)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

smol fix

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update French.properties (#7903)

* update (#7902)

* Update Filipino.properties (#7900)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update German translation (#7899)

* Update Brazilian_Portuguese.properties (#7897)

* Update Spanish.properties (#7896)

* Update Russian.properties (#7895)

* Update Russian.properties

* Update Russian.properties

* tests fixed by removing bad translation

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: 羅少希 <83118946+Tab-Etuc@users.noreply.github.com>
Co-authored-by: David Wesley <david.moura12@hotmail.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Marerjh <40261003+Marerjh@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
2022-10-13 20:06:49 +03:00
Yair Morgenstern
ad8c4a1e97 Rename forOptionsPopup -> tryFixUnknownUniques 2022-10-12 12:28:14 +03:00
MindaugasRumsa51
08ba5736d0
Update TechManager.kt (#7912) 2022-10-12 09:11:40 +03:00
Yair Morgenstern
bbcae01e82 Resolved #7687 - Always reload translations and images when resuming game 2022-10-09 12:48:54 +03:00
Yair Morgenstern
5c973b0de5 Resolved #7846 - Don't show hidden improvements in nation info 2022-10-09 12:28:19 +03:00
nacro711072
ad72c42911
fix untranslated string about politics (#7901)
* fix untranslated string about politics

* update shortcut about textbutton

* check all usage of template "[numberOfTurns] Truns Left"

* revert textbotton and add click event by chain.
2022-10-07 12:36:00 +03:00
Yair Morgenstern
c4bac19bb2 Resolved #7878 - Handle errors when renaming multiplayer games 2022-10-07 11:40:54 +03:00
Yair Morgenstern
b8d1f1d801 Resolved #7893 - Military units take most efficient route to capture civilians 2022-10-06 17:46:55 +03:00
Yair Morgenstern
2ef0284235 4.2.12 2022-10-05 23:13:32 +03:00
Yair Morgenstern
07acbee9ad
Version rollout (#7894)
* Bump version and create initial changelog entry

* Update Vietnamese.properties (#7885)

* Update Filipino.properties (#7874)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Fix grammar mistake (#7873)

* Fix grammar mistake

"Abandonada"?? Quién puso eso?? No pudo ser yo... o_o

* Update Spanish.properties

* update traditional_chinese.properties (#7872)

* Update Traditional_Chinese.properties (#7871)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Spanish.properties (#7868)

* Update Czech.properties (#7867)

* Update Czech.properties

* Update Czech.properties

* Update Czech.properties

* Update Lithuanian.properties (#7866)

* Update Vietnamese.properties (#7865)

* update

* update

* Updated Brazilian_Portuguese.properties (#7864)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Update French.properties (#7861)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Thienanbad <89069988+Thienanbad@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: Chris <cmanlove1234@outlook.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-10-05 23:10:52 +03:00
itanasi
91bb6fa89a
Create Cannot Move Unique (#7855)
* Create Cannot Move Unique

* Covering other potential avenues of moving

* Remove transient, fix Air Units movement range UI

* Better fix for AirUnits
2022-10-05 21:29:56 +03:00
Yair Morgenstern
2a740b9ede Converted dynamic listener classes into real classes
PArt of a crazed bid for saving memory, triggered by #7876
2022-10-02 22:42:15 +03:00
Xander Lenstra
364da94e5d
Fixed softlock forcing you to found a pantheon without available beliefs (#7883) 2022-10-02 15:50:08 +03:00
xk730
bf275cc1c4
Update GameParameters.kt (#7880)
这为解决#7877中所提及的(notanyoneCanSpectate)提供了第二种解决方案
This provides a second solution to the (notanyoneCanSpectate) mentioned in # 7877
2022-10-01 22:57:05 +03:00
Yair Morgenstern
6623991079
Version rollout (#7859)
* Bump version and create initial changelog entry

* Update Catalan.properties (#7858)

* Update Catalan.properties

* Update Catalan.properties

* Update Simplified_Chinese.properties (#7845)

* Update Simplified_Chinese.properties

Small fixes

* Update Simplified_Chinese.properties

* Update Traditional_Chinese.properties (#7841)

* translate some unit & beliefs.

* translate buildings

* translate some character name.

* Update Filipino.properties (#7840)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Spanish.properties (#7837)

* update Vietnamese (#7836)

* update

* update Vietnamese

* update Vietnamese.properties

* update Vietnamese

* Update Italian.properties (#7835)

* Update Simplified_Chinese.properties (#7834)

* Update Lithuanian.properties (#7831)

* Update German translation (#7829)

* Update German translation

* Update German translation

* Update French.properties (#7827)

* Update Brazilian_Portuguese.properties (#7824)

* Update Indonesian.properties (#7823)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@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: kensvin <kensvin28@gmail.com>
2022-09-25 16:37:56 +03:00
Xander Lenstra
e2187a268f
Fixed crash when getting a spy and expanding a city simultaneously (#7849) 2022-09-23 14:16:29 +03:00
Xander Lenstra
14d253fe24
Added a conditional for WLTKD (#7830) 2022-09-22 22:34:47 -07:00
nacro711072
77a1f4a6c1
fix: display "null" text on battleTable if the policy branch autocracy completely (#7843) 2022-09-22 11:48:18 +02:00
Timo T
72d0f2b6b7
Fix multiplayer turn checker option not showing up on Android (#7844)
It should *only* show up on Android, this was caused by a logic fail in a refactoring.
2022-09-21 16:58:20 +03:00
Yair Morgenstern
55c7183160
Version rollout (#7822)
* Bump version and create initial changelog entry

* Update Polish.properties (#7818)

* Update Traditional_Chinese.properties (#7815)

* translate policy/technology/tile/building

* correct typo

* Update French.properties (#7813)

* Update Indonesian.properties (#7812)

* Translate vietnamese (#7810)

* dịch thêm

thêm fanpage và group UnCiv Việt Nam

* update Vietnamese.properties

#update đã dịch tới dòng 3000

* update Vietnamese

add new line

* update Vietnamese.properties

dịch full 4.2.9

* Update Vietnamese.properties

* Update Vietnamese.properties

* fix

* fix

* f

* Update Brazilian_Portuguese.properties (#7808)

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Japanese.properties (#7803)

Few translations added

* Update Simplified_Chinese.properties (#7802)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties (#7801)

Two small fix

* Updated dutch translations (#7796)

* Updated dutch translations

* Fixed translation typos

* Used a better translation in dutch translation

Co-authored-by: Mark ter Maat <livestockmanagement@nedap.com>

* Update Vietnamese.properties (#7780)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: BJiggers <113617818+BJiggers@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: marktermaat <mark.termaat+github@gmail.com>
Co-authored-by: Mark ter Maat <livestockmanagement@nedap.com>
Co-authored-by: Thienanbad <89069988+Thienanbad@users.noreply.github.com>
2022-09-19 16:18:09 +03:00
Xander Lenstra
7f365423e1
Spies now show their current action and take time to move and set up (#7776)
* Spies now show their current action and take time to move and set up

* Fixed tests

* Reviews

* More reviews
2022-09-19 16:13:57 +03:00
Leonard Günther
d05b3d376b
Moddable UI skins (#7804)
* Added SkinStrings and SkinConfig

TODO SkinCache

* Deprecated all old ui background getters

* Added SkinCache

for SkinConfigs to take effect

* Modable or moddable? idk ¯\_(ツ)_/¯

* Added separate alpha to config
2022-09-19 16:13:09 +03:00
Yair Morgenstern
1256724ee3
Desktop settings initialize to fullscreen (#7821) 2022-09-19 16:12:49 +03:00
Yair Morgenstern
d34fd718c9
Special images for embarked units (#7819) 2022-09-19 16:12:40 +03:00
alexban011
d980b0d9ff
Global politics overview screen (#7469)
* getting the data

* finished getting the data

* optimization + separator

* vrtical separators

* more functions

* made it look good

* reverted debug variables

* cleanup

* added icon

* credits

* translations

* removed redundant equalizeColumns

* removed redundant separator

* column headers

* reviews

* removed redundant function

* latest translations

* latest review

* checks 1

* removed space

* removed vars and used DiplomacyManager instead

* combined overview screens

* 2 more translations

* little cleanup and fix
2022-09-19 16:12:24 +03:00
Yair Morgenstern
2bd705d43e
Version rollout (#7800)
* Bump version and create initial changelog entry

* translate opening statement of civ. (#7798)

* Update Catalan.properties (#7789)

* Update German translation (#7786)

* Update Indonesian.properties (#7779)

* Update Simplified_Chinese.properties (#7778)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update android/assets/jsons/translations/Simplified_Chinese.properties

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Translate vietnamese (#7774)

* dịch thêm

thêm fanpage và group UnCiv Việt Nam

* update Vietnamese.properties

#update đã dịch tới dòng 3000

* update Vietnamese

add new line

* Update Brazilian_Portuguese.properties (#7773)

* Updated Lines from Unique Types

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Delete Brazilian_Portuguese.properties

* updated

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update French.properties (#7767)

* Update Italian.properties (#7765)

* Update Spanish.properties (#7764)

* Update Spanish.properties

* Update Spanish.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.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: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2022-09-15 16:09:08 +03:00
Xander Lenstra
8fd3b3194e
Enabled vietnamese (#7772)
* Enabled vietnamese

* Fixed tests

* Fix tests (again)
2022-09-15 16:02:14 +03:00
Xander Lenstra
5ae9b221fc
Starting in later eras triggers era uniques in all previous eras (#7787) 2022-09-15 16:01:10 +03:00
OptimizedForDensity
291b962f97
Generalize Great Wall unique (#7660)
* Generalize Great Wall unique

* Update JSON entries

* And movement calculation too

* Rename other functions

* Cache movement penalty uniques

* Check destination tile instead of unit type
2022-09-15 16:00:19 +03:00
nacro711072
708986c1de
fix wrong happiness point on resume game if adopt 'Cultural Diplomacy' policy. (#7793)
* fix wrong happiness point on resume game.

* update.
2022-09-13 13:58:58 +03:00
Yair Morgenstern
8fec196db1 Got rid of uppercase C in Unciv in ALL places! 2022-09-12 23:26:28 +03:00
xk730
3b8b1dee3b
Increased help button size (#7784)
我试图将MainMenuScreen的helpButton放大了一点,因为有很多玩家向我抱怨说第一次查找时找不到这个按钮。
I tried to enlarge the helpButton of MainMenuScreen a little, because many players complained to me that they could not find this button the first time they searched.
2022-09-12 02:00:34 -07:00
nacro711072
d65c756e4c
fix no victoryTypes for the first time gaming with "quick game" opion. (#7785) 2022-09-12 00:34:47 +03:00
Yair Morgenstern
351c6aa798
Solve CS placement clustering (#7783) 2022-09-12 00:33:22 +03:00
nacro711072
2157f1849e
Fixed: double unit while loading game from customFile. (#7771) 2022-09-10 08:06:31 -07:00
Yair Morgenstern
9a95825ed7
Version rollout (#7763)
* Bump version and create initial changelog entry

* dịch thêm (#7760)

thêm fanpage và group UnCiv Việt Nam

* Update Simplified_Chinese.properties (#7753)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* update traditional_chinese.properties (#7752)

* update chinese.properties.

* update chinese.properties.

* Update Spanish.properties (#7751)

* Update Indonesian.properties (#7750)

* Update Filipino.properties (#7746)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Catalan.properties (#7744)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
2022-09-08 23:51:13 +03:00
Yair Morgenstern
ab1236683f
AI: Recognize when no further techs can be researched, even if some techs are blocked (#7755) 2022-09-08 22:48:58 +03:00
Xander Lenstra
11bfe93ce7
Fixed a wrongly implemented feature disabling pantheon founding (#7738) 2022-09-08 22:48:46 +03:00
Xander Lenstra
0542855f88
Spies give vision in cities in which they are stationed (#7762) 2022-09-08 22:48:35 +03:00
Yair Morgenstern
30c426959b
Resolves second part of #7708 - don't re-raise tech popups for previously researched techs (#7757) 2022-09-08 16:17:17 +03:00
Yair Morgenstern
b11c01bfdc
Resolve #7625 - show Unciv icon when loading game, instead of happy face (#7756) 2022-09-08 16:17:05 +03:00
Leonard Günther
35e225b68f
Replaced BackgroundActor companion (#7749)
as it was interfering with the moddable UI
2022-09-07 12:18:47 +03:00
nacro711072
7a1c025e10
fix: lateinit property cityInfo has not been initialized issue. (#7739)
* fix: lateinit property cityInfo has not been initialized issue.

* use loop instead of foreach.
2022-09-05 08:15:58 +02:00
Leonard Günther
f4dc138186
Moddable UI Skins [Basics] (#7714)
* Made UI skins selectable

This allows mods to provide alternative skin pngs without overriding the default skin purely by being downloaded

* Added UI Skin loading from NinePatches

This allows mod creators to define the stretch region and padding directly in the png

* Update baseScreen skin on skin reload

* Merged displayTab onChange functions

As all of them are equal anyway
2022-09-04 17:09:14 +03:00
Yair Morgenstern
30ed0f544d
Version rollout (#7742)
* Bump version and create initial changelog entry

* Update Lithuanian.properties (#7736)

* update traditional chinese. (#7735)

* Update Korean.properties (#7731)

* Update Romanian.properties (#7729)

* Update Italian.properties (#7728)

* Update French.properties (#7724)

* Update Simplified_Chinese.properties (#7723)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update German translation (#7722)

* Update German translation

* Update German translation

* Update Indonesian.properties (#7719)

* Update Romanian.properties (#7725)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Removed invalid translation

* Fixed tests

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Auvergne <97716654+ARPD-release@users.noreply.github.com>
Co-authored-by: MihaiTurlea <111897551+MihaiTurlea@users.noreply.github.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: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
2022-09-04 17:06:17 +03:00
Xander Lenstra
f46ab1de3a
Disable spectators from changing unit names (#7737) 2022-09-04 16:23:50 +03:00
lishaoxia1985
63324b3272
delete unnecessary random(randomness.RNG) (#7721) 2022-08-30 11:29:57 +03:00
Yair Morgenstern
b1579224a8 Better milestones for world religion 2022-08-29 00:04:44 +03:00
Yair Morgenstern
a0766f75d2 Resolve #7705 - correct filtering of civs that need to have majority religion for world religion to activate
This was very poorly implemented
2022-08-29 00:02:19 +03:00
Yair Morgenstern
71c5177c34
Version rollout (#7716)
* Bump version and create initial changelog entry

* Ukrainian translations (#7711)

* Update Traditional_Chinese.properties (#7709)

* add basic and notification translative sentence.

* update missing placeholder.

* Upadate Catalan.properties (#7704)

* Update Indonesian.properties (#7703)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Czech.properties (#7702)

* Update Czech.properties

* Update Czech.properties

Wrong translation

* Update Czech.properties

* Update Polish.properties (#7700)

* Update Vietnamese.properties (#7699)

* Update Simplified_Chinese.properties (#7698)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update German translation (#7697)

* Update Spanish.properties (#7693)

* Update Spanish.properties

* Update Spanish.properties

* Update Italian.properties (#7692)

* Update French.properties (#7690)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: persinger <63961560+Weltzer@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-08-28 23:40:04 +03:00
Xander Lenstra
a19fed5d28
Added a screen to move spies between cities (#7665)
* Added a screen to move spies between cities

* Fixed tests

* Reviews

* Avoid labels blinking

Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
2022-08-28 23:25:14 +03:00
Brian
2e81a6152b
Fixed unit not giftable in one-sided open borders agreement. (#7701) 2022-08-24 00:14:47 -07:00
nacro711072
34f21dd08f
fix crash for start game with single player. (#7696) 2022-08-23 11:26:36 +03:00
alexban011
f64c5b36d0
added game option to disable unwanted spectators from a multiplayer game (#7290)
* feature

* only display option if onlineMultiplayer is enabled

* translatable

* no more negativity

* 1

* threw UncivShowableException

* reviews

* reviewed myself
2022-08-22 21:11:12 +03:00
CrispyXYZ
e58e184889
close app completely when clicked 'Exit' button (#7655)
* kill app when clicked 'Exit' button

* add super.onDestroy()

* tries to fix temporarily

* Update AndroidLauncher.kt

* add System.exit(0)

* a little fix
2022-08-22 21:09:47 +03:00
Yair Morgenstern
87a4b57bf0
Version rollout (#7688)
* Bump version and create initial changelog entry

* Update Vietnamese.properties (#7686)

* Update Filipino.properties (#7677)

* Update Filipino.properties

* Update Filipino.properties

* update traditional_chinese for Maya. (#7675)

* update traditional_chinese for Maya.

* update

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update Catalan.properties (#7667)

* Update Catalan.properties

* Update Catalan.properties (names of spies)

* Update Catalan.properties

* Update Indonesian.properties (#7664)

* Update Indonesian.properties

* Update Indonesian.properties

* Ukrainian translations (#7659)

* Ukrainian translations

* Misprints corrected

* New strings from a master branch

* Translations for the spy names

* More names translated

* Update German translation (#7657)

* Update French.properties (#7654)

* Update Simplified_Chinese.properties (#7652)

* Update Simplified_Chinese.properties

* Fix error

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Italian.properties (#7651)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Weltzer <63961560+Weltzer@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@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>
2022-08-22 21:02:45 +03:00
Jack Rainy
aa2d457260
Restore the button's style correctly (#7683) 2022-08-22 20:17:04 +03:00
Leonard Günther
18ef8fc20e
Removed legacy tileset code (#7658)
* Removed legacy tileset code

which was only used for the "Default" tileset

* Updated "Default" tileset to support new rendering

* Updated docs

* Fixed fogOfWar coloring bug

* Removed cityImage variable completely

* Renamed variable out to baseHexagon

* Moved color lerp out of for loop

* Renamed "Default" tileset to "Minimal"

* Made "HexaRealm" the games fallback tileset

* Implemented requested changes

* Readded accidentally removed variable

* Reverted updateTileImage back to foreach loop

Since indices are not needed anymore

* Regenerated game.atlas and game.png
2022-08-22 13:02:52 +02:00
Brian
86834de82a
Improved options to rename units (#7676)
Co-authored-by: Brian Huckaby <bdhuckaby@gmail.com>
2022-08-22 11:46:55 +03:00
Jack Rainy
e2de79acbd
Suggest to adopt policy when the game starts with some culture (#7682) 2022-08-20 21:16:59 +03:00
Xander Lenstra
089e762f72
Fixed a crash when marrying a city-state without cities (#7684) 2022-08-20 21:11:25 +03:00
Ouaz
90e582a0c3
Add an icon for "Wait" unit action (#7668) 2022-08-16 12:30:37 +02:00
Ouaz
11fd49c765
Fix "1.5x unhappiness" still being mentioned (#7669)
Follows #7420
2022-08-16 13:23:19 +03:00
Xander Lenstra
b1727f9360
Fix spies being gained in non espionage games (#7661)
* Handfull of comment questions, small refactorings

* Code changes

* Reworded a unique, removed a file

* Added spy names for all nations, minor consistency change

* Removed debug output

* Added an empty constructor so gdx can reconstruct it

* No spies gained when espionage is disabled

* Added missing function
2022-08-14 18:37:39 +03:00
Xander Lenstra
202e0bcf47
Basic version of EspionageManger, added a unique to gain spies (#7641)
* Handfull of comment questions, small refactorings

* Code changes

* Reworded a unique, removed a file

* Added spy names for all nations, minor consistency change

* Removed debug output

* Added an empty constructor so gdx can reconstruct it
2022-08-13 22:45:16 +03:00
MindaugasRumsa51
89979748a1
Notificiations tab scroll fix in empire overview (#7536)
* Update NotificationsOverviewTable.kt

* Update EmpireOverviewCategories.kt

* Update NotificationsOverviewTable.kt
2022-08-13 22:43:42 +03:00
OptimizedForDensity
9967642573
Fix infinite city-state tribute bug (#7653) 2022-08-13 22:43:25 +03:00
Yair Morgenstern
afa2327828
Version rollout (#7650)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties(2nd attempt) (#7646)

* Update Simplified_Chinese.properties

* A checkpoint for undoing commits

* Update Simplified_Chinese.properties

* Fix error

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#7644)

* Update German translation (#7642)

* Update German translations

* Updat German translations

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Polish.properties (#7640)

* Update Spanish.properties (#7639)

* Update Spanish.properties

* Update Spanish.properties

* Update Spanish.properties

* Update Italian.properties (#7636)

* Perform housekeeping for Ukrainian translations - symbols, word order, and extra translations (#7626)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Catalan.properties (#7614)

* Update Catalan.properties

* Update Catalan.properties. Change verbal periphrases and apostrophe symbol.

* Update Catalan.properties

* Update French.properties (#7608)

* Update French.properties

* Update French.properties

Update translation to 4.2.3

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-08-12 14:30:26 +03:00
OptimizedForDensity
8f23ae52cc
List which city owns each tile in the city screen UI (#7631) 2022-08-12 14:26:09 +03:00
OptimizedForDensity
28f65a7599
Add free belief unique + refactor a few religion functions (#7612)
* Free belief unique

* Fix edge case

* Another edge case

* Bug fixes

* Fix some conditions

* Refactor another function

* Handle edge case where the civ has enough faith for a pantheon but also gets a free pantheon pick on the same turn (allow civ to have both picks)

* Fix the edge case handling

* Cleanup

* Reviews + more refactoring and cleanup

* Update comments

* Unnecessary comment

* Improvements

* Typo
2022-08-12 14:24:42 +03:00
Yair Morgenstern
306aef4c67 Resolved #7647 - Mod translations loaded upon lod download 2022-08-12 14:24:22 +03:00
OptimizedForDensity
a4424d2ab1
Several pathfinding optimizations (#7523)
* Slight pathfinding optimization

* Cache canReach()

* More optimizations

* Use hashset instead of two arraylists
2022-08-08 17:13:27 +03:00
Yair Morgenstern
29b6b35f56
Version rollout (#7635)
* Bump version and create initial changelog entry

* Update German translation (#7634)

* Update Korean.properties (#7630)

* fix a few style issues in the German translation (#7621)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Kristian Rother <krother@academis.eu>
2022-08-07 23:48:01 +03:00
OptimizedForDensity
b630388984
Add unit type to Civilopedia (#7620) 2022-08-07 17:37:11 +03:00
OptimizedForDensity
f1a69744cb
Fix mod translation file generation (#7629) 2022-08-07 17:36:55 +03:00
Xander Lenstra
44fdf53b05
Added a hidden option for enabling espionage (#7615) 2022-08-06 22:05:44 +03:00
Xander Lenstra
baeae5c8ae
Occupied cities have +2 extra unhappiness (#7628) 2022-08-06 22:05:21 +03:00
itanasi
69e6093e2e
Update Damage Notifications (#7623)
* Minor Compile change

* Update to -[amount] HP for battle notifications
Update Unseen Interceptor Notification

* Update to -[amount] HP for battle notifications
Update Unseen Interceptor Notification

* Revert "Update to -[amount] HP for battle notifications"

This reverts commit 63961029da.

* Rename variables

* Even if you can't see the Interceptor Tile, still get full info if not killed
2022-08-06 13:23:42 -04:00
Liam A
00e1ed25a1
Made invisible units not become visible just by being next to an owned tile. (#7618) 2022-08-06 11:58:57 +02:00
Xander Lenstra
35eb71c937
Removes the option for disabling religion (#7606)
* Removes the option for disabling religion

* Deprecated religionEnabled variable, set default to `true` and removed in cases where it shouldn't have effect
2022-08-05 11:46:06 -04:00
OptimizedForDensity
6309bbdcb6
Fix bug related to resuming games (#7613) 2022-08-05 14:01:57 +02:00
Xander Lenstra
7a749fdec1
Added 'without resource' conditional (#7611) 2022-08-05 10:16:30 +03:00
Xander Lenstra
121859defb
Added a unique for destroying improvements on attack (#7605)
* Added a unique to destroy improvements on attack

* Removed last part of unique, as we have the `in [tileFilter] tiles` conditional
2022-08-04 20:12:42 -04:00
Yair Morgenstern
7473213d77
Version rollout (#7601)
* Bump version and create initial changelog entry

* Update Ukrainian translations - add missing, correct existing (#7597)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Simplified_Chinese.properties (#7590)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

* Update Korean.properties (#7585)

* Update Catalan.properties (#7583)

* Update French.properties (#7575)

* Update Spanish.properties (#7574)

Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>

* Update Italian.properties (#7572)

* Update Dutch.properties (#7547)

* Update Dutch.properties

* Paar spellingsdingetjes eruit gehaald

* Vertalingen toegevoegd

Verwarrend: speler-ID en gebruiker-ID worden door elkaar gebruikt! vb regel 675
Mag het pull request worden geamendeerd of moet er een apart pull request gemaakt worden?

* Paar spellingsdingetjes

* Nieuwe vertalingen

* Fixed tests not working

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.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: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: TPunkiee <110175928+TPunkiee@users.noreply.github.com>
2022-08-04 18:32:20 +03:00
MindaugasRumsa51
5cc77dad3e
Update ReligionAutomation.kt (#7581) 2022-08-04 18:29:20 +03:00
Nika Kasradze
33ca2d8ef9
fix #7565: Remove duplicate "Consumes ..." lines of city screen (#7592)
* fix #7565: Delete one "Consumes ..." lines of city screen

* fix #7565: Delete one "Consumes ..." lines of city screen

* fix #7565: Delete one "Consumes ..." lines of city screen
2022-08-03 13:38:35 -04:00
itanasi
61d48a5c37
Add Damage numbers to Battle Notifications (#7587)
* Initial changes

* Adding damage numbers
2022-08-03 20:24:19 +03:00
OptimizedForDensity
67fbc07552
Add translation for XP on World Screen (#7595) 2022-08-03 20:22:46 +03:00
itanasi
0da7918a94
Minor Compile change (#7588) 2022-08-03 10:42:41 -04:00
itanasi
2671babefd
Fix Air Sweep Notification Translations (#7577)
* Fix Air Sweep Notification Translations

* Modify all translation files

* Fix a missing space
2022-08-03 17:34:21 +03:00
itanasi
436917f2af
Allow Citizen Management to pick any tile owned within 3 tiles (#7533) 2022-08-03 16:08:46 +02:00
OptimizedForDensity
30e1dcbcdd
Fix broken translation (#7580) 2022-08-02 18:23:37 +03:00
Yair Morgenstern
99cda99f41
Version rollout (#7571)
* Bump version and create initial changelog entry

* Update Korean.properties (#7569)

* Update Korean.properties

Checking every 10~20 lines...

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Ukrainian translations (#7560)

* Update Ukrainian.properties - add missing translations

* Missing translations are added

* Trailing spaces are restored

* More translations are added

* More translations are added

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Hungarian translation #idk (#7558)

Another translation coming up from here ^^

* Update Polish.properties (#7556)

* Update Italian.properties (#7555)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update French.properties (#7553)

* Update Spanish.properties (#7552)

* Update Spanish.properties

Woah, I got fuzzy with so many "Interceptor" conjugations 0_o\

* Update Spanish.properties

* Improve Spread Religion tutorial

Co-authored-by: OptimizedForDensity <105244635+OptimizedForDensity@users.noreply.github.com>

* Update Catalan.properties (#7551)

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Turkish.properties (#7548)

`Domalan` is too local a translation and has other meanings. `Yermantarı"` is better.

* Update Simplified_Chinese.properties (#7546)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#7541)

* Update Indonesian.properties

* Fixed tests

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: JurDan | Led Cut <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@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: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: OptimizedForDensity <105244635+OptimizedForDensity@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Selim <slmyldz41@gmail.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
2022-08-01 19:48:09 +03:00
Yair Morgenstern
e510bf4929 Resolved error where missionary cost was determined by Capital, and not by cities it could actually be constructed in 2022-08-01 19:42:59 +03:00
oynqr
6054b32f92
Fix erroneous relationship decay notification (#7564)
Whenever your relationship resting point as well as the relationship
score for city states is at the exact value of 30 or 60, a notification
is shown that the relationship is about to degrade, even though it can
and will not.
This fixes said issue by changing the comparison operators of the
current influence and the resting point in
getCityStateInfluenceDegrade() and getCityStateInfluenceRecovery() to
the correct ones, respectively <= and >=.
2022-08-01 17:57:58 +03:00
Joan Josep
6a943bb46f
Rename "Show minimap" to "Minimap size" (#7567) 2022-07-31 15:56:45 -04:00
SimonCeder
c760510f5b Invalid players removed from global quests 2022-07-31 14:24:07 +02:00
SimonCeder
a6e61c120b Fix NW placement 2022-07-30 00:07:48 +02:00
OptimizedForDensity
64e79ffa0d
Allow passable natural wonders (#7550) 2022-07-28 23:00:31 +03:00
Yair Morgenstern
c738da892c 4.2.0 2022-07-28 09:12:57 +03:00
Yair Morgenstern
a6b55ca14a
Version rollout (#7538)
* Bump version and create initial changelog entry

* Translate a few missing lines to Ukrainian (#7537)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Finnish.properties (#7535)

* Update Finnish.properties

* Update Finnish.properties

* Update Korean.properties (#7531)

* Update Traditional_Chinese.properties (#7527)

* Update Polish.properties (#7525)

* Update Catalan.properties (#7524)

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Russian.properties (#7520)

* Update Lithuanian.properties (#7518)

* Update Traditional_Chinese.properties (#7516)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update German translation (#7511)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Simplified_Chinese.properties (#7509)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#7506)

* Update Filipino.properties (#7505)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Spanish.properties (#7503)

* Update French.properties (#7501)

* Update Swedish.properties (#7500)

* Update Italian.properties (#7498)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Securetux <110048962+Securetux@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-07-28 09:06:46 +03:00
Xander Lenstra
4eb0038d10
Allows inquisitors to block holy cities (#7521)
* Inquisitors can disable holy cities

* Templates and notifications

* Combined with changes of previous religious PR

* Reviews
2022-07-27 22:18:04 +03:00
itanasi
af6ab8e4e5
Add Air Sweep (#7484)
* Add Air Sweep Unique
Enable Dogfighting Promotion
Add Air Sweep mode button and crosshair overlay

* Adding Air Sweep Battle Table

* Add airSweep to Battle
Remove double XP
While in AirSweep can't select other units on tile

* initial airsweep code

* Implement airSweep

* BattleTable indicates tile you're AirSweeping

* some notifications

* Clean up notifications.
Add icons

* Revert game.atlas and game.png

* Fix selection properly

* Update Vanilla UnitPromotions.json

* Better handling of movement use
comment cleanup

* missing credit

* Proper code so that Seas units also deal no damage
Adding Tutorials!

* Remove Intercept Bonus Damage/Protection

* Remove chance of Interceptor missing

* Battle Table a bit more consistent

* Defender also gets Air Sweep Modifiers

* Defender doesn't get bonus

* Remove unused getInterceptBonus
Combine logic

* Show damage in notifications for Air Sweep

* Randomize intercepting Civ and prioritize Air Units

* Remove debug code

* Updated atlas

* Clean up Uniques

* Object-ify DamageDealt for ease of reference

* code clean up

Co-authored-by: itanasi <spellman23@gmail.com>
2022-07-27 22:16:53 +03:00
SimonCeder
a61c958d03 Merge branch 'automated-ruins' 2022-07-25 22:06:18 +02:00
Xander Lenstra
52d0814e7b
Update religious AI; buying faith buildings, inquisitor AI updates (#7454)
* Update AI for buying with Faith, allowing it to buy Faith buildings

* Minor bug fixes

* Revamped inquisitor AI, minor changes to missionary AI

* Reviews

* Reviews

* Reviews

* Removed magic number
2022-07-23 13:06:48 -04:00
SimonCeder
2f52b6bf1a
Merge pull request #7507 from SimonCeder/marriagebug
avoid potential marriage bug
2022-07-23 09:04:10 +02:00
SimonCeder
9fa00a9fa9 change wording 2022-07-22 23:12:55 +02:00
SimonCeder
0e00ec22c6 workers will replace city ruins 2022-07-22 20:53:01 +02:00
SimonCeder
64e6fd086d
Update CityStateFunctions.kt 2022-07-22 20:16:30 +02:00
SimonCeder
5846da6f8a
cover more cases 2022-07-22 20:14:08 +02:00
Timo T
9f251787fa
Fix games not being loadable (#7508)
* Fix wrong caching key

* Refactor: Change caching keys to unique name
2022-07-22 16:04:30 +03:00
OptimizedForDensity
772e7faf54
Construction automation optimization (#7504) 2022-07-22 14:48:21 +02:00
SimonCeder
73ad76b59c avoid potential marriage bug 2022-07-22 14:06:29 +02:00
Yair Morgenstern
acd71617cc Quick win for #7491 - check religion spread range for cities only after checking it's with a majority major religion 2022-07-22 10:29:25 +03:00
Yair Morgenstern
858c7bc256 Quick win for #7491 - only update resources after trade/unit if resources are relevant 2022-07-22 09:26:40 +03:00
Yair Morgenstern
ae187f4f85 Quick win for #7491 - when creating a unit, only update civ resources if the unit has resource requirements 2022-07-21 22:57:30 +03:00
Yair Morgenstern
77b0b582ae Disabled autosave when resizing worldScreen 2022-07-21 22:31:44 +03:00
Yair Morgenstern
96c9d105f3 Resolved #7497 - Fixed Civilopedia crash on terrains 2022-07-21 18:26:41 +03:00
Yair Morgenstern
5b50106ea5
Version rollout (#7496)
* Bump version and create initial changelog entry

* Update Russian.properties (#7493)

* Update Filipino.properties (#7487)

* Update Simplified_Chinese.properties (#7480)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
2022-07-21 09:19:22 +03:00
Xander Lenstra
986346a127
Added a unique limiting what units can be intercepted (#7488)
* Added a unique limiting what units can be intercepted

* Cleaned up implementation and added stateForConditionals
2022-07-21 09:16:33 +03:00
alexban011
06096eaa8e
Mod categories (#7298)
* feature

* more categories

* added categories

* filter installed part1

* display vanilla rulesets in rulesets category + fix download from URL not showing

* filter installed mods

* removed isVanilla variable

* only look at second topic

* same but for online mdos as well

* replaced tilesets with graphics

* translations

* code duplication

* removed vanilla content from rulesets

* combined the function into one

* revert amountPerPage even tough its already on master

* Filter class

* 1

* mutableListOf<>()

* mutableListOf<>() again

* getFilterText removed

* !categoryFilter(filter)

* matchesCategory

* if (modTopic.size < 2) return false
2022-07-21 09:15:26 +03:00
Yair Morgenstern
42df3f06f0
Simplified and optimized image attempter use (#7494)
* Simplified and optimized image attempter use

Image fallback logic was in a bad place - confusing, semi-optimized, and spread out over several places

This brings everything into one place, simplifies the logic, adds comments,  optimizes string concats to bring down RAM usage, and adds caching so we don't need to conduct the same searches over and over

* Minor reorder

There is still more that can be cleaned up but not now
2022-07-21 07:52:26 +03:00
Yair Morgenstern
448efc813d
40% performance save on tileInfo.getImprovementStats() by caching citywide uniques (#7492) 2022-07-20 19:53:30 +03:00
Yair Morgenstern
8574ad4624
Save all tile terrains and terrain uniques in transients, for better performance (#7490)
* Save all tile terrains and terrain uniques in transients, for better performance
Also minor changes in other places for performance reasons

* CR changes + test fix
2022-07-20 16:38:42 +03:00
Yair Morgenstern
e2d04b37f7
HexaRealm as default tileset (#7477) 2022-07-20 11:57:50 +03:00
itanasi
ee6082c394
Replace "moveTo" in unit overview with "Moving" (#7457) 2022-07-19 14:01:42 +02:00
Yair Morgenstern
d95cf13a41
Version rollout (#7481)
* Bump version and create initial changelog entry

* Update Turkish.properties (#7473)

* Ukrainian translations (#7472)

* Update Spanish.properties (#7471)

* Update Catalan.properties (#7467)

* Update French.properties (#7466)

* Update Italian.properties (#7464)

* Update German translation (#7463)

* Update German translation

* Update German translation

* Update Lithuanian.properties (#7462)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: HasChad <58506555+HasChad@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.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: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
2022-07-18 19:17:36 +03:00
Yair Morgenstern
f1a72e9611
Resolve #7438 -Can no longer receive negative gold offers from AI (#7451)
* Can no longer receive negative gold offers from AI

* Function over field

* Correct checking for tradable offers in AI counteroffer
2022-07-18 17:57:36 +03:00