Commit Graph

450 Commits

Author SHA1 Message Date
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
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
fa41076cf2 3.11.3 2020-10-10 23:18:14 +03:00
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
f7ff1bd267 Translation generation can handle multiple parameters of the same type 2020-10-09 14:39:41 +03:00
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
4fa7c8d4c6 3.11.2 2020-10-08 12:47:08 +03:00
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
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
e951ed8324 3.11.1 2020-10-06 10:43:10 +03:00
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
523ed10e68 Specialist names are taken from the json files 2020-10-04 16:25:07 +03:00
3e98e0c00f 3.11.0 2020-10-03 20:48:34 +03:00
047fba0f1d Translations update (#3220)
* Update Italian.properties (#3199)

* Added more translation and fix some (#3207)

* Translations update (#3212)

* Update Japanese.properties (#3213)

* Update Persian_(Pinglish-DIN).properties (#3215)

adding more translations

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: fab144 <58261459+fab144@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Mojtaba Rahimy <mojtaba.rahimy@chmail.ir>
2020-10-03 20:25:20 +03:00
bfa9c65700 Modding - Buildings can be rendered obsolete (unbuildable) by techs 2020-09-30 23:17:09 +03:00
adaee7e7ab City State quests (#3183)
* City State quests

* Flag to log two civ ever been friends
* Utility functions in GameInfo
* Created Diplomacy Action for notifications
* Utility functions for map
* Can be specified a custom color for surroundWithCircle
* Translation placeholder utility
* Added Quest model
* Utility function: number of researched technologies

* Image atlas rebuilt

* Localization

* Updated DiplomaticFlags and added EverBeenFriends

Slightly reworked nextTurnFlags() for code clarity and introduced the new flag EverBeenFriends that is set as soon as two civilizations are at least friends. It never expires.

* Removed quests not implemented yet from json
2020-09-29 23:26:50 +03:00
847abf31d1 3.10.13 2020-09-29 15:52:39 +03:00
81a1bcb6ed Translations update (#3198)
* Update Italian.properties (#3188)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Czech.properties (#3193)

new parametrised strings
Babylonian, Egyptian, English cities finished
French diplomacy and cities
Russian diplomacy and cities

* Update Spanish.properties (#3195)

* Update Indonesian.properties (#3196)

* So many hungarian translations (#3197)

* So many hungarian translations

* Fixing placeholders

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: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
2020-09-29 15:45:32 +03:00
fa5d2b6f49 3.10.12 2020-09-26 21:25:58 +03:00
bfadf2943b Translations update (#3187)
* Update Italian.properties (#3174)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Indonesian.properties (#3176)

* Update Dutch.properties (#3182)

Added extra translations for city states, starting new game, start screen and multiplayer

* Update Czech.properties (#3185)

new strings
diplomacy and cities - Akkad, England

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yunichi <65927826+Yunichie@users.noreply.github.com>
Co-authored-by: knoeier0 <71691687+knoeier0@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
2020-09-26 21:16:54 +03:00
24b4997e85 3.10.11 2020-09-22 20:03:36 +03:00
e2ea87499e Translations update (#3173)
* Update Indonesian.properties (#3168)

* Update German.properties #2 (#3169)

* Update German.properties

Minor tweaks and corrections, remove lots on unneccesary "\n", it just caused some weird formatting on computer as unciv sets breaks on in own already. Changed wording of tutorial quite a bit.

* Update German.properties

Changed and corrected the whole introduction / tutorial translations, deleted lots of unneccesary "\n" as UnCiv adds breaks on his own. Let some breaks in for a new sentence for better readability.

* More hungarian translations (#3171)

* More hungarian translations

* Fix some character

* Update Dutch.properties (#3170)

Added translations for diplomacy

Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Stefan <natrius@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
Co-authored-by: knoeier0 <71691687+knoeier0@users.noreply.github.com>
2020-09-22 19:46:32 +03:00
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
d0d0481f00 3.10.10 2020-09-20 20:21:40 +03:00
1dbafece02 Translations update (#3162)
* Update Italian.properties (#3156)

* Update Simplified_Chinese.properties (#3157)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update German.properties (#3159)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
2020-09-20 20:13:12 +03:00
8db955b851 3.10.10 2020-09-18 11:27:11 +03:00
dcb1b3f1e8 Major update german.properties (#3147)
* Major update german.properties

Straightened out the form of adress, its now the royal version ( i hope i did not miss anything), added missing translations, corrected lot of translations (i did not(!) look at #################### Lines from Tutorials #################### )

* Major update German.properties

Corrected the mistake and changed all "Felder" to "Kacheln"
2020-09-18 11:18:52 +03:00
177bb6a973 Translations update (#3155)
* Update Indonesian.properties (#3133)

Updating some translations

* Solve Conflicts and Update Brazilian_Portuguese.properties (#3141)

* Update Brazilian_Portuguese.properties

I modified some translations of the menus and some constructions, and translate the Babylon

* Translate all Egyptian cities and remove unnecessaries "Requires translation!"

* Translate more cities and remove unnecessaries "Requires translation!"

* more updates

* a review on prepositions and update

Co-authored-by: AlexLuis <68296033+AlexLuis@users.noreply.github.com>

* more hungarian translation (#3146)

* Update Italian.properties (#3151)

* Update Italian.properties

* Update Italian.properties

* Update Japanese.properties (#3154)

Co-authored-by: Yunichi <65927826+Yunichie@users.noreply.github.com>
Co-authored-by: Lincoln V Schreiber <lincolnschreiber@gmail.com>
Co-authored-by: AlexLuis <68296033+AlexLuis@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
2020-09-18 11:06:42 +03:00
9f4607635b UI Upgrade (#3149)
* UI Update

* Replace ScrollPane with Table in Minimap
2020-09-18 10:59:18 +03:00
1ceb3548dd Resolved #3130 - "All policies adopted" shown in policy picker screen when relevant 2020-09-16 19:17:25 +03:00
76741b446b 3.10.9 2020-09-12 23:06:42 +03:00
02def47f1b Translations update (#3132)
* Update Indonesian.properties (#3125)

* Update Italian.properties (#3126)

* Update Italian.properties

New translations

* Update Italian.properties

* Update Spanish.properties (#3129)

Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
2020-09-12 22:43:58 +03:00
7d32412646 Translation updates, with minor changes to ensure consistency 2020-09-11 11:16:31 +03:00
ea08a96482 Translations update (#3124)
* Update Italian.properties (#3111)

* Update Ukrainian.properties (#3120)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Додав слово Надають

* Update Brazilian_Portuguese.properties (#3121)

* some minutes translating

pra ajudar os player br pq esse jogo é bom demais!

* Update Brazilian_Portuguese.properties

* Update Japanese.properties (#3123)

* Update Spanish.properties (#3113)

* Update Indonesian.properties (#3116)

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

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: ISS <27261371+4urb4nm0nk@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-09-11 11:07:39 +03:00
cb0599b9f5 Simplified "on [seacost]" and "on [tile next to fresh water]" to "next to [Coast]" and "next to [Fresh water]" 2020-09-11 09:24:08 +03:00
9f48f43ad0 parameterized some uniques, fixes some minor bugs (#3122)
Fixed Moai
Wonder overlay will remove terrain overlay in default tileset
Oasis, Marsh and Atoll now have "Rare feature" unique, rare features can be added by mods
implemented TileInfo.fitsUniqueFilter(filterText:String): Boolean
parameterized uniques:
* "Must have an owned [Mountain] within [2] tiles"
* "Must be on [River]" - not to be confused with "Must be next to [River]" - the tile city on must have river at its border, not the adjacent tile
* "Must not be on [Hill]"
* "Must not be next to []"
* "Must be on [seacoast]" - next to "Coast" tile
* "Must be on [tile adjacent to source of fresh water]"
* "Must be next to [Water]" - next to any water tile, including "Lakes"
* "Must be next to [terrainFeature]"
* "Must be next to [unique]" - e.g "Must be next to [Rare feature]" - next to terrain or terrain feature having this unique
2020-09-11 07:56:56 +03:00
9d951835d1 UI Update (#3102)
* Add "Load game" in WorldscreenMenuPopup

* UI Update

* Fix the Ottomans uniques, edit Tech description
2020-09-10 19:25:56 +03:00
f859259c2a 3.10.8 2020-09-08 19:34:25 +03:00
bf2742350d Translations update (#3107)
* Update Italian.properties (#3090)

* Update Indonesian.properties (#3097)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Japanese.properties (#3091)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Spanish.properties (#3096)

* Update Simplified_Chinese.properties (#3098)

* Update Czech.properties (#3106)

Aztecs translation, scenario translation, egypt diplomacy and cities, various missing improvement names and rules

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
2020-09-08 19:14:56 +03:00
3719b5c4f6 Added mod screen translation terms 2020-09-07 23:03:12 +03:00
ca36084e8b 3.10.7 2020-09-04 16:44:00 +03:00
4bc4138f2f Translations update (#3089)
* Update Japanese.properties (#3038)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Italian.properties (#3074)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Spanish.properties (#3084)

* Update Simplified_Chinese.properties (#3088)

* Update Hungarian.properties (#3087)

Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
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>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
2020-09-04 16:22:32 +03:00
08a15a888f Fixed test 2020-09-03 17:58:24 +03:00
6de4300cb8 Testing how the test errors are displayed in Travis 2020-09-03 14:03:17 +03:00
8f75368b99 Farms near freshwater (#3063)
* Farms near freshwater
* Farm now has unique "Can also be built on tiles adjacent to fresh water"
https://civilization.fandom.com/wiki/Farm_(Civ5)
Even snow: https://www.reddit.com/r/civ/comments/11qtko/farms_on_snow/
Hill+Farm, Snow+Farm, Tundra+Farm sprites by THE BUCKETEER and Ravignir from discord
* fields improvingTech and improvingTechStats converted into uniques
e.g.:
"[+1 Production] once [Scientific Theory] is discovered"
"[+1 Food] on [fresh water] tiles once [Civil Service] is discovered"
"[+1 Food] on [non-fresh water] tiles once [Fertilizer] is discovered"

* ai will build trading posts and farms in snow and tundra if it has no better tiles to work on

* "Provides a one-time Production bonus to the closest city when cut down" unique for forest

* update template.properties
2020-09-02 19:49:29 +03:00
145db68248 3.10.6 2020-09-01 22:58:52 +03:00
6c2d597c39 Translations update (#3072)
* Update Czech.properties (#3058)

* Update Czech.properties

tweaked consistency of "resource" term translation
nation uniques (re)translated
missing policy strings (re)translated

* Update Czech.properties

fixed typo and few minor tweaks based on actual string usage

* Add hungarian translation, First batch (#3060)

* add hungarian translation, first batch

* Fixing placeholder

* Update Indonesian.properties (#3064)

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
Co-authored-by: lahdjirayhan <52926983+lahdjirayhan@users.noreply.github.com>
2020-09-01 19:34:12 +03:00
e111bba509 #3050 - Added "automated workers don't replace improvements" setting 2020-08-31 22:39:03 +03:00
c61ec2120b Separated base ruleset mods in new game screen - cannot activate multiple base ruleset mods 2020-08-31 21:24:36 +03:00
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