Commit graph

2654 commits

Author SHA1 Message Date
Yair Morgenstern
757ecd8590 Resolved #3053 - improvements can be built on neutral tiles 2020-08-31 20:51:53 +03:00
Yair Morgenstern
697e193f51 Resolved #3065 - Ottomans' unique is now according to Vanilla 2020-08-31 20:42:50 +03:00
lishaoxia1985
503bf45e8d
Chinese update, Fix CityInfoTable bug (#3062)
* Chinese update, Fix CityInfoTable bug

* Delete some skin classes which are unused in Game
2020-08-31 19:49:01 +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
uncivbot[bot]
fb38fb9da7
Translations update (#3056)
* Update Turkish.properties (#3042)

* russian & ukrainian translations update (#3043)

* russian & ukrainian translations update

* Update completionPercentages.properties

* Update Spanish.properties (#3044)

* Update Brazilian_Portuguese.properties (#3045)

I want to help =)

* Translation update, Some bug fix (#3047)

* Translation update, Some bug fix

* Remove some blank key when we use Fonts.turn

Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
Co-authored-by: DuffKI <51823715+DuffLagerleff@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: arturT7 <70413143+arturT7@users.noreply.github.com>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
2020-08-30 20:27:13 +03:00
HadeanLake
15ed1a608b
New uniques and stuff for mods (#3055)
* "[+1 Gold] for each adjacent [Road]" Roadstatus can be used now in tile improvement uniques

* Added hasViewableResource check to "[stats] from every [Resource]"

* Fixed translation of nation uniques

* Eras with no researchable techs will not appear in dropdown menu in new game options

* Implemented startingUnits, aiMajorCivStartingUnits and aiCityStateStartingUnits fields in difficulty

* reassignRemovedModReferences will also reassign if nation is a City-State in current ruleset
e.g. Venice will be unselected if player unselects Civ5ExpansionMod which has it as playable civ

* "Cannot be purchased" - new unique for non-wonders and units. SS parts have it

* Update template.properties

* Update Difficulty.kt
2020-08-30 15:48:00 +03:00
HadeanLake
5e1508e481
fix nationsToRemove (#3041) 2020-08-28 15:55:44 +03:00
Yair Morgenstern
2a8202d8b6 Can put maps in mods!
All Map based logic changed to by-FileHandle instead of by-name  to support this
2020-08-27 14:43:49 +03:00
Yair Morgenstern
d2e914473a Resolved #3035 - added nationsToRemove in modOptions 2020-08-27 11:51:20 +03:00
Yair Morgenstern
36f5d22a80 Mod management screen takes its list of mods from the Github API! 2020-08-26 15:57:15 +03:00
Yair Morgenstern
0074ebfdb5 temp zip file is now deleted after download 2020-08-26 14:56:32 +03:00
Yair Morgenstern
4cf4381f51 Mod download works on Mobile as well! 2020-08-26 12:39:07 +03:00
Yair Morgenstern
247227bdaa Can now download mods from Github repos! :D 2020-08-25 22:00:38 +03:00
Yair Morgenstern
353b6e71f8 Added initial mod management screen
Changed turn icon to hourglass, per the change in the Discord poll
2020-08-25 18:43:05 +03:00
Yair Morgenstern
3fdcbeeef6 3.10.4 2020-08-25 17:17:25 +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
16356f9d36 Added gold-to-science conversion for Civ IV rules 2020-08-25 11:54:26 +03:00
Yair Morgenstern
b076f482aa Removed UnitContextMenu, since it wasn't actually being used and was causing problems 2020-08-25 11:17:47 +03:00
Yair Morgenstern
0c1e318334 Resolved #2979 - Display countdown to negotiate peace in diplomacy screen 2020-08-25 10:18:05 +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
Yair Morgenstern
a6b89b9885 More minor emoji changes
They do make the whole setup seem much more professional
2020-08-24 23:17:34 +03:00
Yair Morgenstern
bed7fe4c64 Added unit symbols for Strength, Ranged Strength, Range and Movement as 'emojis' 2020-08-24 22:48:00 +03:00
Yair Morgenstern
b85506a7d5 Resolved #2937 - can add large increments of gold in trades 2020-08-24 21:29:00 +03:00
Yair Morgenstern
6c3faec6ac Keep the perpetual construciton going, if the user set it manually. 2020-08-24 20:39:46 +03:00
Yair Morgenstern
1f3b77d038 All 'Turn' and 'Turns' texts changed to a turns icon, much cleaner! 2020-08-24 19:45:53 +03:00
HadeanLake
879c416e30
Few translation and unique fixes (#3020)
* Few translation and unique fixes
Fixed:
* translation of "vs original Unit name" in nation description
e.g. Lost ability(vs Knight): Penalty vs City 33%
* translations of some button texts and labels from map editor

* Fixed "[+X Happiness] in all cities" and "[+X Happiness] in capital" national unique
2020-08-24 15:19:07 +03:00
Yair Morgenstern
8d3b0b09e9 Tech picker screen auto-handles eras of different lengths 2020-08-24 14:54:27 +03:00
Yair Morgenstern
45d90c0458 Unified construction filtering for civ- and city-wide uniques 2020-08-24 14:30:26 +03:00
Yair Morgenstern
6ff712b625 A mishmash of different fixes: Unit uniques and promotions, happiness calculation, etc. 2020-08-24 10:58:14 +03:00
Yair Morgenstern
21c8336563 unit.getMatchingUniques() 2020-08-24 09:48:33 +03:00
Yair Morgenstern
d4b8aae84a Finally changed unit uniques to Unique! 2020-08-23 22:53:38 +03:00
Yair Morgenstern
8203549aea Removed UniqueAbility from Nations 2020-08-23 22:33:31 +03:00
Yair Morgenstern
002d0cc7f6 Settler 'by name' recognition changed to 'by unique' recognition, allowing for modded settler-like units 2020-08-23 00:28:55 +03:00
Yair Morgenstern
a930ad6360 MapGen doesn't place ancient ruins if they're not defined in the current ruleset 2020-08-21 14:16:05 +03:00
Yair Morgenstern
db7f064498 Resolved #3016 - Policy branch uniques are translated properly 2020-08-21 14:06:29 +03:00
Yair Morgenstern
9e7b6ca90d Borders consist of both civ colors, making some borders (esp. Germany) much clearer 2020-08-21 00:12:37 +03:00
Yair Morgenstern
02c2da9347 generified []# of food is carried over 2020-08-20 23:45:44 +03:00
Yair Morgenstern
270c50afd6 Generified more building uniques and merged functionality of global and city uniques when alculating tile stats 2020-08-20 23:11:53 +03:00
Yair Morgenstern
42b5b3f16c Can now disable diplomatic relationship changes in a mod 2020-08-20 16:38:14 +03:00
Yair Morgenstern
acf803de28 Merged Building and Policy unique activations
Added Tech link checks for loaded mods
2020-08-20 15:00:10 +03:00
Yair Morgenstern
e7c0710042 3.10.2 2020-08-20 12:30:46 +03:00
Yair Morgenstern
4d6478cf05 Added link checks when loading mods, so you'll know if you messed something up 2020-08-20 11:55:28 +03:00
Yair Morgenstern
9ca7e7ac5b Dealt with some game assumptions about what exists, which may not be true in mods 2020-08-20 11:18:53 +03:00
Yair Morgenstern
67ce953c62 TechPickerScreen centers small tech trees nicely 2020-08-20 10:44:22 +03:00
HadeanLake
cd72926a60
Bugfixes (#3007)
* Fixed "Can move immediately once bought" unique

* Spectators no longer can adopt policies
Close button is no longer disabled when player has free policy but has no adoptable policies
FreePolicies are being spent properly in scenario editor mode

* redundant
2020-08-19 15:25:17 +03:00
HadeanLake
a12c1ada26
Fixed AI being stuck doing science or gold per turn (#3006)
* AI will no longer get stuck doing science or gold per turn

* added missing commas in jsons
2020-08-18 20:53:16 +03:00
HadeanLake
764a1c3913
scenario editing mode improvements and new unique (#2999)
* scenario editing mode improvements and new uniques

* Fixed Russian nation unique - it is civ-wide bonus

* genericized "+[]% Production when building [] in this city"

* genericized "All newly-trained [] units in this city receive the [] promotion"

* changed some uniques to be able to have list of filters separated by comma as unique param

* scenario editing mode improvements:

Resource requirements when buying buildings and units are ignored

Limit for selling buildings is ignored

Workers improve tiles instantly

Units will not be disbanded if civilization has negative gold

* fix crash in scenario editing mode due to PerpetualConstruction not having a GoldCost

* undo comma separation

* implement All newly-trained [relevant] units in this city receive the [] promotion
relevant as in 'units that can receive'

* upadte template.properties

* unnecessary parentheses

* Not being annoyed by this vs less chance of forgetting to set gold before releasing scenario

* update template.properties

* add missing spaces
2020-08-18 19:20:59 +03:00
Yair Morgenstern
1abbd1520c Game can handle the situation where there are no more techs that can be researched (in mods with limited techs) 2020-08-17 23:17:49 +03:00
Yair Morgenstern
2c8074bfe4 Converted the "special power" of the Future Tech to a unique than can be applied to any tech 2020-08-17 23:07:58 +03:00
HadeanLake
44744fd17b
Fix #3000 (#3001) 2020-08-17 14:46:38 +03:00
Yair Morgenstern
574e588711 City-wide bonuses are clearly marked as such to differentiate them from civ-wide bonuses 2020-08-16 20:43:19 +03:00
Yair Morgenstern
f2f14b6570 Revert "Changed all "[] from [] tiles" to "[] from every []""
This reverts commit c89041e2d4.
2020-08-16 20:16:01 +03:00
Yair Morgenstern
4cd4d5d89f All kinds of crazy translation fixes 2020-08-15 23:20:18 +03:00
Yair Morgenstern
c89041e2d4 Changed all "[] from [] tiles" to "[] from every []" 2020-08-15 21:58:26 +03:00
Yair Morgenstern
be216d8e6b Game no longer crashes on new game screen when no scenarios are available 2020-08-15 21:58:02 +03:00
HadeanLake
dc1181f3fd
Update TileInfo.kt and GameOptionsTable.kt (#2990)
* check if Improvement in question isGreatImprovement before applying buff that only Great Improvements are supposed to have

* update() GameOptionsTable when player selects or unselects mod

some mods might change list of difficulties or eras

* run onChange() when SelectBox is added

so if user select modded difficulty and unselect mod that added it  gameParameters.difficulty will be updated

* add [+stats] from every [baseTerrain or terrainFeature] Nation unique
2020-08-15 21:20:25 +03:00
Yair Morgenstern
7efbe6feb2 Better loading of stuff 2020-08-14 16:33:09 +03:00
Yair Morgenstern
15bca9cc1c Can now load scenarios from inside mods, so they aren't sent as 2 separate files! 2020-08-14 14:50:22 +03:00
Yair Morgenstern
1261b1de30 List of saved games is now returned as a series of file hanldes - this means there's a lot less ping-ponging between the game name and the file in all kinds of places 2020-08-14 14:28:47 +03:00
Yair Morgenstern
4046837a3e AI chooses to fortify in non-bombardable tiles if possible
Can choose replacement building for Palace to indicate the capital city
2020-08-14 13:43:28 +03:00
Yair Morgenstern
7a7fb57f56 Resolved #2985 - fixed Embark/Disembark costs 2020-08-14 10:19:01 +03:00
Yair Morgenstern
81f19c0d12 Merged "save scenario map" and "save map" to the same button - the buttons in the map editor screen are much more managable now 2020-08-14 10:12:24 +03:00
Yair Morgenstern
795599207f Merged "load map" and "load scenario map" to the same screen - they're basically the same thing anyway 2020-08-14 10:07:15 +03:00
Yair Morgenstern
6ebc4ebf6f Units have full movement when starting a scenario map game
Units have full movement when bought when in Scenario Editor mode
2020-08-14 09:43:42 +03:00
Yair Morgenstern
24d5e08783 Translation updates for Finnish 2020-08-14 00:38:17 +03:00
Yair Morgenstern
25b434cb29 Can now adopt policies in Scenario Editor mode by double-clicking 2020-08-13 18:11:21 +03:00
Yair Morgenstern
88d72f0f39 Spectator and City-State civs are no logner considered as having 'discovered' a natural wonder 2020-08-13 17:45:28 +03:00
Yair Morgenstern
d090b0567c Proper separation between "Scenario Map" and "Scenario" 2020-08-13 17:40:48 +03:00
Yair Morgenstern
a27aecda09 The new age of scenarios is upon us!
Can save a game and have it get turned instantly into a scenario!
2020-08-13 17:06:37 +03:00
Yair Morgenstern
42c8a64943 Added "scenario editing" mode for creating prebuild scenarios 2020-08-12 21:58:23 +03:00
Yair Morgenstern
451234c3bb 3.9.20 2020-08-12 19:39:45 +03:00
Yair Morgenstern
5084bb6f9e Can now play an entire scenario with no improvements or techs defined 2020-08-11 22:53:48 +03:00
Yair Morgenstern
7382d4f8e8 The ImageGetter changes rulesets correctly when entering\exiting scenario editor 2020-08-11 22:44:41 +03:00
Yair Morgenstern
0c84b95614 Tests are sometimes ridiculous. 2020-08-10 23:44:10 +03:00
Yair Morgenstern
889d6a1587 Denounce now has a confirmation popup 2020-08-10 23:24:02 +03:00
Yair Morgenstern
3b2e813523 Ancient Ruins can now provide Culture 2020-08-10 23:12:02 +03:00
Yair Morgenstern
2e0d73cf75 Game handles 'picking a scenario based on a custom ruleset' well 2020-08-10 22:59:48 +03:00
Yair Morgenstern
0c4947a03e Added Scenario victory condition - can now have Scenario deathmatches! (sort of) 2020-08-10 22:45:34 +03:00
Yair Morgenstern
fd211b1fa3 Scenario now no longer spawns starting units - they should be prebuilt into the scenario! 2020-08-10 21:18:55 +03:00
Yair Morgenstern
8dd8fa3575 Resolved #2951 - only ancient ruins improvements are removed around players' starting locations, and not other improvements 2020-08-10 21:03:28 +03:00
Yair Morgenstern
c17de11c35 Remove all unavailable resource when scenario-ing a map 2020-08-09 23:10:55 +03:00
Yair Morgenstern
be51735fdf Fixed broken tests 2020-08-09 21:37:09 +03:00
Yair Morgenstern
0dae80d379 AI now has 5 favored policy trees for each preferred victory type, making them more likely to win culturally 2020-08-08 22:02:50 +03:00
Yair Morgenstern
1a021a21fe AI no longer uses all its aluminum on units and leaves some for spaceship construction 2020-08-08 21:56:51 +03:00
Yair Morgenstern
b8ce489ea3 3.9.19 2020-08-08 21:39:34 +03:00
Yair Morgenstern
ae60aab7e5 Resolved #2818 - Can no longer build improvements outside your borders 2020-08-07 17:22:48 +03:00
Yair Morgenstern
376079100d Tile Improvements get parametrized Uniques! 2020-08-07 14:48:14 +03:00
Yair Morgenstern
9a2ec028af Tests fixed 2020-08-07 13:25:51 +03:00
Yair Morgenstern
f0b041b20b NationUnique is now removable whenever we want ;) 2020-08-06 23:48:25 +03:00
Yair Morgenstern
0a30e99359 All nations uniqueified! 2020-08-06 23:29:49 +03:00
Yair Morgenstern
de97e1c32f All nations up till Mongols - almost done! 2020-08-06 20:53:40 +03:00
Yair Morgenstern
5cc610aa5d Persia nation uniques - also contained a translation-wide change 2020-08-06 20:24:18 +03:00
Yair Morgenstern
ce0985d077 All nation uniques up to Iroquois 2020-08-06 20:15:59 +03:00
Yair Morgenstern
9f5b8d157a Converted civ uniques up to India 2020-08-06 19:53:29 +03:00
Yair Morgenstern
1fb566ec30 RIP PolicyManager.PolicyEffects 2020-08-06 18:40:35 +03:00
Yair Morgenstern
97916e15a1 More usage of existing Uniques 2020-08-06 18:26:43 +03:00
Yair Morgenstern
93435948d6 Solved unit purchase discount being 100x what it was supposed to be 2020-08-06 18:11:58 +03:00
Yair Morgenstern
73cd231f5b Merge branch 'master' of https://github.com/yairm210/Unciv 2020-08-05 21:52:48 +03:00
Yair Morgenstern
bde0b97138 Resolved #2872 - Diplomacy screen now scrollable when there's too much text 2020-08-05 21:51:44 +03:00
Väinö Mäkelä
3ecee11e11
Resolved #2893 - Use list_folder/continue to get the whole folder (#2930)
listing when downloading a file
2020-08-05 21:49:23 +03:00