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

Fixed Indirect Fire promotion

Browse Source
This commit is contained in:
Yair Morgenstern
2019-11-02 20:10:01 +02:00
parent 403bd173a8
commit edb5ff92ed
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/assets/jsons/Nations/Nations.json
View File

@ -496,8 +496,8 @@
afterPeace:"Congratulations on your victory! I hope that peace between us will last forever!" afterPeace:"Congratulations on your victory! I hope that peace between us will last forever!"
tradeRequest:"Let us do business! Would you be interested?" tradeRequest:"Let us do business! Would you be interested?"
outerColor:[18,84,30], outerColor:[245,248,185],
innerColor:[245,248,185], innerColor:[18,84,30],
uniqueName:"Barbary Corsairs" uniqueName:"Barbary Corsairs"
unique:"Pay only one third the usual cost for naval unit maintenance. Melee naval units have a 1/3 chance to capture defeated naval units.", unique:"Pay only one third the usual cost for naval unit maintenance. Melee naval units have a 1/3 chance to capture defeated naval units.",
cities:["Istanbul","Edirne","Ankara","Bursa","Konya","Samsun","Gaziantep","Diyabakir","Izmir","Kayseri","Malatya", cities:["Istanbul","Edirne","Ankara","Bursa","Konya","Samsun","Gaziantep","Diyabakir","Izmir","Kayseri","Malatya",

3
core/src/com/unciv/logic/automation/UnitAutomation.kt
View File

@ -221,7 +221,8 @@ class UnitAutomation{
for(reachableTile in tilesToAttackFrom){ // tiles we'll still have energy after we reach there for(reachableTile in tilesToAttackFrom){ // tiles we'll still have energy after we reach there
val tilesInAttackRange = val tilesInAttackRange =
if (unit.hasUnique("Indirect Fire") || unit.type.isAirUnit()) reachableTile.getTilesInDistance(rangeOfAttack) if (unit.hasUnique("Ranged attacks may be performed over obstacles") || unit.type.isAirUnit())
reachableTile.getTilesInDistance(rangeOfAttack)
else reachableTile.getViewableTiles(rangeOfAttack, unit.type.isWaterUnit()) else reachableTile.getViewableTiles(rangeOfAttack, unit.type.isWaterUnit())
attackableTiles += tilesInAttackRange.asSequence().filter { it in tilesWithEnemies } attackableTiles += tilesInAttackRange.asSequence().filter { it in tilesWithEnemies }