Commit Graph

2238 Commits

Author SHA1 Message Date
Yair Morgenstern
d42b93c705 3.11.9 2020-11-02 22:25:34 +02:00
Kensvin
2cddfc2b56
Update Indonesian.properties (#3313) 2020-11-02 20:39:16 +02:00
jnecus
7e7e0e8a3d
Update Simplified_Chinese.properties (#3314)
Additional Chinese translations
2020-11-02 20:39:04 +02:00
uncivbot[bot]
77af9ba80c
Translations update (#3312)
* Update Italian.properties (#3299)

* Update Spanish.properties (#3308)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
2020-11-01 21:50:04 +02:00
Yair Morgenstern
247350d6a1
Revert "-Terracotta Army, Alhambra, Hanse, Leaning Tower of Pisa, Neuschwanstein, and Hubble Space Telescope are no longer buildable or displayed in the pedia since they are not part of vanilla Civ 5. (#3300)" (#3301)
This reverts commit 49cdf09b44.
2020-10-27 00:22:02 +02:00
givehub99
49cdf09b44
-Terracotta Army, Alhambra, Hanse, Leaning Tower of Pisa, Neuschwanstein, and Hubble Space Telescope are no longer buildable or displayed in the pedia since they are not part of vanilla Civ 5. (#3300)
Their entries were kept in the json files so as to not break pre-existing save files.

-Units and buildings that are unbuildable are not shown in the pedia or tech picker as being unlockable by tech
2020-10-27 00:20:48 +02:00
Yair Morgenstern
1d391e14e5 3.11.8 2020-10-26 23:55:20 +02:00
uncivbot[bot]
525671403b
Translations update (#3298)
* Update Italian.properties (#3287)

* Update Czech.properties (#3288)

new strings translated

* Update Japanese.properties (#3290)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Hungarian.properties (#3291)

Mostly fixed typos & added a few translations

* Update Indonesian.properties (#3292)

* Update German.properties (#3297)

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: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: borklfd <67602409+borklfd@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: mister-bum <60568506+mister-bum@users.noreply.github.com>
2020-10-26 23:47:03 +02:00
givehub99
64fc57e6d2
Helicopter Gunship uniques (#3294)
* Preparation for Helicopter unit

-"All tiles costs 1" unique makes every tile cost 1. Used by Helicopter in CIV 5.

-"Can pass through impassable tiles" unique allows unit to pass through any tile. Used by Helicopter in CIV 5. Does not let units cross ocean if they couldn't already, just terrain that is considered "impassable"

-Mountains now do 50 damage to units that end turn on it. In civ 5 and its expansion this is what happens to any unit that is able to pass mountains.
This is "hard coded" for now. Also added the notification text to template.properties

* mountains do not give sight bonus when on them

* Revert "mountains do not give sight bonus when on them"

This reverts commit 83ad3df5d4.
2020-10-26 20:28:44 +02:00
Yair Morgenstern
3713923caf Added mods to crash report, many crashes are caused by incorrectly defined mods 2020-10-24 23:16:16 +03:00
Yair Morgenstern
35e2465f8a 3.11.7 2020-10-24 22:56:07 +03:00
uncivbot[bot]
e6b855cb6f
Translations update (#3286)
* Update Indonesian.properties (#3280)

* Update Italian.properties (#3281)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: Rafsanjani Atallah <rafsan1810@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2020-10-24 22:49:01 +03:00
Yair Morgenstern
895ed528af Resolved #3285 - added a notification when cities are no longer in resistance 2020-10-24 22:43:04 +03:00
Yair Morgenstern
88eab17e9e New snow-versions of existing tiles :) 2020-10-24 22:10:47 +03:00
Yair Morgenstern
8dde23aa38 3.11.6 2020-10-21 19:01:07 +03:00
uncivbot[bot]
635a12feae
Translations update (#3278)
* Update Persian_(Pinglish-UN).properties (#3273)

* Update Japanese.properties (#3276)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Indonesian.properties updates (#3277)

I'm new to github and coding stuff so I'm really sorry if I messed some things up. I've translated all the required translations and also changed some things up to make sense a little bit more.

Co-authored-by: Mojtaba Rahimy <mojtaba.rahimy@chmail.ir>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Rafsanjnai Atallah <memecenterj@gmail.com>
2020-10-20 19:48:29 +03:00
givehub99
d75541e5b4
Consolidated unit kill bonus uniques (#3267)
* -Consolidated unit kill bonus uniques.
Syntax is "Earn []% of [] opponent's [] as [] for kills" for both units and nations.

Ex.
"Earn [10]% of [military] opponent's [Cost] as [Gold] for kills"
or
"Earn [100]% of [Barbarians] opponent's [Strength] as [Culture] for kills"

Only Culture and Gold are supported as rewards now, but it can be expanded later. The pictish warrior unit in G&K gets 50% of opponent's strength as faith, so we can have the function edited to allow for faith when we get to that point.
Only Strength or Cost is supported as what the reward amount is based on.

-Policies.json and Nations.json were changed to fit the new syntax. The old syntax still works for mods for now.

-matchesCategory MapUnit function can now check if the unit is a barbarian

* -Compatibility for depecrated unit kill bonus uniques done more efficiently and counted only once (since prior to this PR, it was also counted only once)

* -Changed it to "Barbarian" instead of "Barbarians", added "Barbarian" to template.properties

* space after translation template
2020-10-18 18:10:26 +03:00
Yair Morgenstern
10818de096 3.11.5 2020-10-17 22:28:58 +03:00
uncivbot[bot]
c3205f8aff
Translations update (#3272)
* Update Italian.properties (#3266)

* Update Vietnamese.properties (#3269)

* Create Vietnamese

* Update and rename Vietnamese to Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

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

* Update Japanese.properties (#3268)

* Update Japanese.properties

* Update Japanese.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: leanhquanea1234 <69520258+leanhquanea1234@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
2020-10-17 22:18:26 +03:00
Yair Morgenstern
a6642cb536 Resolved #3265 - added keyboard shortcuts to tile improvements 2020-10-17 22:06:50 +03:00
Yair Morgenstern
3bf045d354 One high-stakes, no-holds-barred, to-the-death profiling later, and we're left with a much less laggy main screen and a much more profile-able citybutton/ 2020-10-16 00:39:58 +03:00
Yair Morgenstern
0aa53f07e7 3.11.4 2020-10-15 20:08:17 +03:00
Yair Morgenstern
c75f0162d5 Added city images by The Bucketeer for all eras up to Modern 2020-10-15 20:01:25 +03:00
uncivbot[bot]
fb984e4c38
Translations update (#3261)
* Update Italian.properties (#3253)

* Update German.properties (#3255)

* Update Indonesian.properties (#3257)

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Czeczki <72320003+Czeczki@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2020-10-14 19:25:03 +03:00
givehub99
8c51833a5a
New parameterized uniques (#3250)
* -New unit unique "Bonus as Defender []%". "+25% Combat Bonus when defending" now deprecated, but kept for now for mods. Json promotion changed to fit new syntax.
Defender Bonus modifier "Defender Bonus" added to template.properties for translation.

-"All newly-trained [] units in this city receive the [] promotion" now uses unit category checking.

-New building unique "New [] units start with [] Experience in this city"
This can used by Poland's stable unique replacement in BNW, as it gives extra xp for mounted units.
"New [] units start with [] Experience" is the new nation wide version of this.

"New military units start with [] Experience" is now deprecated, but kept for now for mods. Json policy changed to fit new syntax.

-Unit category checking can now check for "non-air", "military", "military units" and uniques.
Added "military" to template.properties for translation.

-New unit unique "No defensive terrain penalty". Admittedly this is for a mod I'm making.

* translations must have spaces after!

* -Attacker Bonus unique changed to "+[]% Strength when attacking"
Changed Units.json and and Wolf Pack from UnitPromotions.json to this syntax

-Defender Bonus unique changed to "+[]% Strength when defending"
Armor Plating promotions were changed to this syntax
2020-10-14 10:22:49 +03:00
Federico Luongo
b5a32e64ae
City-states personalities (#3259)
* City State Personality

* Introduced 4 personalities for city states: Friendly, Neutral, Hostile and Irrational.
* Influence recovery and degrade depends on city state personality.

* Quests assignement dependant on Personality and Trait

* Personality localization strings
2020-10-14 09:51:31 +03:00
Yair Morgenstern
fa41076cf2 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
Yair Morgenstern
f7ff1bd267 Translation generation can handle multiple parameters of the same type 2020-10-09 14:39:41 +03:00
Yair Morgenstern
e292c210c8 Added "Must be next to []" unique for tile improvements 2020-10-08 17:35:25 +03:00
Federico Luongo
fea342a31b
Clear Barbarian Camp quest (#3246) 2020-10-08 16:29:56 +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 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
a485ad5fa5 Merge branch '3.11.1-patch1' 2020-10-07 14:13:30 +03:00
Yair Morgenstern
e690e3bcea Copied files in Android should now overwrite existing files 2020-10-07 14:02:38 +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
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
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 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
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
Giuseppe D'Addio
5e9ffcd22a
Update Quests.json (#3224)
* Update Quests.json

* Update Quests.json
2020-10-05 12:01:50 +03:00
Yair Morgenstern
523ed10e68 Specialist names are taken from the json files 2020-10-04 16:25:07 +03:00
Yair Morgenstern
c70c860437 All specialist slots in jsons converted to proper name 2020-10-04 16:23:35 +03:00
Federico Luongo
2d6c322856
Connect Resource Quest implemented (#3209)
* Removed superfluous filters in getResourceForQuest
2020-10-04 15:01:57 +03:00