From a56e7e43aa04daeeb36ccacc9aa224fe9c515a00 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 24 Jun 2018 21:19:57 +0300
Subject: [PATCH] Added Agriculture tech - no gameplay change, but it does tell
 the game's story well!

---
 android/assets/jsons/Techs.json                     | 13 +++++++++++++
 android/assets/jsons/TileImprovements.json          |  1 +
 android/build.gradle                                |  4 ++--
 .../unciv/logic/civilization/CivilizationInfo.kt    |  1 +
 .../com/unciv/ui/pickerscreens/TechPickerScreen.kt  |  4 ++--
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/android/assets/jsons/Techs.json b/android/assets/jsons/Techs.json
index 6cfe63daf7..923869e3dc 100644
--- a/android/assets/jsons/Techs.json
+++ b/android/assets/jsons/Techs.json
@@ -1,4 +1,17 @@
 [
+	{
+		columnNumber: 0,
+		era:"Ancient",
+		techCost: 20,
+		buildingCost:40,
+		techs:[
+			{
+				name:"Agriculture",
+				row:5,
+			}
+			
+		]	
+	},
 	{
 		columnNumber: 1,
 		era:"Ancient",
diff --git a/android/assets/jsons/TileImprovements.json b/android/assets/jsons/TileImprovements.json
index c31bcf86b0..09594dd5a1 100644
--- a/android/assets/jsons/TileImprovements.json
+++ b/android/assets/jsons/TileImprovements.json
@@ -4,6 +4,7 @@
 		terrainsCanBeBuiltOn:["Plains","Grassland","Desert","Flood plains"],
 		food:1,
 		turnsToBuild:7,
+		techRequired:"Agriculture",
 		improvingTech:"Fertilizer",
 		improvingTechStats:{food:1}
 	},
diff --git a/android/build.gradle b/android/build.gradle
index 02baa7877c..4ffbe01b9e 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.game"
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 91
-        versionName "2.5.5.2"
+        versionCode 92
+        versionName "2.5.6"
     }
     buildTypes {
         release {
diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
index 6f69ddb09e..a8d6b6f08e 100644
--- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
+++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
@@ -118,6 +118,7 @@ class CivilizationInfo {
     constructor(civName: String, startingLocation: Vector2, gameInfo: GameInfo) {
         this.civName = civName
         this.gameInfo = gameInfo
+        tech.techsResearched.add("Agriculture")
         this.placeUnitNearTile(startingLocation, "Settler")
         this.placeUnitNearTile(startingLocation, "Scout")
     }
diff --git a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt
index 9b2522f13c..eff2d42870 100644
--- a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt
+++ b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt
@@ -33,10 +33,10 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen()
     init {
         techsToResearch = ArrayList(civTech.techsToResearch)
 
-        val techMatrix = Array<Array<Technology?>>(17) { arrayOfNulls(10) } // Divided into columns, then rows
+        val techMatrix = Array<Array<Technology?>>(18) { arrayOfNulls(10) } // Divided into columns, then rows
 
         for (technology in GameBasics.Technologies.values) {
-            techMatrix[technology.column!!.columnNumber - 1][technology.row - 1] = technology
+            techMatrix[technology.column!!.columnNumber][technology.row - 1] = technology
         }
 
         for (i in 0..9) {