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

Fix tests

Browse Source
This commit is contained in:
yairm210
2024-11-12 23:09:19 +02:00
parent 3edcc29857
commit cfdfb839c5
7 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -647,7 +647,8 @@
"innerColor": [90, 0, 10], "innerColor": [90, 0, 10],
"favoredReligion": "Islam", "favoredReligion": "Islam",
"uniqueName": "River Warlord", "uniqueName": "River Warlord",
"uniques": ["Receive triple Gold from Barbarian encampments and pillaging Cities", "Defense bonus when embarked <for [All] units>", "[{Military} {Land}] units gain the [Amphibious] promotion"], "uniques": ["Receive triple Gold from Barbarian encampments and pillaging Cities", "[+100]% Strength <when defending> <for [Embarked] units>",
"[{Military} {Land}] units gain the [Amphibious] promotion"],
"cities": ["Gao","Tombouctu","Jenne","Taghaza","Tondibi","Kumbi Saleh","Kukia","Walata","Tegdaoust","Argungu","Gwandu", "cities": ["Gao","Tombouctu","Jenne","Taghaza","Tondibi","Kumbi Saleh","Kukia","Walata","Tegdaoust","Argungu","Gwandu",
"Kebbi","Boussa","Motpi","Bamako","Wa","Kayes","Awdaghost","Ouadane","Dakar","Tadmekket","Tekedda","Kano", "Kebbi","Boussa","Motpi","Bamako","Wa","Kayes","Awdaghost","Ouadane","Dakar","Tadmekket","Tekedda","Kano",
"Agadez","Niamey","Torodi","Ouatagouna","Dori","Bamba","Segou"], "Agadez","Niamey","Torodi","Ouatagouna","Dori","Bamba","Segou"],

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

@ -727,7 +727,7 @@
}, },
{ {
"name": "[Conquistador] ability", "name": "[Conquistador] ability",
"uniques": ["Defense bonus when embarked"] "uniques": ["[+100]% Strength <when defending> <when [Embarked]>"]
}, },
{ {
"name": "[Janissary] ability", "name": "[Janissary] ability",

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

@ -1291,7 +1291,7 @@
"cost": 400, "cost": 400,
"requiredTech": "Pharmaceuticals", "requiredTech": "Pharmaceuticals",
"promotions": ["Amphibious"], "promotions": ["Amphibious"],
"uniques": ["[+1] Sight <when [Embarked]>", "Defense bonus when embarked"], "uniques": ["[+1] Sight <when [Embarked]>", "[+100]% Strength <when defending> <when [Embarked]>"],
"attackSound": "shot" "attackSound": "shot"
}, },
{ {

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

@ -582,7 +582,7 @@
"outerColor": [214, 145, 19], "outerColor": [214, 145, 19],
"innerColor": [90, 0, 10], "innerColor": [90, 0, 10],
"uniqueName": "River Warlord", "uniqueName": "River Warlord",
"uniques": ["Receive triple Gold from Barbarian encampments and pillaging Cities", "Defense bonus when embarked <for [All] units>"], "uniques": ["Receive triple Gold from Barbarian encampments and pillaging Cities", "[+100]% Strength <when defending> <for [Embarked] units>"],
"cities": ["Gao","Tombouctu","Jenne","Taghaza","Tondibi","Kumbi Saleh","Kukia","Walata","Tegdaoust","Argungu","Gwandu", "cities": ["Gao","Tombouctu","Jenne","Taghaza","Tondibi","Kumbi Saleh","Kukia","Walata","Tegdaoust","Argungu","Gwandu",
"Kebbi","Boussa","Motpi","Bamako","Wa","Kayes","Awdaghost","Ouadane","Dakar","Tadmekket","Tekedda","Kano", "Kebbi","Boussa","Motpi","Bamako","Wa","Kayes","Awdaghost","Ouadane","Dakar","Tadmekket","Tekedda","Kano",
"Agadez","Niamey","Torodi","Ouatagouna","Dori","Bamba","Segou"] "Agadez","Niamey","Torodi","Ouatagouna","Dori","Bamba","Segou"]

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

@ -561,7 +561,7 @@
}, },
{ {
"name": "[Conquistador] ability", "name": "[Conquistador] ability",
"uniques": ["Defense bonus when embarked"] "uniques": ["[+100]% Strength <when defending> <when [Embarked]>"]
}, },
{ {
"name": "[Janissary] ability", "name": "[Janissary] ability",

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

@ -425,7 +425,7 @@ enum class UniqueType(
HealAdjacentUnits("All adjacent units heal [amount] HP when healing", UniqueTarget.Unit), HealAdjacentUnits("All adjacent units heal [amount] HP when healing", UniqueTarget.Unit),
// Vision // Vision
@Deprecated("As of 4.14.6", ReplaceWith("[+100]% Strength <when defending> <for [Embarked] units>")) @Deprecated("As of 4.14.6", ReplaceWith("[+100]% Strength <when defending> <when [Embarked]>"))
DefenceBonusWhenEmbarked("Defense bonus when embarked", UniqueTarget.Unit, UniqueTarget.Global), DefenceBonusWhenEmbarked("Defense bonus when embarked", UniqueTarget.Unit, UniqueTarget.Global),
NoSight("No Sight", UniqueTarget.Unit), NoSight("No Sight", UniqueTarget.Unit),
CanSeeOverObstacles("Can see over obstacles", UniqueTarget.Unit), CanSeeOverObstacles("Can see over obstacles", UniqueTarget.Unit),

4
tests/src/com/unciv/testing/BasicTests.kt
View File

@ -91,13 +91,15 @@ class BasicTests {
@Test @Test
fun baseRulesetHasNoBugs() { fun baseRulesetHasNoBugs() {
var hasFailed = false
for (baseRuleset in BaseRuleset.entries) { for (baseRuleset in BaseRuleset.entries) {
val ruleset = RulesetCache[baseRuleset.fullName]!! val ruleset = RulesetCache[baseRuleset.fullName]!!
val modCheck = ruleset.getErrorList() val modCheck = ruleset.getErrorList()
if (modCheck.isNotOK()) if (modCheck.isNotOK())
debug("%s", modCheck.getErrorText(true)) debug("%s", modCheck.getErrorText(true))
Assert.assertFalse(modCheck.isNotOK()) hasFailed = hasFailed || modCheck.isNotOK()
} }
Assert.assertFalse(hasFailed)
} }
@Test @Test