diff --git a/android/assets/jsons/Difficulties.json b/android/assets/jsons/Difficulties.json index 5cd39bdd75..81b9ada3c2 100644 --- a/android/assets/jsons/Difficulties.json +++ b/android/assets/jsons/Difficulties.json @@ -46,7 +46,7 @@ { name:"King", baseHappiness:9, - researchCostModifier:1, + researchCostModifier:1.1, unhappinessModifier:1, aiCityGrowthModifier:0.9, aiUnitMaintainanceModifier:0.8, @@ -57,7 +57,7 @@ { name:"Emperor", baseHappiness:9, - researchCostModifier:1, + researchCostModifier:1.2, unhappinessModifier:1, aiCityGrowthModifier:0.85, aiUnitMaintainanceModifier:0.75, @@ -68,7 +68,7 @@ { name:"Immortal", baseHappiness:9, - researchCostModifier:1, + researchCostModifier:1.3, unhappinessModifier:1, aiCityGrowthModifier:0.75, aiUnitMaintainanceModifier:0.65, @@ -79,7 +79,7 @@ { name:"Deity", baseHappiness:9, - researchCostModifier:1, + researchCostModifier:1.5, unhappinessModifier:1, aiCityGrowthModifier:0.6, aiUnitMaintainanceModifier:0.5, diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index 1a42ad9a0e..43e23e2d12 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -689,31 +689,31 @@ // If so then we need to deal with that as well // I remember that some languages have upside-down question marks before to mark a question - "has grown":{ - Italian:"è cresciuta" - Russian:"вырос" - French:"a grandi" - Romanian:"a crescut" - German:"ist gewachsen" - Dutch:"is gegroeid" + "[cityName] has grown!":{ + Italian:"[cityName] è cresciuta!" + Russian:"[cityName] вырос!" + French:"[cityName] a grandi!" + Romanian:"[cityName] a crescut!" + German:"[cityName] ist gewachsen!" + Dutch:"[cityName] is gegroeid!" } - "has been founded":{ - Italian:"è stata fondata" - Russian:"был основан" - French:"a été fondé" - Romanian:"a fost fondat" - German:"wurde gegründet" - Dutch:"is gesticht" + "[cityName] has been founded!":{ + Italian:"[cityName] è stata fondata!" + Russian:"[cityName] был основан!" + French:"[cityName] a été fondé!" + Romanian:"[cityName] a fost fondat!" + German:"[cityName] wurde gegründet!" + Dutch:"[cityName] is gesticht!" } - "has been razed to the ground":{ - Italian:"è stata rasa al suolo" - Russian:"был разрушен до основания" - French:"a été rasé à terre" - Romanian:"a fost distrus la pământ" - German:"wurde dem Erdboden gleichgemacht" - Dutch:"Is totaal verwoest" + "[cityName] has been razed to the ground!":{ + Italian:"[cityName] è stata rasa al suolo!" + Russian:"[cityName] был разрушен до основания!" + French:"[cityName] a été rasé à terre!" + Romanian:"[cityName] a fost distrus la pământ!" + German:"[cityName] wurde dem Erdboden gleichgemacht!" + Dutch:"[cityName] Is totaal verwoest!" } "We have conquered the city of [cityname]!":{ @@ -725,40 +725,40 @@ Dutch:"We hebben de stad [cityname] ingenomen!" } - "Research of [tehnologyName] has completed!":{ // For technology notifications EG Research of Writing has completed - Italian:"Ricerca di [tehnologyName] completata!" - Russian:"Исследование [tehnologyName] завершено!" - French:"Recherche de [tehnologyName] a completé!" - Romanian:"Cercetarea [tehnologyName] a finalizat!" - German:"[tehnologyName] wurde erforscht!" - Dutch:"[tehnologyName] is onderzocht!" + "Research of [technologyName] has completed!":{ // For technology notifications EG Research of Writing has completed + Italian:"Ricerca di [technologyName] completata!" + Russian:"Исследование [technologyName] завершено!" + French:"Recherche de [technologyName] a completé!" + Romanian:"Cercetarea [technologyName] a finalizat!" + German:"[technologyName] wurde erforscht!" + Dutch:"[technologyName] is onderzocht!" } - "You have entered a golden age":{ - Italian:"Sei entrato in un'età dell'oro" - Russian:"Вы вошли в золотой век" - French:"Vous êtes entré dans un âge d'or" - Romanian:"Ați intrat într-o epocă de aur" - German:"Ein goldenes Zeitalter ist eingetreten" - Dutch:"Een gouden eeuw is geariveerd" + "You have entered a golden age!":{ + Italian:"Sei entrato in un'età dell'oro!" + Russian:"Вы вошли в золотой век!" + French:"Vous êtes entré dans un âge d'or!" + Romanian:"Ați intrat într-o epocă de aur!" + German:"Ein goldenes Zeitalter ist eingetreten!" + Dutch:"Een gouden eeuw is geariveerd!" } - "is starving":{ - Italian:"sta morendo di fame" - Russian:"голодает" - French:"est affamé" - Romanian:"suferă de foame" - German:"verhungert" - Dutch:"verhongerd" + "[cityName] is starving!":{ + Italian:"[cityName] sta morendo di fame!" + Russian:"[cityName] голодает!" + French:"[cityName] est affamé!" + Romanian:"[cityName] suferă de foame!" + German:"[cityName] verhungert!" + Dutch:"[cityName] verhongerd!" } - "has been built in":{ - Italian:"è stato/a costruito/a in" - Russian:"была построена в" - French:"a été construit en" - Romanian:"a fost construit in" - German:"wurde erbaut in" - Dutch:"is gebouwd in" + "[construction] has been built in [cityName]":{ + Italian:"[construction] è stato/a costruito/a in [cityName]" + Russian:"[construction] была построена в [cityName]" + French:"[construction] a été construit en [cityName]" + Romanian:"[construction] a fost construit in [cityName]" + German:"[construction] wurde erbaut in [cityName]" + Dutch:"[construction] is gebouwd in [cityName]" } "Work has started on [construction]":{ @@ -779,13 +779,13 @@ Dutch:"Er kan niet meer veder gewerkt worden aan [construction]" } - "has expanded its borders":{ - Italian:"ha espanso i suoi confini" - Russian:"расширил свои границы" - French:"a élargi ses frontières" - Romanian:"și-a extins frontierele" - German:"hat seine Grenzen erweitert" - Dutch:"heeft zijn grenzen uitgebreid" + "[cityname] has expanded its borders!":{ + Italian:"[cityname] ha espanso i suoi confini!" + Russian:"[cityname] расширил свои границы!" + French:"[cityname] a élargi ses frontières!" + Romanian:"[cityname] și-a extins frontierele!" + German:"[cityname] hat seine Grenzen erweitert!" + Dutch:"[cityname] heeft zijn grenzen uitgebreid!" } "An enemy [unit] has attacked [cityname]":{ Italian:"Un [unit] nemico ha attaccato [cityname]" diff --git a/core/src/com/unciv/logic/city/CityConstructions.kt b/core/src/com/unciv/logic/city/CityConstructions.kt index f468849911..c017bb2a6a 100644 --- a/core/src/com/unciv/logic/city/CityConstructions.kt +++ b/core/src/com/unciv/logic/city/CityConstructions.kt @@ -145,10 +145,10 @@ class CityConstructions { if(construction is Building && construction.isWonder && construction.requiredBuildingInAllCities==null) { val playerCiv = cityInfo.civInfo.gameInfo.getPlayerCivilization() val builtLocation = if(playerCiv.exploredTiles.contains(cityInfo.location)) cityInfo.name else "a faraway land" - playerCiv.addNotification("{$currentConstruction} {has been built in} $builtLocation", cityInfo.location, Color.BROWN) + playerCiv.addNotification("[$currentConstruction] has been built in [$builtLocation]", cityInfo.location, Color.BROWN) } else - cityInfo.civInfo.addNotification("{$currentConstruction} {has been built in} " + cityInfo.name, cityInfo.location, Color.BROWN) + cityInfo.civInfo.addNotification("[$currentConstruction] has been built in [" + cityInfo.name+"]", cityInfo.location, Color.BROWN) currentConstruction="" Automation().chooseNextConstruction(this) diff --git a/core/src/com/unciv/logic/city/CityExpansionManager.kt b/core/src/com/unciv/logic/city/CityExpansionManager.kt index a0e1facdd0..c3f531cf33 100644 --- a/core/src/com/unciv/logic/city/CityExpansionManager.kt +++ b/core/src/com/unciv/logic/city/CityExpansionManager.kt @@ -102,7 +102,7 @@ class CityExpansionManager { cultureStored += culture.toInt() if (cultureStored >= getCultureToNextTile()) { addNewTileWithCulture() - cityInfo.civInfo.addNotification(cityInfo.name + " {has expanded its borders}!", cityInfo.location, Color.PURPLE) + cityInfo.civInfo.addNotification("["+cityInfo.name + "] has expanded its borders!", cityInfo.location, Color.PURPLE) } } diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index 63ca0c7d3b..bca3920668 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -48,7 +48,7 @@ class CityInfo { this.location = cityLocation civInfo.cities = civInfo.cities.toMutableList().apply { add(this@CityInfo) } if(civInfo == civInfo.gameInfo.getPlayerCivilization()) - civInfo.addNotification("$name {has been founded}!", cityLocation, Color.PURPLE) + civInfo.addNotification("[$name] has been founded!", cityLocation, Color.PURPLE) if (civInfo.policies.isAdopted("Legalism") && civInfo.cities.size <= 4) cityConstructions.addCultureBuilding() if (civInfo.cities.size == 1) { cityConstructions.builtBuildings.add("Palace") @@ -169,7 +169,7 @@ class CityInfo { if(isBeingRazed){ population.population-- if(population.population<=0){ // there are strange cases where we geet to -1 - civInfo.addNotification("$name {has been razed to the ground}!",location, Color.RED) + civInfo.addNotification("[$name] has been razed to the ground!",location, Color.RED) destroyCity() if(isCapital() && civInfo.cities.isNotEmpty()) // Yes, we actually razed the capital. Some people do this. civInfo.cities.first().cityConstructions.builtBuildings.add("Palace") diff --git a/core/src/com/unciv/logic/city/PopulationManager.kt b/core/src/com/unciv/logic/city/PopulationManager.kt index cfacc6a7f2..8135ceb6a1 100644 --- a/core/src/com/unciv/logic/city/PopulationManager.kt +++ b/core/src/com/unciv/logic/city/PopulationManager.kt @@ -52,7 +52,7 @@ class PopulationManager { fun nextTurn(food: Float) { foodStored += food.roundToInt() if(food.roundToInt() < 0) - cityInfo.civInfo.addNotification(cityInfo.name + " {is starving}!", cityInfo.location, Color.RED) + cityInfo.civInfo.addNotification("["+cityInfo.name + "] is starving!", cityInfo.location, Color.RED) if (foodStored < 0) // starvation! { @@ -69,7 +69,7 @@ class PopulationManager { 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) + cityInfo.civInfo.addNotification("["+cityInfo.name + "] has grown!", cityInfo.location, Color.GREEN) } } diff --git a/core/src/com/unciv/logic/civilization/GoldenAgeManager.kt b/core/src/com/unciv/logic/civilization/GoldenAgeManager.kt index bf1173f632..fb99797389 100644 --- a/core/src/com/unciv/logic/civilization/GoldenAgeManager.kt +++ b/core/src/com/unciv/logic/civilization/GoldenAgeManager.kt @@ -29,7 +29,7 @@ class GoldenAgeManager{ if (civInfo.getBuildingUniques().contains("Golden Age length increases +50%")) turnsToGoldenAge *= 1.5 if (civInfo.policies.isAdopted("Freedom Complete")) turnsToGoldenAge *= 1.5 turnsLeftForCurrentGoldenAge += turnsToGoldenAge.toInt() - civInfo.addNotification("{You have entered a golden age}!", null, Color.GOLD) + civInfo.addNotification("You have entered a golden age!", null, Color.GOLD) } fun endTurn(happiness: Int) {