Tech reorg - added Lasers and Mobile Tactics, tech tree is now almost 100% G&K

android/assets/jsons/Techs.json

@@ -428,15 +428,9 @@
 			},
 			{
 				name:"Atomic Theory",
-				row:3,
+				row:4,
 				prerequisites:["Plastics","Electronics"]
 			},
-			{
-				name:"Computers",
-				row:5,
-				prerequisites:["Electronics"],
-				uniques:["+10% science and production in all cities"]
-			},
 			{
 				name:"Radar",
 				row:6,
@@ -444,7 +438,7 @@
 			},
 			{
 				name:"Combined Arms",
-				row:7,
+				row:8,
 				prerequisites:["Ballistics","Combustion"]
 			},
 		]	
@@ -464,17 +458,18 @@
 			{
 				name:"Nuclear Fission",
 				row:3,
-				prerequisites:["Atomic Theory"]
+				prerequisites:["Atomic Theory","Radar"]
-			},
-			{
-				name:"Robotics",
-				row:4,
-				prerequisites:["Computers"]
 			},
 			{
 				name:"Rocketry",
 				row:6,
-				prerequisites:["Combined Arms","Radar"]
+				prerequisites:["Radar"]
+			}
+			{
+				name:"Computers",
+				row:8,
+				prerequisites:["Combined Arms","Radar"],
+				uniques:["+10% science and production in all cities"]
 			}
 		]
 	},
@@ -486,22 +481,30 @@
 		wonderCost:1250,
 		techs:[
 			{
-				name:"Nanotechnology",
+				name:"Mobile Tactics",
 				row:3,
-				prerequisites:["Robotics","Ecology"]
+				prerequisites:["Ecology","Nuclear Fission"]
-			},
-			{
-				name:"Particle Physics",
-				row:4,
-				prerequisites:["Nuclear Fission"]
 			},
 			{
 				name:"Satellites",
 				row:5,
-				prerequisites:["Rocketry","Robotics"]
+				prerequisites:["Nuclear Fission","Rocketry"]
 			}
+			{
+				name:"Robotics",
+				row:7,
+				prerequisites:["Rocketry","Computers"]
+			},
+			{
+				name:"Lasers",
+				row:8,
+				prerequisites:["Computers"]
+			},
+			
+			
 		]	
 	},
+	
 	{
 		columnNumber: 16,
 		era:"Future",
@@ -510,8 +513,27 @@
 		wonderCost:1250,
 		techs:[
 			{
-				name:"Future Tech",
+				name:"Particle Physics",
 				row:4,
+				prerequisites:["Mobile Tactics","Satellites"]
+			},
+			{
+				name:"Nanotechnology",
+				row:7,
+				prerequisites:["Robotics","Lasers"]
+			},
+		]	
+	}
+	{
+		columnNumber: 17,
+		era:"Future",
+		techCost: 9500,
+		buildingCost:750,
+		wonderCost:1250,
+		techs:[
+			{
+				name:"Future Tech",
+				row:5,
 				prerequisites:["Nanotechnology","Particle Physics","Satellites"],
 				uniques:["Who knows what the future holds?"]
 			}

android/assets/jsons/Units.json

@@ -1129,7 +1129,7 @@
 		movement:3,
 		strength:90,
 		cost: 375,
-		requiredTech:"Nuclear Fission",
+		requiredTech:"Mobile Tactics",
 		hurryCostModifier:20,
 	},
 	{
@@ -1138,7 +1138,7 @@
 		movement:5,
 		strength:100,
 		cost: 425,
-		requiredTech:"Robotics",
+		requiredTech:"Lasers",
 		requiredResource:"Aluminum",
 		uniques:["Can move after attacking","No defensive terrain bonus"]
 		hurryCostModifier:20,

core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt

@@ -44,7 +44,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
 
         tempTechsToResearch = ArrayList(civTech.techsToResearch)
 
-        val columns = 17
+        val columns = GameBasics.Technologies.values.map { it.column!!.columnNumber}.max()!! +1
         val techMatrix = Array<Array<Technology?>>(columns) { arrayOfNulls(10) } // Divided into columns, then rows
 
         for (technology in GameBasics.Technologies.values) {