From f86736db6d99921c20d2b5d8d6555cc0c624de47 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 28 Oct 2018 16:16:47 +0200
Subject: [PATCH] Removed Hydro Plant, since it requires rivers to be useful,
 and we don't yet have rivers.

---
 android/assets/jsons/Buildings.json | 7 -------
 android/assets/jsons/Policies.json  | 2 +-
 core/src/com/unciv/UnCivGame.kt     | 4 ++++
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json
index c9e8754561..ecb4a98b40 100644
--- a/android/assets/jsons/Buildings.json
+++ b/android/assets/jsons/Buildings.json
@@ -525,13 +525,6 @@
 		maintenance:3,
 		requiredTech:"Plastics"
 	},
-	{
-		name:"Hydro Plant",
-		baseDescription: "Provides +1 production to tiles near rivers",
-		maintenance:3,
-		requiredResource:"Aluminum",
-		requiredTech:"Plastics"
-	},
 	{
 		name:"Stadium",
 		happiness:4,
diff --git a/android/assets/jsons/Policies.json b/android/assets/jsons/Policies.json
index 793d474a26..c809d3e6d7 100644
--- a/android/assets/jsons/Policies.json
+++ b/android/assets/jsons/Policies.json
@@ -311,7 +311,7 @@
 		policies:[
 			{
 				name:"Populism",
-				description:"Wounded military units deal +25% damage", // todo - this is different than +25% strength...
+				description:"Wounded military units deal +25% damage",
 				row:1,
 				column:1
 			},
diff --git a/core/src/com/unciv/UnCivGame.kt b/core/src/com/unciv/UnCivGame.kt
index 23dff849f8..8f488cde9e 100644
--- a/core/src/com/unciv/UnCivGame.kt
+++ b/core/src/com/unciv/UnCivGame.kt
@@ -37,6 +37,10 @@ class UnCivGame : Game() {
     }
 
     fun loadGame(gameInfo:GameInfo){
+        // As of 2.9.6, removed hydro plat, since it requires rivers, which we do not yet have
+        gameInfo.civilizations.flatMap { it.cities }.map { it.cityConstructions }
+                .forEach{if("Hydro Plant" in it.builtBuildings) it.builtBuildings.remove("Hydro Plant")}
+
         this.gameInfo = gameInfo
         if(settings.tutorialsShown.isEmpty()  && this.gameInfo.tutorial.isNotEmpty())
             settings.tutorialsShown.addAll(this.gameInfo.tutorial)