Commit Graph

2978 Commits

Author SHA1 Message Date
Jack Rainy
4986505363
Great General typed uniques and improved moddability (#6818)
* Great General UniqueTyped and improved moddability - draft

* Great General UniqueTyped and improved moddability - reviews

* Great General UniqueTyped and improved moddability - no reason not to cache another

* Integration with JackRainy's solution

* Integration with JackRainy's solution - part 2

* Revert of maxGreatGeneralBonusRadius logic

* Minor refactoring

* Code review: minor refactoring

* Keep the warning for the modders about the obsolete unique

* Code review: Better wording for the unique

Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
2022-05-18 00:02:53 +03:00
Xander Lenstra
7079619fe2
Great improvements can again be constructed on forest (#6823)
* Great improvements can again be constructed on forest
This PR fixes a bug where great improvements couldn't be build on 
forests/marshes/jungles/etc. It does so by creating a unique which 
specifically allows for removing features, and checking for that.
Additionally, we only remove these features when we have the tech to 
remove them. For example, you can no longer plonk an Academy down over a 
forest without having researched mining.

* Missed the file for vanilla

* Reviews

* Fixed logic
2022-05-17 20:04:49 +03:00
SomeTroglodyte
8329d56131
Allow generation of "Default" Deciv redux maps (#6821) 2022-05-16 13:03:06 +03:00
Yair Morgenstern
b5a2aa59b6 4.1.0 2022-05-15 20:44:18 +03:00
Yair Morgenstern
01497a14ec
Version rollout (#6820)
* Bump version and create initial changelog entry

* More translations to Brazilian Portuguese (#6814)

* Update Brazilian_Portuguese.properties

* Adding translations to Brazilian Portuguese

* Adding more translations to Brazilian Portuguese

* Adding more Brazilian Portuguese translations

* Update Simplified_Chinese.properties (#6811)

* Update Simplified_Chinese.properties

Fix 2 errors & fill in the space

* Complete translations for Civilopedia

* Update French.properties (#6794)

* Update Indonesian.properties (#6791)

* Update Italian.properties (#6790)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: André Lucas C. da Silva <andr9310@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-05-15 19:34:50 +03:00
Jack Rainy
c4de3530f6
Possibility to liberate a traded city (#6797) 2022-05-15 17:57:29 +03:00
SomeTroglodyte
816e542e1c
Notifications not scrollable far enough after in-turn notifications got added (#6796) 2022-05-14 23:19:02 +03:00
Yair Morgenstern
e94d109166 4.0.16 2022-05-13 13:00:20 +03:00
Yair Morgenstern
66abc2f779
Version rollout (#6789)
* Bump version and create initial changelog entry

* Update Russian.properties (#6787)

* Update Russian.properties

* Fix translation

* Update Spanish.properties (#6782)

511 - Yes, the double space is intentional

* Add Fastlane_short_description translations (#6781)

Also added Civ V - Vanilla and Civ V - Gods and Kings translation.

* Update German translation (#6778)

* Update French.properties (#6769)

* Update Indonesian.properties (#6768)

* Update Simplified_Chinese.properties (#6766)

* Update Simplified_Chinese.properties

* Make 2 translation together (#1)

* Fetch the latest update
* Update Simplified_Chinese.properties

Correct language defects and ambiguities and fill in gaps

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>

* Update Italian.properties (#6765)

* Update Korean.properties (#6754)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

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

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: nilleh <72703236+niltok64@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: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Auvergne <97716654+ARPD-release@users.noreply.github.com>
2022-05-13 12:52:53 +03:00
SomeTroglodyte
345ca0ec25
Pedia from mainmenu (#6788)
* Make Civilopedia independent of worldScreen or gameInfo

* Make Civilopedia callable from Main Menu

* Era category for Civilopedia

* Era category for Civilopedia - atlas
2022-05-13 12:36:06 +03:00
Leonard Günther
09b4e82589
Rate limit handling for Dropbox (#6416)
* Added rate limit handling to dropbox

+ some refactor to make the whole file one object

* Added error messages on rate limit reached

+ refactored some popup code to reduce repetition

* Fixed merge error

* Made variables private

* Fixed file upload not working

because of missing override flag for dropbox

* Stop multiplayer refresher if rate limit reached

* Fixed typo

* Various code changes/fixes

- ErrorResponse var name has to be `error` because that's how DropBox's json property is named
- Change FileStorageRateLimitReached exception to store the seconds remaining as its own property instead of in the message
- Use toIntOrNull to avoid setting defaults in two places

* Fixed missed exception message

Co-authored-by: Azzurite <azzurite@gmail.com>
2022-05-13 09:16:52 +03:00
Yair Morgenstern
3e63be5376 4.0.15-patch1
Extra images fixed and HexaRealm added :)
2022-05-11 17:58:30 +03:00
The Bucketeer
e9ffe7667c
Proposal to add the current HexaRealm tileset as the built-in tileset. (for serious this time.) (#6756)
* Create posh

* HexaRealm tile sprites upload (part 1)

* HexaRealm tile sprites upload (part2)

* HexaRealm tile sprites upload (part 3)

* Upload HexaRealm.json

Should have no problem in terms of most of the layering!

* Delete posh

* Delete bana.png
2022-05-11 17:34:46 +03:00
Yair Morgenstern
cd002699f3 4.0.15 2022-05-11 17:22:31 +03:00
Yair Morgenstern
97b8bd106a
Version rollout (#6762)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#6753)

Correct some translation errors

* Update Romanian.properties (#6748)

* 1

* 2 - most city names don't have a translation

* 3 - more cities

* Update Turkish.properties (#6746)

* Update French.properties (#6738)

* Update Italian.properties (#6734)

* Update Indonesian.properties (#6733)

* Update German translation (#6732)

* Update Filipino.properties (#6729)

* 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: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: alexban011 <alexban011@gmail.com>
Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@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: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
2022-05-11 17:05:17 +03:00
Yair Morgenstern
e348a20d2e Extracted policies, religions, nations and promotions to separate png files in order to fit HexaRealm tileset into the main file - see #6756 2022-05-11 16:57:39 +03:00
SomeTroglodyte
eb5e8ae226
Switchable gzipping of saved games (#6735)
* Switchable gzipping of saved games

* Switchable gzipping of saved games - consensus says default off
2022-05-11 16:23:11 +03:00
Xander Lenstra
8fcfbf752b
Improved clarity and moddability of building improvements (#6712)
* Renamed tile.hasUnique, deprecated `Indestructable`, unique for citadels
Also refactored the consumption of (great) people out of UnitActions.

* Reworked when improvements can be build somewhere for more clarity

* Made resources improvable by multiple improvements; Offshore Platform

* Fix compatability

* WIP

* Fixed the tests, but better

* I suppose I might as well update this now that we're a version later
2022-05-11 00:35:21 +02:00
SomeTroglodyte
7b4833741d
Fix missing translatables, again (#6705) 2022-05-11 00:21:38 +03:00
Yair Morgenstern
ba96bea556 4.0.14 2022-05-08 21:42:19 +03:00
Yair Morgenstern
4fe775c0f5
Version rollout (#6726)
* Bump version and create initial changelog entry

* Update Filipino.properties (#6714)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Romanian.properties (#6713)

* Fixed issue #6649 by checking for internet connection before starting the game if "online multiplayer" is selected
Many thanks to @SomeTroglodyte for most of the code and for explanations

* Revert "Fixed issue #6649 by checking for internet connection before starting the game if "online multiplayer" is selected"

This reverts commit bae7d7c07f.

* some translations

* merging with 4.0.13

* fixed a little error

* fixed github check error

* Update German translation (#6710)

* Update German translation

* Update German translation

* Update German translation

* Update Italian.properties (#6708)

* Update French.properties (#6697)

* Update French.properties

* Update French.properties to 4.0.13

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: alexban011 <alexban011@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@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-05-08 21:29:33 +03:00
SomeTroglodyte
4b7edca7a8
Rework of the "Creates improvement on a specific tile" Unique (#6687)
* Make Citadel tile takeover a unique

* CreatesOneImprovement unique overhaul step 1

* CreatesOneImprovement unique overhaul - increase highlights alpha

* Fix missing translatables, again

* CreatesOneImprovement unique overhaul - review suggestions

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-05-08 21:22:01 +03:00
Jack Rainy
d00b72806b
Leftovers from previous PRs (#6725)
* Leftovers from #6698

* Leftovers from #6718

* Better naming
2022-05-08 21:19:55 +03:00
Yair Morgenstern
806d58074c 4.0.13 2022-05-06 10:15:38 +03:00
Yair Morgenstern
621099b315
Version rollout (#6707)
* Bump version and create initial changelog entry

* Update Filipino.properties (#6703)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#6693)

* Update German translation (#6691)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2022-05-06 10:07:20 +03:00
Ouaz
822ce5e041
Update healing values in "Injured Units" article (#6704)
- Based on merged commit "Healing parity" (c8be00b)
2022-05-05 21:07:11 +02:00
letstalkaboutdune
035b6528a7
New Demographics Scoreboard (#6645)
* Healing parity

Adjusted healing values for parity with CV

* New Demographics system for victory screen rankings

Added a new game setup checkbox option to use a ranking system on the victory screen which is more in line with the Civ V Demographics window. Created the UI element and game parameter but the demographics screen still needs to be implemented.

Also removed unnecessary comments from adjustments to healing values in a previous update.

* Demographics table init

Beginning to build structure of Demographics rankings table.

* Update VictoryScreen.kt

Attempt at getting more of the Demographics table implemented

* Update VictoryScreen.kt

Continued building the structure of the Demographics table

* Demographics first implementation

Finished first pass of Demographics screen.

* Minor text formatting

Improved some text formatting in code and comments.

* Update MapUnit.kt

Minor comment cleanup.

* SomeTroglodyte's Feedback, pt. 1

Implemented feedback given by SomeTroglodyte in PR #6645.

* Organized into functions

Split up Rankings table creation and Demographics table creation into new functions

* Update template.properties

Fixed missing space.

* Implementing more PR #6645 feedback

Added needed translation templates, used enum class instead of array for headers, moved checkbox to Options -> Display instead of new game

* Implemented rest of PR #6645 feedback

Simplified logic for finding player's rank, value, best/worst civ value, and filtered out defeated civs from the display and calculations

* Dead Civs get 0 in all categories

Added simple check if a civ is dead when computing score. If they are dead then they get 0 and go to the bottom of the scoreboard.

* Update VictoryScreen.kt

Further cleaned up code for better reuse and simpler logic with fewer loops.

* Update CivilizationInfo.kt

Simplified implementation of return 0 for stats when civ is defeated.

* Update CivilizationInfo.kt

Removed commented-out line of code.

* Fixed duplicate rank bug

Adjusted method of determining best and worst civs so that duplicates don't occur.

* Update VictoryScreen.kt

One-lined the handling of logic in buildDemographicsTable()

* Update VictoryScreen.kt

Moved static header row to new function.
2022-05-05 14:42:35 +02:00
MartinP
342367c72c
Fix typo in new translation line (#6692) 2022-05-05 01:23:22 +03:00
Yair Morgenstern
760aace923 4.0.12 2022-05-04 10:56:17 +03:00
Yair Morgenstern
204d80fbe2
Version rollout (#6689)
* Bump version and create initial changelog entry

* Rework German descriptions for F-Droid (#6688)

* Update French.properties (#6678)

* Update German translation (#6674)

* Update Traditional_Chinese.properties (#6673)

* Update Indonesian.properties (#6663)

* Update Simplified_Chinese.properties (#6660)

* Update Simplified_Chinese.properties

* Fix errors

I wonder who translated 'wonder ' into “奇迹”. I bet he/she used machine translating. Pretty annoying

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

Co-authored-by: yairm210 <yairm210@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: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
2022-05-04 10:48:41 +03:00
SomeTroglodyte
cec9975b4d
Implement fastlane step 2: Translating (#6643)
* Implement fastlane step 2: Translating

* Placing the Font family Label before the Thread is nicer
2022-05-03 09:16:22 +02:00
heipizhu4
0d80929945
Make 'Followers of this religion" translatable (#6662)
First time editing the template. Is this the correct way to do so?
2022-05-03 08:07:41 +03:00
SomeTroglodyte
515c9bbcae
Show available resources from CityScreen (bottom right info only) (#6667) 2022-05-03 07:59:42 +03:00
Xander Lenstra
c55b14eaa7
Implemented most easy things from comments on moddable victory PR (#6600)
* Implemented most easy things from comments on moddable victory PR
Also added religious victory condition

* Fixed tests

* Fixed compile problems & missing string

* Fixed typo
2022-05-03 07:56:24 +03:00
Yair Morgenstern
3eb3324848 4.0.11 2022-05-01 00:23:18 +03:00
Yair Morgenstern
058a3e8211
Version rollout (#6658)
* Bump version and create initial changelog entry

* Update Filipino.properties (#6655)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update French.properties (#6642)

* Update Italian.properties (#6629)

* Update Simplified_Chinese.properties (#6628)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#6626)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update German translation (#6625)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@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: 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>
2022-05-01 00:17:32 +03:00
SomeTroglodyte
52586a2101
Map editor2.2 (#6641)
* Readability overloads for `getComplexRuleset`

* Enable loading maps containing missing ruleset objects with fix and message

* Fix bungled `noMapsAvailable` and follow minor criticism
2022-04-30 23:58:03 +03:00
Yair Morgenstern
3d9a53329e 4.0.10 2022-04-27 09:23:45 +03:00
Yair Morgenstern
0a6bdaa54d
Version rollout (#6624)
* Bump version and create initial changelog entry

* Update translation for Simplified_Chinese (#6616)

* Update Simplified_Chinese.properties

* Fix errors in Simplified_Chinsese translation

Including several accidentally deleted space & add 2 translation

* Update French.properties (#6607)

* Update French.properties

* Fix placeholder

* Update Spanish.properties (#6605)

* Update Italian.properties (#6603)

* Update German translation (#6598)

* Update German translation

* Update German translation

* Update German translation

* Update Filipino.properties (#6595)

* Update Filipino.properties

* Update Filipino.properties

* Translations for the Ukrainian language (#6593)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
2022-04-27 09:19:11 +03:00
SomeTroglodyte
8891883998
Resources UI (#6596)
* More info for Resources in Civilopedia

* Remove duplicates for Resource requirements in Civilopedia

* Resource overview link resource label to Civilopedia

* Resource overview stay if clicking can't notify (resources not existing on map)

* Resource overview display of resources produced by buildings
2022-04-27 09:15:49 +03:00
Xander Lenstra
933e769d8e
Changed milestone build globally text to make it more understandable (#6613)
* Changed milestone build globally text to make it more understandable

* Actually this is probably just as clear, gramatically more correct and
more imperative like the other milestones

* Fixed tests

* Reworded again
2022-04-27 09:15:33 +03:00
SomeTroglodyte
996c58e1fb
Some improvements to Map Editor - step 1 (#6622) 2022-04-27 08:19:04 +03:00
Md. Touhidur Rahman
c23387981a
Fix typo in vanilla (#6621)
https://yairm210.github.io/Unciv/Modders/uniques/
2022-04-26 22:37:14 +03:00
MartinP
00b1feb2c2
Added missing "s" (#6599) 2022-04-25 23:13:01 +03:00
Yair Morgenstern
0792d58434 4.0.9 2022-04-24 23:00:59 +03:00
Yair Morgenstern
6b2629c5b9
Version rollout (#6592)
* Bump version and create initial changelog entry

* Update Turkish.properties (#6591)

* Update French.properties (#6581)

* Translations for Ukrainian language (#6580)

* Translations for Ukrainian language

* Revert of accidental renaming of the placeholder

* Additional translations

* More additional translations

* Simplified_Chinese translation update  (#6578)

* translation update 4.0.8 part1

* Simplified_Chinsese translation 4.0.8 part2

* Update Simplified_Chinese.properties

Fix errors

* Update Spanish.properties (#6574)

* Update German translation (#6573)

* Update Filipino.properties (#6572)

* Update Italian.properties (#6571)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: BerAfk <98158661+BerAfk@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-04-24 22:54:47 +03:00
Xander Lenstra
34105efdda
Moddable victories (#6161)
* Added a moddable (but not yet functional) file for victories

* Spaceship parts are units now

* Fixed tests

* Added milestone objects

* Made 'our status' table in VictoryScreen dependend on file

* Updated VictoryManager to use the new Milestone system

* Fixed bug where in vanilla too many spaceship parts could beb uild

* Whoops

* Updated global victory table to use the jsons

* Updated the new game screen to show the new victory types
Also started with the deprecation of VictorType

* Did some translation stuff, also finally fixed the tests

* Removed VictoryType and reworked AI to use Milestones instead

* Add some checks for the victory file; tested that custom victories work
Also moves some code to a better spot and fixes compilation errors

* Fixed some things I thought about while falling asleep
Most notably: built -> build; fixed spaceship part construction 
priority; removed more code for the old system

* Fixed translation issues on the victory screen
2022-04-24 22:45:38 +03:00
Xander Lenstra
382707a6a5
Fixed a problem with the ordering of the vanilla policies (#6582) 2022-04-24 22:44:41 +03:00
Yair Morgenstern
e1363d92f9 4.0.8 2022-04-19 15:32:45 +03:00
Yair Morgenstern
88e9d9c618
Version rollout (#6570)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#6568)

* Update French.properties (#6567)

* Update Italian.properties (#6566)

* Update Filipino.properties (#6562)

* Update German translation (#6561)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@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: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2022-04-19 15:27:17 +03:00
Yair Morgenstern
1069b0933e
Added "Vegetation" unique so that vegetation spawn is not limited to just jungle and forest (#6569) 2022-04-19 15:25:33 +03:00
SomeTroglodyte
9e3df8605e
Request for take-over: Rewritten Map Editor (#5694)
* New Map editor - attempts 1

* New Map editor - attempts 2

* New Map editor - attempts 3

* New Map editor - attempts 4

* New Map editor - attempts 5

* New Map editor - attempts 6

* New Map editor - attempts 7

* New Map editor - attempts 8

* New Map editor - attempts 9

* New Map editor - attempts 10

* New Map editor - merge

* Revert included Stat icons in favour of #f90b22a

* Adapt to renamed TileGroup methods

* Manual merge of some baseruleset code for the map loader only

* Kludge for disappeared `getBaseRuleset`

* Fix after-merge conflicts, run convertTerrains in stepwise map generation

* Fix merge error

* Adapt to latest merge

* Baseruleset control - unpolished draft + max zoom out

* MapEditorV2 - merge fixes, base ruleset and mod control, texture loader fix, pedia links, translation, load mod maps, continent visualization, minor improvements and fixes

* MapEditorV2 - removed old editor
2022-04-19 13:17:44 +03:00
Xander Lenstra
a92057eed5
Made 'go to on map' translatable & fixed crash (#6565) 2022-04-18 11:48:03 +03:00
Yair Morgenstern
06569e6c5f Clearer "owned" resource 2022-04-17 14:18:16 +03:00
Yair Morgenstern
0f70d8360d 4.0.7 2022-04-17 13:45:59 +03:00
Yair Morgenstern
dedd19cff8
Version rollout (#6557)
* Bump version and create initial changelog entry

* Update Spanish.properties (#6550)

* Update Spanish.properties

* Update Spanish.properties

Maybe I have left some grammar mistakes. I have to go, hopefully I'll fix them before the update.

* fix typos

* Update Simplified_Chinese translation (#6545)

* 4.0.6 translation 1

* 4.0.6 translation 2

* Update Simplified_Chinese.properties

* Update Filipino.properties (#6539)

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
2022-04-17 13:41:22 +03:00
Xander Lenstra
7ced78f6a2
Fixed vanilla policies regression (#6552)
* Fixed the vanilla piety tree

* Fixed more regression errors

* Removed unique
2022-04-16 23:04:28 +03:00
Yair Morgenstern
8a32be0ca2 4.0.6 2022-04-13 18:53:46 +03:00
Yair Morgenstern
9d0c4c117c
Version rollout (#6538)
* Bump version and create initial changelog entry

* Update Italian.properties (#6535)

* Update Filipino.properties (#6532)

* Update Filipino.properties

* Update Filipino.properties

* Update Simplified_Chinese.properties (#6529)

* Update Simplified_Chinese.properties

v4.0.5 translation 1

* 4.0.5 Simpified_Chinese translation 2

4.0.5 Simpified_Chinese translation 2

* Update French.properties (#6524)

* Update Polish.properties (#6523)

* Update Spanish.properties (#6517)

Several rewordings, fixes and homogeneization of terms.

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Derdotox <103372983+Derdotox@users.noreply.github.com>
Co-authored-by: Phoenix7g <102632435+Phoenix7g@users.noreply.github.com>
2022-04-13 18:48:10 +03:00
Yair Morgenstern
9fa3d8de2f 4.0.5 2022-04-09 22:41:12 +03:00
Yair Morgenstern
5447f01f1d
Version rollout (#6514)
* Bump version and create initial changelog entry

* Update Spanish.properties (#6505)

* Update French.properties (#6503)

* Update German translation (#6501)

Co-authored-by: yairm210 <yairm210@users.noreply.github.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: MartinP <77325495+Mape6@users.noreply.github.com>
2022-04-09 22:37:23 +03:00
SomeTroglodyte
fe82f773da
Make Icons clickable in religions per city display (#6497)
* Make Icons clickable in religions per city display

* Add tutorial mention of the religious icon click feature

* Fix merge import mistakes
2022-04-09 22:18:19 +03:00
Yair Morgenstern
b728748cfa 4.0.4 2022-04-06 23:43:29 +03:00
Yair Morgenstern
4080718cc3
Version rollout (#6498)
* Bump version and create initial changelog entry

* Update Filipino.properties (#6496)

* Update Filipino.properties

Added a few

* Update Filipino.properties

* Update Filipino.properties

fixed errors

* Update Simplified_Chinese.properties (#6494)

4.0.3 translation 1

* Update Dutch.properties (#6489)

Added some missing translations
Changed the translations of Mercantile and Cultured as those translations did not fit in the context

* Update Indonesian.properties (#6487)

* Update French.properties (#6482)

* Update Russian.properties (#6480)

* Update Russian.properties

* Update Russian.properties

* Update Italian.properties (#6477)

* Update German translation (#6476)

* Update Spanish.properties (#6475)

General grammar improvement and some rewordings.

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: SrirachaGamer87 <58479947+SrirachaGamer87@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@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: Phoenix7g <102632435+Phoenix7g@users.noreply.github.com>
2022-04-06 23:25:24 +03:00
Ouaz
b65d30a8ae
Update template.properties (#6484)
* Update template.properties

- Fix untranslatable entry "Revoke protection for" (see comment in #6131)

* Fix capitalization for "protection"
2022-04-06 23:20:02 +03:00
SomeTroglodyte
83327dabe8
Fix Goddess of Protection - maybe (#6493)
* Fix Goddess of Protection - maybe

* Improve TextSimilarity for case-only differences
2022-04-06 20:24:35 +03:00
Yair Morgenstern
73b6ee9af0 4.0.3 2022-03-31 23:17:09 +03:00
SomeTroglodyte
357800a80e
Missing translations cleanup (#6452) 2022-03-31 23:14:35 +03:00
Yair Morgenstern
443a15dd9b
Version rollout (#6473)
* Bump version and create initial changelog entry

* Update Finnish.properties (#6472)

* Update Indonesian.properties (#6462)

* Update Spanish.properties (#6461)

Some unpleasing grammar mistakes fixed.

* Update French.properties (#6459)

* Update Spanish.properties (#6457)

* Update German translation (#6450)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Tom K <tom.kostiainen@andritz.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Phoenix7g <102632435+Phoenix7g@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2022-03-31 23:14:04 +03:00
Xander Lenstra
72b4d2069e
Typed denmarks unique and generalized it (#6463)
* Typed denmarks unique and generalized it

* Added support for deprecated unique
2022-03-31 23:05:37 +03:00
Yair Morgenstern
6315a16d98 Changed server connection to URL-based to allow connection to uncivserver.xyz 2022-03-31 23:03:14 +03:00
Yair Morgenstern
5ab44dd945 4.0.2 2022-03-28 22:03:23 +03:00
Yair Morgenstern
69603bc528 4.0.2 2022-03-28 17:55:36 +03:00
Yair Morgenstern
7abb982657
Version rollout (#6449)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#6444)

4.0.1 translation 1

* Update Spanish.properties (#6431)

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

* Update Filipino.properties (#6429)

* Update Japanese.properties (#6422)

* Update Russian.properties (#6432)

* Update Russian.properties

* Update Russian.properties

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

* Update French.properties (#6440)

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

* Update Indonesian.properties (#6436)

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

* Update Simplified_Chinese.properties (#6428)

* Simplified_Chinese.properties

* Update Simplified_Chinese.properties

4.0.1 translation 1

* Remove `# Requires translation!`.

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

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: IDontHaveANam3 <92687952+IDontHaveANam3@users.noreply.github.com>
Co-authored-by: kobon2015 <63530082+kobon2015@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Tang <1024830255@qq.com>
2022-03-28 17:50:28 +03:00
Xander Lenstra
8820ae6dad
Generalized a few nation uniques (#6443)
* Generalized a few nation uniques

* Fixed a bug and made random less random

* Implemented requested changes
2022-03-28 17:33:31 +03:00
SomeTroglodyte
7526114281
Empire overview resources (#6442)
* Empire Overview Resources: Vertical option

* Empire Overview Resources: Extra Info

* Empire Overview Resources: Tweaks

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-28 17:31:19 +03:00
SomeTroglodyte
870659d142
Translation writer conditionals (#6433)
* TranslationFileWriter processes Conditionals

* TranslationFileWriter processes Conditionals - wiki and reprocessed language files
2022-03-28 17:30:16 +03:00
Yair Morgenstern
2ef8581b52 4.0.1 2022-03-25 17:48:12 +03:00
Yair Morgenstern
926d3bcf4c
Version rollout (#6426)
* Bump version and create initial changelog entry

* Update Japanese.properties (#6417)

* Update Japanese.properties (#6410)

* Update Filipino.properties (#6409)

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: kobon2015 <63530082+kobon2015@users.noreply.github.com>
Co-authored-by: IDontHaveANam3 <92687952+IDontHaveANam3@users.noreply.github.com>
2022-03-25 17:45:31 +03:00
청하늘
84561e7ad4
Add Moddable Policy Priorities (#6390)
* Fixed G&K policy eras

Patronage should be Medieval and Freedom should be Industrial in G&K

* Added 'priorities' object to policy branch entries

* Fixed Vanilla policy eras

Also set testing priorities in advance

* Partial code formatting

* Reworked how the AI chooses a policy to newly adopt

* Removed debugging codes

* Update Civilization-related-JSON-files.md

Added Branch priorities

* Assigned actual priorities to each branch

Also fixed a debugging value in Ruleset.kt (-1 -> 0)
2022-03-25 17:33:42 +03:00
SomeTroglodyte
0b50715fb3
Improve TranslationFileWriter (less hardcoding, fixes PolicyBranch) (#6421)
* Allow TranslationFileWriter to follow several superclass levels (fixes PolicyBranch names)

* Bring German and template up to par as baseline

* Framework to feed TranslationFileWriter from UniqueParameterType, also fixes Fountain of Youth

* TranslationFileWriter legacy guessing now _much_ simpler

* Fix "chance to be destroyed by nukes" case

* Fix tests (allTranslationsHaveCorrectPlaceholders goes cross-language)
2022-03-25 17:27:25 +03:00
Yair Morgenstern
5fa10348b5 4.0.0 2022-03-21 21:29:55 +02:00
Yair Morgenstern
7a337dea4d
Version rollout (#6399)
* Bump version and create initial changelog entry

* Update Indonesian.properties (#6386)

* Update French.properties (#6371)

* Update Italian.properties (#6370)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@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-03-21 21:18:37 +02:00
Tang
c1737b6183
Custom desktop font (#6377)
* Custom desktop font

* Add `getDesktopAllFonts` to setting custom desktop font.

* Custom font.
`desktopFontFamily` change to `fontFamily`.
Add GameSettings.getSettingsForPlatformLaunchers().

* Add `Custom font` setting UI.

* Add `Custom font` on Android.

* `Default Font` use translations.

* format

* remove open fun.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-21 21:12:16 +02:00
SomeTroglodyte
cf21ade76e
Moddable Ice generation (any impassable feature on Water possible) (#6329)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-21 21:08:25 +02:00
Xander Lenstra
367a427436
Unified two uniques into one more descriptive unique (#6380)
* Unified two uniques into one more descriptive unique

* Fixed fallout generation & typo
2022-03-21 21:05:54 +02:00
Xander Lenstra
984c4d9b2d
Unified & generalized a few uniques (#6379)
* Generalized trade route percent bonuses

* Unified two uniques using populationFilter; deprecated a deprecated uniq

* Made some renamings to improve clarity & fixed tests

* Fixed tests again

* Fixed typo
2022-03-21 21:05:20 +02:00
Yair Morgenstern
2b1251258c
Unciv server (#6384)
* Background implementation for Unciv server with ktor.

Server ip in settings, able to copy your own ip and copy ip from clipboard for easy sharing, created stub for the client-server data transfer. No actual data storage or server implementation.

* Unciv server round 2 - implementing crud for files and it works!
metadata seems to only be in use for mutex, which is currently unused
That's all for today

* When starting a new multiplayer game the files are correctly saved in the server, and the server can return the files, but the function in the game to retrieve the game info is non-blocking so it doesn't work. Still, progress!

* Changed the Gdx http to basic Java http, as used for Dropbox, and now everything works!!!!

* Documentation for running and using the server

* Better texts, translations, etc

* Trog is right this should be a PUT not POST
2022-03-21 21:05:02 +02:00
Xander Lenstra
1df49749f2
Split 6 tiles visible unique into its parts, making it more moddable (#6389)
* Split sight unique into its parts, making it more moddable

* Standardized unique ordering
2022-03-21 21:03:33 +02:00
Yair Morgenstern
4b55882019 3.19.18 2022-03-17 23:37:33 +02:00
Yair Morgenstern
635d588711 More untranslated items fixed - #6131 2022-03-17 23:34:39 +02:00
Yair Morgenstern
bf0a44413f
Version rollout (#6365)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#6359)

* Update Filipino.properties (#6358)

* Update Spanish.properties (#6356)

* Update French.properties (#6352)

* Update Indonesian.properties (#6351)

* Update Italian.properties (#6350)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: SOULTAKER1011 <90161631+SOULTAKER1011@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-03-17 22:52:03 +02:00
Yair Morgenstern
f66930ed68 3.19.17 2022-03-13 22:57:55 +02:00
Yair Morgenstern
b8ef6725eb
Version rollout (#6349)
* Commit from GitHub Actions (UncivBot)

* Update Spanish.properties (#6348)

* Update Simplified_Chinese.properties (#6338)

translation2

* Update French.properties (#6336)

* Update Italian.properties (#6334)

* Update Simplified_Chinese.properties (#6331)

3.19.16 translation1

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@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-03-13 22:53:45 +02:00
Yair Morgenstern
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
SomeTroglodyte
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
Yair Morgenstern
f73916ac3b 3.19.16 2022-03-10 19:52:29 +02:00
ArchDuque-Pancake
3ea8e8bd60
Update Spanish.properties (#6308)
* Update Spanish.properties

* Update Spanish.properties
2022-03-10 19:49:16 +02:00
Yair Morgenstern
dbca233a45
Version rollout (#6326)
* Commit from GitHub Actions (UncivBot)

* Update Brazillian_Portuguese.properties (#6325)

* Tradução mais avançada para português

* Update Brazilian_Portuguese.properties

* Add files via upload

* Update Indonesian.properties (#6324)

* Update French.properties (#6322)

* Update Czech.properties (#6321)

* Update German translation (#6311)

* Update Spanish.properties (#6307)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: RivolviOcelot <73536178+Lufims@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
2022-03-10 19:48:53 +02:00
SomeTroglodyte
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