mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-25 10:26:05 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,079 Commits 6 Branches 1,040 Tags 1.2 GiB
3c56319640
Commit Graph

105 Commits

Author SHA1 Message Date
Yair Morgenstern
19bf15558d Fixed India's 'double unhappiness' unique 2023-07-05 21:10:22 +03:00
Xander Lenstra
aa0fb9ed8b
More unit unique tests (#9639) 2023-06-25 09:35:31 +03:00
Yair Morgenstern
2f25ed3053 Replaced hardcoded embarked sight with configurable 
"Normal vision when embarked" replaced by "[+1] Sight <for [Embarked] units>"
 2023-04-19 11:12:21 +03:00
Yair Morgenstern
bc5e486b20 Resolves #9186 
Atilla's Court -> Attila's Court, Guten tag -> Guten Tag
 2023-04-15 21:00:17 +03:00
Yair Morgenstern
54a192558f Changed nation's colors according to poll results 2023-01-12 15:14:55 +02:00
Yair Morgenstern
fa3296d3bc Fixed nation contrast issues 2023-01-12 10:19:20 +02:00
Yair Morgenstern
2251824d94 Recognize uncontrasting colors for nations according to WCAG guidelines, and suggest tinted versions to conform 2023-01-12 10:06:37 +02:00
vegeta1k95
42a17aab5b
Corrected Civilizations colors (#8224) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-25 10:01:40 +02:00
Yair Morgenstern
662141d661 Resolved #7479 - Removed copyrighted intro texts 2022-12-15 00:23:57 +02:00
Yair Morgenstern
c9ed9d5d74 modding: Double Happiness from Natural Wonders -> [stats] from every known Natural Wonder 2022-12-02 11:50:11 +02:00
Xander Lenstra
160b51d578
Added more unit tests (#7448) 2022-07-14 10:27:06 +03:00
Xander Lenstra
72b4d2069e
Typed denmarks unique and generalized it (#6463) 
* Typed denmarks unique and generalized it

* Added support for deprecated unique
 2022-03-31 23:05:37 +03:00
Xander Lenstra
8820ae6dad
Generalized a few nation uniques (#6443) 
* Generalized a few nation uniques

* Fixed a bug and made random less random

* Implemented requested changes
 2022-03-28 17:33:31 +03:00
SomeTroglodyte
870659d142
Translation writer conditionals (#6433) 
* TranslationFileWriter processes Conditionals

* TranslationFileWriter processes Conditionals - wiki and reprocessed language files
 2022-03-28 17:30:16 +03:00
Xander Lenstra
984c4d9b2d
Unified & generalized a few uniques (#6379) 
* Generalized trade route percent bonuses

* Unified two uniques using populationFilter; deprecated a deprecated uniq

* Made some renamings to improve clarity & fixed tests

* Fixed tests again

* Fixed typo
 2022-03-21 21:05:20 +02:00
SpacedOutChicken
44b4cb7e9b
Add Amphibious promotion to Songhai units (#6306) 
* Destroy Arsenal when city is captured

* Update vanilla Songhai

* Add Amphibious promotion to all Songhai units

In Gods and Kings, all Songhai Land units have the Amphibious promotion. This brings our Gods and Kings up to speed with the original.
 2022-03-10 19:43:34 +02:00
SomeTroglodyte
651dcff581
Fix Polynesia's Wayfinding (#6238) 
* Fix Polynesia's Wayfinding

* Fix mod option to use other unit filters with UnitsMayEnterOcean
 2022-02-28 19:41:22 +02:00
Yair Morgenstern
97d74a3aef Enabled type check checking for uniques whose deprecation leads to multiple uniques! 
This also enables auto-deprecating the Embark+Ocean unique
 2022-02-15 11:29:32 +02:00
Xander Lenstra
a237e7bf82
Typed all remaining uniques using CityInfo.GetMatchingUniques and removed that function (#6071) 
* Typed all remaining uniques using CityInfo.GetMatchingUniques and removed that function

* Fixed two NullPtrExceptions

* Fixed syntax
 2022-01-29 23:27:48 +02:00
will-ca
824efcb1a9
Try to fix potential typos in stock rulesets. (#6028) 
* Make mod checker pass status message translatable.

* Try to fix some possibly broken Uniques.

Move comma.
 2022-01-26 22:36:24 +02:00
Xander Lenstra
39ed8bd269
Typed some uniques, added more examples for parameters in unique documentation (#6020) 
* Typed some uniques, etc.

* Missed a few square braces

* Missed a parameter

* Missed another parameter

* Made a conditional, spelling, added check to `isStatRelated`

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2022-01-24 11:03:40 +02:00
Yair Morgenstern
6e95a07572
More unit unique typing (#5952) 
* There are so many of these my gosh

* Fixed, good thing we have tests :)

* Fixed
 2022-01-14 10:43:13 +02:00
Xander Lenstra
7cb58eb82d
Typed all policy uniques (#5955) 
* Typed all policy uniques

* Reworded golden age length
 2022-01-14 10:11:30 +02:00
Xander Lenstra
f06242ebe1
Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques (#5882) 2021-12-31 13:47:52 +02:00
Xander Lenstra
ee65adb5e4
Fixed a bug where all global unit discounts would always apply, despite only being for certain units (#5879) 2021-12-31 11:07:59 +02:00
Xander Lenstra
b195f0b92c
Removed the religions file and favoured religions from the vanilla ruleset (#5682) 2021-11-15 15:35:45 +02:00
Xander Lenstra
003f2434c1
Differentiating Vanilla & G&K (#5654) 
* Fixed tests checking for mod correctness

* Update G&K jsons to current vanilla versions

* First pass over buildings & beliefs

* First pass over nations

* First pass over eras.json

* Fully updated tech tree

* First pass over units

* Second pass over buildings -- fixed techs

* Fixed last prerequisites and row numbers of tech

* Went through the entire tech tree and moved things to their correct spot

* Fixed tests
 2021-11-09 06:23:30 +02:00
Xander Lenstra
13859e78c1
Unified and enumified production percentage bonus uniques (#5521) 2021-10-20 16:57:55 +03:00
Xander Lenstra
1a6eee0d19
Fixed unit tests failing randomly (#5503) 2021-10-17 23:02:14 +03:00
Giuseppe D'Addio
dd8f7ed8ff
Update Nations.json (#5457) 
You put one space too much
 2021-10-13 23:24:25 +03:00
SomeTroglodyte
7bbcb8db1a
Mayas (#5408) 
* The Maya - data and calendar

* The Maya - completed

* The Maya - notifications

* The Maya - favoredReligion

* The Maya - comments in GreatPersonManager

* The Maya - clickable notifications

* The Maya - templates

* The Maya - atlas

* The Maya - patch1
 2021-10-09 20:45:59 +03:00
Xander Lenstra
fc01fde163
Nations now have a favoured religion they try choose when available (#5406) 2021-10-05 20:38:58 +03:00
SomeTroglodyte
088e35ff13
Ethiopia - Nation (#5387) 
* Ethiopia - Nation

* Ethiopia - Unit and Stele

* Ethiopia - Graphics

* Ethiopia - color
 2021-10-04 20:56:34 +03:00
Xander Lenstra
e1b4c53573
Added two more conditionals and updated movement, sight & combat to use these (#5389) 2021-10-04 08:32:10 +03:00
SomeTroglodyte
edfc66aa2f
Sort City States, replace+deprecate Dublin and Edinburgh (#5386) 2021-10-03 19:03:54 +03:00
SomeTroglodyte
71405b93aa
The Celtic People Reboot (#5367) 
* The Celtic People Reboot

* Redid the Shamrock sword of the Pictish Warrior

* The Celtic People Reboot - one comment

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2021-10-03 12:02:58 +03:00
SomeTroglodyte
5f9bcd0d74
Coats to Coast (#5344) 2021-09-28 23:43:36 +03:00
Xander Lenstra
d07eed31b8
Added the Byzantine empire (#5299) 
* Added Byzantine Empire as a nation

* Added unique units

* Implemented unique ability

* Refactored out the beliefContainer

* Implemented reviews

* Credits

* Enumified the uniques & added missing translatable strings
 2021-09-26 16:58:24 +03:00
SimonCeder
027057874d
Update and generalize Siam UP (#5237) 
* refactor and generalize Siam UP, display correct values in diplo screen

* enable preferred diplomatic victory

* allow compatibility mode

* revisions, restore timesInPlace

* don't change game.png

* don't change game.png

* objectify and enum city state bonuses

* objectify and enum city state bonuses

* template.properties

* refactored city state bonuses into Unique

* further enumization, fix toStringWithDecimals

* reviews
 2021-09-19 06:28:10 +03:00
SimonCeder
8eb24ac273
Carthage civ (#5224) 
* Add Carthage

* Implement uniques

* performance improvement, better elephant

* AI avoids taking too much damage from mountains

* more performance

* better AI

* can't settle cities on mountains

* AI improvement

* AI improvement

* revisions, damagePerTurn in Terrains.json

* terrain damage stored as unique in json, damage also works for terrain features

* don't change game.png
 2021-09-18 20:28:12 +03:00
yairm210
af9e691102 Ease of deprecation, brought to you by unique types! 
*Visible*, locatable deprecated uniques!
Stated replacement uniques!
 2021-09-17 10:33:53 +03:00
Xander Lenstra
eb665a9158
Embarked units only have 1 vision (except marines) (#5215) 
* Embarked units only have 1 vision

* Embarked units always only have 1 vision, unless they don't
 2021-09-16 20:55:33 +03:00
Interdice
297618706c
Adding religous city states to unciv! (#5136) 
* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!
 2021-09-14 10:49:38 +03:00
SimonCeder
c7264556ea
City state intrusion anger (#5090) 
* move functions, greece UP

* CS influence from killing barbs

* Greece healing in CS territory

* move diplomacy bonuses into CityStateFunctions.kt

* Split filter in Battle.kt, nicer code
 2021-09-05 21:22:02 +03:00
Xander Lenstra
b347366d50
Refactored some code and uniques (#5051) 
* Refactored some code and uniques

* Fixed compilation errors, tests and crashes

* Moved influence bounds check from add to set
 2021-09-01 19:20:04 +03:00
SimonCeder
a7c4895985
Add Austrian civ (#5026) 
* Json definition for nation, images

* Jsons, Hussar and Coffee House

* Diplomatic Marriage Button

* Implement Marriage

* AI Marriage

* template.properties

* Popups etc

* Strings

* reviews

* reviews pt 2
 2021-08-30 23:21:02 +03:00
SimonCeder
74a1da8e17
CS bonuses graded according to relationship level (#4664) 
* city-state bonuses graded depending on friend or ally

* siam militaristic UP, cleaned up presentation

* fix strings

* move city state modifiers to json

* city-state bonuses graded depending on friend or ally

* siam militaristic UP, cleaned up presentation

* fix strings

* move city state modifiers to json

* Restructure eras.json

* reduce indentation in DiplomacyManager.kt

* Add fallback values in cas of missing json definitions

* review edits

* fix conflicts???

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2021-08-17 13:55:02 +03:00
Xander Lenstra
9a24f04d56
Fixes bug where Russia's unique no longer works (#4803) 2021-08-07 23:43:47 +03:00
Xander Lenstra
547f5a57e5
Added missionairy units, which can spread religion and bought with faith (#4568) 
* Added missionairy units, which can spread religion and bought with faith

* Forgot an include, minor additions

* Forgot credit for the missionary image

* Large refactor, enabling buying with almost all stats, split IConstruction into IConstruction & INonPerpetualConstruction

* Does this fix the tests

* Fixed accidentally removing all trailing spaces in template.properties

* Thanks to someTroglodyte for paying more attention than I do :)

* Implemented requested changes

* Fixed large amount of question marks

* Missing space, of course

* Fixed function name change

* Fixed merge problems

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2021-08-06 14:40:48 +03:00
Yair Morgenstern
7a42ab3e99 Resolved #4394 - corrected misspelled city names 2021-07-23 16:34:04 +03:00