From 6a73909c67acae6bd895deefe763041bbfd98a77 Mon Sep 17 00:00:00 2001
From: givehub99 <71454921+givehub99@users.noreply.github.com>
Date: Fri, 4 Dec 2020 04:20:24 -0800
Subject: [PATCH] Helicopter Gunship (#3385)

* -Helicopter Gunship Implemented
-Anti-Tank Gun upgrades to it

* unit atlas

* "All tiles cost 1 movement"
---
 ...{Helicopter.png => Helicopter Gunship.png} | Bin
 android/assets/UnitIcons.atlas                |   2 +-
 .../assets/jsons/Civ V - Vanilla/Units.json   |  30 +++++++++---------
 core/src/com/unciv/logic/map/MapUnit.kt       |   2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)
 rename android/ImagesToPackSeparately/UnitIcons/{Helicopter.png => Helicopter Gunship.png} (100%)

diff --git a/android/ImagesToPackSeparately/UnitIcons/Helicopter.png b/android/ImagesToPackSeparately/UnitIcons/Helicopter Gunship.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Helicopter.png
rename to android/ImagesToPackSeparately/UnitIcons/Helicopter Gunship.png
diff --git a/android/assets/UnitIcons.atlas b/android/assets/UnitIcons.atlas
index 932813d70e..560829bf66 100644
--- a/android/assets/UnitIcons.atlas
+++ b/android/assets/UnitIcons.atlas
@@ -256,7 +256,7 @@ Great War Infantry
   orig: 100, 100
   offset: 0, 0
   index: -1
-Helicopter
+Helicopter Gunship
   rotate: false
   xy: 614, 104
   size: 100, 100
diff --git a/android/assets/jsons/Civ V - Vanilla/Units.json b/android/assets/jsons/Civ V - Vanilla/Units.json
index 05297902b2..831d9674f5 100644
--- a/android/assets/jsons/Civ V - Vanilla/Units.json	
+++ b/android/assets/jsons/Civ V - Vanilla/Units.json	
@@ -1232,9 +1232,23 @@
 		"strength": 50,
 		"cost": 300,
 		"requiredTech": "Combined Arms",
-		//"upgradesTo": "Helicopter Gunship",
+		"upgradesTo": "Helicopter Gunship",
 		"uniques": ["Bonus vs Armor 100%"]
 	},
+	{
+		// "Hovering unit" unique gives ability to get into impassable tiles - and only that (no vision bonus or flying over ocean)
+		// Unit embarks like any other ground unit and has penalty for attacking over river or from embarked state
+		// "Unable to capture cities"
+		"name": "Helicopter Gunship",
+		"unitType": "Melee",
+		"movement": 6,
+		"strength": 60,
+		"cost": 425,
+		"requiredTech": "Computers",
+		"requiredResource": "Aluminum",
+		"uniques": ["Bonus vs Armor 100%", "No defensive terrain bonuses", "Can move after attacking", "All tiles cost 1 movement", "Can pass through impassable tiles", "Unable to capture cities"],
+		"attackSound": "shot"
+	},
 	{
 		"name": "Rocket Artillery",
 		"unitType": "Siege",
@@ -1312,20 +1326,6 @@
 		"attackSound": "shot"
 		// cannot be based on carrier
 	},
-	{
-		// "Hovering unit" unique gives ability to get into impassable tiles - and only that (no vision bonus or flying over ocean)
-		// Unit embarks like any other ground unit and has penalty for attacking over river or from embarked state
-		// "Unable to capture cities"
-		"name": "Helicopter Gunship",
-		"unitType": "Melee",
-		"movement": 6,
-		"strength": 60,
-		"cost": 425,
-		"requiredTech": "Computers",
-		"requiredResource": "Aluminum",
-		"uniques": ["Bonus vs Armor 100%", "Ignores terrain cost", "No defensive terrain bonuses", "Can move after attacking"],
-		"attackSound": "shot"
-	},
 	{
 		"name": "Missile Cruiser",
 		"unitType": "WaterRanged",
diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt
index dbd711c93a..ca3db57c62 100644
--- a/core/src/com/unciv/logic/map/MapUnit.kt
+++ b/core/src/com/unciv/logic/map/MapUnit.kt
@@ -123,7 +123,7 @@ class MapUnit {
 
         tempUniques = uniques
 
-        allTilesCosts1 = hasUnique("All tiles costs 1")
+        allTilesCosts1 = hasUnique("All tiles cost 1 movement") || hasUnique("All tiles costs 1")
         canPassThroughImpassableTiles = hasUnique("Can pass through impassable tiles")
         ignoresTerrainCost = hasUnique("Ignores terrain cost")
         roughTerrainPenalty = hasUnique("Rough terrain penalty")