From 1dffbe2db5dbbe03aaddbaebba0d5e4d5f964fa2 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 25 Jun 2018 13:59:51 +0300
Subject: [PATCH] Added Dynamite tech with Artillery

---
 android/assets/jsons/Techs.json                      |  7 ++++++-
 android/assets/jsons/Units.json                      | 12 ++++++++++++
 .../src/com/unciv/logic/automation/UnitAutomation.kt |  3 ++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/android/assets/jsons/Techs.json b/android/assets/jsons/Techs.json
index 923869e3dc..12a4dda4a0 100644
--- a/android/assets/jsons/Techs.json
+++ b/android/assets/jsons/Techs.json
@@ -329,6 +329,11 @@
 				name:"Steam Power",
 				row:7,
 				prerequisites:["Industrialization","Scientific Theory","Chemistry"]
+			},
+			{
+				name:"Dynamite",
+				row:9,
+				prerequisites:["Fertilizer"]
 			}
 		]	
 	},
@@ -353,7 +358,7 @@
 			{
 				name:"Combustion",
 				row:8,
-				prerequisites:["Steam Power"]
+				prerequisites:["Steam Power","Dynamite"]
 			}
 		]	
 	},
diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json
index 87010f3d62..e8c913d203 100644
--- a/android/assets/jsons/Units.json
+++ b/android/assets/jsons/Units.json
@@ -249,6 +249,18 @@
 	},
 	*/
 	
+	{
+		name:"Artillery",
+		unitType:"Siege",
+		movement:2,
+		strength:21,
+		rangedStrength:28,
+		range:3,
+		cost: 120,
+		requiredTech:"Dynamite",
+		uniques:["Bonus vs City 200%","No defensive terrain bonus","Must set up to ranged attack","Limited Visibility"],
+		hurryCostModifier:20
+	},
 	
 	/* Great people */
 	
diff --git a/core/src/com/unciv/logic/automation/UnitAutomation.kt b/core/src/com/unciv/logic/automation/UnitAutomation.kt
index 5fb86c421f..2540c4e17d 100644
--- a/core/src/com/unciv/logic/automation/UnitAutomation.kt
+++ b/core/src/com/unciv/logic/automation/UnitAutomation.kt
@@ -96,7 +96,8 @@ class UnitAutomation{
         if (enemyTileToAttack != null) {
             val enemy = Battle().getMapCombatantOfTile(enemyTileToAttack.tileToAttack)!!
             unit.moveToTile(enemyTileToAttack.tileToAttackFrom)
-            val setupAction = UnitActions().getUnitActions(unit, UnCivGame.Current.worldScreen).firstOrNull{ it.name == "Set up" }
+            val setupAction = UnitActions().getUnitActions(unit, UnCivGame.Current.worldScreen)
+                    .firstOrNull{ it.name == "Set up" }
             if(setupAction!=null) setupAction.action()
             if(unit.currentMovement>0) // This can be 0, if the set up action took away what action points we had left...
                 Battle(unit.civInfo.gameInfo).attack(MapUnitCombatant(unit), enemy)