Added Monastery and Solar Plant icons, which were missing

Credits.md

@@ -137,7 +137,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
 * [College](https://thenounproject.com/term/college/129978/) By Alexander Skowalsky for University
 * [College](https://thenounproject.com/term/college/1203703/) By Vectors Market for National College
 * [Chichen Itza](https://thenounproject.com/term/chichen-itza/668065/) By Hea Poh Lin
-* [Christian Church](https://thenounproject.com/term/christian-church/1174183/) By Andrejs Kirma for Monastary
+* [Christian Church](https://thenounproject.com/term/christian-church/1174183/) By Andrejs Kirma for Monastery
 * [Cambodia](https://thenounproject.com/term/cambodia/1809152/) By Wichai Wi for Angkor Wat
 * [Books](https://thenounproject.com/term/books/1140218/) By Abir Alward for Oxford University
 * [Forge](https://thenounproject.com/term/forge/1044767/) By Monjin Friends
@@ -183,7 +183,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
 * [Chemistry](https://thenounproject.com/term/chemistry/175847/) By Creative Stall for Medical Lab
 * [Microscope](https://thenounproject.com/term/microscope/1452362/) By Arafat Uddin for Research Lab
 * [Water dam](https://thenounproject.com/term/water-dam/1002726/) By Symbolon for Hydro Plant
-* [Solar panel](https://thenounproject.com/term/solar-panel/154447/) By Andrew J. Young for Solar Plant
+* [Solar panel](https://thenounproject.com/term/solar-panel/1131/) By Modik for Solar Plant
 * [Spaceship](https://thenounproject.com/term/spaceship/1444621/) By Dinosoft Labs for Apollo Program
 * [Build](https://thenounproject.com/term/build/1156478/) By Michael G Brown for Spaceship Factory
 * [Nuclear Plant](https://thenounproject.com/term/nuclear-plant/1132340/) By Andrejs Kirma

android/assets/jsons/Techs.json

@@ -240,7 +240,7 @@
 			},
 			{
 				name:"Gunpowder",
-				row:9,
+				row:10,
 				prerequisites:["Physics","Steel"]
 			}
 		]	
@@ -258,11 +258,6 @@
 				prerequisites:["Astronomy"],
 				baseDescription:"Does nothing since we have no sea tiles - In theory, allows construction of Frigates and Seaports"
 			},*/
-			{
-				name:"Archaeology",
-				row:2,
-				prerequisites:["Astronomy"]
-			},
 			{
 				name:"Architecture",
 				row:4,
@@ -275,12 +270,12 @@
 			},
 			{
 				name:"Metallurgy",
-				row:8,
+				row:9,
 				prerequisites:["Printing Press","Gunpowder"]
 			}
 			{
 				name:"Chemistry",
-				row:9,
+				row:10,
 				prerequisites:["Gunpowder"]
 			}
 		]	
@@ -292,6 +287,11 @@
 		buildingCost:360,
 		wonderCost:920,
 		techs:[
+			{
+				name:"Archaeology",
+				row:2,
+				prerequisites:["Astronomy"]
+			},
 			{
 				name:"Scientific Theory",
 				row:4,
@@ -309,12 +309,12 @@
 			},
 			{
 				name:"Military Science",
-				row:8,
+				row:9,
 				prerequisites:["Metallurgy","Chemistry"]
 			},
 			{
 				name:"Fertilizer",
-				row:9,
+				row:10,
 				prerequisites:["Chemistry"]
 			}
 		]	

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

@@ -43,15 +43,38 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen()
             defaults().pad(10f)
             background = ImageGetter.getDrawable("OtherIcons/civTableBackground.png")
             if(ImageGetter.techIconExists(techName))
-                add(ImageGetter.getTechIconGroup(techName))
+                add(ImageGetter.getTechIconGroup(techName)) // this is 60*60
 
+            val rightSide = Table()
             val techCost = techManager.costOfTech(techName)
             val remainingTech = techManager.remainingScienceToTech(techName)
             if(techCost!=remainingTech){
                 val percentComplete = (techCost-remainingTech)/techCost.toFloat()
                 add(ImageGetter.getProgressBarVertical(2f,30f,percentComplete, Color.BLUE, Color.WHITE))
             }
-            add(text)
+            rightSide.add(text).row()
+
+            // here we add little images of what the tech gives you
+            val techEnabledIcons = Table()
+
+
+            for(unit in GameBasics.Units.values.filter { it.requiredTech==techName
+                    && (it.uniqueTo==null || it.uniqueTo==techManager.civInfo.civName) })
+                techEnabledIcons.add(ImageGetter.getConstructionImage(unit.name)).size(25f).pad(2.5f)
+
+            for(building in GameBasics.Buildings.values.filter { it.requiredTech==techName
+                    && (it.uniqueTo==null || it.uniqueTo==techManager.civInfo.civName)})
+                techEnabledIcons.add(ImageGetter.getConstructionImage(building.name)).size(25f).pad(2.5f)
+
+            for(improvement in GameBasics.TileImprovements.values.filter { it.techRequired==techName }) {
+                if(improvement.name.startsWith("Remove"))
+                    techEnabledIcons.add(ImageGetter.getImage("OtherIcons/Stop")).size(25f).pad(2.5f)
+                else techEnabledIcons.add(ImageGetter.getImprovementIcon(improvement.name, 25f)).pad(2.5f)
+            }
+
+            rightSide.add(techEnabledIcons)
+
+            add(rightSide)
             pack()
         }
     }