mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-09 15:29:32 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed nation contrast issues

Browse Source
This commit is contained in:
Yair Morgenstern
2023-01-12 10:19:20 +02:00
parent 2251824d94
commit fa3296d3bc
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
android/assets/jsons/Civ V - Gods & Kings/Nations.json
View File

@ -346,8 +346,8 @@
"neutralHello": "I wish you peace.", "neutralHello": "I wish you peace.",
"hateHello": "What do you want?", "hateHello": "What do you want?",
"tradeRequest": "My friend, are you interested in this arrangement?", "tradeRequest": "My friend, are you interested in this arrangement?",
"outerColor": [18, 136, 7], "outerColor": [15, 115, 5],
"innerColor": [255, 153, 50], "innerColor": [255, 168, 80],
"favoredReligion": "Hinduism", "favoredReligion": "Hinduism",
"uniqueName": "Population Growth", "uniqueName": "Population Growth",
"uniques": ["Unhappiness from number of Cities doubled", "[-50]% Unhappiness from [Population] [in all cities]"], "uniques": ["Unhappiness from number of Cities doubled", "[-50]% Unhappiness from [Population] [in all cities]"],
@ -703,8 +703,8 @@
"afterPeace": "Viracocha has frowned upon our war, and has agreed to our peace agreements.", "afterPeace": "Viracocha has frowned upon our war, and has agreed to our peace agreements.",
"tradeRequest": "The Incan people offer this fair trade.", "tradeRequest": "The Incan people offer this fair trade.",
"outerColor": [255,184,34], "outerColor": [255,181,86],
"innerColor": [7,159,119], "innerColor": [4,120,90],
"favoredReligion": "Christianity", "favoredReligion": "Christianity",
"uniqueName": "Great Andean Road", "uniqueName": "Great Andean Road",
"uniques": ["Units ignore terrain costs when moving into any tile with Hills", "uniques": ["Units ignore terrain costs when moving into any tile with Hills",
@ -788,7 +788,7 @@
"neutralHello": "Once again, greetings.", "neutralHello": "Once again, greetings.",
"hateHello": "What do you want?", "hateHello": "What do you want?",
"tradeRequest": "I believe I have something that may be of some importance to you.", "tradeRequest": "I believe I have something that may be of some importance to you.",
"outerColor": [255, 144, 0], "outerColor": [216, 120, 0],
"innerColor": [255, 255, 255], "innerColor": [255, 255, 255],
"favoredReligion": "Christianity", "favoredReligion": "Christianity",
"uniqueName": "Dutch East India Company", "uniqueName": "Dutch East India Company",
@ -1071,7 +1071,7 @@
"attacked": "Very well, this shall not be forgotten.", "attacked": "Very well, this shall not be forgotten.",
"defeated": "So this is how it feels to die...", "defeated": "So this is how it feels to die...",
"outerColor": [0, 0, 0], "outerColor": [0, 0, 0],
"innerColor": [0,0,255], "innerColor": [51,51,255],
"cities": ["Hanoi"] "cities": ["Hanoi"]
}, },
{ {
@ -1083,7 +1083,7 @@
"attacked": "Very well, this shall not be forgotten.", "attacked": "Very well, this shall not be forgotten.",
"defeated": "Unacceptable!", "defeated": "Unacceptable!",
"outerColor": [0, 0, 0], "outerColor": [0, 0, 0],
"innerColor": [153,0,76], "innerColor": [168,38,102],
"cities": ["Kabul"] "cities": ["Kabul"]
}, },
{ {
@ -1455,7 +1455,7 @@
{ {
"name": "Barbarians", "name": "Barbarians",
"outerColor": [0,0,0], "outerColor": [0,0,0],
"innerColor": [182,0,0], "innerColor": [185,12,12],
"uniques": ["Can only heal by pillaging"] "uniques": ["Can only heal by pillaging"]
} }

16
android/assets/jsons/Civ V - Vanilla/Nations.json
View File

@ -320,8 +320,8 @@
"neutralHello": "I wish you peace.", "neutralHello": "I wish you peace.",
"hateHello": "What do you want?", "hateHello": "What do you want?",
"tradeRequest": "My friend, are you interested in this arrangement?", "tradeRequest": "My friend, are you interested in this arrangement?",
"outerColor": [18, 136, 7], "outerColor": [15, 115, 5],
"innerColor": [255, 153, 50], "innerColor": [255, 168, 80],
"uniqueName": "Population Growth", "uniqueName": "Population Growth",
"uniques": ["Unhappiness from number of Cities doubled", "[-50]% Unhappiness from [Population] [in all cities]"], "uniques": ["Unhappiness from number of Cities doubled", "[-50]% Unhappiness from [Population] [in all cities]"],
"cities": ["Delhi","Mumbai","Vijayanagara","Pataliputra","Varanasi","Agra","Calcutta","Lahore","Bangalore","Hyderabad","Madurai","Ahmedabad", "cities": ["Delhi","Mumbai","Vijayanagara","Pataliputra","Varanasi","Agra","Calcutta","Lahore","Bangalore","Hyderabad","Madurai","Ahmedabad",
@ -652,8 +652,8 @@
"afterPeace": "Viracocha has frowned upon our war, and has agreed to our peace agreements.", "afterPeace": "Viracocha has frowned upon our war, and has agreed to our peace agreements.",
"tradeRequest": "The Incan people offer this fair trade.", "tradeRequest": "The Incan people offer this fair trade.",
"outerColor": [255,184,34], "outerColor": [255,181,86],
"innerColor": [7,159,119], "innerColor": [4,120,90],
"uniqueName": "Great Andean Road", "uniqueName": "Great Andean Road",
"uniques": ["Units ignore terrain costs when moving into any tile with Hills", "uniques": ["Units ignore terrain costs when moving into any tile with Hills",
"[-50]% maintenance on road & railroads", "[-50]% maintenance on road & railroads",
@ -726,7 +726,7 @@
"attacked": "Very well, this shall not be forgotten.", "attacked": "Very well, this shall not be forgotten.",
"defeated": "So this is how it feels to die...", "defeated": "So this is how it feels to die...",
"outerColor": [0, 0, 0], "outerColor": [0, 0, 0],
"innerColor": [0,0,255], "innerColor": [51,51,255],
"cities": ["Hanoi"] "cities": ["Hanoi"]
}, },
{ {
@ -737,8 +737,8 @@
"declaringWar": "You leave us no choice. War it must be.", "declaringWar": "You leave us no choice. War it must be.",
"attacked": "Very well, this shall not be forgotten.", "attacked": "Very well, this shall not be forgotten.",
"defeated": "Unacceptable!", "defeated": "Unacceptable!",
"outerColor": [0, 0, 0], "outerColor": [0, 0, 0],
"innerColor": [153,0,76], "innerColor": [168,38,102],
"cities": ["Kabul"] "cities": ["Kabul"]
}, },
{ {
@ -1072,7 +1072,7 @@
{ {
"name": "Barbarians", "name": "Barbarians",
"outerColor": [0,0,0], "outerColor": [0,0,0],
"innerColor": [182,0,0], "innerColor": [185,12,12],
"uniques": ["Can only heal by pillaging"] "uniques": ["Can only heal by pillaging"]
} }

2
core/src/com/unciv/models/ruleset/RulesetValidator.kt
View File

@ -103,7 +103,7 @@ class RulesetValidator(val ruleset: Ruleset) {
} }
lines.add( lines.add(
text, RulesetErrorSeverity.Warning text, RulesetErrorSeverity.WarningOptionsOnly
) )
} }