Added Kremlin wonder

This commit is contained in:
Yair Morgenstern 2019-02-22 10:27:47 +02:00
parent 563bbaf021
commit 53664ec043
8 changed files with 415 additions and 401 deletions

View File

@ -199,6 +199,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
* [Eiffel Tower](https://thenounproject.com/term/eiffel-tower/1907757/) By Felipe Alvarado * [Eiffel Tower](https://thenounproject.com/term/eiffel-tower/1907757/) By Felipe Alvarado
* [Statue of Liberty](https://thenounproject.com/search/?q=statue%20of%20liberty&i=1801199) By 1516 * [Statue of Liberty](https://thenounproject.com/search/?q=statue%20of%20liberty&i=1801199) By 1516
* [Christ the redeemer](https://thenounproject.com/term/christ-the-redeemer/56112/) By Stefan Spieler for Cristo Redentor * [Christ the redeemer](https://thenounproject.com/term/christ-the-redeemer/56112/) By Stefan Spieler for Cristo Redentor
* [St. Petersburg](https://thenounproject.com/search/?q=kremlin&i=1569704) By Carpe Diem for Kremlin
### Information Era ### Information Era

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 855 KiB

After

Width:  |  Height:  |  Size: 866 KiB

View File

@ -577,6 +577,13 @@
uniques:["Culture cost of adopting new Policies reduced by 10%"], uniques:["Culture cost of adopting new Policies reduced by 10%"],
requiredTech:"Flight" requiredTech:"Flight"
}, },
{
name:"Kremlin",
culture:3,
isWonder:true,
uniques:["Defensive buildings in all cities are 25% more effective"],
requiredTech:"Railroad"
},
// Information Era // Information Era

View File

@ -1324,16 +1324,7 @@
Portuguese:"Nome do jogo salvo" Portuguese:"Nome do jogo salvo"
} }
"Copy game info":{ "Copy to clipboard":{
Italian:"Copia le informazioni sul gioco"
Russian:"Копировать информацию об игре"
French:"Copier les données de la partie"
Romanian:"Copiază informațiile jocului"
German:"Spielinfo kopieren"
Dutch:"Spelinformatie kopiëren"
Spanish:"Copiar información de partida"
Simplified_Chinese:"复制游戏信息"
Portuguese:"Copiar informação do jogo"
} }
"Could not load game":{ "Could not load game":{
@ -5239,6 +5230,11 @@
Portuguese:"Custo cultural de adotar novas políticas reduzido em 10%" Portuguese:"Custo cultural de adotar novas políticas reduzido em 10%"
} }
"Kremlin":{
}
"Defensive buildings in all cities are 25% more effective":{
}
"Military Academy":{ "Military Academy":{
Italian:"Accademia Militare" Italian:"Accademia Militare"
Russian:"Военная академия" Russian:"Военная академия"

View File

@ -52,7 +52,10 @@ class CityCombatant(val city: CityInfo) : ICombatant {
if(cityTile.militaryUnit!=null) if(cityTile.militaryUnit!=null)
strength += cityTile.militaryUnit!!.baseUnit().strength * cityTile.militaryUnit!!.health/100f strength += cityTile.militaryUnit!!.baseUnit().strength * cityTile.militaryUnit!!.health/100f
strength += city.cityConstructions.getBuiltBuildings().sumBy{ it.cityStrength } var buildingsStrength = city.cityConstructions.getBuiltBuildings().sumBy{ it.cityStrength }.toFloat()
if(getCivInfo().getBuildingUniques().contains("Defensive buildings in all cities are 25% more effective"))
buildingsStrength*=1.25f
strength += buildingsStrength
return strength.toInt() return strength.toInt()
} }

View File

@ -47,7 +47,7 @@ class SaveScreen : PickerScreen() {
newSave.add("Saved game name".toLabel()).row() newSave.add("Saved game name".toLabel()).row()
newSave.add(textField).width(300f).pad(10f).row() newSave.add(textField).width(300f).pad(10f).row()
val copyJsonButton = TextButton("Copy game info".tr(),skin) val copyJsonButton = TextButton("Copy to clipboard".tr(),skin)
copyJsonButton.onClick { copyJsonButton.onClick {
val json = Json().toJson(game.gameInfo) val json = Json().toJson(game.gameInfo)
val base64Gzip = Gzip.zip(json) val base64Gzip = Gzip.zip(json)