wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4231 commits 7 branches 304 tags 288 MiB
Commit graph

4231 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
683cbb5864 3.10.5-patch1 2020-08-30 20:50:56 +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
b83ad41518 3.10.5 2020-08-27 15:21:11 +03:00
uncivbot[bot]
69bdadf87b
Translations update (#3036) 
* Update Italian.properties (#3030)

* German translation updates (#3031)

* Update German.properties

* Update German.properties

* Update Simplified_Chinese.properties (#3032)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Spanish.properties (#3034)

Fixed some spelling errors and missing translations added.

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
 2020-08-27 15:03:47 +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
2c66b53b27 Fixed tests 2020-08-26 16:52:10 +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
uncivbot[bot]
078b07bdb5
Translations update (#3029) 
* Update Italian.properties (#3023)

* Update Spanish.properties (#3024)

Actualización de cambios del idioma español
Spanish language changes update

* Update Simplified_Chinese.properties (#3025)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
 2020-08-25 17:07:12 +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
cdde27d74d Can remove tile features outside your borders 2020-08-24 11:01:15 +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
40f93461fa With new translation lines 2020-08-23 21:27:31 +03:00
Yair Morgenstern
9ef7d8770d Added a new test that ensures no two placeholders are the same 
Fixed double 'param' parameter in existing translations
 2020-08-23 21:20:17 +03:00
uncivbot[bot]
6185312fd9
Translations update (#3022) 
* Update Italian.properties (#3013)

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

* Update Simplified_Chinese.properties and Traditional_Chinese.properties (#3019)

* Update Simplified_Chinese.properties

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Indonesian.properties (#3014)

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

* Update German.properties (#3015)

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

* Update Russian.properties and Ukrainian.properties (#3018)

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties

* update Ukrainian.properties

* Update Ukrainian.properties

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties and Ukrainian.properties

* update Ukrainian.properties after review

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties and Ukrainian.properties after review

* Update Russian.properties and Ukrainian.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: HadeanLake <69697985+HadeanLake@users.noreply.github.com>
 2020-08-23 20:29:37 +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
408077cd5f Roads and railoads can be removed outside your borders 2020-08-20 23:21:12 +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
uncivbot[bot]
2492c17216
Translations update (#3012) 
* Update Italian.properties (#3002)

* Update Czech.properties (#3003)

lot of new strings translated

* Update German.properties (#3005)

* Update Indonesian.properties (#3004)

* Update Simplified_Chinese.properties (#3010)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties (#3011)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: ZGMZY <69511837+ZGMZY@users.noreply.github.com>
 2020-08-20 12:09:06 +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