AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 22:37:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #243 from bryanwweber/fix_medical_lab_stats

Browse Source 
Fix medical lab stats and stasis chamber name
This commit is contained in:
yairm210 2018-10-15 12:24:49 +03:00 committed by GitHub
commit 8912984e74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Credits.md
View File

@ -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 * [Missile](https://thenounproject.com/term/missile/799922/) By ProSymbols for SS Booster
* [Rocket](https://thenounproject.com/term/rocket/937173/) By BomSymbols for SS Cockpit * [Rocket](https://thenounproject.com/term/rocket/937173/) By BomSymbols for SS Cockpit
* [Engine](https://thenounproject.com/term/engine/1877958/) By Andre for SS Engine * [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 ## Social Policies

6
android/assets/jsons/Buildings.json
View File

@ -527,10 +527,10 @@
{ {
name:"Medical Lab", name:"Medical Lab",
baseDescription: "25% of food carried over after a new citizen is born",
requiredBuilding:"Hospital", requiredBuilding:"Hospital",
maintenance:3, maintenance:3,
requiredTech:"Pharmaceuticals" requiredTech:"Pharmaceuticals",
uniques:["25% of food carried over after a new citizen is born"]
}, },
{ {
name:"Nuclear Plant", name:"Nuclear Plant",
@ -590,7 +590,7 @@
uniques:["Spaceship part"] uniques:["Spaceship part"]
}, },
{ {
name:"SS Statis Chamber", name:"SS Stasis Chamber",
requiredResource:"Aluminum", requiredResource:"Aluminum",
requiredTech:"Nanotechnology", requiredTech:"Nanotechnology",
uniques:["Spaceship part"] uniques:["Spaceship part"]

8
android/assets/jsons/Translations.json
View File

@ -3134,13 +3134,13 @@
French:"Usine du vaisseau spatial" French:"Usine du vaisseau spatial"
Romanian:"Fabbrica di astronave" 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
} }

1
core/src/com/unciv/logic/city/PopulationManager.kt
View File

@ -66,6 +66,7 @@ class PopulationManager {
{ {
foodStored -= getFoodToNextPopulation() 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("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++ population++
autoAssignPopulation() autoAssignPopulation()
cityInfo.civInfo.addNotification(cityInfo.name + " {has grown}!", cityInfo.location, Color.GREEN) cityInfo.civInfo.addNotification(cityInfo.name + " {has grown}!", cityInfo.location, Color.GREEN)

2
core/src/com/unciv/logic/civilization/ScienceVictoryManager.kt
View File

@ -10,7 +10,7 @@ class ScienceVictoryManager {
requiredParts.add("SS Booster", 3) requiredParts.add("SS Booster", 3)
requiredParts.add("SS Cockpit", 1) requiredParts.add("SS Cockpit", 1)
requiredParts.add("SS Engine", 1) requiredParts.add("SS Engine", 1)
requiredParts.add("SS Statis Chamber", 1) requiredParts.add("SS Stasis Chamber", 1)
} }
fun clone(): ScienceVictoryManager { fun clone(): ScienceVictoryManager {