Commit Graph

543 Commits

Author SHA1 Message Date
SomeTroglodyte
4290373cf1
Move UncivServer to own module (and jar) (#6468)
* Move UncivServer to own module (and jar)

* UncivServer isalive logged

* Separate UncivServer - some wiki hints

* Separate UncivServer - how to build UncivServer.jar

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-05-08 21:22:43 +03:00
Jack Rainy
569b51cb27
Missing uniques are added (#6721) 2022-05-08 11:23:55 +02: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
MartinP
e279e14fe8
Update Hosting-a-Multiplayer-server.md (#6676)
* Update Hosting-a-Multiplayer-server.md

Added a section for explaining that Android does not like unencrypted traffic to a self-hosted server and that you need to setup a reverse proxy to do that.

* Added hint for MultiplayerFiles folder
2022-05-03 07:52:59 +03:00
Jack Rainy
a938fffb99
Fix of the broken link in the uniques.md (once again) (#6665)
* Fix of misprint (once again)

* Usage of CRLF endings
2022-05-03 07:52:20 +03:00
SomeTroglodyte
f668f65bb3
Update From-code-to-deployment.md (#6638)
Better link for the F-Droid Monitor and a hint what to expect
2022-05-01 00:12:42 +03:00
Yair Morgenstern
940306432f Added new page with map rendering documentation 2022-04-30 23:50:15 +03:00
Yair Morgenstern
3d9a53329e 4.0.10 2022-04-27 09:23:45 +03:00
itanasi
cf761f4a2c
Update to note you need Android 11.0 SDK Platform (#6611)
* Update to note you need Android 11.0 SDK Platform

* Also mention which version of Gradle we're on
2022-04-27 08:19:31 +03:00
Jack Rainy
4ad9d69424
Fix of misprint (#6620) 2022-04-26 22:37:40 +03:00
Xander Lenstra
c985782113
Updated documentation to contain information on victory types (#6615) 2022-04-26 12:31:11 +03:00
Yair Morgenstern
0792d58434 4.0.9 2022-04-24 23:00:59 +03:00
SomeTroglodyte
23c23e5566
Unique docs writer makeover (#6516)
* Comments to 'link' implementation (matchFilter) to UniqueParameterType

* Comments to 'link' UniqueParameterType to implementation (matchFilter)

* Fix two mistakes in UniqueParameterType

* Make "and" filter logic for MapUnit and BaseUnit modular, fix mistake

* Make UnitMovementMemory immutable and without lateinit

* Keep UniqueType comment promise that instances can override parameter types

* Reorg UniqueDocsWriter so UniqueParameterType-specific text is moved to the enum

Also some minor improvements - e.g. abbreviations sorted & consistent punctuation, less memory allocations, a/b/c type params get an example,...

* New abilities for UniqueDocsWriter concerning UniqueTarget and inheritsFrom (initially deactivated)

* Actually implement the wish for distinction between absolute and relative amounts

* Change UniqueParameterType.UnitName.docExample to Xander's choice
2022-04-24 22:47:19 +03:00
Xander Lenstra
0a5fc3cf33
Fixed the internal name & parameter of a unique (#6577) 2022-04-20 17:02:31 +03:00
Yair Morgenstern
e1363d92f9 4.0.8 2022-04-19 15:32:45 +03:00
heipizhu4
0dda359f38
Add modding translation instruction to the wiki (#6544)
Add modding translation instruction to translation.md inpired by #6483.
Mostly is copied from @SomeTroglodyte 's comment and add some of my own translation expeirence.
There might be some grammatical mistakes in this doc.
2022-04-15 16:24:51 +03:00
Xander Lenstra
d417556720
Added a unique for attacking when embarked (#6464)
* Added a unique for attacking when embarked

* Implemented requested changes

* Fixed withdrawel probability
2022-03-31 23:06:42 +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
청하늘
279178f103
Fixed the official wiki (#6453)
* Fixed the links in the docs

* Fixed broken tables

Tables without a line break above are not treated as valid tables

* Removed redundant table of contents and formatted some bulleted lists

* The image in Regions.md is now properly displayed

* Standardized list indentation, line spacing, table header rows, and JSON code blocks

* Standardized headers

* Fixed remaining broken links, edited pseudo-footnotes
2022-03-31 09:47:58 +02:00
heipizhu4
c8a88bfc49
Update Hosting_a_Multiplayer_server.md (#6424)
* Update Hosting_a_Multiplayer_server.md

* Update Hosting_a_Multiplayer_server.md
2022-03-28 17:34:08 +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
청하늘
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
9721b38f6b
Update Installing-on-macOS.md 2022-03-23 09:16:44 +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
f66930ed68 3.19.17 2022-03-13 22:57:55 +02:00
SomeTroglodyte
e4b0afb7e3
Update ModConstants and start its documentation (#6309)
* Update ModConstants

* Update ModConstants - revert Ice, tweak formula

* Update ModConstants - comment on predefined MapSizes
2022-03-13 22:43:23 +02:00
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
Yair Morgenstern
cb757da900 Wiki improvements 2022-03-09 18:55:46 +02:00
Yair Morgenstern
7f9c6e01f7 Maybe this will add table of contents correctly? 2022-03-09 18:41:26 +02:00
Yair Morgenstern
9b7d5049b3 Readable deployment documentation 2022-03-09 18:37:15 +02:00
Yair Morgenstern
09ee742833 Documentation for the rollout changes, and replacing the old translation method with the new one 2022-03-09 15:03:40 +02:00
Yair Morgenstern
eaf5e453ba 3.19.15 2022-03-08 14:32:01 +02:00
SomeTroglodyte
fb7cb707e0
WLTK decorations (#6253)
* WLTK decoration png's and atlas

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

* Empire Overview Cities add WLTK column

* Make WLTK line on CityScreen stats box link to Civilopedia

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

* Revive Civilopedia links in WorldScreen.TileInfoTable

* Festive decoration for WLTK day on CityScreen
2022-03-05 20:10:03 +02:00
Yair Morgenstern
c9dfd4062d 3.19.13 2022-02-28 19:49:50 +02:00
SomeTroglodyte
651dcff581
Fix Polynesia's Wayfinding (#6238)
* Fix Polynesia's Wayfinding

* Fix mod option to use other unit filters with UnitsMayEnterOcean
2022-02-28 19:41:22 +02:00
Yair Morgenstern
db1304ee35 3.19.12 2022-02-25 13:48:47 +02:00
Yair Morgenstern
6babefd3ae Removed documentation of deprecated uniques, with the autoreplace it's no longer important information 2022-02-24 10:55:16 +02:00
Yair Morgenstern
4b921b6006 Mouseover descriptions for simple unique parameters 2022-02-24 10:52:23 +02:00
Yair Morgenstern
40918db1b0 Unique documentation is collapsable 2022-02-24 10:22:47 +02:00
Yair Morgenstern
6170322a9f Fixed tables in new wiki 2022-02-23 21:14:29 +02:00
Yair Morgenstern
e99ba8cee7 Reorganized wiki 2022-02-23 21:06:32 +02:00
Yair Morgenstern
4d710bcda7 mkdocs test 2022-02-23 19:28:06 +02:00
Yair Morgenstern
1fcc59adb3 More readable unique docs - this is the easiest way I've found to have the uniques themselves stand out 2022-02-23 16:26:07 +02:00
Yair Morgenstern
09089cb60d Added uniques and deprecations for "Requires" and "Unlocked by" uniques - #6165 2022-02-22 16:55:37 +02:00
Yair Morgenstern
1f9c6f39b5
Uniques list is now officially the autogenerated doc 2022-02-22 12:25:07 +02:00
Yair Morgenstern
162ed35255 3.19.11 2022-02-22 11:41:06 +02:00
Yair Morgenstern
13af71e427
Autoupdates to uniques will multiple solutions now replace to the correct one (#6208)
* Autoupdates to uniques will multiple solutions now replace to the correct one

Problem - some deprecated uniques can lead to multiple possibilities of replacements, depending on the parameter type
This lead to replacements in the jsons that were either unparseable entirely or were causing errors, both of which needed to be corrected by hand
We now separate such deprecations into their constituent potential replacement uniques, and try and take only the unique that doesn't cause any errors
Works like a charmander :)

* Conditional name change

* Resolved #6179 - when changing units production due to deprecation, notification no longer counts the same city multiple times if it appears multiple times in its queue
2022-02-22 11:33:07 +02:00
Xander Lenstra
90386bd4e7
Made spaceship parts units instead of buildings (#6203)
* Spaceship parts are units now

* Fixed tests

* Removed commented out lines

* `Spaceship Part` unique can also go on buildings in ods
2022-02-22 11:30:20 +02:00
SomeTroglodyte
5bac71709b
Wiki chapters for context-sensitive music (#6197)
* Wiki chapters for context-sensitive music

* Wiki chapters for context-sensitive music - matched to code
2022-02-21 10:18:46 +02:00
Yair Morgenstern
cd92f66c3a Resolved ANR when copying game data to clipboard 2022-02-20 19:53:19 +02:00
Yair Morgenstern
970e535e62 3.19.10 2022-02-19 19:57:23 +02:00
Yair Morgenstern
82236fe2c8 More uniquetyping 2022-02-18 13:42:23 +02:00
Yair Morgenstern
9d0db40bbf 3.19.9 2022-02-15 11:52:56 +02:00
Yair Morgenstern
86cbe895be
In Civ VI there are certain units available only if a specific building is built, and this was raised as a request by modders as well. (#6160)
Instead of expanding the existing 'requires building' unique to units and adding limiters, it's both easier and more generalizable to add conditionals for cities with and without certain buildings to replace the uniques entirely
2022-02-15 11:40:47 +02:00
Yair Morgenstern
97d74a3aef Enabled type check checking for uniques whose deprecation leads to multiple uniques!
This also enables auto-deprecating the Embark+Ocean unique
2022-02-15 11:29:32 +02:00
itanasi
9d1f463310
Add Amphibious penalty to Land attacking into Water and vice versa (#6127)
* Add Amphibious penalty to Land attacking into Water and vice versa

* Replace Landing with Amphibious in all translation files

* Fix trailing whitespace

* Revert translation files

* Change working of Amphibious
Set penalty to Landing and Boarding

* Type-ify Unique and add Depreciated
Add Promotion to Melee Naval
Add exception that Landing penalty is NOT against cities

* Fix Vanilla

* Rename to Landing Party
Icon doesn't work

* Properly regenerated game.atlas/game.png

Co-authored-by: itanasi <spellman23@gmail.com>
2022-02-14 19:21:53 +01:00
Yair Morgenstern
bce65a96f6 More unique typing 2022-02-14 19:05:54 +02:00
Yair Morgenstern
c498426715 3.19.8 2022-02-12 19:25:12 +02:00
Xander Lenstra
f5e9952caf
Add uniques and constants for unit supply (#6146)
* Code readability

* Uniques & constants for unit supply

* Fixed tests

* Added a cityFilter to the 'supply per pop' unique
2022-02-12 19:22:17 +02:00
Yair Morgenstern
e72dcc8b0d
Unified "X is only available under Y conditions" into a single unique (#6133)
* Unified "X is only available under Y conditions" into a single unique

There were a few problems with existing uniques - they weren't really composable, the offered things they didn't keep, etc

For example, "Incompatible with [policy/tech/promotion]", UniqueTarget.Policy, UniqueTarget.Tech, UniqueTarget.Promotion. In fact, promotions only checked promotion incompatibility, promotions - promotion incompat, etc

Additionally, with a few more changes, this could cover several other uniques - "Hidden until [amount] social policy branches have been completed", "Requires at least [amount] population", perhaps others

I have to say I think conditionals are the best thing ever and they make amazing composability possible :)

* Autoupdate correctly recognizes parameters
Updated ruleset jsons

* Deprecation texts should be allowed to forward to other deprecated uniques so we only need to change the leaves when introducing new uniques, not go through the whole tree
2022-02-12 19:03:30 +02:00
Yair Morgenstern
4fb4722e3a
Arbitrary conditionals can become timed conditionals! (#6134)
* Arbitrary conditionals can become timed conditionals!
triggerCivwideUniques is activated in 3 situations:
- Tech complete
- Policy adopted
- Building complete

So for each of the unique containers for these I added a catch saying 'if this unique is a temporary unique then don't save it yourself

This has been lying around in todos for a while and generalizes one of the nasty hardcoded messes that I hate about Civ V. Why would you introduce ONE timed effect in the whole game?! You can use them all the time like Humankind or never use them like Civ IV, but why have just one whyyy

One more thing in this PR, that needed to be solved by the by, is allowing parameters to have a '2' on the end so we can autoreplace multiple parameters of the same type.
Using a regex is slightly more inefficient, but since this is A. only used once per UniqueType.kt, and B. allows us to have as many 'amount's as we want which is important if we have a lot of conditionals, I feel this is justified.

* Fixed comments from PR
2022-02-12 19:03:11 +02:00
Yair Morgenstern
09ea1a869d 3.19.7 2022-02-09 12:31:08 +02:00
Yair Morgenstern
90d459a9f4
Added conditional for 'first civilization to research a tech' (#6120)
* Techs with these kinds of conditional bonuses exist in Civ IV and VI

* Phrasing can now include long-term benefits :)

* Capitalization

* Triggered uniques now subject to conditionals

* Removed extraneous parameter

* Conditional placement

* Updated uniques.md to better phrasing
2022-02-09 12:21:20 +02:00
Yair Morgenstern
03f7af4360
Typified Obsolete unique, made luxury resources obsoletable (#6129)
* Typified Obsolete unique, made luxury resources obsoletable
Things that were luxuries in the past become uninteresting as time goes on

* Unified obsolescence handling for buildings, improvements and resources

* Obsolete icons have their x's in the right place

* All images &c are done - we have the skeleton of the mod in place!

* Revert "All images &c are done - we have the skeleton of the mod in place!"

This reverts commit 61553c17
2022-02-09 12:18:14 +02:00
Yair Morgenstern
92f0be995d More -/+ unique deprecation fixes 2022-02-07 18:26:20 +02:00
lishaoxia1985
aa11602c9a
Delete unused var in the method getDescription/getShortDescription of the Class Building (#6117) 2022-02-07 10:11:53 +02:00
Yair Morgenstern
4817f49ce9 Flood plains no longer generate on desert hills 2022-02-03 22:59:38 +02:00
Yair Morgenstern
27e383631d A couple more that were in Son of War 2022-02-03 20:16:10 +02:00
Yair Morgenstern
6654acd92e Added more deprecated uniques that I found still existing in LOTR Unciv 2022-02-03 19:46:10 +02:00
Yair Morgenstern
3661ad8d5b
Find all replaceable uniques, generate replacement text, check for compatibility, and replace! (#6105)
* Find all replaceable uniques, generate replacement text, check for compatibility, and replace!

All of the work up until now has lead up to this point - since we already know what's out and what to replace it with, we can do 90%+ of the work ourselves and spare the sanity of our modders

For an example run:
- Download your favorite mod
- Check its deprecated uniques in the options menu
- Run the autoupdater from the same menu
- See how they disappear
- Bask in the glory

* A few unreplaced uniques raised problems in some of the replacement texts

* Old unusable deprecated uniques are suddenly important again, because they can help autoupdate mods!

I'm wondering if to remove outdated mods entirely from the uniques.md, since they're going to keep accumulating

* Padding for the 'autoupdate' button

* Only display autoupdate button if there are unique to update
Also, fixed some of the revived deprecated unique's replacement text thanks to fancy new tests :)
Tech uniques autoupdate!

* Toast now pops correctly, added translation entries
2022-02-03 14:58:17 +02:00
Yair Morgenstern
57ada6aa27 Separated single unique check to a different function, so we can use it individually 2022-02-02 11:11:14 +02:00
Yair Morgenstern
9696fa59f5
Added unique to convert terrain to other terrain if adjacent to something (#6094)
* Added unique to convert terrain to other terrain if adjacent to something

Terrain converting to other terrain when adjacent to rivers was using hardcoded stuff, so I un-hardcoded it
I thought I could use this to replace the 'coast' hardcoding, and if it wasn't for the maxCoastExtension then I could.
Modders CAN therefore add their own coast (Lava tiles and Ash tiles I dunno) but it will only be for directly close terrains.
This enables Deciv Redux to spawn huge maps.

* Also for Vanilla, which apparently had a different number of tabs than G&K for no apparent reason.

* Apparently terrain name wasn't a uniquetype yet

(cherry picked from commit 593fc257b5)
2022-02-02 00:59:37 -08:00
Yair Morgenstern
6d3eabde22 Code cleanup 2022-02-01 15:18:23 +02:00
Yair Morgenstern
c3d185cce8 Deprecated old uniques 2022-02-01 10:03:47 +02:00
Xander Lenstra
6bc41a627c
Typed all healing uniques (#6087)
* Typed all healing uniques

* Fixed tests by replacing placeholder texts by types in BeliefAutomation
2022-02-01 09:43:37 +02:00
Xander Lenstra
0951e5d6fd
Fixed a bug where unit discounts would not work (#6081) 2022-02-01 09:43:25 +02:00
Yair Morgenstern
f6e22f60bf
Replace old uniques with *parameter-filled* new uniques! (#6077)
* Since we have the old unique typed, and the new replacement unique typed, we can show modders EXACTLY the new unique they'll need to have!
The final step of this process is having a 'replace old uniques' button which will automagically replace old uniques in a mod with the new versions. This will of course require some manual intervention since it's possible we added some parameters that didn't exist in the old one, but should work well for 95%+ of uniques.

* Also allow "[-amount]" replacements
Better replacements - "[+amount]" etc - where relevant

* Fixed misadded + in unique
2022-02-01 09:42:52 +02:00
Yair Morgenstern
16855f66f6
Gradle build tools upgrade (#6085)
* Gradle build tools upgrade
Apparently the magic is rewriting a specific line in the Android build file and downloading Android SDK 30.0.3

* Added wiki change, isn't that nice :)
2022-01-31 15:05:42 +02:00
Yair Morgenstern
0f4449f2e9 3.19.3 2022-01-29 23:40:43 +02:00
Xander Lenstra
a237e7bf82
Typed all remaining uniques using CityInfo.GetMatchingUniques and removed that function (#6071)
* Typed all remaining uniques using CityInfo.GetMatchingUniques and removed that function

* Fixed two NullPtrExceptions

* Fixed syntax
2022-01-29 23:27:48 +02:00
Md. Touhidur Rahman
1b01ee3802
updated Caravel.png, resolves #5317 (#6069)
* updated Caravel.png, resolves #5317

* Update Credits.md
2022-01-29 18:36:05 +02:00
Yair Morgenstern
fbec7c836e Performance boost for GameInfo.setTransients - speeds up loadGame and nextTurn 2022-01-27 00:28:41 +02:00
will-ca
40d88eb486
Wiki: Details on keeping the wiki files in the repo. (#6050)
* Wiki: Details on keeping the wiki files in the repo.

* Wiki: Missed a word.
2022-01-25 21:53:00 +02:00
will-ca
607d3f521b
Wiki: Mention nation colour layers. (#6049)
* Fix some inter-wiki links.

* Wiki: Mention nation colour layers.

* Wiki: Slight wording change to a page.
2022-01-25 21:52:03 +02:00
Xander Lenstra
6a5d44c3e9
Adressed comments on the happiness PR after it was merged (#6047) 2022-01-24 22:23:26 +00:00
will-ca
1ee1214b35
Wiki: Remove outdated translation info? (#6046) 2022-01-25 00:08:41 +02:00
will-ca
2234b86d3c
Post-Wiki-Migration cleanup. (#6045)
* Fix GH wiki repository link translation.

* Harmonize wiki links to local paths, as used by AS+GHTree and translated on Wiki by UncivBot.
2022-01-25 00:06:19 +02:00
Xander Lenstra
b69507255f
Fixed the problems with the food carry-over unique (#6040) 2022-01-24 19:52:35 +02:00
Xander Lenstra
f6cb2bd0d7
Made unhappiness effects moddable by adding a global uniques json; added revolts when < -20 happiness (#5932)
* Added a json file for unhappiness effects

* Change existing code to handle these effects

* Made a weird and unexpendable way to add unhappiness effects to the civilopedia

* Add the default unhappinesseffects to mods without the json

* Added revolts when at very low happiness

* Renamed a few often-used functions

* Added a file for uniques that are always active

* Fixed tests

* Nullifies [Food] -> Nullifies Growth
2022-01-24 17:19:51 +00:00
Yair Morgenstern
336e190ff0 3.19.1 2022-01-24 11:56:00 +02:00
Xander Lenstra
86edb90e0a
Added a .md file documenting the different parameters used in uniques (#6023)
* Added a .md file documenting the different parameters used in uniques

* I am very good at typing
2022-01-24 11:06:17 +02:00
Xander Lenstra
39ed8bd269
Typed some uniques, added more examples for parameters in unique documentation (#6020)
* Typed some uniques, etc.

* Missed a few square braces

* Missed a parameter

* Missed another parameter

* Made a conditional, spelling, added check to `isStatRelated`

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-01-24 11:03:40 +02:00
will-ca
a78fa5dc12
Repo wiki resync. — Requires #5854. (#6024)
* Initial Home page

Updated Home (markdown)

Updated Getting Started (markdown)

Created Project structure overview (markdown)

Initial Home page

Updated Project structure overview (markdown)

Updated Project structure overview (markdown)

Created Making a new Civilization (markdown)

Updated Getting Started (markdown)

Updated Home (markdown)

Updated Project structure overview (markdown)

Created From code to deployment (markdown)

Updated Project structure overview (markdown)

Updated Major classes (markdown)

Updated Project structure and major classes (markdown)

Updated Getting Started (markdown)

Updated Project structure and major classes (markdown)

Updated From code to deployment (markdown)

Created Translating (markdown)

Updated Translating (markdown)

Updated Translating (markdown)

Updated Translating (markdown)

Updated Translating (markdown)

Created Coding standards (markdown)

Updated Home (markdown)

Added "why do we clone on NextTurn" explanation

Created Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Translating (markdown)

New translation files location

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Translating (markdown)

Added mod file location on chromebook

Created Scenarios (markdown)

Updated Scenarios (markdown)

Updated Scenarios (markdown)

Updated Scenarios (markdown)

Updated Scenarios (markdown)

Updated Scenarios (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

Updated Mods (markdown)

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

* Base wiki state.

* 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.)

* Base wiki migration state.

* Author: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-02 11:04:38
Committer: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-02 11:04:38
Parent: 8fe9385ee644a74b1c3ae3c6d1fa8200cc952a3f (Mention docs/uniques.md, emphasized Stat capitalization)
Child:  7463af24381cc6b94b949b4419841d303af6bb93 (Expanded documentation on constructionFilters)
Branches: master, remotes/origin/master
Follows:
Precedes:

    Added construction filter in the header

* Author: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-02 11:06:59
Committer: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-02 11:06:59
Parent: 49654ec91dcf565685fd6e4ca966456484c578bd (Added construction filter in the header)
Child:  d48da00f4fa03f61891ec7396a5d0ba9109f44df (Added actual steps I take when releasing a version)
Branches: master, remotes/origin/master
Follows:
Precedes:

    Expanded documentation on constructionFilters

* Author: Yair Morgenstern <yairm210@>  2022-01-02 18:15:10
Committer: Yair Morgenstern <yairm210@>  2022-01-02 18:15:10
Parent: 7463af24381cc6b94b949b4419841d303af6bb93 (Expanded documentation on constructionFilters)
Child:  e7873b135204510742017be455c8b73862bb1d75 (Updated From code to deployment (markdown))
Branches: master, remotes/origin/master
Follows:
Precedes:

    Added actual steps I take when releasing a version

* Author: Yair Morgenstern <yairm210@>  2022-01-02 19:54:18
Committer: Yair Morgenstern <yairm210@>  2022-01-02 19:54:18
Parent: d48da00f4fa03f61891ec7396a5d0ba9109f44df (Added actual steps I take when releasing a version)
Child:  84a6eb3a44ed2504f157d55e90cfe2363bb70659 (Added buildingFilter and reworded a bit of generated documentation)
Branches: master, remotes/origin/master
Follows:
Precedes:

    Updated From code to deployment (markdown)

* Author: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-07 11:48:11
Committer: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-07 11:48:11
Parent: e7873b135204510742017be455c8b73862bb1d75 (Updated From code to deployment (markdown))
Child:  2a4a0add3728a676012ce51bc3f825c8a5c04c84 (Slightly improved wording)
Branches: master, remotes/origin/master
Follows:
Precedes:

    Added buildingFilter and reworded a bit of generated documentation

* Author: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-07 11:51:18
Committer: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-07 11:51:18
Parent: 84a6eb3a44ed2504f157d55e90cfe2363bb70659 (Added buildingFilter and reworded a bit of generated documentation)
Child:  d4b91ed84a0989ea5205a77390543d268f7a8b22 (Removed a deprecated field)
Branches: master, remotes/origin/master
Follows:
Precedes:

    Slightly improved wording

* Author: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-17 16:59:32
Committer: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-17 16:59:32
Parent: 2a4a0add3728a676012ce51bc3f825c8a5c04c84 (Slightly improved wording)
Child:  3cd48433f279bcceaaab4f63c2c48606781c059f (Updated belief type valed values)
Branches: master, remotes/origin/master
Follows:
Precedes:

    Removed a deprecated field

* Author: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-17 17:00:14
Committer: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>  2022-01-17 17:00:14
Parent: d4b91ed84a0989ea5205a77390543d268f7a8b22 (Removed a deprecated field)
Child:  2f076df75fc5d112146902c88f240a3ebdac8849 (Updated Getting Started (markdown))
Branches: master, remotes/origin/master
Follows:
Precedes:

    Updated belief type valed values

* Author: Yair Morgenstern <yairm210@>  2022-01-22 19:40:43
Committer: Yair Morgenstern <yairm210>  2022-01-22 19:40:43
Parent: 3cd48433f279bcceaaab4f63c2c48606781c059f (Updated belief type valed values)
Child:  5d60469df68e0416ffa815e1366aef191583c451 (Updated Getting Started (markdown))
Branches: master, remotes/origin/master
Follows:
Precedes:

    Updated Getting Started (markdown)

* Author: Yair Morgenstern <yairm210@>  2022-01-22 19:46:03
Committer: Yair Morgenstern <yairm210@>  2022-01-22 19:46:03
Parent: 2f076df75fc5d112146902c88f240a3ebdac8849 (Updated Getting Started (markdown))
Child:  73475b37b28934478dc05830d3aeb61cf8ee6b69 (Updated Getting Started (markdown))
Branches: master, remotes/origin/master
Follows:
Precedes:

    Updated Getting Started (markdown)

* Normalize some links.

* Author: Yair Morgenstern <yairm210@>  2022-01-22 19:54:23
Committer: Yair Morgenstern <yairm210@>  2022-01-22 19:54:23
Parent: 5d60469df68e0416ffa815e1366aef191583c451 (Updated Getting Started (markdown))
Branches: master, remotes/origin/master
Follows:
Precedes:

    Updated Getting Started (markdown)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-01-24 10:58:00 +02:00
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
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
yairm210
871dcfaf7d Deprecated old uniques 2022-01-19 14:42:09 +02:00
yairm210
21fbaf4814 3.18.18 2022-01-16 19:51:33 +02:00
yairm210
462ae2dad0 3.18.17 2022-01-14 10:49:22 +02:00
Xander Lenstra
d809f3a132
Made all the other constants determining the strength of cities moddable (#5940) 2022-01-10 13:55:22 -08:00
Xander Lenstra
93a109b082
Fixed a bug where citadels did not damage nearby units (#5941)
* Fixed a bug where citadels did not damage nearby units

* Fixed tests
2022-01-10 13:32:48 -08:00
yairm210
1999364b9e Chore - more typified unit uniques 2022-01-10 21:53:13 +02:00
Yair Morgenstern
513b37583f
Converted "Can construct [improvementName]" to a uniqueType (#5924) 2022-01-09 21:39:27 +02:00
Xander Lenstra
cdbdda366b
Revamped nukes again to closer match the original (#5892) 2022-01-02 04:04:43 -08:00
Xander Lenstra
687ecb83f1
Merged some uniques and added a new one for not allowing to build units (#5731)
* Print stacktraces in more cases when crashing, useful for debugging

* Conditionalized no oceans before astronomy unique

* Cannot be built on tile before tech conditionalized

* Added "Cannot build unitFilter units" unique

* Fixed tests failing

* Merge branch master into some-uniques

* Fixed typo

* Apparently I made the same mistake twice

* Globalized unique
2021-12-31 12:13:09 +02:00
Xander Lenstra
ee65adb5e4
Fixed a bug where all global unit discounts would always apply, despite only being for certain units (#5879) 2021-12-31 11:07:59 +02:00
Xander Lenstra
f03918f610
Fixed a few combat bugs and changed the religions founded label (#5846)
* Fixed a bug where bonusses applying 'in friendly tiles' would not apply

* Reworded something so it actually makes sense

* Fixed capitalization error leading to autocracy complete bonus no longer working

* Fixed save serialization errors and finally correctly implemented the time limit for autocracy bonus

* Made value const and static
2021-12-26 07:31:07 +02:00
will-ca
af941754cd
Show arrows on map for unit actions: Asset files. (#5825)
* Show arrows on map for unit actions.

* Don't wrap arrows unless world wrap is actually enabled.

* Fix transported air units always being treated like teleports.

* Simple reviews.

* Separate movement arrow visibility checks from WorldScreen.

* Assets for map arrows overlay.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-12-25 22:29:19 +02:00
Xander Lenstra
ecadfb53fa
Typed some uniques and fixed a policy not working (#5848)
* Typed some uniques, fixing a policy not working

* Repurposed an unused function to remove .unit in some places

* Fixed compilation errors
2021-12-25 17:55:14 +02:00
Xander Lenstra
c9628c7fa7
Extended use for "in [tileFilter] tiles" conditionals (#5827)
* Changed 'in [tileFilter] tiles' to also apply outside of combat

* Changed unique docs writer to also sort applicables, so these are also not regenerated constantly
2021-12-20 13:53:03 +02:00
Xander Lenstra
75ef6f6c8d
Changed remove heresy sound effect (#5821) 2021-12-18 20:05:11 +02:00
Xander Lenstra
17b382a614
Replaced illegal / questionably legal assets (#5819)
* Replaced illegal / questionably legal assets

* Resized policy icon to correct size
2021-12-18 17:53:21 +02:00
yairm210
a7b880c033 3.18.10 2021-12-15 23:12:28 +02:00
yairm210
c655d69c78 Order unique docs by target type so we don't get reorderings all the time 2021-12-14 19:02:58 +02:00
yairm210
b537f9e386 Resolved #5779 - uniques and conditionals for translating are taken directly from the uniquetypes 2021-12-10 15:34:17 +02:00
yairm210
3dfb0aec70 3.18.8 2021-12-07 22:12:05 +02:00
Xander Lenstra
10be481524
Added an icon for the telegraph tech (#5765) 2021-12-06 11:53:29 +02:00
yairm210
0d4da03b7c 3.18.7 2021-12-05 21:23:04 +02:00
yairm210
5697a6f912 Solved crash of #5728 - AIs ignore trade requests that have become invalid mid-turn
They also no longer spam each other with requests
2021-12-03 13:57:00 +02:00
yairm210
9edc713d5c 3.18.6 2021-12-03 11:33:18 +02:00
yairm210
234b1b1741 Removed many "proxy functions" from civInfo to cityStateFunctions 2021-12-03 11:28:24 +02:00
yairm210
69db686101 Moved all fully deprecated uniques to their own region down below
Slight steps towards stat percent bonus calculation efficiency in CityStats
2021-12-03 11:01:55 +02:00
yairm210
0def261012 Added unique types, added regions for easier location 2021-12-03 10:48:39 +02:00
itanasi
7f07bcb9e5
Recycling center (#5738)
* Add support to UniqueType.MaxNumberBuilding (including rejectionReasons)
Add Recycling Center entry to JSON
Need Graphical Icon

* Fix typo
Add TODO

* adding Recycling Center icon

* Credit update for icon
Rephrase Rejection text
Updated .atlas and .png
Add code to block showing Recycling Center

* Fix using placeholderText
Set shouldShow to True so iot still appears while under construction but not completed

* Rejection Text now working
Remove debug prints

* Remove odd extra lines

* extra lines

* Remove excessive if statement in shouldBeDisplayed
Reword text. Unique can apply to Buildings and Units
Refactor Signature since not just Buildings

* Adding code to remove building in transferred city

Co-authored-by: temurakami <spellman23@gmail.com>
2021-12-03 10:15:51 +02:00
yairm210
6296f6917f Autogenerated docs wraps conditionals and doesn't give examples for non-parameter-containing uniques 2021-11-28 08:30:31 +02:00
yairm210
05742e02f3 Added documentation for Mac parameters as per #5679 and future-proofing build.gradle for eventual mac releases 2021-11-27 21:05:11 +02:00
yairm210
84e600786c 3.18.5 2021-11-27 20:08:47 +02:00
yairm210
5d160508d3 Fixed bug when attempting to load a game that uses mods you don't have 2021-11-24 18:33:44 +02:00
yairm210
694e862944 Small improvement 2021-11-22 22:01:17 +02:00
yairm210
1b0eaa8a71 Unique autodocs ++ 2021-11-22 21:59:35 +02:00
yairm210
92fd72d895 Better autogenerated unique docs 2021-11-22 21:10:21 +02:00
yairm210
4617bc21a7 Added unique documentation generation when running from Android Studio :) 2021-11-22 20:49:31 +02:00
SimonCeder
bfe0b68ab8
Barbarian units (#5589)
* barbarian unique units; barbarian blacklisted units

* credits

* barbarian units do not take resources

* ai fix
2021-10-29 13:33:11 +03:00
SomeTroglodyte
7bbcb8db1a
Mayas (#5408)
* The Maya - data and calendar

* The Maya - completed

* The Maya - notifications

* The Maya - favoredReligion

* The Maya - comments in GreatPersonManager

* The Maya - clickable notifications

* The Maya - templates

* The Maya - atlas

* The Maya - patch1
2021-10-09 20:45:59 +03:00
SomeTroglodyte
088e35ff13
Ethiopia - Nation (#5387)
* Ethiopia - Nation

* Ethiopia - Unit and Stele

* Ethiopia - Graphics

* Ethiopia - color
2021-10-04 20:56:34 +03:00
SomeTroglodyte
71405b93aa
The Celtic People Reboot (#5367)
* The Celtic People Reboot

* Redid the Shamrock sword of the Pictish Warrior

* The Celtic People Reboot - one comment

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-10-03 12:02:58 +03:00
SomeTroglodyte
fb30a76e85
Civilopedia category icons and keyboard navigation (#5341)
* Civilopedia category icons and keyboard navigation

* Civilopedia category icons - white alternative
2021-09-29 17:39:02 +03:00
AdityaMH
1a35ec82ed
Change NationIcon for 4 nation (#5336)
* Change NationIcon for 4 nation

* Update Credits.md

* Resize Icon
2021-09-28 22:42:45 +03:00
Xander Lenstra
d07eed31b8
Added the Byzantine empire (#5299)
* Added Byzantine Empire as a nation

* Added unique units

* Implemented unique ability

* Refactored out the beliefContainer

* Implemented reviews

* Credits

* Enumified the uniques & added missing translatable strings
2021-09-26 16:58:24 +03:00
SimonCeder
d20b4b0805
"The original work has been modified." in attributions (#5304) 2021-09-24 10:06:24 +03:00
SomeTroglodyte
4a83bed4ba
Nation Picker visual help where to click (#5287)
* Nation Picker visual help where to click

* Nation Picker visual help where to click - circles
2021-09-23 11:23:40 +03:00
SimonCeder
8eb24ac273
Carthage civ (#5224)
* Add Carthage

* Implement uniques

* performance improvement, better elephant

* AI avoids taking too much damage from mountains

* more performance

* better AI

* can't settle cities on mountains

* AI improvement

* AI improvement

* revisions, damagePerTurn in Terrains.json

* terrain damage stored as unique in json, damage also works for terrain features

* don't change game.png
2021-09-18 20:28:12 +03:00
SomeTroglodyte
5fd04f6e32
Modmanager sort and filter (#5186)
* Mod manager portrait mode

* Mod manager portrait and auto scroll

- MM switches to stacked expanders in portrait.
- Use AutoScrollPanes.
- Disable the enter/leave listener of AutoScrollPane in Pickers which disable the default ScrollPane to roll their own - helps all such pickers.
- No expander open/close persistence on purpose.
- PickerScreen a bit cleaned 'cuz I needed to understand something.
- Marked mods from the kill-list that are already installed.
- Button sync now OK when counterpart missing (deselects other column).

* Mod Manager sorts and filters - WIP 1

* Mod Manager sorts and filters - WIP 2

* Mod Manager sorts and filters - WIP 2a

* Mod Manager sorts and filters - WIP 3

* Mod Manager sorts and filters - atlas

* Mod Manager sorts and filters - tip
2021-09-16 20:54:47 +03:00
SimonCeder
cbd3c2910e
Icons for city states (#5160)
* Add city state icons

* Add the icons

* Get filename from cityStateType.name

* less padding

* Icon names in enum, icons in diplomacy screen
2021-09-09 21:28:30 +03:00
SomeTroglodyte
38a545e9a6
An icon for BeliefType.Enhancer (#5159) 2021-09-09 20:06:20 +03:00
Xander Lenstra
9575b5bf66
Implemented renaming of religions (#5057)
* Implemented renaming of religions

* Made AskForText display error on invalid input, implemented recommended changes

* Almost forgot the translatable strings in the new popup
2021-09-02 17:40:10 +03:00
Xander Lenstra
634f4a3533
Added Religious wonders (#5041)
* Added Grand Temple and Great Mosque of Djenne buildings

* Added uniques for Grand Temple

* Added uniques for Mosque of Djenne, refactored ability uses system to count down isntead of up
2021-08-31 22:23:02 +03:00
SimonCeder
a7c4895985
Add Austrian civ (#5026)
* Json definition for nation, images

* Jsons, Hussar and Coffee House

* Diplomatic Marriage Button

* Implement Marriage

* AI Marriage

* template.properties

* Popups etc

* Strings

* reviews

* reviews pt 2
2021-08-30 23:21:02 +03:00
Xander Lenstra
7dd7e0b278
Fixed a unique & better credits (#4998) 2021-08-27 16:27:17 +03:00
SomeTroglodyte
448b04fab8
Civilopedia - Tweaks (#4990)
- Icon for BeliefType.Founder
- Religion icons inverted in Civilopedia
- Terrain icons in links and entry header centered
2021-08-26 17:29:55 +03:00
SomeTroglodyte
b93f93ea9b
Stat Icons Redone (#4961)
* Stat Icons Redone

* Stat Icons Redone - Sources

* Stat Icons Redone - Rebuild atlas
2021-08-23 23:15:17 +03:00
Xander Lenstra
89ea30af95
Implemented Inquisitors (#4909)
* Added inquisitor unit including image

* Inquisitor now blocks spreading of religions

* Added 'remove heresy' action

* Fixed tests

* Reworded remove heresy unique, updated sprites

* Fix Crash

* Implemented requested changes & fixed a few minor bugs

* Implemented requested changes
2021-08-23 20:26:37 +03:00
AdityaMH
8c97e2c6fc
Improve horse sound (#4849)
* Improve horse and construction sound

* Update Credits.md

* Convert to mp3

* Delete construction.ogg

* Improve horse sound

By https://freesound.org/people/Kubuzz/sounds/347036/

* Update Credits.md

* Bring back to old "construction" sound

* Update Credits.md
2021-08-17 13:51:58 +03:00
Xander Lenstra
5d249ee673
Implemented religious pressure (#4863)
* Implemented religious pressure: cities now can have more than one religion in them and religions spread between nearby cities over time.

* Implemented proposed changes

* Implemented requested changes & minor changes I forgot to include last time

* All pantheons not founded by you are now removed when you gain a new city (found this somewhere in the source code of the original, don't know if it's documented anywhere online)
2021-08-15 18:53:01 +03:00
ravignir
5d2732c656
G&K resources, resource improvement yield changes to match civ5. (#4835)
* Update Credits.md

* Add files via upload

* Add files via upload

* Update TileResources.json

* Update FantasyHex.json

* Update TileResources.json
2021-08-11 18:48:10 +03:00
Xander Lenstra
55d32e1bcb
Added follower beliefs for buying religious buildings (#4793)
* Added follower beliefs for buying religious buildings

* Implemented recommended changes
2021-08-08 22:23:22 +03:00
Xander Lenstra
a35f55db6f
Added missing religion icons (#4795) 2021-08-07 23:46:55 +03:00
Xander Lenstra
547f5a57e5
Added missionairy units, which can spread religion and bought with faith (#4568)
* Added missionairy units, which can spread religion and bought with faith

* Forgot an include, minor additions

* Forgot credit for the missionary image

* Large refactor, enabling buying with almost all stats, split IConstruction into IConstruction & INonPerpetualConstruction

* Does this fix the tests

* Fixed accidentally removing all trailing spaces in template.properties

* Thanks to someTroglodyte for paying more attention than I do :)

* Implemented requested changes

* Fixed large amount of question marks

* Missing space, of course

* Fixed function name change

* Fixed merge problems

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-08-06 14:40:48 +03:00
Xander Lenstra
4d3195ec5a
Added Diplomatic victory, United Nations, Globalization (#4619)
* Added globalization tech

* Added united nations and backbone for diplomatic victory

* You can now vote with the united nations every 20 * gameSpeed turns, and the results will be displayed the turn after

* You can now win with diplomacy

* AI will now vote in the united nations

* Added the amount of turns till the next diplomatic vote in the diplomacy overview

* Added translatable strings

* Implemented most of the requested changes (rest coming soon)

* Implemented further requested changes
2021-08-03 21:48:51 +03:00
SimonCeder
1f6f49efd7
Mercantile CS resources (#4641)
* Added Porcelain and Jewelry, assigned to Mercantile CS

* resized Jewelry.png

* moved citystateresource, added resource overview to diplo screen

* citystateresource saved as string

* Update template.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-07-27 22:28:36 +03:00
SomeTroglodyte
e41ba0da91
A Civilopedia category for Religion (#4609)
* A Civilopedia category for Religion

* Civilopedia for Religion - rename cat, template and EOF linting

* Civilopedia for Religion - oversight
2021-07-23 00:10:47 +03:00
SimonCeder
239a406bc4
Added Sweden Civ (#4566)
* wonder splash screens

* wonder splash screens atlas

* reset to master

* Add Sweden

* add translations

* translations

* implement first part of UP

* add icons to atlas

* implement second part of swedens up

* implement first hakkapeliitta unique

* implement second hakkapeliitta unique

* gifted GPs are removed

* update sweden symbol

* translations

* review Hakkapeliitta unique

* removed unneccesary parameters

* hakka UP review

* Hakka UP part 2

* yairm's reviews

* translations for fixes

* removed [great person generation] parameter as it's hardcoded anyway

* Moved check for stacking unit bonus outside great general logic
2021-07-20 17:06:15 +03:00
Xander Lenstra
2752c713b9
Founding Religions (#4505)
* Fixed crashes on loading save games with religion

* Added missing credit

* Religious cities now show religion icons in the city button

* Add icons for religions

* You can now found beliefs, with snazzy icons!

* Fixed bug which made prophets impossible to generate

* Added missing translatable strings

* Fixed translation tests properly

* Implemented requested changes

* Implemented part of the requested changes

* Removed SplitPane in favor of Table

* Removed unused code

* Capped the amount of foundable religions to the amount of religions
2021-07-14 22:09:51 +03:00
SomeTroglodyte
f54c76ec42
'Swap units' sound replaced (#4501) 2021-07-13 17:38:38 +03:00
Xander Lenstra
5376e488a0
Added a simplified version of great prophets, implemented a basic city religion UI (#4356)
* Add a very simple display for the religion in a city

* Added missing credits for shrine

* Added Great Prophet unit

* Great prophets can now be generated using faith

* Great Prophets can now construct holy sites

* Great Prophets can now spread their religion to friendly cities

* Holy site can only be constructed if the great prophet hasn't spread religion yet

* Added missing translation string

* Fixed more translation problems

* Implemented requested changes
2021-07-09 10:48:33 +03:00
SomeTroglodyte
d909143a34
'Swap units' sound and more attack sounds (#4379) 2021-07-05 11:31:13 +03:00
Xander Lenstra
957c8697ac
Added the nation of the Netherlands (#4372)
* Added the nation of the Netherlands

* Added Sea Beggar, Dutch unique unit

* Added polder improvement, Dutch unique improvement

* Added national ability
2021-07-05 09:35:04 +03:00
Xander Lenstra
6c221cd56b
Fix multiple bugs resulting from updating promotions and implementing missile cruisers (#4355)
* Fixed carriers in mods no longer working

* Fixed scouting prerequisites

* Fixed surivialism not having icon or prerequisites

* Fix logistics in mods not working

* Added image for supply promotion
2021-07-03 22:26:03 +03:00
Xander Lenstra
70882b4e8b
Added Privateer unit; updated Coastal Raider promotion (#4301)
* Added privateer unit

* Privateers can now capture other naval units

* Updated Coastal Raider promotion to include the gold gained from damaging cities

* Added missing translatable notification

* Implemented requested changes

* Implemented requested changes _but better_

* Forgot to update a variable name
2021-07-02 10:38:45 +03:00
Xander Lenstra
afdc2ffbd5
Adds the nation of The Huns (#4311)
* Added the nation of The Huns

* Added unique units of The Huns

* Removed MountedRanged unitType

* Implemented requested changes

* Fixed some typo's, split up a very long function for redability

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-07-01 22:53:00 +03:00
SomeTroglodyte
a69776cafa
The GDR needs an impressive attack sound. (#4317)
* The GDR needs an impressive attack sound.

* The GDR needs an impressive attack sound - alt

* The GDR needs an impressive attack sound - alt2
2021-06-30 20:41:43 +03:00
Arthur van der Staaij
0f0abad5ea
Added Stealth tech and Stealth Bombers (#4271)
* Changed some interception-related uniques

- "Can not be intercepted" -> "Cannot be intercepted"
  This really irked me, and the new version is also how it is written
  in the wiki.
- "Reduces damage taken from interception by 50%" ->
  "Damage taken from interception reduced by [50]%"

* Added "Cannot be carried by [unitFilter] units" unique

* Added an icon for Stealth

* Added Stealth technology and the Stealth Bomber

* Possibly fixed incorrect rounding for interception damage bonus

* Various code style changes

* Made Stealth Bomber interceptable, but with 100% damage reduction
2021-06-27 08:57:11 +03:00
Xander Lenstra
1c079bcef3
Added Nuclear Submarines & Missile Cruisers, capable of transporting missiles (#4260)
* Implemented Nuclear Submarine and Missile Cruiser units

* Information Era -> Atomic Era; Future Era -> Information Era, conform G&K

* Fixed deprecated uniques still working

* Implemented requested changes
2021-06-26 22:47:27 +03:00
Xander Lenstra
af0cd0c9df
Implements the Telecommunications tech (v2) (#4249)
* Added the addPopulation() and setPopulation() functions to add population to cities and automatically reassign them

* Added the Telecommunications tech

* Added the CN tower

* Implemented Bomb Shelter

* Added icons for new buildings

* Implemented requsted changes
2021-06-24 19:07:33 +03:00
Xander Lenstra
111d11b9b2
Added Advanced Ballistics Tech, Atomic Bomb Unit, Updated how nukes work (#4211)
* Improved nukes

* Fixed build error (probably)

* Implemented reocmmended changes, fixed some other stuff, the usual

* Implemented requested changes

* Fixed Tech connections

* Fixed nuclear missiles and guided missiles being interceptable

* Missiles are no longer air units. This is, as they cannot be stationed on carriers and cannot be intercepted.
2021-06-24 16:03:59 +03:00
Arthur van der Staaij
5b730fbc56
Added Nuclear Fusion tech and the Giant Death Robot (#4207)
* Reordered units

Consistently ordered units based on, in decreasing priority:
- Tech tree column
- Height in tech tree column

* Added Nuclear Fusion technology and GDR
2021-06-23 09:44:53 +03:00
Xander Lenstra
7f88844d82
Created Patronage policy branch (#4186)
* Created Patronage policy branch -- draft

* Patronage branch is now functional

* Added images for the policies

* Temporarily bandaged backwards compatability, added incompatabilities

* Implemented recommended changes

* Fixed acquirement of 'patronage complete' not being saved

* Reverted change I was unhappy with

* Implemented requested changes

* Fixed build errors

* Implemented recommended changes

* City States can now give any great person, including unique ones, conform Ravignirs tests
2021-06-22 17:25:29 +03:00
Xander Lenstra
3d1836a081
Created Order branch with G&K policies (#4158)
* Created Order branch with G&K policies

* Implemented requested changes
2021-06-20 21:39:14 +03:00
sockybob
6b75283f6d
Fix typo (#4168) 2021-06-17 12:13:23 +03:00
Xander Lenstra
434136e6cc
Updated Commerce branch to G&K (#4129)
* Updated Commerce branch to G&K

* Implemented requested changes
2021-06-15 09:52:59 +03:00
Xander Lenstra
1c21573a42
Updated the culture victory so it now requires the Utopia Project to be built (#4060)
* Added the Utopia Project for the culture victory; AI will now build it

* Forgot to credit the icon

* Fixed a few minor issues

* Improved code quality; added translatable notifications

* Fixed mistakes; improved quality

* Changed a label

* Revert a small change which is no longer necessary

* Reverted the revert of a small change which is no longer necessary

* Made requsted changes
2021-06-14 14:48:22 +03:00
Arthur van der Staaij
583bca56b8
Obsoletion and upgrade fixes for enabled G&K units (#4121)
* Updated some unit obsoletions

* Added a missing unit upgrade

* Added some missing commas in units.json

* Replaced Military Base icon with a simpler one

The original had a bit too much detail for the size at which it is
shown.
2021-06-13 07:55:35 +03:00
Arthur van der Staaij
91154aed34
Enabled various G&K buildings and units (#4092)
* Enabled Arsenal and added a new Armory icon

The old icon for Armory was much more appropriate for Arsenal, so I
added a new icon for Armory instead.

* Enabled Military Base and added an icon for it

* Enabled Petra and added an icon for it

* Enabled Composite Bowman and added an icon for it

* Enabled Mobile SAM and added an icon for it

* Enabled Jet Fighter

* Made Machine Gun upgrade to Mechanized Infantry

* Removed "Will be added in G&K" comments

Since we are now targeting G&K, these comments are no longer required.

* Fixed Aluminum/Aluminium inconsistencies
2021-06-10 15:38:40 +03:00
Arthur van der Staaij
a7afc0718c
Unit swapping (#4049)
* Added an icon for unit swapping

* Implemented unit swapping

In the original Civ V, unit swapping is a supported mechanic.
If you try to move a unit to a tile with another of your units, and both
units have enough movement points left to reach the other's tile, they
will swap places. They will consume only the movement points needed to
reach the other's tile in this way.

This change implements unit swapping for Unciv.

To prevent all kinds of problems from arising with automatic unit
movement, unit swapping can only be done explicitly. This also means
that it can only be done if the unit-swap movement is possible in a
single turn. It is however not limited to adjacent units.

Because Unciv supports mobile devices, there is in general no separation
between a unit-selection click and a movement click. Clicking on another
unit while a unit is selected simply selects that other unit. Because we
do not want to make it more difficult to select other units in this way,
unit swapping is implemented as a separate "movement mode": to toggle
this mode on or off, the new unit action "Swap units" must be used.
Newly selected units still always start in the normal movement mode.

In the unit-swap movement mode, the possible swap tiles are highlighted
instead of the possible movement and attack tiles. Clicking on a
highlighted tile will display a swap button, similar to the movement
button, or instantly perform the swap if single-click-movement is
enabled. This new behavior overrides the selection of the unit on the
target tile: if the user wants to select the unit instead, they have to
exit the unit-swapping mode first.

The swapping code is robust, it can even handle swaps that involve a
paradrop!

An option to always swap-move when an eligible tile is clicked instead
of requiring the unit-swapping mode, similar to the existing
single-click-movement option, could perhaps be added in later.

* Added some comments to existing movement functions

* Fixed a silly mistake

Fixed a silly mistake which caused the unit-swapping eligibility
detection to sometimes remove units from the world.

* Removed some unneeded code

* Fixed movement buttons not showing with world wrap

Fixed a bug where the "move here" and "swap with" buttons would only
show on the leftmost copy of the world when world wrap was enabled.

* Made the swap action only display if usable

Made the unit swapping button only display if there is at least one
possible swap movement.
2021-06-06 22:56:25 +03:00
Xander Lenstra
aa9dda2eea
Added the paratrooper unit (#4025)
* Added the paratrooper unit

* Reverted accidental reordering of action table

* Fixed Github build errors

* Hopefully actually fixed the build errors

* Added a Dutch translation, finally fixing the error

* Paratroopers can no longer actually paradrop on a tile they shouldn't be able to paradrop onto

* Removed double update action
2021-06-03 07:33:38 +03:00
SomeTroglodyte
ab4441ad1f
Fix two sound credits (#4020) 2021-05-30 21:05:46 +03:00
SomeTroglodyte
589ed4e423
Sound upgrade - enable BaseUnit.attackSound, a few extras (#4013) 2021-05-30 10:18:42 +03:00
Xander Lenstra
432e937474
Added the amphibious promotion and the marine unit (#3987)
* Technology and construction bars no longer extend past their maximum

* Fixed compile errors

* actually fixed the issue

* Added the marine unit

* Moved amphibious promotion effect to unique

* Added icons for Amphibious promotion and Marine unit

* aaah
2021-05-29 23:42:04 +03:00
Yair Morgenstern
bc1c9ad921 Tileset for new layering is now in base game
New layering now supports natural wonders
2021-04-01 23:19:07 +03:00
Yair Morgenstern
9cb017c8a5 Added Faith icon and display for games with Religion 2021-04-01 20:44:27 +03:00
Ivan Romanov
d8ed663ec9
Fix typo in docs (#3337) 2020-11-14 19:30:03 +02:00
Yair Morgenstern
ac679663a0
Update Game Making Tips.md 2020-11-08 23:22:42 +02:00
HadeanLake
f721f59734
Added national wonders, fixed some minor issues (#3163)
* fixed translation of "Owned: [amountOwned] = " line

* Tweaked culture from killing
Aztecs get melee strength of the unit killed in culture and honor opener does the same thing.
They stack. So you get culture equal to 200% of the dead unit's strength (not ranged strength).

* removed hurryCostModifier from units that should not have it

Default value of HurryCostModifier is 0
List of units with non-default HurryCostModifier:

Settler (20)
SS parts (-1) (cannot be hurried)

Frigate (20)
Ship of the Line (20)
Caravel (30)
Turtle Ship (30)

Catapult (20)
Ballista (20)

Horseman (20)
Companion Cavalry (20)

Swordsman (20)
Mohawk Warrior (20)
Legion (20)
Berserker (20)

* added missing definitions from vanilla (commented out)
added missing obsolete tech tags, etc

* tweaked hurryCostModifier, added missing vanilla buildings (commented out)

* added promotions and parametrized uniques
Morale (+[15]% Combat Strength)
Great Generals I ([Great General] is earned [50]% faster)
Great Generals II ([Great General] is earned [100]% faster)
Quick Study ([50]% Bonus XP gain)
Unretired Mass Media icon

Added Heroic Epic, National Epic and National Treasury national wonders
Heroic Epic has unique "All newly-trained [non-air] units in this city receive the [Morale] promotion" - "non-air" is valid param now

[Raising The Flag on Iwo Jima silhouette, Marine Corps War Memorial Raising the Flag on Iwo Jima Battle of Iwo Jima Washington, D.C., memorial free png](https://www.pngfuel.com/free-png/opgid) for Heroic Epic and Morale promotion
[Arc de Triomphe](https://thenounproject.com/search/?q=Arc%20de%20Triomphe&i=2936011) by iconfield for National Epic
[Bank](https://thenounproject.com/term/bank/213472/) by By P Thanga Vignesh for National Treasury
reused general icon for Great Generals and Quick Study promotions

* implemented "Cost increases by [30] per owned city of cities" unique
All vanilla national wonders that require something in all cities have it

* added uniques
"Nuclear weapon" - Game option "nuclearWeaponsEnabled" enables units with this unique
"Requires [building]" - Apollo Program, Manhattan Project etc
"Requires adopted [policy]" - in expansions Statue of Zeus will require "Honor", Prora - "Autocracy", Landsknecht - "Mercenary Army".

* merged "Requires adopted [policy]" with "Requires [Wonder]"

* Separated unique.params[0] to val filter

* Changed National Epic image
2020-09-21 21:44:52 +03:00
HadeanLake
e6e31b4e1a
Aztecs and some other things (#3033)
* Added icons
* [temple](https://thenounproject.com/search/?q=temple&i=28256) By Fabio Meroni for Temple of Artemis
* [Canoe](https://thenounproject.com/term/canoe/402285/) By Viktor Fedyuk (Tim P) for Floating Gardens
* [Garden](https://thenounproject.com/search/?q=garden&i=1478380) By Bharat
Aztecs by Séan https://discord.com/channels/586194543280390151/633733497277775884/727255962754351104
Jaguar by Red11

Reused slinger icon for Slinger Withdraw

* Added buildings and uniques for them
garden - bonus building of the Medieval Era. City "Must border a source of fresh water"
Temple of Artemis - World wonder of the Ancient era
Floating Gardens - Aztec unique building, replaces Water Mill

"[+1 Science] Per [2] Population in this city" - for Library and Public School
"+[]% great person generation in this city" - for garden
"Must border a source of fresh water" - "fresh water" provided by river or tiles with "Fresh water" unique. Added "Fresh water" unique to Lakes and Oasis
"+[10]% growth in all cities" - now has parameter - for Tradition Complete policy and Temple of Artemis
"+[10]% growth in capital" - now has parameter
"+[15]% Production when constructing [ranged units]"   - "ranged units" now valid param
"[stats] once [tech] is discovered" - Petra and Mughal Fort have it
"[+1 Production] from [River] tiles in this city"]  - now can use "River" - for Hydro plant

* Added Jaguar - Aztec unique unit
New unique - "+[]% combat bonus in [param]" unique - Norwegian Ski Infantry, Jaguars and Mohawks have it. param can be terrainFeature or baseTerrain, in case of baseTerrain it implies there are no features like vegetation her
Implemented "Culture for the empire from each enemy unit killed"
tweaked honor policy - it should bring half as much culture, and same as Sacrificial Captives
Fixed penalty for terrain if unit do not have "No defensive terrain bonus" unique

* Added Aztecs

* Update template.properties

* update template.properties

* update template.properties

* update template.properties
2020-08-30 21:02:59 +03:00
Yair Morgenstern
0074ebfdb5 temp zip file is now deleted after download 2020-08-26 14:56:32 +03:00
Yair Morgenstern
247227bdaa Can now download mods from Github repos! :D 2020-08-25 22:00:38 +03:00
Yair Morgenstern
a253a97940 Added Unzip functionality - we should soon be ready for mod management from within the game! 2020-08-25 16:38:55 +03:00
Yair Morgenstern
6d7903eb93 Resolved #2844 - Can now immediately move units in Desktop with right-click 2020-08-25 00:24:09 +03:00
Alexander Korolyov
c51879cc5f
OptionsPopup with two experimental switches: Spectator mode, Extended Map editor. (#2834) 2020-07-12 12:59:32 +03:00
Yair Morgenstern
c73df02d76 Unified City States and City-States -> City-States #2497 2020-04-23 19:39:16 +03:00
Yair Morgenstern
700b1afb34 3.8.0 2020-04-21 20:28:41 +03:00
u-ndefine
bb98bee733
Missed Unciv new icon credits, whoops (#2331)
* New Unciv icon credits by u-ndefined
2020-04-05 00:20:26 +03:00
Jack Rainy
29a077a803
Forts and citadels (with AI) (#2325)
* Enabled Forts & Citadels

* Friendly territory checks

* Citadel damage & notifications

* Sprites, Icons, Translation & Atlas

* Obsolete tests are removed

* NullReferenceException code is fixed

* Refactoring: using the static object

* AI for the forts and citadels

* Display defence stats

* Exclude enemies tiles as candidates

Co-authored-by: r3versi <fluo392@gmail.com>
2020-04-03 11:22:27 +03:00
Jack Rainy
dde01738de
New wonders: Mausoleum of Halicarnassus, Statue of Zeus (#2301)
* New wonder: Mausoleum of Halicarnassus

* New wonder: Statue of Zeus

* Obsolete tests are removed
2020-04-01 20:12:25 +03:00
u-ndefine
3ec27ec6c3
Add missing images (#2277)
* Add missing images

* Add missing files

* Update Credits.md
2020-03-29 13:39:19 +03:00
Yair Morgenstern
378f56207c Resolved #1779 - Can now lock worked tiles to prevent them from being unassigned 2020-03-29 12:42:58 +03:00
Yair Morgenstern
cf79ac0db1 Inca fixes - added icon, fixed colors 2020-03-28 22:41:55 +03:00
Federico Luongo
2a67294554
Snow, Ice, Atoll & Map Generation (#1909)
* Snow, Atoll & Ice

* Fix White Hexagon + Small NW refactor

* More Land in Continents #1886

* Atoll can spawn only on Coast

* Added new constants and turned Constant into an object

* Latitude and Longitude utility methods

* New MapGenerator steps

* New MapParameters & MapGenerator cleanup

* Added New Map option to MapEditor menu

* New parameters default values and limits

* archipelagos map type

* Translations & Atlas

* removing unneeded octave displacement

* Fix Archipelago

* Perlin noise parameters & no-elvis in TileMap

* Rebuilt Atlas

Co-authored-by: Eddh <remi.dufour@protonmail.com>
2020-03-11 11:39:37 +02:00
u-ndefine
609c8f843b
Minor update on Credits.md (#1949)
# Nations
- Fix typo on word "crescent"
- Fix link that flew off on word "sword"
2020-02-16 09:32:10 +02:00
JackRainy
e0a00eb9a5 Implemented aircraft carrier "Flight Deck" and "Armor Plating" promotions (#1754)
* Implemented aircraft carrier "Flight Deck" and "Armor Plating" promotions

* Template for the translation strings

* New icons are added

Co-authored-by: ltrcao <ltrcao@users.noreply.github.com>
2020-01-25 19:43:53 +02:00
JackRainy
1441dd49f5 Aircraft carrier is added (#1731)
* Implemented aircraft carrier by @ltrcao in PR #1723

* New icon for the Carrier unit
2020-01-20 22:53:59 +02:00
Yair Morgenstern
cc29f15ba9
Delete NewCivs.md 2019-12-10 22:06:16 +02:00
Sam Rogers
cdcd7cf116 correct spelling of "Fascism" policy (#1432) 2019-12-08 18:40:48 +02:00
Yair Morgenstern
34bd8155ae New icon! 2019-12-08 15:00:27 +02:00
Duan Tao
111030e457 Nuke your enemy! (#1318)
* Nuke your enemy!

* Fantasy tiles. Worker automaticly clears fallout.

* Some AI improvement for choosing wonder and military unit.

* Add nuclear weapon option.
2019-11-19 08:43:04 +02:00
Yair Morgenstern
7a02019b7c Resolved #1340
Apparently some chipsets, like NVIDIA Tegra 3 graphics chipset (used in Asus TF700T tablet), don't support non-power-of-two texture sizes - kudos @yuroller!
2019-11-17 20:15:10 +02:00
Yair Morgenstern
57b0040df7 Added Siam civ - #703 2019-11-03 23:22:49 +02:00
Yair Morgenstern
9dee9f8256 Can now download background music for the game through the Options menu =D 2019-10-30 23:31:16 +02:00
Yair Morgenstern
27dfae18de Can now choose Era when starting a new game! 2019-10-11 16:05:27 +03:00
Yair Morgenstern
4da70dfe88 Added polynesia icon and colors 2019-10-11 12:49:07 +03:00
Yair Morgenstern
a8dac82157 Added Moai as part of Polynesian civ - lots of changes to be made for that! 2019-10-11 12:09:22 +03:00
Yair Morgenstern
3abd25c130 Added Thai, although the symbols on top don't seem to render well =( 2019-09-29 12:44:02 +03:00
Yair Morgenstern
a1f5690e41 Added Puppet icon - some reorgnizing still needs to be done in regards to puppet vs annex 2019-09-23 10:46:51 +03:00
Duan Tao
65b8fe531e Duantao/liberate city (#1097)
* Allow to liberate city to its founder.

* Workaround : Avoid exception on conquering city with infantry unit.

* Liberate button actually works.

* Fix trade resources check.

* Postpone the 2nd part of postBattleActions until choice is made.

* Add puppet option.

* Puppet city cannot be controlled directly.

* Add annex and puppet happiness/culture/science bonus.

* Add courthouse. Icon is missing.

* Icon for courthouse.

* Update png.
2019-09-23 08:37:53 +03:00
Yair Morgenstern
f4d828d5e4 Finished changing all unit promotion icons! 2019-09-18 22:15:37 +03:00
Yair Morgenstern
b86d11b5fa Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-17 22:40:09 +03:00
Yair Morgenstern
04127164bc Added all remaining wonder quotes and more promotion icons 2019-09-17 22:39:08 +03:00
Smashfanful
2ef533f57b Update Credits.md (#1087)
* Update Credits.md

* Update Credits.md
2019-09-17 08:14:36 +03:00
Yair Morgenstern
48ad8f3f88 Got rid of most of the original civ's Promotion icons and replaced with Unciv icons =) 2019-09-15 23:26:20 +03:00
Yair Morgenstern
9665c59782 Changed some border icons to filled icons, which look way better in-game 2019-09-15 14:53:18 +03:00
Yair Morgenstern
d645ae4478 Added Iroquois civilization 2019-09-15 12:13:14 +03:00
Yair Morgenstern
c8c9daf820
Added Icon source legal considerations 2019-09-06 15:56:28 +03:00
Yair Morgenstern
eeb1c26ef5 Added Korean civ 2019-09-02 23:44:29 +03:00
Yair Morgenstern
c82ce697b9
Update NewCivs.md 2019-09-02 00:04:45 +03:00
Yair Morgenstern
a3a5a82eaa
Update NewCivs.md 2019-09-02 00:02:29 +03:00
Yair Morgenstern
65251ef04a Added documentation for adding a new civ 2019-09-02 00:00:06 +03:00