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

Merge branch 'master' of https://github.com/yairm210/Unciv

Browse Source
This commit is contained in:
Yair Morgenstern
2020-03-28 21:42:32 +03:00
parent 2c83bd0896 c749fe6188
commit 9f0ee0d578
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/assets/jsons/Units.json
View File

@ -856,6 +856,7 @@
"unitType": "WaterAircraftCarrier", "unitType": "WaterAircraftCarrier",
"movement": 5, "movement": 5,
"strength": 40, "strength": 40,
"rangedStrength": 40,
"cost": 375, "cost": 375,
"requiredTech": "Electronics", "requiredTech": "Electronics",
"uniques": ["Can carry 2 aircraft"], "uniques": ["Can carry 2 aircraft"],

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

@ -32,6 +32,7 @@ enum class UnitType{
|| this == Siege || this == Siege
|| this == WaterRanged || this == WaterRanged
|| this == WaterSubmarine || this == WaterSubmarine
|| this == WaterAircraftCarrier
|| this == City || this == City
|| this.isAirUnit() || this.isAirUnit()