From 05100eca6d8da79bce0ed6ca9265db21b7efe32a Mon Sep 17 00:00:00 2001 From: yairm210 Date: Mon, 3 Feb 2025 21:56:17 +0200 Subject: [PATCH] chore: "extremeness" is both long, and not a word. The correct word is "intensity." --- android/assets/jsons/translations/Afrikaans.properties | 2 +- android/assets/jsons/translations/Bangla.properties | 2 +- .../assets/jsons/translations/Belarusian.properties | 2 +- android/assets/jsons/translations/Bosnian.properties | 2 +- .../jsons/translations/Brazilian_Portuguese.properties | 2 +- android/assets/jsons/translations/Bulgarian.properties | 2 +- android/assets/jsons/translations/Catalan.properties | 2 +- android/assets/jsons/translations/Croatian.properties | 2 +- android/assets/jsons/translations/Czech.properties | 2 +- android/assets/jsons/translations/Dutch.properties | 2 +- android/assets/jsons/translations/English.properties | 2 +- android/assets/jsons/translations/Filipino.properties | 2 +- android/assets/jsons/translations/Finnish.properties | 2 +- android/assets/jsons/translations/French.properties | 2 +- android/assets/jsons/translations/Galician.properties | 2 +- android/assets/jsons/translations/German.properties | 2 +- android/assets/jsons/translations/Greek.properties | 2 +- android/assets/jsons/translations/Hungarian.properties | 2 +- .../assets/jsons/translations/Indonesian.properties | 2 +- android/assets/jsons/translations/Italian.properties | 2 +- android/assets/jsons/translations/Japanese.properties | 2 +- android/assets/jsons/translations/Korean.properties | 2 +- android/assets/jsons/translations/Latin.properties | 2 +- .../assets/jsons/translations/Lithuanian.properties | 2 +- android/assets/jsons/translations/Malay.properties | 2 +- android/assets/jsons/translations/Norwegian.properties | 2 +- .../translations/Persian_(Pinglish-DIN).properties | 2 +- .../translations/Persian_(Pinglish-UN).properties | 2 +- android/assets/jsons/translations/Polish.properties | 2 +- .../assets/jsons/translations/Portuguese.properties | 2 +- android/assets/jsons/translations/Romanian.properties | 2 +- android/assets/jsons/translations/Russian.properties | 2 +- android/assets/jsons/translations/Rusyn.properties | 2 +- .../jsons/translations/Simplified_Chinese.properties | 2 +- android/assets/jsons/translations/Spanish.properties | 2 +- android/assets/jsons/translations/Swedish.properties | 2 +- android/assets/jsons/translations/Thai.properties | 2 +- .../jsons/translations/Traditional_Chinese.properties | 2 +- android/assets/jsons/translations/Turkish.properties | 2 +- android/assets/jsons/translations/Ukrainian.properties | 2 +- .../assets/jsons/translations/Vietnamese.properties | 2 +- android/assets/jsons/translations/Zulu.properties | 2 +- android/assets/jsons/translations/template.properties | 2 +- core/src/com/unciv/logic/map/MapParameters.kt | 10 +++++----- .../com/unciv/logic/map/mapgenerator/MapGenerator.kt | 10 +++++----- core/src/com/unciv/models/ModConstants.kt | 2 +- .../unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt | 2 +- .../ui/screens/mapeditorscreen/MapGeneratorSteps.kt | 2 +- .../ui/screens/newgamescreen/MapParametersTable.kt | 4 ++-- 49 files changed, 58 insertions(+), 58 deletions(-) diff --git a/android/assets/jsons/translations/Afrikaans.properties b/android/assets/jsons/translations/Afrikaans.properties index 5077c96965..1aeaa82e1f 100644 --- a/android/assets/jsons/translations/Afrikaans.properties +++ b/android/assets/jsons/translations/Afrikaans.properties @@ -497,7 +497,7 @@ This is used for painting resources, not in map generator steps: = Advanced Settings = Gevorderde Instellings RNG Seed = RNG Saad Map Elevation = Kaarthoogte -Temperature extremeness = Uiterste temperatuur +Temperature intensity = Uiterste temperatuur Temperature shift = Temperatuurverskuiwing Resource richness = Hulpbronrykdom Vegetation richness = Plantegroeirykheid diff --git a/android/assets/jsons/translations/Bangla.properties b/android/assets/jsons/translations/Bangla.properties index 3cddbd8ea8..afc7b0e907 100644 --- a/android/assets/jsons/translations/Bangla.properties +++ b/android/assets/jsons/translations/Bangla.properties @@ -455,7 +455,7 @@ This is used for painting resources, not in map generator steps: = এটি র Advanced Settings = উন্নত সেটিংগুলো RNG Seed = এলোমেলো সংখ্যা বানানো শুরু করার বীজ Map Elevation = মানচিত্রের উচ্চতার ব্যাপ্তি -Temperature extremeness = তাপমাত্রার চরমতা +Temperature intensity = তাপমাত্রার চরমতা Temperature shift = তাপমাত্রার স্থানান্তর Resource richness = সম্পদ বিপুলতা Vegetation richness = গাছপালার বিপুলতা diff --git a/android/assets/jsons/translations/Belarusian.properties b/android/assets/jsons/translations/Belarusian.properties index 0645eded74..74ff7bda6a 100644 --- a/android/assets/jsons/translations/Belarusian.properties +++ b/android/assets/jsons/translations/Belarusian.properties @@ -478,7 +478,7 @@ This is used for painting resources, not in map generator steps: = Гэта вы Advanced Settings = Спецыяльныя Налады RNG Seed = Семя RNG Map Elevation = Узвышшы Мапы -Temperature extremeness = Экстрымальнасць тэмпературы +Temperature intensity = Экстрымальнасць тэмпературы Temperature shift = Змена тэмпературы Resource richness = Насычанасць рэсурсамі Vegetation richness = Расліннасць diff --git a/android/assets/jsons/translations/Bosnian.properties b/android/assets/jsons/translations/Bosnian.properties index b942b8d8ce..aa72969700 100644 --- a/android/assets/jsons/translations/Bosnian.properties +++ b/android/assets/jsons/translations/Bosnian.properties @@ -618,7 +618,7 @@ RNG Seed = # Requires translation! Map Elevation = # Requires translation! -Temperature extremeness = +Temperature intensity = # Requires translation! Temperature shift = # Requires translation! diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 1871225d0f..e33c2361e8 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -450,7 +450,7 @@ This is used for painting resources, not in map generator steps: = Isso é usado Advanced Settings = Configurações Avançadas RNG Seed = Semente RNG Map Elevation = Altura do Mapa -Temperature extremeness = Severidade da temperatura +Temperature intensity = Severidade da temperatura Temperature shift = Mudança de temperatura Resource richness = Abundância de recursos Vegetation richness = Abundância de vegetação diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties index c6ffd584e1..fcfbc1ae1e 100644 --- a/android/assets/jsons/translations/Bulgarian.properties +++ b/android/assets/jsons/translations/Bulgarian.properties @@ -494,7 +494,7 @@ This is used for painting resources, not in map generator steps: = Това се Advanced Settings = Разширени Настройки RNG Seed = Случайно генериран сийд Map Elevation = Височина на Карта -Temperature extremeness = Температурни Крайности +Temperature intensity = Температурни Крайности Temperature shift = Измяна на температура Resource richness = Богатство на ресурси Vegetation richness = Богатство на растителност diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties index 1867a3f838..9d632b161f 100644 --- a/android/assets/jsons/translations/Catalan.properties +++ b/android/assets/jsons/translations/Catalan.properties @@ -450,7 +450,7 @@ This is used for painting resources, not in map generator steps: = Es fa servir Advanced Settings = Opcions avançades RNG Seed = Llavor inicial Map Elevation = Elevació del mapa -Temperature extremeness = Radicalitat de les temperatures +Temperature intensity = Radicalitat de les temperatures Temperature shift = Modificador de la temperatura Resource richness = Recursos Vegetation richness = Vegetació diff --git a/android/assets/jsons/translations/Croatian.properties b/android/assets/jsons/translations/Croatian.properties index 6c6db457f1..76821b361c 100644 --- a/android/assets/jsons/translations/Croatian.properties +++ b/android/assets/jsons/translations/Croatian.properties @@ -450,7 +450,7 @@ This is used for painting resources, not in map generator steps: = Ovo se korist Advanced Settings = Napredne Postavke RNG Seed = Početna RNG vrijednost Map Elevation = Nadmorska Visina Karte -Temperature extremeness = Ekstremnost temperature +Temperature intensity = Ekstremnost temperature Temperature shift = Promjena temperature Resource richness = Bogatstvo resursa Vegetation richness = Bogatstvo vegetacije diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 63f77f507e..6424f2797c 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -465,7 +465,7 @@ This is used for painting resources, not in map generator steps: = Toto je použ Advanced Settings = Pokročilá nastavení RNG Seed = RNG Seed Map Elevation = Výška mapy -Temperature extremeness = Teplotní extrémy +Temperature intensity = Teplotní extrémy Temperature shift = Posun teplot Resource richness = Hustota surovin Vegetation richness = Hustota vegetace diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index c000cc1e38..05163c1712 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -452,7 +452,7 @@ This is used for painting resources, not in map generator steps: = Dit wordt geb Advanced Settings = Geavanceerde instellingen RNG Seed = RNG Seed Map Elevation = Maphoogte -Temperature extremeness = Temparatuurextreemheid +Temperature intensity = Temparatuurextreemheid Temperature shift = Temperatuur verandering Resource richness = Grondstofrijkheid Vegetation richness = Vegetatierijkheid diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index d5eb0ffade..c62897c61c 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -810,7 +810,7 @@ RNG Seed = # Requires translation! Map Elevation = # Requires translation! -Temperature extremeness = +Temperature intensity = # Requires translation! Temperature shift = # Requires translation! diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties index fc0ddc8ddb..463179c256 100644 --- a/android/assets/jsons/translations/Filipino.properties +++ b/android/assets/jsons/translations/Filipino.properties @@ -460,7 +460,7 @@ This is used for painting resources, not in map generator steps: = Ginagamit ito Advanced Settings = Mga komplikadong pagpipilian RNG Seed = RNG Seed Map Elevation = Taas ng mapa -Temperature extremeness = Agwat ng temperatura +Temperature intensity = Agwat ng temperatura Temperature shift = Pagbago ng Temperatura Resource richness = Dami ng pagkukunan Vegetation richness = Dami ng halaman diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index fe4141790c..c664e7786e 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -502,7 +502,7 @@ This is used for painting resources, not in map generator steps: = Tätä käyte Advanced Settings = Edistyneet Asetukset RNG Seed = Satunnaisgeneroinnin siemen Map Elevation = Maailman Korkeus -Temperature extremeness = Lämpötilan äärimmäisyys +Temperature intensity = Lämpötilan äärimmäisyys Temperature shift = Lämpötilan muutos Resource richness = Resurssirikkaus Vegetation richness = Kasvuston rikkaus diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index e4d1f33eae..058dfeb434 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -450,7 +450,7 @@ This is used for painting resources, not in map generator steps: = Ce réglage e Advanced Settings = Paramètres avancés RNG Seed = Graine de génération aléatoire Map Elevation = Altitude moyenne -Temperature extremeness = Amplitude thermique +Temperature intensity = Amplitude thermique Temperature shift = Variation thermique Resource richness = Abondance des ressources Vegetation richness = Abondance de végétation diff --git a/android/assets/jsons/translations/Galician.properties b/android/assets/jsons/translations/Galician.properties index e296f1e9b5..4770d33914 100644 --- a/android/assets/jsons/translations/Galician.properties +++ b/android/assets/jsons/translations/Galician.properties @@ -462,7 +462,7 @@ This is used for painting resources, not in map generator steps: = Isto é usado Advanced Settings = Axustes Avanzados RNG Seed = Semente Map Elevation = Elevación -Temperature extremeness = Extremísmo térmico +Temperature intensity = Extremísmo térmico Temperature shift = Cambio de Temperatura Resource richness = Recursos Vegetation richness = Vexetación diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 2db810d439..b9e254095f 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -450,7 +450,7 @@ This is used for painting resources, not in map generator steps: = Dies wird ver Advanced Settings = Erweiterte Einstellungen RNG Seed = Seed Map Elevation = Erhebungen -Temperature extremeness = Temperaturextreme +Temperature intensity = Temperaturextreme Temperature shift = Temperaturverschiebung Resource richness = Ressourcenreichtum Vegetation richness = Vegetationsreichtum diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties index 3a7908e01d..03c7013acd 100644 --- a/android/assets/jsons/translations/Greek.properties +++ b/android/assets/jsons/translations/Greek.properties @@ -671,7 +671,7 @@ Advanced Settings = Προχωρημένες ρυθμίσεις # Requires translation! RNG Seed = Map Elevation = ύψος χάρτη -Temperature extremeness = +Temperature intensity = # Requires translation! Temperature shift = # Requires translation! diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 1a553f0edd..272fd7abca 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -470,7 +470,7 @@ This is used for painting resources, not in map generator steps: = Ez az erőfor Advanced Settings = Haladó Beállítások RNG Seed = Véletlenszám-generátor kezdőértéke Map Elevation = Térkép kiemelkedése -Temperature extremeness = Hőmérsékleti szélsőségek +Temperature intensity = Hőmérsékleti szélsőségek Temperature shift = Hőmérséklet-eltolódás Resource richness = Erőforrás-mennyiség Vegetation richness = Növényzet mennyisége diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index ac674fd291..7345042a71 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -450,7 +450,7 @@ This is used for painting resources, not in map generator steps: = Ini digunakan Advanced Settings = Pengaturan Lanjutan RNG Seed = Benih Acak Map Elevation = Tinggi Peta -Temperature extremeness = Keekstreman temperatur +Temperature intensity = Keekstreman temperatur Temperature shift = Perubahan suhu Resource richness = Kekayaan sumber daya alam Vegetation richness = Kerimbunan tumbuhan diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 87385058a3..be48c91dce 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -456,7 +456,7 @@ This is used for painting resources, not in map generator steps: = Questo va usa Advanced Settings = Impostazioni avanzate RNG Seed = Seme RNG Map Elevation = Altezza mappa -Temperature extremeness = Estremità temperatura +Temperature intensity = Estremità temperatura Temperature shift = Cambio temperatura Resource richness = Abbondanza risorse Vegetation richness = Abbondanza vegetazione diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index beeef2dcea..b730c8d4c6 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -490,7 +490,7 @@ This is used for painting resources, not in map generator steps: = Advanced Settings = 詳細設定 RNG Seed = RNG値 Map Elevation = マップの高さ -Temperature extremeness = 極度な気候 +Temperature intensity = 極度な気候 Temperature shift = 気候の変化 Resource richness = 資源の数 Vegetation richness = 植生の豊かさ diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 4d4d3bba73..5e6fa371eb 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -488,7 +488,7 @@ This is used for painting resources, not in map generator steps: = 자원 배치 Advanced Settings = 고급 설정 RNG Seed = 난수 시드값 Map Elevation = 육지 높이 -Temperature extremeness = 온도 편차 +Temperature intensity = 온도 편차 Temperature shift = 온도 편중 Resource richness = 자원 밀도 Vegetation richness = 초목 밀도 diff --git a/android/assets/jsons/translations/Latin.properties b/android/assets/jsons/translations/Latin.properties index aae09edbf4..06c5cc9b89 100644 --- a/android/assets/jsons/translations/Latin.properties +++ b/android/assets/jsons/translations/Latin.properties @@ -511,7 +511,7 @@ This is used for painting resources, not in map generator steps: = Advanced Settings = Optiones provehendae RNG Seed = Semen creationis caecae Map Elevation = Elevatio tabulae -Temperature extremeness = Gradus extremitatis temperaturæ +Temperature intensity = Gradus extremitatis temperaturæ Temperature shift = Mutatus temperaturæ Resource richness = Copiositas mercium Vegetation richness = Abundantia viriditatis diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index db1b5c2cab..ce2eabb84f 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -529,7 +529,7 @@ This is used for painting resources, not in map generator steps: = Advanced Settings = Papildomi nustatymai RNG Seed = Generavimo raktas Map Elevation = Kalnuotumas -Temperature extremeness = Temperatūrų svyravimai +Temperature intensity = Temperatūrų svyravimai # Requires translation! Temperature shift = Resource richness = Resursų gausa diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index a8f0d65af0..13bde6ad98 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -497,7 +497,7 @@ This is used for painting resources, not in map generator steps: = Ini digunakan Advanced Settings = Tetapan Lanjutan RNG Seed = Benih Penjana Nombor Rawak Map Elevation = Ketinggian Peta -Temperature extremeness = Keterlaluan suhu +Temperature intensity = Keterlaluan suhu Temperature shift = Peralihan Suhu Resource richness = Kekayaan sumber Vegetation richness = Kekayaan flora diff --git a/android/assets/jsons/translations/Norwegian.properties b/android/assets/jsons/translations/Norwegian.properties index 094a07ee81..b2e8759c7e 100644 --- a/android/assets/jsons/translations/Norwegian.properties +++ b/android/assets/jsons/translations/Norwegian.properties @@ -532,7 +532,7 @@ RNG Seed = STG-verdi # Requires translation! Map Elevation = # Requires translation! -Temperature extremeness = +Temperature intensity = Temperature shift = Temperaturskifte Resource richness = Rikdom av ressursar Vegetation richness = Rikdom av planteliv diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index e49038574e..330115a98f 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -664,7 +664,7 @@ Advanced Settings = # Requires translation! RNG Seed = Map Elevation = Ertefa’e Nağše -Temperature extremeness = Šeddat e damā +Temperature intensity = Šeddat e damā # Requires translation! Temperature shift = Resource richness = Mizān e manābe diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index ea396d85f0..a6c1ab2d6a 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -547,7 +547,7 @@ This is used for painting resources, not in map generator steps: = Advanced Settings = Tanzimat e pishrafte RNG Seed = Seed e RNG Map Elevation = Ertefa’e Naghshe -Temperature extremeness = Sheddat e damaa +Temperature intensity = Sheddat e damaa # Requires translation! Temperature shift = Resource richness = Mizaan e manaabe diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index a80a828959..99f7b0e7be 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -457,7 +457,7 @@ This is used for painting resources, not in map generator steps: = Dotyczy to u Advanced Settings = Opcje zaawansowane RNG Seed = Ziarno losowości Map Elevation = Wysokość mapy -Temperature extremeness = Skrajność temperatury +Temperature intensity = Skrajność temperatury Temperature shift = Zmienność temperatury Resource richness = Bogactwo surowców Vegetation richness = Bogactwo roślinności diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index a1a2bdcba6..7ea5e23e53 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -461,7 +461,7 @@ This is used for painting resources, not in map generator steps: = Isto é usado Advanced Settings = Definições avançadas RNG Seed = Seed RNG Map Elevation = Altura do Mapa -Temperature extremeness = Severidade da temperatura +Temperature intensity = Severidade da temperatura Temperature shift = Mudança de temperatura Resource richness = Abundância de recursos Vegetation richness = Abundância de vegetação diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 3ea9e9032d..5109b6ca7a 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -489,7 +489,7 @@ This is used for painting resources, not in map generator steps: = Advanced Settings = Setări Avansate RNG Seed = RNG Seed Map Elevation = Înălțimea hărții -Temperature extremeness = Extremitatea temperaturii +Temperature intensity = Extremitatea temperaturii Temperature shift = Schimbarea temperaturii Resource richness = Abundența resurselor Vegetation richness = Abundența vegetației diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 6436bbf7bf..6e08048919 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -453,7 +453,7 @@ This is used for painting resources, not in map generator steps: = Исполь Advanced Settings = Дополнительные настройки RNG Seed = Сид Map Elevation = Гористость -Temperature extremeness = Перепады температур +Temperature intensity = Перепады температур Temperature shift = Смещение температуры Resource richness = Богатство ресурсами Vegetation richness = Богатство растительностью diff --git a/android/assets/jsons/translations/Rusyn.properties b/android/assets/jsons/translations/Rusyn.properties index 1d67f5f1cc..d03f99a68d 100644 --- a/android/assets/jsons/translations/Rusyn.properties +++ b/android/assets/jsons/translations/Rusyn.properties @@ -612,7 +612,7 @@ RNG Seed = # Requires translation! Map Elevation = # Requires translation! -Temperature extremeness = +Temperature intensity = # Requires translation! Temperature shift = # Requires translation! diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index c8d06506c2..c283fc88c0 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -452,7 +452,7 @@ This is used for painting resources, not in map generator steps: = 仅用于绘 Advanced Settings = 高级设置 RNG Seed = 随机种子 Map Elevation = 地图海拔 -Temperature extremeness = 气温上限 +Temperature intensity = 气温上限 Temperature shift = 温度变化 Resource richness = 资源丰富度 Vegetation richness = 植被密度 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 663b6ab294..4bd328702e 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -450,7 +450,7 @@ This is used for painting resources, not in map generator steps: = Esto es usado Advanced Settings = Ajustes Avanzados RNG Seed = Semilla Map Elevation = Elevación -Temperature extremeness = Extremismo térmico +Temperature intensity = Extremismo térmico Temperature shift = Cambio de Temperatura Resource richness = Recursos Vegetation richness = Vegetación diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index 80b284f000..08e8925822 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -515,7 +515,7 @@ This is used for painting resources, not in map generator steps: = Advanced Settings = Avancerade Inställningar RNG Seed = RNG-frö Map Elevation = Karthöjd -Temperature extremeness = Temperaturextremvärden +Temperature intensity = Temperaturextremvärden Temperature shift = Temperaturskifte Resource richness = Resursrikedom Vegetation richness = Växtrikedom diff --git a/android/assets/jsons/translations/Thai.properties b/android/assets/jsons/translations/Thai.properties index a0a40c5b6c..6a672de5bf 100644 --- a/android/assets/jsons/translations/Thai.properties +++ b/android/assets/jsons/translations/Thai.properties @@ -628,7 +628,7 @@ RNG Seed = # Requires translation! Map Elevation = # Requires translation! -Temperature extremeness = +Temperature intensity = # Requires translation! Temperature shift = # Requires translation! diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index d7a1742e3e..f0c130afff 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -464,7 +464,7 @@ This is used for painting resources, not in map generator steps: = 僅用於繪 Advanced Settings = 進階設置 RNG Seed = 隨機種子 Map Elevation = 地圖海拔 -Temperature extremeness = 氣溫上限 +Temperature intensity = 氣溫上限 Temperature shift = 溫度偏移 Resource richness = 資源豐富度 Vegetation richness = 植被密度 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index d2912b8cc8..6e040bf2a3 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -484,7 +484,7 @@ This is used for painting resources, not in map generator steps: = Bu kaynaklar Advanced Settings = Gelişmiş Ayarlar RNG Seed = RNG Kodu Map Elevation = Harita Yüksekliği -Temperature extremeness = Sıcaklık aşırılığı +Temperature intensity = Sıcaklık aşırılığı Temperature shift = Sıcaklık değişimi Resource richness = Kaynak zenginliği Vegetation richness = Bitki örtüsü diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index f97a13b34b..381f4a8626 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -452,7 +452,7 @@ This is used for painting resources, not in map generator steps: = Викори Advanced Settings = Розширені налаштування RNG Seed = Ключ генерації Map Elevation = Висота мапи -Temperature extremeness = Екстремальні температури +Temperature intensity = Екстремальні температури Temperature shift = Перепади температур Resource richness = Багатство ресурсів Vegetation richness = Багатство рослинності diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties index 55745a3162..c1a3714e0b 100644 --- a/android/assets/jsons/translations/Vietnamese.properties +++ b/android/assets/jsons/translations/Vietnamese.properties @@ -462,7 +462,7 @@ This is used for painting resources, not in map generator steps: = Điều này Advanced Settings = Cài đặt nâng cao RNG Seed = RNG Seed Map Elevation = Chiều cao bản đồ -Temperature extremeness = Độ khắc nghiệt của nhiệt độ +Temperature intensity = Độ khắc nghiệt của nhiệt độ Temperature shift = Sự thay đổi nhiệt độ Resource richness = Độ giàu tài nguyên Vegetation richness = Độ giàu thảm thực vật diff --git a/android/assets/jsons/translations/Zulu.properties b/android/assets/jsons/translations/Zulu.properties index 0598f17319..29262a69af 100644 --- a/android/assets/jsons/translations/Zulu.properties +++ b/android/assets/jsons/translations/Zulu.properties @@ -475,7 +475,7 @@ This is used for painting resources, not in map generator steps: = Lokhu kusetsh Advanced Settings = Advanced Settings RNG Seed = RNG Seed Map Elevation = Map Elevation -Temperature extremeness = Temperature extremeness +Temperature intensity = Temperature intensity Temperature shift = Temperature shift Resource richness = Resource richness Vegetation richness = Vegetation richness diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index 8c84dcdab5..405223c3b5 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -450,7 +450,7 @@ This is used for painting resources, not in map generator steps: = Advanced Settings = RNG Seed = Map Elevation = -Temperature extremeness = +Temperature intensity = Temperature shift = Resource richness = Vegetation richness = diff --git a/core/src/com/unciv/logic/map/MapParameters.kt b/core/src/com/unciv/logic/map/MapParameters.kt index 04769cada2..289de81548 100644 --- a/core/src/com/unciv/logic/map/MapParameters.kt +++ b/core/src/com/unciv/logic/map/MapParameters.kt @@ -73,13 +73,13 @@ class MapParameters : IsPartOfGameInfoSerialization { var tilesPerBiomeArea = 6 var maxCoastExtension = 2 var elevationExponent = 0.7f - var temperatureExtremeness = 0.6f + var temperatureintensity = 0.6f var vegetationRichness = 0.4f var rareFeaturesRichness = 0.05f var resourceRichness = 0.1f var waterThreshold = 0.0f - /** Shifts temperature (after random, latitude and temperatureExtremeness).*/ + /** Shifts temperature (after random, latitude and temperatureintensity).*/ var temperatureShift = 0f fun clone() = MapParameters().also { @@ -99,7 +99,7 @@ class MapParameters : IsPartOfGameInfoSerialization { it.tilesPerBiomeArea = tilesPerBiomeArea it.maxCoastExtension = maxCoastExtension it.elevationExponent = elevationExponent - it.temperatureExtremeness = temperatureExtremeness + it.temperatureintensity = temperatureintensity it.temperatureShift = temperatureShift it.vegetationRichness = vegetationRichness it.rareFeaturesRichness = rareFeaturesRichness @@ -117,7 +117,7 @@ class MapParameters : IsPartOfGameInfoSerialization { tilesPerBiomeArea = 6 maxCoastExtension = 2 elevationExponent = 0.7f - temperatureExtremeness = 0.6f + temperatureintensity = 0.6f temperatureShift = 0.0f vegetationRichness = 0.4f rareFeaturesRichness = 0.05f @@ -163,7 +163,7 @@ class MapParameters : IsPartOfGameInfoSerialization { if (type != MapGeneratedMainType.custom && type != MapType.empty) yield("{Map Generation Type}: {$type}, ") yield("{RNG Seed} $seed") yield(", {Map Elevation}=" + elevationExponent.niceToString(2)) - yield(", {Temperature extremeness}=" + temperatureExtremeness.niceToString(2)) + yield(", {Temperature intensity}=" + temperatureintensity.niceToString(2)) yield(", {Resource richness}=" + resourceRichness.niceToString(3)) yield(", {Vegetation richness}=" + vegetationRichness.niceToString(2)) yield(", {Rare features richness}=" + rareFeaturesRichness.niceToString(3)) diff --git a/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt b/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt index cc2e3f3f41..8734854658 100644 --- a/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt +++ b/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt @@ -425,7 +425,7 @@ class MapGenerator(val ruleset: Ruleset, private val coroutineScope: CoroutineSc /** * [MapParameters.tilesPerBiomeArea] to set biomes size - * [MapParameters.temperatureExtremeness] to favor very high and very low temperatures + * [MapParameters.temperatureintensity] to favor very high and very low temperatures * [MapParameters.temperatureShift] to shift temperature towards cold (negative) or hot (positive) */ private fun applyHumidityAndTemperature(tileMap: TileMap) { @@ -435,7 +435,7 @@ class MapGenerator(val ruleset: Ruleset, private val coroutineScope: CoroutineSc tileMap.setTransients(ruleset) val scale = tileMap.mapParameters.tilesPerBiomeArea.toDouble() - val temperatureExtremeness = tileMap.mapParameters.temperatureExtremeness + val temperatureintensity = tileMap.mapParameters.temperatureintensity val temperatureShift = tileMap.mapParameters.temperatureShift val humidityShift = if (temperatureShift > 0) -temperatureShift / 2 else 0f @@ -471,7 +471,7 @@ class MapGenerator(val ruleset: Ruleset, private val coroutineScope: CoroutineSc val randomTemperature = randomness.getPerlinNoise(tile, temperatureSeed, scale = scale, nOctaves = 1) var temperature = (5.0 * expectedTemperature + randomTemperature) / 6.0 - temperature = abs(temperature).pow(1.0 - temperatureExtremeness) * temperature.sign + temperature = abs(temperature).pow(1.0 - temperatureintensity) * temperature.sign temperature = (temperature + temperatureShift).coerceIn(-1.0..1.0) // Old, static map generation rules - necessary for existing base ruleset mods to continue to function @@ -613,7 +613,7 @@ class MapGenerator(val ruleset: Ruleset, private val coroutineScope: CoroutineSc } /** - * [MapParameters.temperatureExtremeness] as in [applyHumidityAndTemperature] + * [MapParameters.temperatureintensity] as in [applyHumidityAndTemperature] */ private fun spawnIce(tileMap: TileMap) { val waterTerrain: Set = @@ -649,7 +649,7 @@ class MapGenerator(val ruleset: Ruleset, private val coroutineScope: CoroutineSc val randomTemperature = randomness.getPerlinNoise(tile, temperatureSeed, scale = tileMap.mapParameters.tilesPerBiomeArea.toDouble(), nOctaves = 1) val latitudeTemperature = 1.0 - 2.0 * abs(tile.latitude) / tileMap.maxLatitude var temperature = ((latitudeTemperature + randomTemperature) / 2.0) - temperature = abs(temperature).pow(1.0 - tileMap.mapParameters.temperatureExtremeness) * temperature.sign + temperature = abs(temperature).pow(1.0 - tileMap.mapParameters.temperatureintensity) * temperature.sign temperature = (temperature + tileMap.mapParameters.temperatureShift).coerceIn(-1.0..1.0) val candidates = iceEquivalents diff --git a/core/src/com/unciv/models/ModConstants.kt b/core/src/com/unciv/models/ModConstants.kt index 781e0b59da..6a106eeedd 100644 --- a/core/src/com/unciv/models/ModConstants.kt +++ b/core/src/com/unciv/models/ModConstants.kt @@ -81,7 +81,7 @@ class ModConstants { // MapGenerator.spreadAncientRuins: number of ruins = suitable tile count * this var ancientRuinCountMultiplier = 0.02f - // MapGenerator.spawnIce: spawn Ice where T < this, with T calculated from temperatureExtremeness, latitude and perlin noise. + // MapGenerator.spawnIce: spawn Ice where T < this, with T calculated from temperatureintensity, latitude and perlin noise. var spawnIceBelowTemperature = -0.8f // MapGenerator.spawnLakesAndCoasts: Water bodies up to this tile count become Lakes var maxLakeSize = 10 diff --git a/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt b/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt index 91e23c2db0..c8bbdc52d4 100644 --- a/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt +++ b/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt @@ -257,7 +257,7 @@ class MainMenuScreen: BaseScreen(), RecreateOnResize { shape = MapShape.rectangular mapSize = MapSize.Small type = MapType.pangaea - temperatureExtremeness = .7f + temperatureintensity = .7f waterThreshold = -0.1f // mainly land, gets about 30% water modifyForEasterEgg() }) diff --git a/core/src/com/unciv/ui/screens/mapeditorscreen/MapGeneratorSteps.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/MapGeneratorSteps.kt index 1628e1e901..3ff5137b48 100644 --- a/core/src/com/unciv/ui/screens/mapeditorscreen/MapGeneratorSteps.kt +++ b/core/src/com/unciv/ui/screens/mapeditorscreen/MapGeneratorSteps.kt @@ -12,7 +12,7 @@ private object MapGeneratorStepsHelpers { actualParameters.elevationExponent = newParameters.elevationExponent } val applyHumidityAndTemperature = fun(newParameters: MapParameters, actualParameters: MapParameters) { - actualParameters.temperatureExtremeness = newParameters.temperatureExtremeness + actualParameters.temperatureintensity = newParameters.temperatureintensity actualParameters.temperatureShift = newParameters.temperatureShift } val applyLakesAndCoast = fun(newParameters: MapParameters, actualParameters: MapParameters) { diff --git a/core/src/com/unciv/ui/screens/newgamescreen/MapParametersTable.kt b/core/src/com/unciv/ui/screens/newgamescreen/MapParametersTable.kt index a657c8180c..4656305143 100644 --- a/core/src/com/unciv/ui/screens/newgamescreen/MapParametersTable.kt +++ b/core/src/com/unciv/ui/screens/newgamescreen/MapParametersTable.kt @@ -413,8 +413,8 @@ class MapParametersTable( addSlider("Map Elevation", {mapParameters.elevationExponent}, 0.6f, 0.8f) { mapParameters.elevationExponent = it } - addSlider("Temperature extremeness", {mapParameters.temperatureExtremeness}, 0.4f, 0.8f) - { mapParameters.temperatureExtremeness = it } + addSlider("Temperature intensity", {mapParameters.temperatureintensity}, 0.4f, 0.8f) + { mapParameters.temperatureintensity = it } addSlider("Temperature shift", {mapParameters.temperatureShift}, -0.4f, 0.4f, 0.1f) { mapParameters.temperatureShift = it }