AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 21:35:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #4170 - updated deprecated Polynesian unique

Browse Source
This commit is contained in:
Yair Morgenstern 2021-06-17 19:57:52 +03:00
parent 67820e8870
commit fc7e07aa7f
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -469,7 +469,7 @@
"outerColor": [225,105,0], "outerColor": [225,105,0],
"innerColor": [255,255,78], "innerColor": [255,255,78],
"uniqueName": "Wayfinding", "uniqueName": "Wayfinding",
"uniques": ["Can embark and move over Coasts and Oceans immediately", "+1 Sight when embarked", "+[10]% Strength if within [2] tiles of a [Moai]"], "uniques": ["Can embark and move over Coasts and Oceans immediately", "+[1] Sight for all [Embarked] units", "+[10]% Strength if within [2] tiles of a [Moai]"],
"cities": ["Honolulu","Samoa","Tonga","Nuku Hiva","Raiatea","Aotearoa","Tahiti","Hilo","Te Wai Pounamu","Rapa Nui", "cities": ["Honolulu","Samoa","Tonga","Nuku Hiva","Raiatea","Aotearoa","Tahiti","Hilo","Te Wai Pounamu","Rapa Nui",
"Tuamotu","Rarotonga","Tuvalu","Tubuai","Mangareva","Oahu","Kiritimati","Ontong Java","Niue","Rekohu", "Tuamotu","Rarotonga","Tuvalu","Tubuai","Mangareva","Oahu","Kiritimati","Ontong Java","Niue","Rekohu",
"Rakahanga","Bora Bora","Kailua","Uvea","Futuna","Rotuma","Tokelau","Lahaina","Bellona","Mungava","Tikopia", "Rakahanga","Bora Bora","Kailua","Uvea","Futuna","Rotuma","Tokelau","Lahaina","Bellona","Mungava","Tikopia",

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

@ -1174,7 +1174,7 @@
"requiredTech": "Pharmaceuticals", "requiredTech": "Pharmaceuticals",
"attackSound": "shot", "attackSound": "shot",
"promotions": ["Amphibious"], "promotions": ["Amphibious"],
"uniques": ["[+1] Sight when [Embarked]", "Defense bonus when embarked"] "uniques": ["[+1] Sight for all [Embarked] units", "Defense bonus when embarked"]
}, },
{ {
"name": "Machine Gun", "name": "Machine Gun",

5
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -214,6 +214,7 @@ class MapUnit {
visibilityRange += unique.params[0].toInt() visibilityRange += unique.params[0].toInt()
if (hasUnique("+2 Visibility Range")) visibilityRange += 2 // This shouldn't be stackable if (hasUnique("+2 Visibility Range")) visibilityRange += 2 // This shouldn't be stackable
if (hasUnique("Limited Visibility")) visibilityRange -= 1 if (hasUnique("Limited Visibility")) visibilityRange -= 1
// Deprecated since 3.15.1
if (civInfo.hasUnique("+1 Sight for all land military units") && type.isMilitary() && type.isLandUnit()) if (civInfo.hasUnique("+1 Sight for all land military units") && type.isMilitary() && type.isLandUnit())
visibilityRange += 1 visibilityRange += 1
@ -222,10 +223,6 @@ class MapUnit {
visibilityRange += 1 visibilityRange += 1
// //
for (unique in civInfo.getMatchingUniques("[] Sight when []"))
if (matchesFilter(unique.params[1]))
visibilityRange += unique.params[0].toInt()
val tile = getTile() val tile = getTile()
for (unique in tile.getAllTerrains().flatMap { it.uniqueObjects }) for (unique in tile.getAllTerrains().flatMap { it.uniqueObjects })
if (unique.placeholderText == "[] Sight for [] units" && matchesFilter(unique.params[1])) if (unique.placeholderText == "[] Sight for [] units" && matchesFilter(unique.params[1]))

1
core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
View File

@ -241,6 +241,7 @@ class BaseUnit : INamed, IConstruction {
"Air", "air units" -> unitType.isAirUnit() "Air", "air units" -> unitType.isAirUnit()
"non-air" -> !unitType.isAirUnit() "non-air" -> !unitType.isAirUnit()
"Military", "military units" -> unitType.isMilitary() "Military", "military units" -> unitType.isMilitary()
// Deprecated as of 3.15.2
"military water" -> unitType.isMilitary() && unitType.isWaterUnit() "military water" -> unitType.isMilitary() && unitType.isWaterUnit()
else -> false else -> false
} }