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

Try to fix potential typos in stock rulesets. (#6028)

Browse Source 
* Make mod checker pass status message translatable.

* Try to fix some possibly broken Uniques.

Move comma.
This commit is contained in:
will-ca
2022-01-26 12:36:24 -08:00
committed by GitHub
parent dcb1be8e9b
commit 824efcb1a9
8 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/assets/jsons/Civ V - Gods & Kings/Buildings.json
View File

@ -1036,7 +1036,7 @@
"isWonder": true, "isWonder": true,
"culture": 3, "culture": 3,
"greatPersonPoints": {"Great Engineer": 2}, "greatPersonPoints": {"Great Engineer": 2},
"uniques": ["[-33]% Gold cost of upgrading [Military] units"], "uniques": ["[-33]% Gold cost of upgrading <for [Military] units>"],
"requiredTech": "Combined Arms", "requiredTech": "Combined Arms",
"quote": "'In preparing for battle I have always found that plans are useless, but planning is indispensable.' - Dwight D. Eisenhower" "quote": "'In preparing for battle I have always found that plans are useless, but planning is indispensable.' - Dwight D. Eisenhower"
}, },
@ -1206,5 +1206,5 @@
"faith": 2, "faith": 2,
"happiness": 2, "happiness": 2,
"uniques": ["Unbuildable", "Hidden when religion is disabled"] "uniques": ["Unbuildable", "Hidden when religion is disabled"]
}, }
] ]

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

@ -661,7 +661,7 @@
"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",
"[-50]% maintenance on roads & railroads", "[-50]% maintenance on road & railroads",
"No Maintenance costs for improvements in [Hill] tiles"], "No Maintenance costs for improvements in [Hill] tiles"],
"cities": ["Cuzco","Tiwanaku","Machu","Ollantaytambo","Corihuayrachina","Huamanga","Rumicucho","Vilcabamba","Vitcos", "cities": ["Cuzco","Tiwanaku","Machu","Ollantaytambo","Corihuayrachina","Huamanga","Rumicucho","Vilcabamba","Vitcos",
"Andahuaylas","Ica","Arequipa","Nasca","Atico","Juli","Chuito","Chuquiapo","Huanuco Pampa","Tamboccocha", "Andahuaylas","Ica","Arequipa","Nasca","Atico","Juli","Chuito","Chuquiapo","Huanuco Pampa","Tamboccocha",

6
android/assets/jsons/Civ V - Gods & Kings/Policies.json
View File

@ -239,7 +239,7 @@
}, },
{ {
"name": "Trade Unions", "name": "Trade Unions",
"uniques": ["[-33]% maintenance on roads & railroads", "[+1 Gold] from every [Harbor]", "[+1 Gold] from every [Seaport]"], "uniques": ["[-33]% maintenance on road & railroads", "[+1 Gold] from every [Harbor]", "[+1 Gold] from every [Seaport]"],
"row": 1, "row": 1,
"column": 4 "column": 4
}, },
@ -260,7 +260,7 @@
}, },
{ {
"name": "Protectionism", "name": "Protectionism",
"uniques": ["[+2] happiness from each type of luxury resource"], "uniques": ["[+2] Happiness from each type of luxury resource"],
"requires": ["Mercantilism"], "requires": ["Mercantilism"],
"row": 3, "row": 3,
"column": 4 "column": 4
@ -339,7 +339,7 @@
}, },
{ {
"name": "Civil Society", "name": "Civil Society",
"uniques": ["[-50]% food consumption by specialists [in all cities]"], "uniques": ["[-50]% Food consumption by specialists [in all cities]"],
"row": 1, "row": 1,
"column": 5 "column": 5
}, },

6
android/assets/jsons/Civ V - Vanilla/Buildings.json
View File

@ -690,7 +690,7 @@
}, },
{ {
"name": "Kremlin", "name": "Kremlin",
"cost": 500 "cost": 500,
"culture": 3, "culture": 3,
"cityStrength": 12, "cityStrength": 12,
"isWonder": true, "isWonder": true,
@ -905,7 +905,7 @@
"isWonder": true, "isWonder": true,
"culture": 3, "culture": 3,
"greatPersonPoints": {"Great Engineer": 2}, "greatPersonPoints": {"Great Engineer": 2},
"uniques": ["[-33]% Gold cost of upgrading [Military] units"], "uniques": ["[-33]% Gold cost of upgrading <for [Military] units>"],
"requiredTech": "Radar", "requiredTech": "Radar",
"quote": "'In preparing for battle I have always found that plans are useless, but planning is indispensable.' - Dwight D. Eisenhower" "quote": "'In preparing for battle I have always found that plans are useless, but planning is indispensable.' - Dwight D. Eisenhower"
}, },
@ -995,6 +995,6 @@
"isNationalWonder": true, "isNationalWonder": true,
"uniques": ["Hidden until [5] social policy branches have been completed", "Triggers a global alert upon build start", "uniques": ["Hidden until [5] social policy branches have been completed", "Triggers a global alert upon build start",
"Triggers a Cultural Victory upon completion", "Hidden when [Cultural] Victory is disabled"] "Triggers a Cultural Victory upon completion", "Hidden when [Cultural] Victory is disabled"]
}, }
] ]

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

@ -635,7 +635,7 @@
"innerColor": [3,115,86], "innerColor": [3,115,86],
"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 roads & railroads", "[-50]% maintenance on road & railroads",
"No Maintenance costs for improvements in [Hill] tiles"], "No Maintenance costs for improvements in [Hill] tiles"],
"cities": ["Cuzco","Tiwanaku","Machu","Ollantaytambo","Corihuayrachina","Huamanga","Rumicucho","Vilcabamba","Vitcos", "cities": ["Cuzco","Tiwanaku","Machu","Ollantaytambo","Corihuayrachina","Huamanga","Rumicucho","Vilcabamba","Vitcos",
"Andahuaylas","Ica","Arequipa","Nasca","Atico","Juli","Chuito","Chuquiapo","Huanuco Pampa","Tamboccocha", "Andahuaylas","Ica","Arequipa","Nasca","Atico","Juli","Chuito","Chuquiapo","Huanuco Pampa","Tamboccocha",

8
android/assets/jsons/Civ V - Vanilla/Policies.json
View File

@ -121,7 +121,7 @@
}, },
{ {
"name": "Professional Army", "name": "Professional Army",
"uniques": ["[-33]% Gold cost of upgrading [Military] units", "[+1 Happiness] from every [Walls]", "uniques": ["[-33]% Gold cost of upgrading <for [Military] units>", "[+1 Happiness] from every [Walls]",
"[+1 Happiness] from every [Castle]", "[+1 Happiness] from every [Arsenal]", "[+1 Happiness] from every [Military Base]" "[+1 Happiness] from every [Castle]", "[+1 Happiness] from every [Arsenal]", "[+1 Happiness] from every [Military Base]"
], ],
"requires": ["Military Caste"], "requires": ["Military Caste"],
@ -239,7 +239,7 @@
}, },
{ {
"name": "Trade Unions", "name": "Trade Unions",
"uniques": ["[-33]% maintenance on roads & railroads", "[+1 Gold] from every [Harbor]", "[+1 Gold] from every [Seaport]"], "uniques": ["[-33]% maintenance on road & railroads", "[+1 Gold] from every [Harbor]", "[+1 Gold] from every [Seaport]"],
"row": 1, "row": 1,
"column": 4 "column": 4
}, },
@ -260,7 +260,7 @@
}, },
{ {
"name": "Protectionism", "name": "Protectionism",
"uniques": ["[+1] happiness from each type of luxury resource"], "uniques": ["[+1] Happiness from each type of luxury resource"],
"requires": ["Mercantilism"], "requires": ["Mercantilism"],
"row": 3, "row": 3,
"column": 4 "column": 4
@ -335,7 +335,7 @@
}, },
{ {
"name": "Civil Society", "name": "Civil Society",
"uniques": ["[-50]% food consumption by specialists [in all cities]"], "uniques": ["[-50]% Food consumption by specialists [in all cities]"],
"row": 1, "row": 1,
"column": 5 "column": 5
}, },

1
android/assets/jsons/translations/template.properties
View File

@ -551,6 +551,7 @@ When disabled, saves battery life but certain animations will be suspended =
Order trade offers by amount = Order trade offers by amount =
Check extension mods based on vanilla = Check extension mods based on vanilla =
Checking mods for errors... = Checking mods for errors... =
No problems found. =
Show experimental world wrap for maps = Show experimental world wrap for maps =
HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! =
Enable portrait orientation = Enable portrait orientation =

2
core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt
View File

@ -295,7 +295,7 @@ class OptionsPopup(val previousScreen: BaseScreen) : Popup(previousScreen) {
if (modLinks.isNotOK()) noProblem = false if (modLinks.isNotOK()) noProblem = false
lines += FormattedLine() lines += FormattedLine()
} }
if (noProblem) lines += FormattedLine("{No problems found}.",) if (noProblem) lines += FormattedLine("No problems found.".tr())
postCrashHandlingRunnable { postCrashHandlingRunnable {
// Don't just render text, since that will make all the conditionals in the mod replacement messages move to the end, which makes it unreadable // Don't just render text, since that will make all the conditionals in the mod replacement messages move to the end, which makes it unreadable