From bca3d5645aeaa9299b29a099927a47859a077a8f Mon Sep 17 00:00:00 2001
From: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Date: Mon, 28 Feb 2022 18:42:02 +0100
Subject: [PATCH] Fix Spaceship production boni (and key binding) (#6247)

* Fix spaceship part boni

* Key binding for 'Add part to spaceship'
---
 .../assets/jsons/Civ V - Gods & Kings/Buildings.json | 12 +++---------
 android/assets/jsons/Civ V - Vanilla/Buildings.json  |  8 ++------
 core/src/com/unciv/models/UnitAction.kt              |  2 +-
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/android/assets/jsons/Civ V - Gods & Kings/Buildings.json b/android/assets/jsons/Civ V - Gods & Kings/Buildings.json
index 527edfafc7..ca877fee31 100644
--- a/android/assets/jsons/Civ V - Gods & Kings/Buildings.json	
+++ b/android/assets/jsons/Civ V - Gods & Kings/Buildings.json	
@@ -527,9 +527,7 @@
 		"hurryCostModifier": 25,
 		"requiredNearbyImprovedResources": ["Iron"],
 		"requiredTech": "Metal Casting",
-		// If spaceship parts are changed into units, the spaceship part unique should be changed to
-		// "[+15]% Production when constructing [Spaceship part] units [in this city]"
-		"uniques": ["[+15]% Production when constructing [Spaceship part] buildings [in this city]",
+		"uniques": ["[+15]% Production when constructing [Spaceship part] units [in this city]",
 			"[+15]% Production when constructing [Land] units [in this city]",
 			"[+1 Production] from [Iron] tiles [in this city]"]
 	},
@@ -1107,10 +1105,8 @@
 		"name": "Hubble Space Telescope",
 		"isWonder": true,
 		"greatPersonPoints": {"Great Scientist": 1},
-		// If spaceship parts are changed into units, the spaceship part unique should be changed to
-		// "[+25]% Production when constructing [Spaceship part] units [in this city]"
 		"uniques": ["[2] free [Great Scientist] units appear",
-			"[+25]% Production when constructing [Spaceship part] buildings [in this city]",
+			"[+25]% Production when constructing [Spaceship part] units [in this city]",
 			"Gain a free [Spaceship Factory] [in this city]"],
 		"requiredTech": "Satellites",
 		"quote": "'The wonder is, not that the field of stars is so vast, but that man has measured it.' - Anatole France"
@@ -1121,9 +1117,7 @@
 		"requiredResource": "Aluminum",
 		"cost": 360,
 		"requiredBuilding": "Factory",
-		// If spaceship parts are changed into units, this unique should be changed to
-		// "[+50]% Production when constructing [Spaceship part] units [in this city]"
-		"uniques": ["[+50]% Production when constructing [Spaceship part] buildings [in this city]"],
+		"uniques": ["[+50]% Production when constructing [Spaceship part] units [in this city]"],
 		"requiredTech": "Robotics"
 	},
 	// Column 16
diff --git a/android/assets/jsons/Civ V - Vanilla/Buildings.json b/android/assets/jsons/Civ V - Vanilla/Buildings.json
index 8957f8b3a3..e61fed3325 100644
--- a/android/assets/jsons/Civ V - Vanilla/Buildings.json	
+++ b/android/assets/jsons/Civ V - Vanilla/Buildings.json	
@@ -465,9 +465,7 @@
 		"hurryCostModifier": 25,
 		"requiredNearbyImprovedResources": ["Iron"],
 		"requiredTech": "Metal Casting",
-		// If spaceship parts are changed into units, the spaceship part unique should be changed to
-		// "[+15]% Production when constructing [Spaceship part] units [in this city]"
-		"uniques": ["[+15]% Production when constructing [Spaceship part] buildings [in this city]",
+		"uniques": ["[+15]% Production when constructing [Spaceship part] units [in this city]",
 			"[+15]% Production when constructing [Land] units [in this city]",
 			"[+1 Production] from [Iron] tiles [in this city]"]
 	},
@@ -947,9 +945,7 @@
 		"requiredResource": "Aluminum",
 		"cost": 360,
 		"requiredBuilding": "Factory",
-		// If spaceship parts are changed into units, this unique should be changed to
-		// "[+50]% Production when constructing [Spaceship part] units [in this city]"
-		"uniques": ["[+50]% Production when constructing [Spaceship part] buildings [in this city]"],
+		"uniques": ["[+50]% Production when constructing [Spaceship part] units [in this city]"],
 		"requiredTech": "Robotics"
 	},
 	// Column 16
diff --git a/core/src/com/unciv/models/UnitAction.kt b/core/src/com/unciv/models/UnitAction.kt
index 2f481cea4e..fa4642c3b4 100644
--- a/core/src/com/unciv/models/UnitAction.kt
+++ b/core/src/com/unciv/models/UnitAction.kt
@@ -141,7 +141,7 @@ enum class UnitActionType(
     HideAdditionalActions("Back",
         { imageGetHideMore() }, KeyCharAndCode(Input.Keys.PAGE_UP)),
     AddInCapital( "Add in capital",
-        { ImageGetter.getUnitIcon("SS Cockpit")}, UncivSound.Chimes),
+        { ImageGetter.getUnitIcon("SS Cockpit")}, 'g', UncivSound.Chimes),
     ;
 
     // Allow shorter initializations