From e816d9dbed5c1ae0832ee157fa81802b3c5866dd Mon Sep 17 00:00:00 2001 From: "Bryan W. Weber" Date: Sun, 14 Oct 2018 11:17:37 -0400 Subject: [PATCH 1/4] Fix typo in SS Stasis Chamber name --- android/assets/jsons/Buildings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json index e4d905ac73..929accf7d9 100644 --- a/android/assets/jsons/Buildings.json +++ b/android/assets/jsons/Buildings.json @@ -590,7 +590,7 @@ uniques:["Spaceship part"] }, { - name:"SS Statis Chamber", + name:"SS Stasis Chamber", requiredResource:"Aluminum", requiredTech:"Nanotechnology", uniques:["Spaceship part"] From edc3e730b961b5ee4edc42f4c5545ae0336ca396 Mon Sep 17 00:00:00 2001 From: "Bryan W. Weber" Date: Sun, 14 Oct 2018 11:18:51 -0400 Subject: [PATCH 2/4] Change Medical Lab to use uniques This matches how the Aqueduct is specified. It also fixes that the description is not available on the building picker screen. --- android/assets/jsons/Buildings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json index 929accf7d9..24c2e34035 100644 --- a/android/assets/jsons/Buildings.json +++ b/android/assets/jsons/Buildings.json @@ -527,10 +527,10 @@ { name:"Medical Lab", - baseDescription: "25% of food carried over after a new citizen is born", requiredBuilding:"Hospital", maintenance:3, - requiredTech:"Pharmaceuticals" + requiredTech:"Pharmaceuticals", + uniques:["25% of food carried over after a new citizen is born"] }, { name:"Nuclear Plant", From f90f2026eca7d20813bbd8dae21b56e536f0a53f Mon Sep 17 00:00:00 2001 From: "Bryan W. Weber" Date: Sun, 14 Oct 2018 11:19:20 -0400 Subject: [PATCH 3/4] Apply the Medical Lab effect to the city food supply --- core/src/com/unciv/logic/city/PopulationManager.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/com/unciv/logic/city/PopulationManager.kt b/core/src/com/unciv/logic/city/PopulationManager.kt index fc193d1693..cfacc6a7f2 100644 --- a/core/src/com/unciv/logic/city/PopulationManager.kt +++ b/core/src/com/unciv/logic/city/PopulationManager.kt @@ -66,6 +66,7 @@ class PopulationManager { { foodStored -= getFoodToNextPopulation() if (cityInfo.getBuildingUniques().contains("40% of food is carried over after a new citizen is born")) foodStored += (0.4f * getFoodToNextPopulation()).toInt() // Aqueduct special + if (cityInfo.getBuildingUniques().contains("25% of food carried over after a new citizen is born")) foodStored += (0.25f * getFoodToNextPopulation()).toInt() // Medical Lab special population++ autoAssignPopulation() cityInfo.civInfo.addNotification(cityInfo.name + " {has grown}!", cityInfo.location, Color.GREEN) From 345f0db27e1811d37c59c244603e3cc9695dccf4 Mon Sep 17 00:00:00 2001 From: "Bryan W. Weber" Date: Sun, 14 Oct 2018 13:55:01 -0400 Subject: [PATCH 4/4] Fix all spellings of Statis->Stasis --- Credits.md | 2 +- android/assets/jsons/Translations.json | 8 ++++---- .../com/unciv/logic/civilization/ScienceVictoryManager.kt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Credits.md b/Credits.md index 122d3132d8..fd6d7efd12 100644 --- a/Credits.md +++ b/Credits.md @@ -187,7 +187,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Missile](https://thenounproject.com/term/missile/799922/) By ProSymbols for SS Booster * [Rocket](https://thenounproject.com/term/rocket/937173/) By BomSymbols for SS Cockpit * [Engine](https://thenounproject.com/term/engine/1877958/) By Andre for SS Engine -* [Chamber](https://thenounproject.com/term/chamber/1242689/) By IYIKON for SS Statis Chamber +* [Chamber](https://thenounproject.com/term/chamber/1242689/) By IYIKON for SS Stasis Chamber ## Social Policies diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index 7d8f8f8e81..b7a9c4c686 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -3134,13 +3134,13 @@ French:"Usine du vaisseau spatial" Romanian:"Fabbrica di astronave" } - "SS Booster":{ //no traslation that i know of + "SS Booster":{ //no translation that I know of } - "SS Cockpit":{ //no traslation that i know of + "SS Cockpit":{ //no translation that I know of } - "SS Engine":{ //no traslation that i know of + "SS Engine":{ //no translation that I know of } - "SS Statis Chamber":{ //no traslation that i know of + "SS Stasis Chamber":{ //no translation that I know of } diff --git a/core/src/com/unciv/logic/civilization/ScienceVictoryManager.kt b/core/src/com/unciv/logic/civilization/ScienceVictoryManager.kt index 2fbd3f392e..478ed397c2 100644 --- a/core/src/com/unciv/logic/civilization/ScienceVictoryManager.kt +++ b/core/src/com/unciv/logic/civilization/ScienceVictoryManager.kt @@ -10,7 +10,7 @@ class ScienceVictoryManager { requiredParts.add("SS Booster", 3) requiredParts.add("SS Cockpit", 1) requiredParts.add("SS Engine", 1) - requiredParts.add("SS Statis Chamber", 1) + requiredParts.add("SS Stasis Chamber", 1) } fun clone(): ScienceVictoryManager {