AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 05:46:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added Ironclad unit

Browse Source
This commit is contained in:
Yair Morgenstern 2018-11-12 11:21:00 +02:00
parent d3a4952fef
commit 5ef5ff572e
6 changed files with 166 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/UnitIcons/Ironclad.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

293
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 788 KiB

After

Width:  |  Height:  |  Size: 790 KiB

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

@ -350,6 +350,17 @@
uniques:["Bonus vs City 200%","No defensive terrain bonus","Must set up to ranged attack","Limited Visibility","Indirect Fire"], uniques:["Bonus vs City 200%","No defensive terrain bonus","Must set up to ranged attack","Limited Visibility","Indirect Fire"],
hurryCostModifier:20 hurryCostModifier:20
}, },
{
name:"Ironclad",
unitType:"WaterMelee",
movement:3,
strength:45,
cost: 250,
requiredTech:"Steam Power",
requiredResource:"Coal",
uniques:["Bonus vs City 33%","Double movement in coast"],
hurryCostModifier:20
},
/* Great people */ /* Great people */

2
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -180,6 +180,8 @@ class CivilizationInfo {
// we don't modify the iterator as we're using it // we don't modify the iterator as we're using it
for (city in cities) civResources.add(city.getCityResources()) for (city in cities) civResources.add(city.getCityResources())
for (dip in diplomacy.values) civResources.add(dip.resourcesFromTrade()) for (dip in diplomacy.values) civResources.add(dip.resourcesFromTrade())
for(resource in getCivUnits().map { it.baseUnit.requiredResource }.filterNotNull().map { GameBasics.TileResources[it] })
civResources.add(resource,-1)
return civResources return civResources
} }

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

@ -25,6 +25,9 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
&& (to.baseTerrain == "Hill" || to.terrainFeature == "Forest" || to.terrainFeature == "Jungle")) && (to.baseTerrain == "Hill" || to.terrainFeature == "Forest" || to.terrainFeature == "Jungle"))
return 4f return 4f
if(unit.hasUnique("Double movement in coast") && to.baseTerrain=="Coast")
return 1/2f
return to.lastTerrain.movementCost.toFloat() // no road return to.lastTerrain.movementCost.toFloat() // no road
} }