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

"+[] Movement for all [] units" now respects all unit categories

Browse Source
This commit is contained in:
Yair Morgenstern
2020-12-06 21:50:46 +02:00
parent 378e1ddc66
commit b50c129e2d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,7 +139,7 @@
"outerColor": [ 114, 0, 0], "outerColor": [ 114, 0, 0],
"innerColor": [255,255,255], "innerColor": [255,255,255],
"uniqueName": "Sun Never Sets", "uniqueName": "Sun Never Sets",
"uniques": ["+2 movement for all naval units"], "uniques": ["+[2] Movement for all [Water] units"],
"cities": ["London","York","Nottingham","Hastings","Canterbury","Coventry","Warwick","Newcastle","Oxford","Liverpool", "cities": ["London","York","Nottingham","Hastings","Canterbury","Coventry","Warwick","Newcastle","Oxford","Liverpool",
"Dover","Brighton","Norwich","Leeds","Reading","Birmingham","Richmond","Exeter","Cambridge","Gloucester", "Dover","Brighton","Norwich","Leeds","Reading","Birmingham","Richmond","Exeter","Cambridge","Gloucester",
"Manchester","Bristol","Leicester","Carlisle","Ipswich","Portsmouth","Berwick","Bath","Mumbles","Southampton", "Manchester","Bristol","Leicester","Carlisle","Ipswich","Portsmouth","Berwick","Bath","Mumbles","Southampton",

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

@ -89,11 +89,12 @@ class MapUnit {
&& civInfo.hasUnique("All military naval units receive +1 movement and +1 sight")) && civInfo.hasUnique("All military naval units receive +1 movement and +1 sight"))
movement += 1 movement += 1
// Deprecated as of 3.11.18
if (type.isWaterUnit() && civInfo.hasUnique("+2 movement for all naval units")) if (type.isWaterUnit() && civInfo.hasUnique("+2 movement for all naval units"))
movement += 2 movement += 2
for (unique in civInfo.getMatchingUniques("+[] Movement for all [] units")) for (unique in civInfo.getMatchingUniques("+[] Movement for all [] units"))
if (unique.params[1] == type.name) if (matchesCategory(unique.params[1]))
movement += unique.params[0].toInt() movement += unique.params[0].toInt()
if (civInfo.goldenAges.isGoldenAge() && if (civInfo.goldenAges.isGoldenAge() &&