Commit Graph

6678 Commits

Author SHA1 Message Date
will-ca
fbd6d36ad3
Move wiki pages into repository, fix dozens of broken links. (#5854)
* Updated Mods (markdown)

* Updated Scenarios (markdown)

* Updated Mods (markdown)

* Added itch.io release

* Updated Mods (markdown)

* Updated Mods (markdown)

* Updated Mods (markdown)

* Updated Mods (markdown)

* Updated Mods (markdown)

* Updated Project structure and major classes (markdown)

* Updated Mods (markdown)

* Created Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Added link to Uniques

* Updated Uniques (markdown)

* Added 'triggers victory' unique

* Updated Making a new Civilization (markdown)

* Created Building locally without Android Studio (markdown)

* Updated Translating (markdown)

* Updated Uniques (markdown)

* Updated Mods (markdown)

* Updated Mods (markdown)

* Updated Mods (markdown)

* Updated Uniques (markdown)

* Added improvement uniques

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Mods (markdown)

* Updated Mods (markdown)

* Updated Mods (markdown)

* Updated Mods (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* I thought a tutorial on how to create a custom tileset in the first place could not hurt

* Moved the sentence to the "Creating a custom tileset" page

* Updated Making a new Civilization (markdown)

* Updated Mods Making a new Civilization (markdown)

* Updated Mods Making a new Civilization (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Destroyed Scenarios (markdown)

* Updated Uniques (markdown)

* Changed Travis documentation to Github actions documentation

* Updated Translating (markdown)

* Updated Translating (markdown)

* Updated From code to deployment (markdown)

* Removed "working on templated rule variants" because we currently don't

* Updated Uniques (markdown)

* Updated uniques based on everything done during the policy update

* Misplaced a unique

* Updated Making a new Civilization (markdown)

* Updated Making a new Civilization (markdown)

* Updated Translating (markdown)

* Updated Uniques (markdown)

* Removed [pending] messages for PR's that were no longer pending

* Added uniques from telecommuncations/advanced balistics

* Added all the uniques from my PR's (telecommunicatoins -- shrines); added uniques I deprecated at some point

* Updated Uniques (markdown)

* Added missing deprecated unique

* Added uniques changed in #4292

* Updated Uniques (markdown)

* Added uniques from #4311 and #4301

* Added uniques from #4331

* Added Discord webhook message

* Created page with basic information

* Typo

* Made information not incorrect

* Added units.json

* Manual new lines was a terrible idea

* Updated JSON files for mods (markdown)

* Added link to JSON files for mods explanation

* Added eras.json

* capitalization

* Added a header

* Improved example

* Added Buildings.json

* hmmm

* Doesn't work, sad

* Added information on Specialists.json

* Updated JSON files for mods (markdown)

* Added uniques from #4372

* Updated Uniques (markdown)

* Updated uniques after #4393

* Updated uniques after #4423

* Add new and deprecated uniques of #4487, #4459

* add wonder images

* Fixed mod directory

* Updated Uniques (markdown)

* Updated uniques after #4530, #4505, #4419

* Reworked the passages on tileFilter, terrainFilter and improvementFilter from code inspection

* Added a more indept guide on how to install UnCiv on macOS

* Updated Uniques (markdown)

* Created Credits.md (markdown)

* Destroyed Credits.md (markdown)

* Added installing from source method

* Improve Sound chapter, added Civilopedia text chapter

* Added after #4619

* Added unitTypes.json

* Added beliefs.json

* Updated Translating (markdown)

* Added eras:unitBaseBuyCost

* Added after #4568

* Added ruins.json

* Added after #4771

* Added rudimentary Difficulties.json doc

* Added ruin-specfic uniques explanation

* Added TOC and Nations

* Detailed Techs chapter

* Fix 1 line - tech uniques

* Added Quests.json

* Added ModOptions

* Added ModOptions

* Added UnitPromotions, structured TOC

* Added Policies

* Added crosslinks

* Fixed broken links

* Added TileResources

* Added more crosslinks

* Small fix resource tile graphix aren't toggle-able

* Added TileImprovements

* Added Terrains

* Updated JSON files for mods (markdown)

* Updated Getting Started (markdown)

* Updated Getting Started (markdown)

* Updated Getting Started (markdown)

* Updated JSON files for mods (markdown)

* Updated Translating (markdown)

* Created Civilization-related JSON files (markdown)

* Created Map-related JSON files (markdown)

* Double title

* Double title

* Created Unit-related JSON files (markdown)

* Moved sounds

* Updated Unit related JSON files (markdown)

* Moved Stats

* Created Miscellaneous JSON files (markdown)

* Removed content that has been moved to separate pages, update TOC

* Created _Sidebar (markdown)

* Updated Uniques (markdown)

* test

* Fixed broken links. Apparently the way 'preview' links to pages differs from how it links when you view them on a saved page for some reason

* Updated Uniques (markdown)

* Fix relative `..` link suddenly leaving the wiki

* Updated Miscellaneous JSON files (markdown)

* Fix relative links

* Fix era links to Units.json

* Updated Uniques (markdown)

* Updated From code to deployment (markdown)

* Added uniques & cityFilters up to #4995

* Mass deprecation as per 422607

* Fixed broken link to redirect to Unit Uniques in Wiki

* Fixed broken link to redirect to Unit Uniques in Wiki table

* Updated Uniques (markdown)

* Updated Getting Started (markdown)

* Updated Uniques (markdown)

* Added uniques & filters up to #5094

* Removed a deprecated unique

* Moved some uniques to better sections, removed an outdated unique

* fixed a typo

* Updated Uniques (markdown)

* eras.json is now required

* Removed outdated religion section

* Added missing terrain uniques

* Added resource uniques

* Fixed resource unique link

* Added missing unique for tile improvements

* Fixed broken link

* "Disappearing" translations explained

* Updated Home (markdown)

* Some atlas info, leader portraits

* Created Force rating calculation (markdown)

* "Not yet" for Image atlas distribution in mods

* Updated uniques after #5259

* Added information on conditionals

* Updated growth unique

* Added conditional support up to #5270

* Typo

* Escape html tags

* Add conditionals to table of contents

* Updated _Sidebar (markdown)

* Created Audiovisual Mods (markdown)

* Audiovisual Mods, move Graphics-only info

* Updated Audiovisual Mods (markdown)

* Audiovisual Mods - Draft done.

* Documented translation method

* Updated Translations, mods, and modding freedom in Open Source (markdown)

* Fix Typos and Links

* New Terrain uniques / 2 sections

* Atlas control via multiple Images.x folders is now live

* Link to atlas paragraph

* startBias clarification

* Missing bracket

* Added uniques & conditionals up to #5345 (my PR's only)

* Updated Force rating calculation (markdown)

* Updated Getting Started (markdown => asciidoc)

* Undid renaming

* Updated Getting Started (asciidoc => markdown)

* Added fix for Gradle sync fail

* Updated Project structure and major classes (markdown)

* Bump Java version from JDK 8 to JDK 11 due to gradle upgrade

* Updated uniques & conditionals up to #5618 from my PR's

* Created Regions (markdown)

* Updated Uniques (markdown)

* Updated Uniques (markdown)

* Mention docs/uniques.md, emphasized Stat capitalization

* Move wiki files into `/docs/wiki`.

* Migrate inter-Markdown links.

* Fix pre-existing broken links and anchors.

* Standardize repository links for AS linting.

* Add wiki footer.

* Updated Uniques (markdown)

* Updated Mods Making a new Civilization (markdown)

* Updated Making a new Civilization (markdown)

* Add GH Action for updating wiki.

* Play it safer, and don't `push -f`. (Should be the same either way though.)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: GGGuenni <leonard@eynck.de>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Arthur van der Staaij <32672293+avdstaaij@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: jvy1001 <76390095+jvy1001@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: NxOne14 <81563289+NxOne14@users.noreply.github.com>
Co-authored-by: MenaKing2020 <92416577+MenaKing2020@users.noreply.github.com>
Co-authored-by: asda488 <39116917+asda488@users.noreply.github.com>
2022-01-23 21:49:43 +02:00
will-ca
5c7832acf4
Clear mod action Table when deleting mods; Avoid crashy nulls. (#6026) 2022-01-23 21:43:40 +02:00
will-ca
f285abaa26
Fix uneven fonts, unify font sizes. (#6014)
* Fix uneven font sizes.

* Unify standard uses of font size parameter.
2022-01-23 17:14:27 +00:00
Yair Morgenstern
822f0603fb
Start bias includes neighboring tiles for better effect (#6019)
This also means we don't need a special coastal check, since it's caught by the regular check
IIRC there are nations in Original Civ that have 'mountain' start bias - if so this will also enable that :)
2022-01-23 17:09:52 +00:00
will-ca
8461032a52
Try to fix a potentially miscapitalized/broken policy cost unique. (#6016)
* Try to fix a potentially miscapitalized/broken policy cost unique.

* Deprecate old capitalization.
2022-01-23 18:08:59 +01:00
will-ca
da748a96f9
Miscellaneous linting, Unique typifying, refactoring, bugfix/consistency to avoid broken links to disabled religious UBs. (#6012)
* Remove unused Constants.

* Remove outdated comments.

* Typified "Will not be displayed in Civilopedia" Unique.

* Fix pre-existing inconsistency that would display religious UBs with broken links in the Civilopedia when religion was disabled.

* Use Sequences, and fewer function params, in Nations' Civilopedia texts.

* Accidentally hid a Unique that should be visible.

* Oops… Missed a negation.

* Unhide limitations on Religious Ruin rewards— But I'm not sure they'll be displayed anywhere even so.
2022-01-23 18:08:26 +01:00
Yair Morgenstern
2b7e279b4d 2-digit numbers no longer clip with the outwards circle.
This is really minor.
2022-01-23 19:07:08 +02:00
Yair Morgenstern
f7b99541a1 Tech order is displayed in a much nicer, more standardized, and overall much more professional way.
This is one of the small things that's been bugging me for a while
2022-01-23 19:04:23 +02:00
Xander Lenstra
6a8f88f202
Added a few more unit tests for global uniques (#6018) 2022-01-23 06:18:15 -08:00
Yair Morgenstern
f9c05997dd
Typified some building uniques (#6017)
* Typified some building uniques
I noticed that the code allows "[stats] from every [buildingFilter]" but the UniqueType was limited to "[stats] from every [buildingName]", so now that that's available we don't actually need the "[stats] from every Wonder" unique :)

* buildings-only unique moved to buildings section
2022-01-23 06:03:50 -08:00
will-ca
fe67dfa1c4
Make "Help" button clearer and translatable, random nation indicators and labels translatable. (#6013)
* Make unknown nation placeholder translatable.

* Make MultiplayerScreen help button clearer and translatable.

* Use `Constants.spectator` more.

* Make random/unknown nation icon translatable.
2022-01-23 09:39:28 +01:00
Yair Morgenstern
7e4a2944c3 3.19.0 2022-01-22 21:58:23 +02:00
Yair Morgenstern
f4bfcbab7c
Translations update (#6011)
* Update French.properties (#6006)

* Update French.properties

* Update French.properties

* Update Indonesian.properties (#6002)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Newexae <96820363+Newexae@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
2022-01-22 20:44:19 +02:00
Yair Morgenstern
7e59e28f1c
Added button to update an installed mod from its action menu (#6005)
Much easier and more intuitive than clicking on it, then on the equivalent online mod, then 'download'
2022-01-22 20:35:19 +02:00
Yair Morgenstern
bebc2c7e21
Converted all stat percent uniques to be iterated on efficiently once! (#6004)
This also makes a specific unique which was previously 'nation-only' to be applicable generally
2022-01-22 20:34:05 +02:00
Yair Morgenstern
080fc245d8
Removed ALL hardcoded decisions in worker AI - we're now fully moddable! (#6003)
I tested this out with RekMOD, 150 simulated turns, to see if this was working.
Not only did I discover that workers were squatting on Antiquity Sites since they had resource improvements that they couldn't build, I also discovered something much worse.
Even after fixing that, most cities were woefully underimproved.
Turns out, the construction automation would limit worker construction to a measly *3 workers* even for a *10 city* civ!
After removing this limitation and making civs aim for a 1:1 ratio between cities and workers, everything started looking much, much better.
I'm not sure what the exact effect on the AI will be but I'm _sure_ that this leads to a major improvement. More improved tiles means more stats means more everything.
2022-01-22 16:47:39 +00:00
Xander Lenstra
feb9b19d11
Removed a probably unnecessary check in unit.mayPassThrough() (#6008) 2022-01-22 08:32:55 -08:00
Xander Lenstra
f4716689a3
Fixed a conversion error in "% city strength from defensive buildings" unique (#6007) 2022-01-22 18:22:35 +02:00
yairm210
06c8eca43c More simplification and readability through naming 2022-01-19 19:47:04 +02:00
yairm210
30b7e0f343 Separated data download and data handling for more readable download flow and less indentation 2022-01-19 19:33:12 +02:00
yairm210
7ea5a12079 Deprecation text, label and cell were never actually in use. 2022-01-19 19:21:46 +02:00
yairm210
ab0ff2e33e Made some of this stuff more readable
I came to the mod management screen to add a functionality to download the latest version of an installed mod by adding a 'download latest version' button to its action menu.
I did not expect the code to be this intractable. I've been reading and writing Kotlin daily for the past 5 years now, and even I struggle to understand what's going on here.
(also instead of adding button and counting duplicate entries just to remove them from both UI and count, just - don't add them to begin with)
2022-01-19 19:20:34 +02:00
yairm210
682d65f02e 3.18.19 2022-01-19 14:47:43 +02:00
yairm210
871dcfaf7d Deprecated old uniques 2022-01-19 14:42:09 +02:00
Yair Morgenstern
a82d330c02
Translations update (#6001)
* Update Simplified_Chinese.properties (#5997)

* Update Italian.properties (#5990)

* Update Simplified_Chinese.properties (#6000)

* Update Simplified_Chinese.properties

* Create Simplified_Chinese.properties

* update bad translate

Co-authored-by: wwwxxxzzz666 <2273204577@qq.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: ThebestkillerTBK <62250232+ThebestkillerTBK@users.noreply.github.com>
2022-01-19 14:41:40 +02:00
Yair Morgenstern
8df762a2dd
Iterate once through all uniques to find those relevant to sat percent bonuses, instead of per-type (#5999)
The same change we made in the move to getStatsFromUniquesBySource()
This should be faster, more generic, more accurate (buildings vs wonders), and catch all usecases (i.e. stat bonuses from uniques attached to *techs* or who knows what else
2022-01-19 14:16:51 +02:00
Yair Morgenstern
0279adadb9
Worker AI for mods, step 2 (#5998)
* Worker AI for mods, step 2

Support for removing terrain features, both when we need to get rid of them for a resource, and when they plain reduce the yield of a tile

Note that the "Remove <improvement>" was implemented WAY before templating and uniques were a thing - the correct solution in these enlightened times would be to separate the improvement *name* from the *effect*, so we could have e.g. a "Deforestation" improvement which would contain botth ["Removes [Jungle]", "Removes [Forest]"] or whatnot.

For now I Constant'D the "Remove " so we can at least follow where it's used.

* Reverted some of the auto-formatting so the PR is cleaner

* Caught 'nullify yields' unique for terrain removal
2022-01-19 14:16:33 +02:00
will-ca
19927d89ba
Use .toTextButton() in more places. (#5994)
* Use toTextButton for WorldScreenTopbar "Overview".

* Use toTextButton for AddMultiplayerGameScreen "Paste gameID from clipboard".

* Use toTextButton in MultiplayerScreen.

* Use toTextButton for CityOverviewTable city.name.
2022-01-19 14:16:21 +02:00
will-ca
b0ffae0da0
Refactor and unify some buttons that have a label next to an icon. (#5992)
* Take Actor instead of image String for String.toButton icon.

* Remove superfluous Group size wrapper.

* Builder-style configuration for string icon buttons.

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

* Unify unit action string icon button.

* Unify TabbedPager string icon buttons.

* Unify EmpireOverviewScreen string icon buttons.

* Unify CivilopediaScreen string icon buttons.

* Unify GreaterPersonPickerScreen string icon buttons.

* Unify PromotionPickerScreen string icon buttons.

* Unify ImprovementPickerScreen string icon buttons.

* Unify DiplomaticVotePickerScreen string icon buttons.

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

* Unify UnitOverviewTable string icon buttons.

* Turn IconTextButton into a class.

* Separate icon parameters.

* Remove outdated arg and comment.

* Remove obsolete generic.
2022-01-19 14:16:08 +02:00
Yair Morgenstern
8846c158fb
Resolved #5988 - Allow modded improvements (#5989)
Current worker automation assumes A LOT about the current ruleset.
This is only step 1, which allows skipping irrelevant improvements to reach actually useful improvements.
Comments welcome.
2022-01-18 01:58:43 +00:00
will-ca
e477e4917a
Missing template.properties fields for AddMultiplayerGameScreen. (#5993) 2022-01-17 22:23:56 +02:00
yairm210
b4214baf1f Smaller stars on the promotions, so they don't 'leak' outside the promotion image 2022-01-16 22:07:44 +02:00
yairm210
e074ed7546 Added civ icon to Battle Table when attacking cities 2022-01-16 21:09:43 +02:00
yairm210
21fbaf4814 3.18.18 2022-01-16 19:51:33 +02:00
Yair Morgenstern
838b797699
Translations update (#5986)
* Update English.properties. (Remove no-op translations.) (#5977)

* Update Spanish.properties (#5970)

* Update Italian.properties (#5966)

* I made some changes to the simplified Chinese translation file.  (#5987)

* Minor polishing up for accuracy and some translation

* Additional translation

* Update Simplified_Chinese.properties

Co-authored-by: will-ca <willchencontact@gmail.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: unciv-translation <97832928+unciv-translation@users.noreply.github.com>
2022-01-16 19:50:07 +02:00
yairm210
dd90b2bacc NewGameScreen threading normalized.
The NewGameScreen was written by a past version of myself that had no idea how to handle threading, and thus was extremely strange. Checking an object _on render_ and if it's set then activate? Totally clueless.
2022-01-16 19:10:30 +02:00
will-ca
9b121a478a
Clean up refactored pixel unit resolving. (#5979) 2022-01-16 18:43:49 +02:00
will-ca
f68c41e369
Explain when cities can't be razed. (#5976)
* Explain when cities can't be razed.

* Light refactoring and reword.

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

* Change to not count civilian attacks

Co-authored-by: temurakami <spellman23@gmail.com>
2022-01-15 22:43:11 +02:00
yairm210
a2f5941927 chore - Minor improvements to science and culture tutorial capitalization 2022-01-15 22:09:33 +02:00
Xander Lenstra
2986052397
Typed all tech uniques (#5967) 2022-01-14 17:44:53 +00:00
yairm210
8311e65120 Victory types capitalized 2022-01-14 12:21:53 +02:00
yairm210
e7042d24ea City state permutations normalized to "City-State"
#5963
2022-01-14 12:16:16 +02:00
yairm210
4dcb45408d Unique deprecation 2022-01-14 11:00:38 +02:00