From cfdfb839c54208037c4661b68231acff33f6f31e Mon Sep 17 00:00:00 2001 From: yairm210 Date: Tue, 12 Nov 2024 23:09:19 +0200 Subject: [PATCH] Fix tests --- android/assets/jsons/Civ V - Gods & Kings/Nations.json | 3 ++- android/assets/jsons/Civ V - Gods & Kings/UnitPromotions.json | 2 +- android/assets/jsons/Civ V - Gods & Kings/Units.json | 2 +- android/assets/jsons/Civ V - Vanilla/Nations.json | 2 +- android/assets/jsons/Civ V - Vanilla/UnitPromotions.json | 2 +- core/src/com/unciv/models/ruleset/unique/UniqueType.kt | 2 +- tests/src/com/unciv/testing/BasicTests.kt | 4 +++- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/android/assets/jsons/Civ V - Gods & Kings/Nations.json b/android/assets/jsons/Civ V - Gods & Kings/Nations.json index d654307705..809197bd94 100644 --- a/android/assets/jsons/Civ V - Gods & Kings/Nations.json +++ b/android/assets/jsons/Civ V - Gods & Kings/Nations.json @@ -647,7 +647,8 @@ "innerColor": [90, 0, 10], "favoredReligion": "Islam", "uniqueName": "River Warlord", - "uniques": ["Receive triple Gold from Barbarian encampments and pillaging Cities", "Defense bonus when embarked ", "[{Military} {Land}] units gain the [Amphibious] promotion"], + "uniques": ["Receive triple Gold from Barbarian encampments and pillaging Cities", "[+100]% Strength ", + "[{Military} {Land}] units gain the [Amphibious] promotion"], "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", "Agadez","Niamey","Torodi","Ouatagouna","Dori","Bamba","Segou"], diff --git a/android/assets/jsons/Civ V - Gods & Kings/UnitPromotions.json b/android/assets/jsons/Civ V - Gods & Kings/UnitPromotions.json index a0cf75da41..e1f82e7fa7 100644 --- a/android/assets/jsons/Civ V - Gods & Kings/UnitPromotions.json +++ b/android/assets/jsons/Civ V - Gods & Kings/UnitPromotions.json @@ -727,7 +727,7 @@ }, { "name": "[Conquistador] ability", - "uniques": ["Defense bonus when embarked"] + "uniques": ["[+100]% Strength "] }, { "name": "[Janissary] ability", diff --git a/android/assets/jsons/Civ V - Gods & Kings/Units.json b/android/assets/jsons/Civ V - Gods & Kings/Units.json index 6be7cd75b5..5d301e4042 100644 --- a/android/assets/jsons/Civ V - Gods & Kings/Units.json +++ b/android/assets/jsons/Civ V - Gods & Kings/Units.json @@ -1291,7 +1291,7 @@ "cost": 400, "requiredTech": "Pharmaceuticals", "promotions": ["Amphibious"], - "uniques": ["[+1] Sight ", "Defense bonus when embarked"], + "uniques": ["[+1] Sight ", "[+100]% Strength "], "attackSound": "shot" }, { diff --git a/android/assets/jsons/Civ V - Vanilla/Nations.json b/android/assets/jsons/Civ V - Vanilla/Nations.json index 23ff0911cf..fbc173d2ab 100644 --- a/android/assets/jsons/Civ V - Vanilla/Nations.json +++ b/android/assets/jsons/Civ V - Vanilla/Nations.json @@ -582,7 +582,7 @@ "outerColor": [214, 145, 19], "innerColor": [90, 0, 10], "uniqueName": "River Warlord", - "uniques": ["Receive triple Gold from Barbarian encampments and pillaging Cities", "Defense bonus when embarked "], + "uniques": ["Receive triple Gold from Barbarian encampments and pillaging Cities", "[+100]% Strength "], "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", "Agadez","Niamey","Torodi","Ouatagouna","Dori","Bamba","Segou"] diff --git a/android/assets/jsons/Civ V - Vanilla/UnitPromotions.json b/android/assets/jsons/Civ V - Vanilla/UnitPromotions.json index cf92be4959..92df9cdb7e 100644 --- a/android/assets/jsons/Civ V - Vanilla/UnitPromotions.json +++ b/android/assets/jsons/Civ V - Vanilla/UnitPromotions.json @@ -561,7 +561,7 @@ }, { "name": "[Conquistador] ability", - "uniques": ["Defense bonus when embarked"] + "uniques": ["[+100]% Strength "] }, { "name": "[Janissary] ability", diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index 5c5e4cdef7..9659baa57f 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -425,7 +425,7 @@ enum class UniqueType( HealAdjacentUnits("All adjacent units heal [amount] HP when healing", UniqueTarget.Unit), // Vision - @Deprecated("As of 4.14.6", ReplaceWith("[+100]% Strength ")) + @Deprecated("As of 4.14.6", ReplaceWith("[+100]% Strength ")) DefenceBonusWhenEmbarked("Defense bonus when embarked", UniqueTarget.Unit, UniqueTarget.Global), NoSight("No Sight", UniqueTarget.Unit), CanSeeOverObstacles("Can see over obstacles", UniqueTarget.Unit), diff --git a/tests/src/com/unciv/testing/BasicTests.kt b/tests/src/com/unciv/testing/BasicTests.kt index 0a967a1966..6b36a7a524 100644 --- a/tests/src/com/unciv/testing/BasicTests.kt +++ b/tests/src/com/unciv/testing/BasicTests.kt @@ -91,13 +91,15 @@ class BasicTests { @Test fun baseRulesetHasNoBugs() { + var hasFailed = false for (baseRuleset in BaseRuleset.entries) { val ruleset = RulesetCache[baseRuleset.fullName]!! val modCheck = ruleset.getErrorList() if (modCheck.isNotOK()) debug("%s", modCheck.getErrorText(true)) - Assert.assertFalse(modCheck.isNotOK()) + hasFailed = hasFailed || modCheck.isNotOK() } + Assert.assertFalse(hasFailed) } @Test