Game crash popup is no longer a tutorial, so it doesn't get affected by the "displayTutorials" settings and has migrated to the .properties files for translation.

This commit is contained in:
Yair Morgenstern 2019-12-21 18:58:14 +02:00
parent 3f0e33df89
commit 32621b6611
31 changed files with 64 additions and 120 deletions

View File

@ -294,15 +294,6 @@
]
],
_GameCrashed: [
[
"Hrom do čepice! Vypadá to, že se něco HÓÓÓDNĚ pokazilo",
"Tohle by se v ŽÁDNÉM PŘÍPADĚ nemělo stávat!",
"Prosím pošlete mi (yairm210@hotmail.com) email s informacemi o hře",
" (menu -> uložit hru -> kopírovat herní info -> vložit do emailu)",
" a já se to pokusím opravit jak nejrychleji budu umět!"
]
],
Apollo_Program: [
[

View File

@ -213,15 +213,6 @@
]
]
_GameCrashed: [
[
"Oh no! It looks like something went DISASTROUSLY wrong!",
"This is ABSOLUTELY not supposed to happen!",
"Please send me (yairm210@hotmail.com) an email with the game information",
" (menu -> save game -> copy game info -> paste into email)",
" and I'll try to fix it as fast as I can!"
]
]
Apollo_Program: [
[

View File

@ -330,16 +330,7 @@
" et vous pouvez échanger avec elles, mais elles pourront vous déclarer la guerre si l'envie leur prend."
]
]
_GameCrashed: [
[
"Oh non ! On dirait que quelque chose ne s'est ABSOLUMENT pas passé comme prévu !",
" Ce n'est pas censé arriver !",
" S'il vous plaît, envoyez un mail à yairm210@hotmail.com avec les informations de la partie",
" (Menu (en haut à gauche) -> Charger une partie -> Copy saved game to clipboard -> Copier dans le mail)",
" et j'essayerai de régler cela aussi vite que possible !"
]
]
Apollo_Program: [
[

View File

@ -287,16 +287,7 @@
"Le altre civiltà cominciamo come pacifiche, e tu potrai commerciare con loro, ma spesso possono anche dichiararti guerra!"
]
],
_GameCrashed: [
[
"Santi numi! Pare che qualcosa sia andato disastrosamente storto!",
"Quello che è successo non era assolutamente previsto!",
"Mandami un'email all'indirizzo yairm210@hotmail.com con l'info della partita",
"(menu -> salva partita -> copia info partita -> incolla su email)",
"e proverò a riparare il guasto il più in fretta possibile!"
]
],
Apollo_Program: [
[

View File

@ -303,15 +303,6 @@
]
]
_GameCrashed: [
[
"이런, 뭔가 심각한 일이 일어난 것 같군요!",
"원래라면 일어나지 않아야 하는 일인데 말이죠!",
"(yairm210@hotmail.com) 이메일로 게임 정보를 함께 보내주세요.",
" (메뉴 -> 게임 저장 -> 게임 정보 복사 -> 이메일에 붙여넣기)",
" 하루빨리 찾아서 이런 일이 일어나지 않도록 하겠습니다!"
]
]
Apollo_Program: [
[

View File

@ -314,16 +314,6 @@
]
]
_GameCrashed: [
[
"O nie! Wygląda na to że coś przegapiłem!",
"To absolutnie nie powinno się wydarzyć!",
"Wyślij mi proszę (yairm210@hotmail.com) maila z informacją o grze",
" (menu -> zapisz grę -> skopiuj informacje o grze -> wklej do maila)",
" a ja postaram się to naprawić.",
"Dziękuję za pomoc."
]
]
Apollo_Program: [
[

View File

@ -258,15 +258,6 @@
" но позднее они могут решить объявить вам войну"
]
]
_GameCrashed: [
[
"О нет! Кажется всё что-то пошло КАТАСТРОФИЧЕСКИ плохо!",
"Это АБСОЛЮТНО не должно было произойти!",
"Пожалуйста отправьте мне (yairm210@hotmail.com) емейл с информацией об игре",
" (меню -> сохранить игру -> скопируйте информацию об игре -> вставьте в емейл)",
" и я попытаюсь это исправить настолько быстро как я могу!"
]
]
}

View File

@ -315,16 +315,7 @@
"但是他们以后可能会选择对您宣战。"
]
]
_GameCrashed: [
[
"NO!看起来游戏好像出现了灾难性的Bug!",
"这绝对不应该发生!",
"请将游戏存档信息发送给我,方法如下:",
"依次点击“菜单->保存游戏->复制当前游戏数据到剪贴板”将剪贴板的内容通过email发送给我。",
"我的email地址yairm210@hotmail.com。我会尽快处理!"
]
]
Apollo_Program: [
[

View File

@ -315,16 +315,7 @@
"但是他们以后可能会选择对您宣战。"
]
]
_GameCrashed: [
[
"NO!看起来游戏好像出现了灾难性的Bug!",
"这绝对不应该发生!",
"请将游戏存档信息发送给我,方法如下:",
"依次点击“菜单->保存游戏->复制当前游戏数据到剪贴板”将剪贴板的内容通过email发送给我。",
"我的email地址yairm210@hotmail.com。我会尽快处理!"
]
]
Apollo_Program: [
[

View File

@ -213,15 +213,6 @@
]
]
_GameCrashed: [
[
"Трясця! Схоже щось пішло КАТАСТРОФІЧНО неправильно!",
"Цього АБСОЛЮТНО НЕ ПОВИННО БУЛО СТАТИСЯ!",
"Будь ласка, надішліть мені (yairm210@hotmail.com) електронний лист з ігровою інформацією",
" (меню -> зберегти гру -> копіювати інформацію про гру -> вставити до email)",
" і я спробую виправити якнайшвидше!"
]
]
Apollo_Program: [
[

View File

@ -17,6 +17,8 @@ Conquer a city!\nBring an enemy city down to low health > \nEnter the city with
Move an air unit!\nSelect an air unit > select another city withing range > \nMove the unit to the other city = Přesuň vzdušnou jednotkou!\nVyber vzdušnou jednotku > vyber jiné měso v dosahu > \nPřesuň jednotku do onoho města
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = Zobraz statistiku!\nVstup do Přehledové obrazovky (pravý horní roh) >\nKlikni na 'Statistika'
Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = Hrom do čepice! Vypadá to, že se něco HÓÓÓDNĚ pokaziloTohle by se v ŽÁDNÉM PŘÍPADĚ nemělo stávat! Prosím pošlete mi (yairm210@hotmail.com) email s informacemi o hře (menu -> uložit hru -> kopírovat herní info -> vložit do emailu) a já se to pokusím opravit jak nejrychleji budu umět!
# Buildings
## Ancient era buildings

View File

@ -30,6 +30,9 @@ Move an air unit!\nSelect an air unit > select another city withing range > \nMo
# Requires translation!
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' =
# Requires translation!
Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! =
# Buildings
## Ancient era buildings

View File

@ -30,6 +30,9 @@ Move an air unit!\nSelect an air unit > select another city withing range > \nMo
# Requires translation!
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' =
# Requires translation!
Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! =
# Buildings
## Ancient era buildings

View File

@ -16,6 +16,8 @@ Conquer a city!\nBring an enemy city down to low health > \nEnter the city with
Move an air unit!\nSelect an air unit > select another city withing range > \nMove the unit to the other city = Déplacez une unité aérienne !\nSéléctionnez une unité aérienne > Séléctionnez une autre cité à portée > \nDéplacez l'unité vers l'autre cité
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = Observez vos statistiques en détail !\n Allez dans la vue d'ensemble (dans le coin en haut à droite) >\nCliquez sur 'Statistiques'
Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = Oh non ! On dirait que quelque chose ne s'est ABSOLUMENT pas passé comme prévu ! Ce n'est pas censé arriver ! S'il vous plaît, envoyez un mail à yairm210@hotmail.com avec les informations de la partie (Menu (en haut à gauche) -> Charger une partie -> Copy saved game to clipboard -> Copier dans le mail) et j'essayerai de régler cela aussi vite que possible !
# Buildings
## Ancient era buildings

View File

@ -16,6 +16,9 @@ Conquer a city!\nBring an enemy city down to low health > \nEnter the city with
Move an air unit!\nSelect an air unit > select another city withing range > \nMove the unit to the other city = Bewege eine Lufteinheit!\nWähle eine Lufteinheit > Wähle eine andere Stadt in Reichweite > \nVerschiebe die Einheit zu der anderen Stadt.
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = Schaue deine Statistiken an!\nGehe in den Übersichtsbildschirm (obere rechte Ecke) >\nKlicke auf 'Statistiken'.
# Requires translation!
Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! =
# Buildings
## Ancient era buildings

View File

@ -17,6 +17,8 @@ Conquer a city!\nBring an enemy city down to low health > \nEnter the city with
Move an air unit!\nSelect an air unit > select another city withing range > \nMove the unit to the other city = Sposta un'unità aerea!\nSeleziona un'unità aerea > Seleziona un'altra Città nel suo raggio > \nSposta l'unità in quell'altra Città.
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = Visualizza le tue statistiche!\nEntra nella tua schermata Panoramica (in alto a sinistra)\nClicca su 'Statistiche'
Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = Santi numi! Pare che qualcosa sia andato disastrosamente storto! Quello che è successo non era assolutamente previsto! Mandami un'email all'indirizzo yairm210@hotmail.com con l'info della partita (menu -> salva partita -> copia info partita -> incolla su email) e proverò a riparare il guasto il più in fretta possibile!
# Buildings
## Ancient era buildings

View File

@ -30,6 +30,8 @@ Move an air unit!\nSelect an air unit > select another city withing range > \nMo
# Requires translation!
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' =
Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = 이런, 뭔가 심각한 일이 일어난 것 같군요! 원래라면 일어나지 않아야 하는 일인데 말이죠! (yairm210@hotmail.com) 이메일로 게임 정보를 함께 보내주세요. (메뉴 -> 게임 저장 -> 게임 정보 복사 -> 이메일에 붙여넣기) 하루빨리 찾아서 이런 일이 일어나지 않도록 하겠습니다!
# Buildings
## Ancient era buildings

View File

@ -30,6 +30,9 @@ Move an air unit!\nSelect an air unit > select another city withing range > \nMo
# Requires translation!
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' =
# Requires translation!
Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! =
# Buildings
## Ancient era buildings

View File

@ -20,6 +20,8 @@ Move an air unit!\nSelect an air unit > select another city withing range > \nMo
# Requires translation!
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' =
Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = O nie! Wygląda na to że coś przegapiłem! To absolutnie nie powinno się wydarzyć! Wyślij mi proszę (yairm210@hotmail.com) maila z informacją o grze (menu -> zapisz grę -> skopiuj informacje o grze -> wklej do maila) a ja postaram się to naprawić. Dziękuję za pomoc.
# Buildings
## Ancient era buildings

View File

@ -30,6 +30,9 @@ Move an air unit!\nSelect an air unit > select another city withing range > \nMo
# Requires translation!
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' =
# Requires translation!
Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! =
# Buildings
## Ancient era buildings

View File

@ -30,6 +30,9 @@ Move an air unit!\nSelect an air unit > select another city withing range > \nMo
# Requires translation!
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' =
# Requires translation!
Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! =
# Buildings
## Ancient era buildings

View File

@ -16,6 +16,8 @@ Conquer a city!\nBring an enemy city down to low health > \nEnter the city with
Move an air unit!\nSelect an air unit > select another city withing range > \nMove the unit to the other city = Переместите воздушый юнит!\nВыберите воздушный юнит > Выберите другой город в доступном радиусе > \nПереместите юнит в другой город
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = Посмотрите вашу статистику!\nОткройте экран обзора (верхний правый угол) >\nНажмите на 'Статистика'
Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = О нет! Кажется всё что-то пошло КАТАСТРОФИЧЕСКИ плохо! Это АБСОЛЮТНО не должно было произойти! Пожалуйста отправьте мне (yairm210@hotmail.com) емейл с информацией об игре (меню -> сохранить игру -> скопируйте информацию об игре -> вставьте в емейл) и я попытаюсь это исправить настолько быстро как я могу!
# Buildings
## Ancient era buildings

View File

@ -16,6 +16,8 @@ Conquer a city!\nBring an enemy city down to low health > \nEnter the city with
Move an air unit!\nSelect an air unit > select another city withing range > \nMove the unit to the other city = 移动空军单位!\n选择一个空军单位 > 选取移动范围内的其他城市 > \n将单位移至该城市
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = 查看当前文明详细信息!\n点击概览按钮(右上角) >\n点击"统计"
Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = NO!看起来游戏好像出现了灾难性的Bug! 这绝对不应该发生! 请将游戏存档信息发送给我,方法如下:依次点击“菜单->保存游戏->复制当前游戏数据到剪贴板”将剪贴板的内容通过email发送给我。我的email地址yairm210@hotmail.com。我会尽快处理!
# Buildings
## Ancient era buildings

View File

@ -16,6 +16,9 @@ Conquer a city!\nBring an enemy city down to low health > \nEnter the city with
Move an air unit!\nSelect an air unit > select another city withing range > \nMove the unit to the other city = Mueve una unidad aérea!\nSelecciona una unidad aérea > selecciona otra ciudad que este al alcance > \nMueve la unidad a la otra ciudad
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = ¡Mira tus estadísticas!\nEntra en la ventana de Visión general (arriba a la derecha) >\nHaz clic en 'Estadísticas'
# Requires translation!
Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! =
# Buildings
## Ancient era buildings
@ -1123,7 +1126,6 @@ Theology = Teología
Civil Service = Servicio civil
# Requires translation!
'The only thing that saves us from the bureaucracy is it inefficiency' - Eugene McCarthy =
# Requires translation!
Enables Open Borders agreements = Habilita acuerdos de fronteras abiertas
Guilds = Gremios
# Requires translation!

View File

@ -16,6 +16,8 @@ Conquer a city!\nBring an enemy city down to low health > \nEnter the city with
Move an air unit!\nSelect an air unit > select another city withing range > \nMove the unit to the other city = 移動空軍單位!\n選擇一個空軍單位 > 選取移動範圍內的其他城市 > \n將單位移至該城市
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = 查看當前文明詳細信息!\n點擊概覽按鈕(右上角) >\n點擊"統計"
Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = NO!看起来游戏好像出现了灾难性的Bug!这绝对不应该发生!请将游戏存档信息发送给我,方法如下:依次点击“菜单->保存游戏->复制当前游戏数据到剪贴板”将剪贴板的内容通过email发送给我。我的email地址yairm210@hotmail.com。我会尽快处理!
# Buildings
## Ancient era buildings

View File

@ -17,6 +17,8 @@ Conquer a city!\nBring an enemy city down to low health > \nEnter the city with
Move an air unit!\nSelect an air unit > select another city withing range > \nMove the unit to the other city = Перемістіть повітряний підрозділ!\nВиберіть його !\n виберіть інше місто в радіусі дії > \nПеремість підрозділ в інше місто
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = Подивіться статистику\nУвійдіть до екрану огляну (верхній правий вугол) >\nНатисніть на «Статистика»
Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = Трясця! Схоже щось пішло КАТАСТРОФІЧНО неправильно! Цього АБСОЛЮТНО НЕ ПОВИННО БУЛО СТАТИСЯ! Будь ласка, надішліть мені (yairm210@hotmail.com) електронний лист з ігровою інформацією (меню -> зберегти гру -> копіювати інформацію про гру -> вставити до email) і я спробую виправити якнайшвидше!
# Buildings
## Ancient era buildings
@ -646,9 +648,7 @@ Map uploaded successfully! = Мапа вивантажена успішно!
Options = Налаштування
Display options = Налаштування екрану
# Requires translation!
Gameplay options = Налаштування ігроладу
# Requires translation!
Other options = Інші налаштування
Turns between autosaves = Ходів між автозбереженням
Sound effects volume = Гучність звуків
@ -874,7 +874,6 @@ vs [unitType] = проти [unitType]
Terrain = Місцевість
# Requires translation!
Hurry Research = Поспішайте з дослідженнями
Conduct Trade Mission = Проведення торговельної угоди
Your trade mission to [civName] has earned you [goldAmount] gold and [influenceAmount] influence! = Ваша торгова місія з цивілізіцією «[civName]» принесла вам [goldAmount] золота та [influenceAmount] впливу!
@ -1576,25 +1575,16 @@ Impassible = Непрохідні
# Natural Wonders
# Requires translation!
Barringer Crater = Аризонський кратер
# Requires translation!
Grand Mesa = Велика меса
# Requires translation!
Great Barrier Reef = Великий бар'єрний риф
# Requires translation!
Krakatoa = Кракатау
# Requires translation!
Mount Fuji = Гора Фудзі
# Requires translation!
Old Faithful =
# Requires translation!
Rock of Gibraltar = Гібралтарська скеля
# Requires translation!
Cerro de Potosi = Серро-Ріко
# Requires translation!
El Dorado = Ельдорадо
# Requires translation!
Fountain of Youth = Джерело вічної молодості
# Resources
@ -1797,7 +1787,6 @@ Unbuildable = Неможливо створити
Can start an 8-turn golden age = Може почати золотий вік на 8 ходів
Can build improvement: Landmark = Може будувати вдосконалення: Визначна пам’ятка
Great Scientist = Видатний науковець
# Requires translation!
Can hurry technology research = Може пришвидшити технологічне дослідження
Can build improvement: Academy = Може будувати вдосконалення: Академія
Great Merchant = Видатний торговець
@ -1812,7 +1801,8 @@ Bonus for units in 2 tile radius 15% = Підрозділи в радіусі 2
# Promotions
Pick promotion = Обрати поліпшення
OR = АБО
# Requires translation!
OR =
Bonus vs [unitType] = Перевага проти типу: [unitType]
Penalty vs [unitType] = Поступається підрозділам типу: [unitType]
Accuracy I = Точність I

View File

@ -6,7 +6,6 @@ Romanian = 50
Korean = 97
Simplified_Chinese = 99
German = 97
thai = 98
English = 0
Ukrainian = 75
French = 99
@ -14,5 +13,4 @@ Portuguese = 78
Czech = 99
Malay = 14
Spanish = 94
Thai = 98
Dutch = 22

View File

@ -16,6 +16,8 @@ Conquer a city!\nBring an enemy city down to low health > \nEnter the city with
Move an air unit!\nSelect an air unit > select another city withing range > \nMove the unit to the other city =
See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' =
Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! =
# Buildings
## Ancient era buildings

View File

@ -27,21 +27,23 @@ import kotlin.concurrent.thread
class UncivGame(val version: String) : Game() {
lateinit var gameInfo: GameInfo
lateinit var settings : GameSettings
/**
* This exists so that when debugging we can see the entire map.
* Remember to turn this to false before commit and upload!
*/
var viewEntireMapForDebug = false
/** For when you need to test something in an advanced game and don't have time to faff around */
val superchargedForDebug = false
var rewriteTranslationFiles = false
lateinit var worldScreen: WorldScreen
var music : Music? =null
val musicLocation = "music/thatched-villagers.mp3"
var isInitialized = false
var rewriteTranslationFiles = false
lateinit var ruleset:Ruleset
@ -59,11 +61,12 @@ class UncivGame(val version: String) : Game() {
// If this takes too long players, especially with older phones, get ANR problems.
// Whatever needs graphics needs to be done on the main thread,
// So it's basically a long set of deferred actions.
// We probably could make this better by moving stuff that we can to another thread but ehhhhhhh
settings = GameSaver().getGeneralSettings() // needed for the screen
screen=LoadingScreen()
thread {
ruleset = Ruleset(true)
settings.hasCrashedRecently=true // for test
if(rewriteTranslationFiles) { // Yes, also when running from the Jar. Sue me.
translations.readAllLanguagesTranslation()
@ -79,6 +82,7 @@ class UncivGame(val version: String) : Game() {
settings.save()
}
// This stuff needs to run on the main thread because it needs the GL context
Gdx.app.postRunnable {
CameraStageBaseScreen.resetFonts()
autoLoadGame()

View File

@ -15,8 +15,8 @@ import com.unciv.logic.GameSaver
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.civilization.diplomacy.DiplomaticStatus
import com.unciv.models.ruleset.tile.ResourceType
import com.unciv.models.translations.tr
import com.unciv.models.ruleset.unit.UnitType
import com.unciv.models.translations.tr
import com.unciv.ui.VictoryScreen
import com.unciv.ui.cityscreen.CityScreen
import com.unciv.ui.pickerscreens.GreatPersonPickerScreen
@ -262,8 +262,13 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
private fun displayTutorialsOnUpdate() {
if (UncivGame.Current.settings.hasCrashedRecently) {
displayTutorials("_GameCrashed")
UncivGame.Current.settings.tutorialsShown.remove("_GameCrashed")
val crashPopup = PopupTable(this)
crashPopup.addGoodSizedLabel("Oh no! It looks like something went DISASTROUSLY wrong!" +
" This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com)" +
" an email with the game information (menu -> save game -> copy game info -> paste into email)" +
" and I'll try to fix it as fast as I can!").row()
crashPopup.addCloseButton()
crashPopup.open()
UncivGame.Current.settings.hasCrashedRecently = false
UncivGame.Current.settings.save()
}

View File

@ -1 +1 @@
include 'desktop', 'android', 'ios', 'html', 'core', 'tests'
include 'desktop', 'android', 'ios', 'core', 'tests'