4561 Commits

Author SHA1 Message Date
Yair Morgenstern
8292b848b7 3.11.3-patch1 2020-10-11 22:21:36 +03:00
Yair Morgenstern
8f535391b3 Influence bar not displayed for city-states that don't know the viewing civ 3.11.3-patch1 2020-10-11 22:11:31 +03:00
Yair Morgenstern
9a887e4840 Resolved #3254 - food-to-production not added twice when calculating turns to production 2020-10-11 22:10:32 +03:00
Yair Morgenstern
fa41076cf2 3.11.3 3.11.3 2020-10-10 23:18:14 +03:00
uncivbot[bot]
27a474ddd0
Translations update (#3252)
* Update Russian.properties (#3249)

* Update Russian.properties

* Update Russian.properties

* Update Japanese.properties (#3247)

* Update Japanese.properties

* Update Japanese.properties

* Add some translations for french language (#3251)

* Update Italian.properties (#3245)

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

* Update Hungarian.properties (#3244)

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

Co-authored-by: DarkHeaven <52608694+D4rkHeaven@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: ikarris <Yan.Petit@hotmail.fr>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Czeczki <72320003+Czeczki@users.noreply.github.com>
2020-10-10 23:03:30 +03:00
Federico Luongo
80ce4496c9
City states button influence bar (#3248)
* City States influence fix

* Influence when at war = -60f
* Enemies if influence < 0f, neutrality is only from 0f to 30f
* Changed RelationshipLevel accordingly

* City States buttons influence bar

* Influence bar in DiplomacyScreen
2020-10-10 22:59:17 +03:00
Yair Morgenstern
f7ff1bd267 Translation generation can handle multiple parameters of the same type 2020-10-09 14:39:41 +03:00
Yair Morgenstern
be5f42f94b AI does not construct science-related constructions when all techs have been researched 2020-10-09 14:22:57 +03:00
Yair Morgenstern
e292c210c8 Added "Must be next to []" unique for tile improvements 2020-10-08 17:35:25 +03:00
Yair Morgenstern
0543c6473f Welp now it builds fine 2020-10-08 17:34:35 +03:00
Yair Morgenstern
8df9a4fd7e Merge branch 'master' of https://github.com/yairm210/Unciv 2020-10-08 17:12:01 +03:00
Yair Morgenstern
e14db65996 Resolved #3239 - simplified unit actions, which were unnecessarily complicated 2020-10-08 17:11:37 +03:00
Federico Luongo
fea342a31b
Clear Barbarian Camp quest (#3246) 2020-10-08 16:29:56 +03:00
Federico Luongo
eaa89d69f4
Pixel unit colors based on civilization colors (#3231)
* Enabled Pixel Unit colors based on civilization colors

* Strict pattern for image layers

* Updated docstring

* Reworked layers' retrieval
2020-10-08 15:42:16 +03:00
Yair Morgenstern
0b9bcabea4 Added resource-providing building unique 2020-10-08 15:36:00 +03:00
Yair Morgenstern
55d904e1cd Confirmation popup when clearing the map in the map editor 2020-10-08 15:34:31 +03:00
Yair Morgenstern
36ed648621 Files in the mod folder no longer crash the game on startup 2020-10-08 15:33:55 +03:00
givehub99
da328c0408
Unified Unit Category Checking For Uniques (#3238)
* Starting unified unit category checking. This will increase flexibility with uniques as well as cut down on uniques that have only a slightly different way of checking unit categories.

Things currently checked by the category checking method are:
Type of unit
Name of unit
Whether unit is wounded
If the unit is land, water, or air

"Bonus vs City y%" still works currently.

Uniques that have been changed/added to use this category checking method so far are:

"Bonus vs x y%"
"[] units deal +[]% damage" (parameterization of "Wounded military units deal +25% damage")
"[] units gain the [] promotion"

If PR approved, using this method for more uniques would be a good idea.

Commented as depecrated are these uniques
"+[]% Strength vs []" (this has not been used in json files)
"Wounded military units deal +25% damage" (policies json file was updated to use parameterized version)

The following was added to template.properties for translating modifiers:

Air
Wounded

* translation ending with a space

* -Changed matchesCategory method for CityCombatant to what was suggested
-Changed matchesCategory method for MapUnitCombatant to what was suggested
-Use type.name instead of type.toString().toLowerCase()
-Lowercasing is no longer allowed for type names and unit names.

I kept the lower cased versions of wounded, land, water, and air for compatibility as several of the uniques are phrased like "Bonus vs land units 25%" and such and have entries in template.properties (ie. land units = ).

* -Lowercasing is no longer allowed. For wounded, land, water or air, you have to either use the capitalized version (ie. "Wounded") or lower case with units (ie. "wounded units"). This lets preexisting uniques that use "wounded units" etc still work while also letting people use the singular capitalized word (ie. "Wounded") for other uniques.

* fixed missing check for wounded units
2020-10-08 13:09:05 +03:00
Yair Morgenstern
4fa7c8d4c6 3.11.2 3.11.2 2020-10-08 12:47:08 +03:00
uncivbot[bot]
9616d1458d
Translations update (#3243)
* Add fixes and localizations (#3234)

Added some translations needed and fixed some typos. Also shortened some phrases for more concise text.

* Update Italian.properties (#3235)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: Rafael 'Fig Diamantino de Figueiredo <45023203+rafaeldfigueiredo@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2020-10-08 12:37:14 +03:00
Federico Luongo
7aedb6d4df
Find Player quest (#3237)
* Find Player quest

* Sequences
2020-10-08 12:25:58 +03:00
Yair Morgenstern
4e50ea9618 Merge remote-tracking branch 'origin/revert-3240-TechUniques' 2020-10-08 12:23:53 +03:00
Yair Morgenstern
18c837a7ed More informative alert for tech modders 2020-10-08 12:21:43 +03:00
Yair Morgenstern
236c7a1c15 Revert "When checking for nation uniques, it also checks the tech uniques (#3240)"
This reverts commit 31226c97e86d9a2bc956461a5fdb29d90c9bd47d.
2020-10-07 23:05:46 +03:00
givehub99
31226c97e8
When checking for nation uniques, it also checks the tech uniques (#3240)
* When checking for nation uniques, it also checks the tech uniques

* asSequence() before map
2020-10-07 23:05:06 +03:00
Yair Morgenstern
223e52fe32 "matches" is a more intuitive name than "fits" for filtering 2020-10-07 14:17:50 +03:00
Yair Morgenstern
a485ad5fa5 Merge branch '3.11.1-patch1' 2020-10-07 14:13:30 +03:00
Yair Morgenstern
effc7485a9 3.11.1-patch1 3.11.1-patch1 2020-10-07 14:04:19 +03:00
Yair Morgenstern
8c1913c2c4 Total conversion mods should handle missing specialists (altough they really should deal with it) 2020-10-07 14:03:27 +03:00
Yair Morgenstern
e690e3bcea Copied files in Android should now overwrite existing files 2020-10-07 14:02:38 +03:00
Yair Morgenstern
1a4cc125c3 And for units as well of course 2020-10-07 13:44:42 +03:00
Yair Morgenstern
e9835eab12 Resolved #3229 - added "Not displayed as an available construction unless [] is built" unique 2020-10-07 13:41:56 +03:00
givehub99
b96cdae232
Polynesia's unique was fixed to match the syntax of the unique, which is "+[]% Strength if within [] tiles of a []". The 2 was put in brackets. (#3241) 2020-10-07 13:25:44 +03:00
Yair Morgenstern
0c038fa4af New & better Github preview image 2020-10-06 14:48:08 +03:00
Federico Luongo
1dd82f6f58
Find Natural Wonder Quest implemented (#3211)
* Find Natural Wonder Quest implemented

* List to sequence to list
2020-10-06 13:59:54 +03:00
Yair Morgenstern
fa59d4888a Era-specific city tiles for Ancient, Classical and Medieval 2020-10-06 12:22:55 +03:00
Yair Morgenstern
bb5eff5250 Battle damage calculations changed to ints, for simplicity 2020-10-06 11:16:33 +03:00
givehub99
9ffa0bee54
Consolidated Generic Tile Bonus Uniques (including Friendly Land, Foreign Land) (#3232)
* Redid things with help from HadeanLake:

-"+[]% combat bonus in []" Unit Unique
-"+[]% combat bonus for units fighting in []" Nation Unique
-Both of these can check for terrain or Friendly Land or Foreign Land
-Function to add stacking modifiers
-Himeji Castle and Foreign Legion had uniques changed to fit this syntax
-Old way still works for now, but deprecated

* fixed comments about deprecation and the new syntax
2020-10-06 10:52:30 +03:00
Federico Luongo
f9ebc8aa0f
Acquire Great Person Quest implemented (#3210)
* Acquire Great Person Quest implemented

* List to sequence to list
2020-10-06 10:48:59 +03:00
Yair Morgenstern
e951ed8324 3.11.1 3.11.1 2020-10-06 10:43:10 +03:00
uncivbot[bot]
7ecb059e05
Translations update (#3233)
* Update Italian.properties (#3221)

* Update Italian.properties

* Update Italian.properties

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

* Update Simplified_Chinese.properties (#3225)

* Update German.properties (#3228)

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: Czeczki <72320003+Czeczki@users.noreply.github.com>
2020-10-06 10:35:41 +03:00
Mojtaba Rahimy
8e53be616d
Ui fixes (#3218)
* moving close button to end of the list and setting color to red

* aligning text/icon in main screen top bar
2020-10-06 10:28:13 +03:00
Yair Morgenstern
93bf69f3d5 Fixes for minor bugs from the previous version 2020-10-05 23:20:49 +03:00
Yair Morgenstern
0e327012a7 Fixed Windmill unique 2020-10-05 22:51:55 +03:00
Yair Morgenstern
010497e095 Don't delete existing mods when copying mods from the external diretory on Android app startup 2020-10-05 14:40:23 +03:00
Yair Morgenstern
27c8243a78 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-10-05 12:12:34 +03:00
Yair Morgenstern
256eedc7c0 Lines go behind the techs in the tech screen, and are colored so you can trace the path of the current research queue 2020-10-05 12:12:15 +03:00
Giuseppe D'Addio
5e9ffcd22a
Update Quests.json (#3224)
* Update Quests.json

* Update Quests.json
2020-10-05 12:01:50 +03:00
Yair Morgenstern
5553be0d67 Minimap no longer adds city indicator on every update, leading to lower framerate over time 2020-10-05 11:45:55 +03:00
Yair Morgenstern
523ed10e68 Specialist names are taken from the json files 2020-10-04 16:25:07 +03:00