diff --git a/assets/graphics/fonts/terrarum-sans-bitmap/puae000-e0ff.tga b/assets/graphics/fonts/terrarum-sans-bitmap/puae000-e0ff.tga index 28340050f..9ab0497a7 100644 --- a/assets/graphics/fonts/terrarum-sans-bitmap/puae000-e0ff.tga +++ b/assets/graphics/fonts/terrarum-sans-bitmap/puae000-e0ff.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:255bb8e9778fece83dbd703005f51d100a88d2c785f56f0bd996a0ada72e00b0 -size 331794 +oid sha256:6dcc1b7ea8d91b536df52f63f207f4c4bf268c78f22d632c1d4e10adf7dc1a4f +size 331820 diff --git a/assets/mods/basegame/locales/bgBG/game.json b/assets/mods/basegame/locales/bgBG/game.json index adb0d250f..688ae10d8 100644 --- a/assets/mods/basegame/locales/bgBG/game.json +++ b/assets/mods/basegame/locales/bgBG/game.json @@ -2,18 +2,17 @@ "MENU_LABEL_NEW_WORLD": "Нов Свят", "MENU_LABEL_DELETE_WORLD": "Изтриване на Света", "CONTEXT_WORLD_COUNT": "Светове: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Всички права запазени", "COPYRIGHT_GNU_GPL_3": "Разпределени под GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "ВНИМАНИЕ-ЗДРАВЕ И БЕЗОПАСНОСТ", "MENU_LABEL_PRESS_START_SYMBOL": "атисни >", - - "GAME_INVENTORY_INGREDIENTS" : "Съставки", - "GAME_INVENTORY_POTIONS" : "Отвари", - "GAME_INVENTORY_BLOCKS" : "Блокове", - "GAME_INVENTORY_WALLS" : "Стени", - "CONTEXT_ITEM_TOOL_PLURAL" : "Инструменти", - "GAME_INVENTORY_FAVORITES" : "Любими" + "GAME_INVENTORY_INGREDIENTS": "Съставки", + "GAME_INVENTORY_POTIONS": "Отвари", + "GAME_INVENTORY_BLOCKS": "Блокове", + "GAME_INVENTORY_WALLS": "Стени", + "CONTEXT_ITEM_TOOL_PLURAL": "Инструменти", + "GAME_INVENTORY_FAVORITES": "Любими", + "CONTEXT_ITEM_MAP": "Карта", + "MENU_LABEL_MENU": "Меню" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/csCZ/game.json b/assets/mods/basegame/locales/csCZ/game.json index b46e33fa4..f1bb6fd89 100644 --- a/assets/mods/basegame/locales/csCZ/game.json +++ b/assets/mods/basegame/locales/csCZ/game.json @@ -2,11 +2,12 @@ "MENU_LABEL_NEW_WORLD": "Nový Svět", "MENU_LABEL_DELETE_WORLD": "Smazat Svět", "CONTEXT_WORLD_COUNT": "Světy: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Všechna práva vyhrazena", "COPYRIGHT_GNU_GPL_3": "Šířen pod licencí GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "POZOR-ZDRAVÍ A BEZPEČNOST", - "MENU_LABEL_PRESS_START_SYMBOL": "Stiskněte >" + "MENU_LABEL_PRESS_START_SYMBOL": "Stiskněte >", + "CONTEXT_ITEM_MAP": "Mapa", + "MENU_LABEL_MENU": "Nabídka", + "GAME_INVENTORY_REGISTER": "Zaregistrovat" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/daDK/game.json b/assets/mods/basegame/locales/daDK/game.json index 19428c1b7..f58852ba0 100644 --- a/assets/mods/basegame/locales/daDK/game.json +++ b/assets/mods/basegame/locales/daDK/game.json @@ -2,11 +2,12 @@ "MENU_LABEL_NEW_WORLD": "Ny Verden", "MENU_LABEL_DELETE_WORLD": "Slet Verden", "CONTEXT_WORLD_COUNT": "Verdener: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Alle rettigheder forbeholdes", "COPYRIGHT_GNU_GPL_3": "Distribueret under GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "ADVARSEL-SUNDHED OG SIKKERHED", - "MENU_LABEL_PRESS_START_SYMBOL": "Tryk >" + "MENU_LABEL_PRESS_START_SYMBOL": "Tryk >", + "CONTEXT_ITEM_MAP": "Kort", + "MENU_LABEL_MENU": "Menu", + "GAME_INVENTORY_REGISTER": "Registrer" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/de/game.json b/assets/mods/basegame/locales/de/game.json index 4e3dd9223..b62b076bf 100644 --- a/assets/mods/basegame/locales/de/game.json +++ b/assets/mods/basegame/locales/de/game.json @@ -2,18 +2,18 @@ "MENU_LABEL_NEW_WORLD": "Neue Welt", "MENU_LABEL_DELETE_WORLD": "Welt Löschen", "CONTEXT_WORLD_COUNT": "Welten: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Alle Rechte vorbehalten", "COPYRIGHT_GNU_GPL_3": "Verteilt unter GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "WARNUNG-GESUNDHEIT UND SICHERHEIT", "MENU_LABEL_PRESS_START_SYMBOL": "Drücke >", - - "GAME_INVENTORY_INGREDIENTS" : "Zutaten", - "GAME_INVENTORY_POTIONS" : "Tränke", - "GAME_INVENTORY_BLOCKS" : "Blöcke", - "GAME_INVENTORY_WALLS" : "Wände", - "CONTEXT_ITEM_TOOL_PLURAL" : "Werkzeuge", - "GAME_INVENTORY_FAVORITES" : "Favoriten" + "GAME_INVENTORY_INGREDIENTS": "Zutaten", + "GAME_INVENTORY_POTIONS": "Tränke", + "GAME_INVENTORY_BLOCKS": "Blöcke", + "GAME_INVENTORY_WALLS": "Wände", + "CONTEXT_ITEM_TOOL_PLURAL": "Werkzeuge", + "GAME_INVENTORY_FAVORITES": "Favoriten", + "CONTEXT_ITEM_MAP": "Karte", + "MENU_LABEL_MENU": "Menü", + "GAME_INVENTORY_REGISTER": "Registrieren" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/elGR/game.json b/assets/mods/basegame/locales/elGR/game.json index ca97de809..3387b1d63 100644 --- a/assets/mods/basegame/locales/elGR/game.json +++ b/assets/mods/basegame/locales/elGR/game.json @@ -2,12 +2,12 @@ "MENU_LABEL_NEW_WORLD": "Νέο Κόσμο", "MENU_LABEL_DELETE_WORLD": "Διαγραφή Κόσμο", "CONTEXT_WORLD_COUNT": "Κόσμοι: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Όλα τα δικαιώματα διατηρούνται", "COPYRIGHT_GNU_GPL_3": "Διανέμεται υπό την GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "ΠΡΟΣΟΧΗ-ΥΓΕΙΑ ΚΑΙ ΑΣΦΑΛΕΙΑ", - "MENU_LABEL_PRESS_START_SYMBOL": "Πάτα >" - + "MENU_LABEL_PRESS_START_SYMBOL": "Πάτα >", + "CONTEXT_ITEM_MAP": "Χαρτης", + "MENU_LABEL_MENU": "Μενού", + "GAME_INVENTORY_REGISTER": "Εγγραφή" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/en/game.json b/assets/mods/basegame/locales/en/game.json index b81b6151a..ec56fb2cd 100644 --- a/assets/mods/basegame/locales/en/game.json +++ b/assets/mods/basegame/locales/en/game.json @@ -2,20 +2,18 @@ "MENU_LABEL_NEW_WORLD": "New World", "MENU_LABEL_DELETE_WORLD": "Delete World", "CONTEXT_WORLD_COUNT": "Worlds: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "All rights reserved", "COPYRIGHT_GNU_GPL_3": "Distributed under GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "Best gameplay experience can be achieved with properly adjusted monitor. If you have not, please do it before you play.", - "APP_WARNING_HEALTH_AND_SAFETY": "WARNING-HEALTH AND SAFETY", "MENU_LABEL_PRESS_START_SYMBOL": "Press >", - - "GAME_INVENTORY_INGREDIENTS" : "Ingredients", - "GAME_INVENTORY_POTIONS" : "Potions", - "GAME_INVENTORY_BLOCKS" : "Blocks", - "GAME_INVENTORY_WALLS" : "Walls", - "CONTEXT_ITEM_TOOL_PLURAL" : "Tools", - "GAME_INVENTORY_FAVORITES" : "Favorites", - - "GAME_INVENTORY_REGISTER" : "Register" + "GAME_INVENTORY_INGREDIENTS": "Ingredients", + "GAME_INVENTORY_POTIONS": "Potions", + "GAME_INVENTORY_BLOCKS": "Blocks", + "GAME_INVENTORY_WALLS": "Walls", + "CONTEXT_ITEM_TOOL_PLURAL": "Tools", + "GAME_INVENTORY_FAVORITES": "Favorites", + "GAME_INVENTORY_REGISTER": "Register", + "CONTEXT_ITEM_MAP": "Map", + "MENU_LABEL_MENU": "Menu" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/es/game.json b/assets/mods/basegame/locales/es/game.json index 526f0b593..9da15f716 100644 --- a/assets/mods/basegame/locales/es/game.json +++ b/assets/mods/basegame/locales/es/game.json @@ -2,11 +2,12 @@ "MENU_LABEL_NEW_WORLD": "Nuevo Mundo", "MENU_LABEL_DELETE_WORLD": "Eliminar Mundo", "CONTEXT_WORLD_COUNT": "Mundos: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Todos los derechos reservados", "COPYRIGHT_GNU_GPL_3": "Distribuido bajo GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "ADVERTENCIA-SALUD Y SEGURIDAD", - "MENU_LABEL_PRESS_START_SYMBOL": "Pulsa >" + "MENU_LABEL_PRESS_START_SYMBOL": "Pulsa >", + "CONTEXT_ITEM_MAP": "Mapa", + "MENU_LABEL_MENU": "Menú", + "GAME_INVENTORY_REGISTER": "Registrar" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/fiFI/game.json b/assets/mods/basegame/locales/fiFI/game.json index 58ba790ef..1b2690528 100644 --- a/assets/mods/basegame/locales/fiFI/game.json +++ b/assets/mods/basegame/locales/fiFI/game.json @@ -2,20 +2,19 @@ "MENU_LABEL_NEW_WORLD": "Uusi Maailma", "MENU_LABEL_DELETE_WORLD": "Poista Maailma", "CONTEXT_WORLD_COUNT": "Maailmoja: ", - "MENU_MONITOR_CALI_TITLE": "Tarkista näytön", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Kaikki oikeudet pidätetään", "COPYRIGHT_GNU_GPL_3": "Jaetaan GNU GPL 3:n mukaisesti", "APP_ADJUST_YOUR_MONITOR": "Paras pelikokemus saavutetaan on oikealla säädetty näytöllä. Jos et ole ollut, säädä ennen pelaamista.", - "APP_WARNING_HEALTH_AND_SAFETY": "VAROITUS-TERVEYS JA TURVALLISUUS", "MENU_LABEL_PRESS_START_SYMBOL": "Paina >", - - "GAME_INVENTORY_INGREDIENTS" : "Ainekset", - "GAME_INVENTORY_POTIONS" : "Juomat", - "GAME_INVENTORY_BLOCKS" : "Lohkareet", - "GAME_INVENTORY_WALLS" : "Seinät", - "CONTEXT_ITEM_TOOL_PLURAL" : "Työkalut", - "GAME_INVENTORY_FAVORITES" : "Suosikit" + "GAME_INVENTORY_INGREDIENTS": "Ainekset", + "GAME_INVENTORY_POTIONS": "Juomat", + "GAME_INVENTORY_BLOCKS": "Lohkareet", + "GAME_INVENTORY_WALLS": "Seinät", + "CONTEXT_ITEM_TOOL_PLURAL": "Työkalut", + "GAME_INVENTORY_FAVORITES": "Suosikit", + "CONTEXT_ITEM_MAP": "Kartta", + "MENU_LABEL_MENU": "Valikko", + "GAME_INVENTORY_REGISTER": "Rekisteröidä" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/frFR/game.json b/assets/mods/basegame/locales/frFR/game.json index 8313f528a..6143db478 100644 --- a/assets/mods/basegame/locales/frFR/game.json +++ b/assets/mods/basegame/locales/frFR/game.json @@ -2,20 +2,19 @@ "MENU_LABEL_NEW_WORLD": "Nouveau Monde", "MENU_LABEL_DELETE_WORLD": "Supprimer Monde", "CONTEXT_WORLD_COUNT": "Mondes: ", - "MENU_MONITOR_CALI_TITLE": "Vérification d'écran", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Tous les droits sont réservés", "COPYRIGHT_GNU_GPL_3": "Distribué sous GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "Meilleur l'expérience du jeu peut être obtenue avec un écran correctement réglé. Si vous ne l'avez pas, faites-le avant de jouer.", - "APP_WARNING_HEALTH_AND_SAFETY": "ATTENTION-SANTÉ ET SÉCURITÉ", "MENU_LABEL_PRESS_START_SYMBOL": "Appuyez sur >", - - "GAME_INVENTORY_INGREDIENTS" : "Ingrédients", - "GAME_INVENTORY_POTIONS" : "Potions", - "GAME_INVENTORY_BLOCKS" : "Blocs", - "GAME_INVENTORY_WALLS" : "Murs", - "CONTEXT_ITEM_TOOL_PLURAL" : "Outils", - "GAME_INVENTORY_FAVORITES" : "Favoris" + "GAME_INVENTORY_INGREDIENTS": "Ingrédients", + "GAME_INVENTORY_POTIONS": "Potions", + "GAME_INVENTORY_BLOCKS": "Blocs", + "GAME_INVENTORY_WALLS": "Murs", + "CONTEXT_ITEM_TOOL_PLURAL": "Outils", + "GAME_INVENTORY_FAVORITES": "Favoris", + "CONTEXT_ITEM_MAP": "Carte", + "MENU_LABEL_MENU": "Menu", + "GAME_INVENTORY_REGISTER": "Inscrire" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/huHU/game.json b/assets/mods/basegame/locales/huHU/game.json index 43e91aa29..2a1ef29cc 100644 --- a/assets/mods/basegame/locales/huHU/game.json +++ b/assets/mods/basegame/locales/huHU/game.json @@ -1,12 +1,11 @@ { "MENU_LABEL_NEW_WORLD": "Új Világ", "MENU_LABEL_DELETE_WORLD": "Világ Törlése", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Minden jog fenntartva", "COPYRIGHT_GNU_GPL_3": "Elosztott GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "VIGYÁZAT-EGÉSZSÉGÜGYI ÉS BIZTONSÁGI", - "MENU_LABEL_PRESS_START_SYMBOL": "Nyomd meg a >ot" - + "MENU_LABEL_PRESS_START_SYMBOL": "Nyomd meg a >ot", + "CONTEXT_ITEM_MAP": "Térkép", + "MENU_LABEL_MENU": "Menü" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/it/game.json b/assets/mods/basegame/locales/it/game.json index f898d5ea3..defbed4dd 100644 --- a/assets/mods/basegame/locales/it/game.json +++ b/assets/mods/basegame/locales/it/game.json @@ -2,12 +2,12 @@ "MENU_LABEL_NEW_WORLD": "Nuovo Mondo", "MENU_LABEL_DELETE_WORLD": "Cancella Mondo", "CONTEXT_WORLD_COUNT": "Mondi: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Tutti i diritti riservati", "COPYRIGHT_GNU_GPL_3": "Distribuito sotto licenza GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "ATTENZIONE-SALUTE E SICUREZZA", - "MENU_LABEL_PRESS_START_SYMBOL": "Premi >" - + "MENU_LABEL_PRESS_START_SYMBOL": "Premi >", + "CONTEXT_ITEM_MAP": "Mappa", + "MENU_LABEL_MENU": "Menu", + "GAME_INVENTORY_REGISTER": "Registrare" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/jaJP/game.json b/assets/mods/basegame/locales/jaJP/game.json index 126b7dce2..b8c2d7849 100644 --- a/assets/mods/basegame/locales/jaJP/game.json +++ b/assets/mods/basegame/locales/jaJP/game.json @@ -2,22 +2,19 @@ "MENU_LABEL_NEW_WORLD": "新しい世界", "MENU_LABEL_DELETE_WORLD": "世界を削除", "CONTEXT_WORLD_COUNT": "世界: ", - "MENU_MONITOR_CALI_TITLE": "モニターチェック", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "全著作権所有", "COPYRIGHT_GNU_GPL_3": "GNU GPL 3で配布", "APP_ADJUST_YOUR_MONITOR": "このゲームは、適切に調整したモニターから最高のプレイができます。調整していなかったら、プレイする前に調整してください。", - "APP_WARNING_HEALTH_AND_SAFETY": "警告ー健康と安全のために", "MENU_LABEL_PRESS_START_SYMBOL": "> ボタンを押す", - - "GAME_INVENTORY_INGREDIENTS" : "材料", - "GAME_INVENTORY_POTIONS" : "水薬", - "GAME_INVENTORY_BLOCKS" : "ブロック", - "GAME_INVENTORY_WALLS" : "壁", - "CONTEXT_ITEM_TOOL_PLURAL" : "道具", - "GAME_INVENTORY_FAVORITES" : "お気に入り", - - "GAME_INVENTORY_REGISTER" : "登録する" + "GAME_INVENTORY_INGREDIENTS": "材料", + "GAME_INVENTORY_POTIONS": "水薬", + "GAME_INVENTORY_BLOCKS": "ブロック", + "GAME_INVENTORY_WALLS": "壁", + "CONTEXT_ITEM_TOOL_PLURAL": "道具", + "GAME_INVENTORY_FAVORITES": "お気に入り", + "GAME_INVENTORY_REGISTER": "登録する", + "CONTEXT_ITEM_MAP": "地図", + "MENU_LABEL_MENU": "メニュー" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/koKR/game.json b/assets/mods/basegame/locales/koKR/game.json index 0f7e7a0c7..eacbb58fd 100644 --- a/assets/mods/basegame/locales/koKR/game.json +++ b/assets/mods/basegame/locales/koKR/game.json @@ -2,22 +2,19 @@ "MENU_LABEL_NEW_WORLD": "새 세계", "MENU_LABEL_DELETE_WORLD": "새계 삭제", "CONTEXT_WORLD_COUNT": "새계: ", - "MENU_MONITOR_CALI_TITLE": "모니터 확인", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "모든 권리 보유", "COPYRIGHT_GNU_GPL_3": "GNU GPL 3에 따라 배포됨", "APP_ADJUST_YOUR_MONITOR": "본 게임은 적절히 조정된 모니터에서 최상으로 즐길 수 있습니다. 조정하지 않았다면 플레이하기 전에 조정해 주십시오.", - "APP_WARNING_HEALTH_AND_SAFETY": "경고—건강과 안전을 위하여", "MENU_LABEL_PRESS_START_SYMBOL": ">을 누르세요", - - "GAME_INVENTORY_INGREDIENTS" : "재료", - "GAME_INVENTORY_POTIONS" : "물약", - "GAME_INVENTORY_BLOCKS" : "블록", - "GAME_INVENTORY_WALLS" : "벽지", - "CONTEXT_ITEM_TOOL_PLURAL" : "도구", - "GAME_INVENTORY_FAVORITES" : "즐겨찾기", - - "GAME_INVENTORY_REGISTER" : "등록하기" + "GAME_INVENTORY_INGREDIENTS": "재료", + "GAME_INVENTORY_POTIONS": "물약", + "GAME_INVENTORY_BLOCKS": "블록", + "GAME_INVENTORY_WALLS": "벽지", + "CONTEXT_ITEM_TOOL_PLURAL": "도구", + "GAME_INVENTORY_FAVORITES": "즐겨찾기", + "GAME_INVENTORY_REGISTER": "등록하기", + "MENU_LABEL_MENU": "메뉴", + "CONTEXT_ITEM_MAP": "지도" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/nlNL/game.json b/assets/mods/basegame/locales/nlNL/game.json index b9edc8f36..3e891c3e0 100644 --- a/assets/mods/basegame/locales/nlNL/game.json +++ b/assets/mods/basegame/locales/nlNL/game.json @@ -2,12 +2,12 @@ "MENU_LABEL_NEW_WORLD": "Nieuwe Wereld", "MENU_LABEL_DELETE_WORLD": "Verwijder Wereld", "CONTEXT_WORLD_COUNT": "Werelden: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Alle rechten voorbehouden", "COPYRIGHT_GNU_GPL_3": "Gedistribueerd onder GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "WAARSCHUWING-GEZONDHEID EN VEILIGHEID", - "MENU_LABEL_PRESS_START_SYMBOL": "Druk op >" - + "MENU_LABEL_PRESS_START_SYMBOL": "Druk op >", + "CONTEXT_ITEM_MAP": "Kaart", + "MENU_LABEL_MENU": "Menu", + "GAME_INVENTORY_REGISTER": "Registreren" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/noNB/game.json b/assets/mods/basegame/locales/noNB/game.json index 37b8c7dba..51faed5ae 100644 --- a/assets/mods/basegame/locales/noNB/game.json +++ b/assets/mods/basegame/locales/noNB/game.json @@ -2,12 +2,12 @@ "MENU_LABEL_NEW_WORLD": "Ny Verden", "MENU_LABEL_DELETE_WORLD": "Slett Verden", "CONTEXT_WORLD_COUNT": "Verdener: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Alle rettigheter reservert", "COPYRIGHT_GNU_GPL_3": "Distribuert under GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "ADVARSEL-HELSE OG SIKKERHET", - "MENU_LABEL_PRESS_START_SYMBOL": "Trykk >" - + "MENU_LABEL_PRESS_START_SYMBOL": "Trykk >", + "CONTEXT_ITEM_MAP": "Kart", + "MENU_LABEL_MENU": "Meny", + "GAME_INVENTORY_REGISTER": "Registrer" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/plPL/game.json b/assets/mods/basegame/locales/plPL/game.json index 54d9391c3..3be8b81d0 100644 --- a/assets/mods/basegame/locales/plPL/game.json +++ b/assets/mods/basegame/locales/plPL/game.json @@ -2,12 +2,12 @@ "MENU_LABEL_NEW_WORLD": "Nowy Świat", "MENU_LABEL_DELETE_WORLD": "Usuń Świat", "CONTEXT_WORLD_COUNT": "Światy: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Wszelkie prawa zastrzeżone", "COPYRIGHT_GNU_GPL_3": "Rozpowszechniana w GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "UWAGA-ZDROWIE I BEZPIECZEŃSTWO", - "MENU_LABEL_PRESS_START_SYMBOL": "Naciśnij >" - + "MENU_LABEL_PRESS_START_SYMBOL": "Naciśnij >", + "CONTEXT_ITEM_MAP": "Mapa", + "MENU_LABEL_MENU": "Menu", + "GAME_INVENTORY_REGISTER": "Zarejestruj" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/ptBR/game.json b/assets/mods/basegame/locales/ptBR/game.json index 1f4e5e086..08d0ecc01 100644 --- a/assets/mods/basegame/locales/ptBR/game.json +++ b/assets/mods/basegame/locales/ptBR/game.json @@ -2,12 +2,12 @@ "MENU_LABEL_NEW_WORLD": "Novo Mundo", "MENU_LABEL_DELETE_WORLD": "Excluir Mundo", "CONTEXT_WORLD_COUNT": "Mundos: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Todos os direitos reservados", "COPYRIGHT_GNU_GPL_3": "Distribuído sob GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "ATENÇÃO-SAÚDE E SEGURANÇA", - "MENU_LABEL_PRESS_START_SYMBOL": "Pressione >" - + "MENU_LABEL_PRESS_START_SYMBOL": "Pressione >", + "CONTEXT_ITEM_MAP": "Mapa", + "MENU_LABEL_MENU": "Menu", + "GAME_INVENTORY_REGISTER": "Registrar" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/ptPT/game.json b/assets/mods/basegame/locales/ptPT/game.json index fee190af1..ac72bbcbf 100644 --- a/assets/mods/basegame/locales/ptPT/game.json +++ b/assets/mods/basegame/locales/ptPT/game.json @@ -2,12 +2,12 @@ "MENU_LABEL_NEW_WORLD": "Nova Mundo", "MENU_LABEL_DELETE_WORLD": "Apagar Mundo", "CONTEXT_WORLD_COUNT": "Mundos: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Todos os direitos reservados", "COPYRIGHT_GNU_GPL_3": "Distribuído sob GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "ATENÇÃO-SAÚDE E SEGURANÇA", - "MENU_LABEL_PRESS_START_SYMBOL": "Carrega no >" - + "MENU_LABEL_PRESS_START_SYMBOL": "Carrega no >", + "CONTEXT_ITEM_MAP": "Mapa", + "MENU_LABEL_MENU": "Menu", + "GAME_INVENTORY_REGISTER": "Registar" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/roRO/game.json b/assets/mods/basegame/locales/roRO/game.json index 777f3033f..9bc425f9e 100644 --- a/assets/mods/basegame/locales/roRO/game.json +++ b/assets/mods/basegame/locales/roRO/game.json @@ -2,12 +2,11 @@ "MENU_LABEL_NEW_WORLD": "Lume Nouă", "MENU_LABEL_DELETE_WORLD": "Șterge Lume", "CONTEXT_WORLD_COUNT": "Lumi: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Toate drepturile rezervate", "COPYRIGHT_GNU_GPL_3": "Distribuit sub GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "ATENȚIONARE-SĂNĂTATE ȘI SIGURANȚĂ", - "MENU_LABEL_PRESS_START_SYMBOL": "Apasă >" - + "MENU_LABEL_PRESS_START_SYMBOL": "Apasă >", + "CONTEXT_ITEM_MAP": "Hartă", + "MENU_LABEL_MENU": "Meniu" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/ruRU/game.json b/assets/mods/basegame/locales/ruRU/game.json index 7dfcabd68..0289be1cf 100644 --- a/assets/mods/basegame/locales/ruRU/game.json +++ b/assets/mods/basegame/locales/ruRU/game.json @@ -2,18 +2,18 @@ "MENU_LABEL_NEW_WORLD": "Новый Мир", "MENU_LABEL_DELETE_WORLD": "Удалить Мир", "CONTEXT_WORLD_COUNT": "Миры: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Все права защищены", "COPYRIGHT_GNU_GPL_3": "Распространяется в соответствии с GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "ПРЕДУПРЕЖДЕНИЕ-ЗДОРОВЬЕ И БЕЗОПАСНОСТЬ", "MENU_LABEL_PRESS_START_SYMBOL": "Нажмите >", - - "GAME_INVENTORY_INGREDIENTS" : "Ингредиенты", - "GAME_INVENTORY_POTIONS" : "Зелья", - "GAME_INVENTORY_BLOCKS" : "Блоки", - "GAME_INVENTORY_WALLS" : "Стены", - "CONTEXT_ITEM_TOOL_PLURAL" : "Инструменты", - "GAME_INVENTORY_FAVORITES" : "Избранное" + "GAME_INVENTORY_INGREDIENTS": "Ингредиенты", + "GAME_INVENTORY_POTIONS": "Зелья", + "GAME_INVENTORY_BLOCKS": "Блоки", + "GAME_INVENTORY_WALLS": "Стены", + "CONTEXT_ITEM_TOOL_PLURAL": "Инструменты", + "GAME_INVENTORY_FAVORITES": "Избранное", + "CONTEXT_ITEM_MAP": "Карта", + "MENU_LABEL_MENU": "Меню", + "GAME_INVENTORY_REGISTER": "Зарегистрировать" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/svSE/game.json b/assets/mods/basegame/locales/svSE/game.json index 8728cf8e9..288a0cee4 100644 --- a/assets/mods/basegame/locales/svSE/game.json +++ b/assets/mods/basegame/locales/svSE/game.json @@ -2,12 +2,12 @@ "MENU_LABEL_NEW_WORLD": "Ny Värld", "MENU_LABEL_DELETE_WORLD": "Radera Värld", "CONTEXT_WORLD_COUNT": "Världar: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Alla rättigheter förbehållna", "COPYRIGHT_GNU_GPL_3": "Distribueras under GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "VARNING-HÄLSA OCH SÄKERHET", - "MENU_LABEL_PRESS_START_SYMBOL": "Tryck >" - + "MENU_LABEL_PRESS_START_SYMBOL": "Tryck >", + "CONTEXT_ITEM_MAP": "Karta", + "MENU_LABEL_MENU": "Meny", + "GAME_INVENTORY_REGISTER": "Registrera" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/thTH/game.json b/assets/mods/basegame/locales/thTH/game.json index df6f86fd6..348c15904 100644 --- a/assets/mods/basegame/locales/thTH/game.json +++ b/assets/mods/basegame/locales/thTH/game.json @@ -2,12 +2,11 @@ "MENU_LABEL_NEW_WORLD": "โลกใหม่", "MENU_LABEL_DELETE_WORLD": "ลบโลก", "CONTEXT_WORLD_COUNT": "โลก: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "สงวนลิขสิทธิ์", "COPYRIGHT_GNU_GPL_3": "เผยแพร่ภายใต้ GNU GPL 3", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "คำเตือน-อนามัยและความปลอดภัย", - "MENU_LABEL_PRESS_START_SYMBOL": "กดปุ่ม >" - + "MENU_LABEL_PRESS_START_SYMBOL": "กดปุ่ม >", + "CONTEXT_ITEM_MAP": "แผนที่", + "MENU_LABEL_MENU": "เมนู" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/trTR/game.json b/assets/mods/basegame/locales/trTR/game.json index 18c89469a..3fe4a6e38 100644 --- a/assets/mods/basegame/locales/trTR/game.json +++ b/assets/mods/basegame/locales/trTR/game.json @@ -2,12 +2,11 @@ "MENU_LABEL_NEW_WORLD": "Yeni Dünya", "MENU_LABEL_DELETE_WORLD": "dünyayı Sil", "CONTEXT_WORLD_COUNT": "Dünyalar: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "Her hakkı saklıdır", "COPYRIGHT_GNU_GPL_3": "GNU GPL 3 kapsamında dağıtılan", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "UYARI-SAĞLIK VE GÜVENLİK", - "MENU_LABEL_PRESS_START_SYMBOL": "> basınız" - + "MENU_LABEL_PRESS_START_SYMBOL": "> basınız", + "CONTEXT_ITEM_MAP": "Harita", + "MENU_LABEL_MENU": "Menü" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/zhCN/game.json b/assets/mods/basegame/locales/zhCN/game.json index d6cf3b9b7..50e4ec158 100644 --- a/assets/mods/basegame/locales/zhCN/game.json +++ b/assets/mods/basegame/locales/zhCN/game.json @@ -2,12 +2,12 @@ "MENU_LABEL_NEW_WORLD": "创新世界", "MENU_LABEL_DELETE_WORLD": "删除世界", "CONTEXT_WORLD_COUNT": "世界: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "版权所有", "COPYRIGHT_GNU_GPL_3": "分布在GNU GPL 3下", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "警告ー健康和安全", - "MENU_LABEL_PRESS_START_SYMBOL": "按下 >" - + "MENU_LABEL_PRESS_START_SYMBOL": "按下 >", + "CONTEXT_ITEM_MAP": "地图", + "MENU_LABEL_MENU": "菜单", + "GAME_INVENTORY_REGISTER": "注册" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/zhTW/game.json b/assets/mods/basegame/locales/zhTW/game.json index 75936e108..1556fab28 100644 --- a/assets/mods/basegame/locales/zhTW/game.json +++ b/assets/mods/basegame/locales/zhTW/game.json @@ -2,12 +2,12 @@ "MENU_LABEL_NEW_WORLD": "創新世界", "MENU_LABEL_DELETE_WORLD": "刪除世界", "CONTEXT_WORLD_COUNT": "世界: ", - "COPYRIGHT_ALL_RIGHTS_RESERVED": "版權所有", "COPYRIGHT_GNU_GPL_3": "分佈在GNU GPL 3下", "APP_ADJUST_YOUR_MONITOR": "", - "APP_WARNING_HEALTH_AND_SAFETY": "警告ー健康和安全", - "MENU_LABEL_PRESS_START_SYMBOL": "按下 >" - + "MENU_LABEL_PRESS_START_SYMBOL": "按下 >", + "CONTEXT_ITEM_MAP": "地圖", + "MENU_LABEL_MENU": "功能表", + "GAME_INVENTORY_REGISTER": "註冊" } \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/console/GsonTest.kt b/src/net/torvald/terrarum/modulebasegame/console/GsonTest.kt index 7e5c20502..4725fcbfe 100644 --- a/src/net/torvald/terrarum/modulebasegame/console/GsonTest.kt +++ b/src/net/torvald/terrarum/modulebasegame/console/GsonTest.kt @@ -5,7 +5,7 @@ import net.torvald.terrarum.Terrarum import net.torvald.terrarum.console.ConsoleCommand import net.torvald.terrarum.console.Echo import net.torvald.terrarum.modulebasegame.Ingame -import net.torvald.terrarum.serialise.SavegameWriter +import net.torvald.terrarum.utils.JsonWriter import java.io.BufferedWriter import java.io.FileWriter import java.io.IOException @@ -17,7 +17,7 @@ internal object GsonTest : ConsoleCommand { override fun execute(args: Array) { if (args.size == 2) { - val jsonBuilder = SavegameWriter.getJsonBuilder() + val jsonBuilder = JsonWriter.getJsonBuilder() val jsonString = jsonBuilder.toJson((Terrarum.ingame!! as Ingame).actorNowPlaying) diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt index 1e406be06..c697b6ae3 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt @@ -8,11 +8,11 @@ import com.badlogic.gdx.graphics.glutils.ShapeRenderer import net.torvald.terrarum.* import net.torvald.terrarum.AppLoader.printdbg import net.torvald.terrarum.Terrarum.gamepadLabelEast -import net.torvald.terrarum.Terrarum.gamepadLabelLEFTRIGHT import net.torvald.terrarum.Terrarum.gamepadLabelLStick +import net.torvald.terrarum.Terrarum.gamepadLabelLT import net.torvald.terrarum.Terrarum.gamepadLabelNorth -import net.torvald.terrarum.Terrarum.gamepadLabelRIGHT import net.torvald.terrarum.Terrarum.gamepadLabelRStick +import net.torvald.terrarum.Terrarum.gamepadLabelRT import net.torvald.terrarum.Terrarum.gamepadLabelStart import net.torvald.terrarum.Terrarum.gamepadLabelWest import net.torvald.terrarum.gameactors.ActorWBMovable @@ -57,7 +57,7 @@ class UIInventoryFull( internal val catArrangement: IntArray = intArrayOf(9,6,7,1,0,2,3,4,5,8) - private val SP = "${0x3000.toChar()}${0x3000.toChar()}" + private val SP = "${0x3000.toChar()} " val listControlHelp: String get() = if (AppLoader.environment == RunningEnvironment.PC) "${0xe031.toChar()} ${Lang["GAME_ACTION_CLOSE"]}$SP" + @@ -66,7 +66,8 @@ class UIInventoryFull( "${0xe034.toChar()} ${Lang["GAME_INVENTORY_DROP"]}" else "$gamepadLabelStart ${Lang["GAME_ACTION_CLOSE"]}$SP" + - "$gamepadLabelLEFTRIGHT ${"$ Section"}$SP" + + "$gamepadLabelLT ${Lang["CONTEXT_ITEM_MAP"]}$SP" + + "$gamepadLabelRT ${Lang["MENU_LABEL_MENU"]}$SP" + "$gamepadLabelWest ${Lang["GAME_INVENTORY_USE"]}$SP" + "$gamepadLabelNorth$gamepadLabelLStick ${Lang["GAME_INVENTORY_REGISTER"]}$SP" + "$gamepadLabelEast ${Lang["GAME_INVENTORY_DROP"]}" @@ -77,13 +78,13 @@ class UIInventoryFull( else "$gamepadLabelStart ${Lang["GAME_ACTION_CLOSE"]}$SP" + "$gamepadLabelRStick ${Lang["GAME_ACTION_MOVE_VERB"]}$SP" + - "$gamepadLabelRIGHT ${Lang["GAME_INVENTORY"]}" + "$gamepadLabelRT ${Lang["GAME_INVENTORY"]}" val gameMenuControlHelp: String get() = if (AppLoader.environment == RunningEnvironment.PC) "${0xe031.toChar()} ${Lang["GAME_ACTION_CLOSE"]}" else "$gamepadLabelStart ${Lang["GAME_ACTION_CLOSE"]}$SP" + - "${0xe068.toChar()} ${Lang["GAME_INVENTORY"]}" + "$gamepadLabelLT ${Lang["GAME_INVENTORY"]}" val controlHelpHeight = Terrarum.fontGame.lineHeight private var encumbrancePerc = 0f diff --git a/src/net/torvald/terrarum/serialise/SavegameWriter.kt b/src/net/torvald/terrarum/serialise/SavegameWriter.kt index b086bd496..78815479b 100644 --- a/src/net/torvald/terrarum/serialise/SavegameWriter.kt +++ b/src/net/torvald/terrarum/serialise/SavegameWriter.kt @@ -1,7 +1,6 @@ package net.torvald.terrarum.serialise import com.badlogic.gdx.Gdx -import com.google.gson.GsonBuilder import net.torvald.terrarum.AppLoader import net.torvald.terrarum.Terrarum import net.torvald.terrarum.gameactors.AVKey @@ -10,6 +9,7 @@ import net.torvald.terrarum.itemproperties.GameItem import net.torvald.terrarum.itemproperties.ItemCodex import net.torvald.terrarum.modulecomputers.virtualcomputer.tvd.* import net.torvald.terrarum.roundInt +import net.torvald.terrarum.utils.JsonWriter.getJsonBuilder import java.io.File import java.nio.charset.Charset @@ -133,23 +133,6 @@ object SavegameWriter { TODO() } - fun getJsonBuilder() = if (AppLoader.IS_DEVELOPMENT_BUILD) { - GsonBuilder() - .setPrettyPrinting() - - .serializeNulls() - .disableHtmlEscaping() - .enableComplexMapKeySerialization() - .create() - } - else { - GsonBuilder() - .serializeNulls() - .disableHtmlEscaping() - .enableComplexMapKeySerialization() - .create() - } - private fun serialiseActor(a: Actor): ByteArray64 { val gson = getJsonBuilder().toJson(a).toByteArray(charset) return ByteArray64.fromByteArray(gson) diff --git a/src/net/torvald/terrarum/serialise/WriteLayerDataZip.kt b/src/net/torvald/terrarum/serialise/WriteLayerDataZip.kt index 14e0097c7..016075245 100644 --- a/src/net/torvald/terrarum/serialise/WriteLayerDataZip.kt +++ b/src/net/torvald/terrarum/serialise/WriteLayerDataZip.kt @@ -107,83 +107,83 @@ internal object WriteLayerDataZip { wb(PAYLOAD_HEADER); wb("TERR".toByteArray()) wi48(world.width * world.height * 3L / 2) - deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION), true) + deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION, true), false) deflater.write(world.terrainArray) deflater.write(world.layerTerrainLowBits.data) - deflater.finish() + deflater.flush(); deflater.finish() wb(PAYLOAD_FOOTER) // WALL payload wb(PAYLOAD_HEADER); wb("WALL".toByteArray()) wi48(world.width * world.height * 3L / 2) - deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION), true) + deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION, true), false) deflater.write(world.wallArray) deflater.write(world.layerWallLowBits.data) - deflater.finish() + deflater.flush(); deflater.finish() wb(PAYLOAD_FOOTER) // WIRE payload wb(PAYLOAD_HEADER); wb("WIRE".toByteArray()) wi48(world.width * world.height.toLong()) - deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION), true) + deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION, true), false) deflater.write(world.wireArray) - deflater.finish() + deflater.flush(); deflater.finish() wb(PAYLOAD_FOOTER) // TdMG payload wb(PAYLOAD_HEADER); wb("TdMG".toByteArray()) wi48(world.terrainDamages.size * 10L) - deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION), true) + deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION, true), false) world.terrainDamages.forEach { t, u -> deflater.write(t.toULittle48()) deflater.write(u.toRawBits().toLittle()) } - deflater.finish() + deflater.flush(); deflater.finish() wb(PAYLOAD_FOOTER) // WdMG payload wb(PAYLOAD_HEADER); wb("WdMG".toByteArray()) wi48(world.wallDamages.size * 10L) - deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION), true) + deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION, true), false) world.wallDamages.forEach { t, u -> deflater.write(t.toULittle48()) deflater.write(u.toRawBits().toLittle()) } - deflater.finish() + deflater.flush(); deflater.finish() wb(PAYLOAD_FOOTER) // FlTP payload wb(PAYLOAD_HEADER); wb("FlTP".toByteArray()) wi48(world.fluidTypes.size * 8L) - deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION), true) + deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION, true), false) world.fluidTypes.forEach { t, u -> deflater.write(t.toULittle48()) deflater.write(u.value.toLittleShort()) } - deflater.finish() + deflater.flush(); deflater.finish() wb(PAYLOAD_FOOTER) // FlFL payload wb(PAYLOAD_HEADER); wb("FlFL".toByteArray()) wi48(world.fluidFills.size * 10L) - deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION), true) + deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION, true), false) world.fluidFills.forEach { t, u -> deflater.write(t.toULittle48()) deflater.write(u.toRawBits().toLittle()) } - deflater.finish() + deflater.flush(); deflater.finish() wb(PAYLOAD_FOOTER) diff --git a/src/net/torvald/terrarum/tests/Addnewcolumn.kt b/src/net/torvald/terrarum/tests/Addnewcolumn.kt new file mode 100644 index 000000000..e81300c5c --- /dev/null +++ b/src/net/torvald/terrarum/tests/Addnewcolumn.kt @@ -0,0 +1,72 @@ + +import net.torvald.terrarum.utils.JsonFetcher +import net.torvald.terrarum.utils.JsonWriter +import java.io.File + +/** + * Created by minjaesong on 2019-02-23. + */ + +val locales = arrayOf( + "en", + "frFR", + "es", + "de", + "it", + "ptBR", + "ptPT", + "ruRU", + "elGR", + "trTR", + "daDK", + "noNB", + "svSE", + "nlNL", + "plPL", + "fiFI", + "jaJP", + "zhCN", + "zhTW", + "koKR", + "csCZ", + "huHU", + "roRO", + "thTH", + "bgBG", + "heIL", + "ar", + "bsBS", + "msMS", + "idID" +) +val delimiter = '\t' +val input = arrayOf( + "CONTEXT_ITEM_MAP [Noun] Map Carte Mapa Karte Mappa Mapa Mapa Карта Χαρτης Harita Kort Kart Karta Kaart Mapa Kartta 地図 地图 地圖 지도 Mapa Térkép Hartă แผนที่ Карта מפה خريطة Mapa Peta Peta", + "MENU_LABEL_MENU We have \"Main Menu\" but don't have generic \"Menu\" Menu Menu Menú Menü Menu Menu Menu Меню Μενού Menü Menu Meny Meny Menu Menu Valikko メニュー 菜单 功能表 메뉴 Nabídka Menü Meniu เมนู Меню תפריט القائمة Meni Menu Menu", + "GAME_INVENTORY_REGISTER [Infinitive/tutorial verb] to register an item onto a keyboard shortcut, as favourites, etc. Register Inscrire Registrar Registrieren Registrare Registrar Registar Зарегистрировать Εγγραφή Registrer Registrer Registrera Registreren Zarejestruj Rekisteröidä 登録する 注册 註冊 등록하기 Zaregistrovat " +) + + +val inTable = input.map { it.split(delimiter) } + +fun main() { + locales.forEachIndexed { index, it -> + val file = File("./assets/mods/basegame/locales/$it/game.json") + + println("Locale: $it") + + if (file.exists()) { + val jsonObject = JsonFetcher(file) + + inTable.forEach { record -> + val key = record[0] + val value = record[index + 2] + if (value.isNotBlank()) { + jsonObject.addProperty(key, value) + } + } + + JsonWriter.writeToFile(jsonObject, file.absolutePath) + } + } +} \ No newline at end of file diff --git a/src/net/torvald/terrarum/tests/GsonTest.kt b/src/net/torvald/terrarum/tests/GsonTest.kt index 090e5aacf..2866b61d5 100644 --- a/src/net/torvald/terrarum/tests/GsonTest.kt +++ b/src/net/torvald/terrarum/tests/GsonTest.kt @@ -1,5 +1,5 @@ -import net.torvald.terrarum.serialise.SavegameWriter +import net.torvald.terrarum.utils.JsonWriter import org.dyn4j.geometry.Vector2 /** @@ -21,7 +21,7 @@ object GsonTest { operator fun invoke() { - val gson = SavegameWriter.getJsonBuilder() + val gson = JsonWriter.getJsonBuilder() val jsonString = gson.toJson(testClass) println(jsonString) diff --git a/src/net/torvald/terrarum/utils/JsonWriter.kt b/src/net/torvald/terrarum/utils/JsonWriter.kt index df940a26f..21e26de0b 100644 --- a/src/net/torvald/terrarum/utils/JsonWriter.kt +++ b/src/net/torvald/terrarum/utils/JsonWriter.kt @@ -1,5 +1,8 @@ package net.torvald.terrarum.utils +import com.google.gson.GsonBuilder +import net.torvald.terrarum.AppLoader + /** * Created by minjaesong on 2016-03-04. */ @@ -7,6 +10,25 @@ object JsonWriter { private val formattingRegex = Regex("""(?<=[\{,\[])|(?=[\]}])""") + fun getJsonBuilder() = if (AppLoader.IS_DEVELOPMENT_BUILD) { + getPrettyBuilder() + } + else { + GsonBuilder() + .serializeNulls() + .disableHtmlEscaping() + .enableComplexMapKeySerialization() + .create() + } + + fun getPrettyBuilder() = GsonBuilder() + .setPrettyPrinting() + + .serializeNulls() + .disableHtmlEscaping() + .enableComplexMapKeySerialization() + .create() + /** * serialise a class to the file as JSON, using Google GSON. * @@ -15,9 +37,9 @@ object JsonWriter { */ @Throws(java.io.IOException::class) fun writeToFile(c: Any, path: String) { - val classElem = com.google.gson.Gson().toJsonTree(c) - val jsonString = classElem.toString() - val writer = java.io.FileWriter(path) + val jsonString = getJsonBuilder().toJson(c) + + val writer = java.io.FileWriter(path, false) writer.write(jsonString.replace(formattingRegex, "\n")) writer.close() } @@ -30,8 +52,10 @@ object JsonWriter { */ @Throws(java.io.IOException::class) fun writeToFile(jsonObject: com.google.gson.JsonObject, path: String) { - val writer = java.io.FileWriter(path) - writer.write(jsonObject.toString().replace(formattingRegex, "\n")) + val writer = java.io.FileWriter(path, false) + + writer.write(getPrettyBuilder().toJson(jsonObject)) + //writer.write(jsonObject.toString().replace(formattingRegex, "\n")) writer.close() } diff --git a/work_files/graphics/fonts/puae000-e0ff.psd b/work_files/graphics/fonts/puae000-e0ff.psd index 25c331077..9251d2d24 100644 --- a/work_files/graphics/fonts/puae000-e0ff.psd +++ b/work_files/graphics/fonts/puae000-e0ff.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee0a23a3287cdb2dadef054c7ad2b3ac6629f2e0b73f8aa6f5bc407638b23f76 -size 193795 +oid sha256:6dd17c679983f5c3c8712c951b6be7c1bc7c64dd35dc006e04462cd233ffbe1c +size 248233