diff --git a/gulp/translations.js b/gulp/translations.js index 53d8953a..88afa989 100644 --- a/gulp/translations.js +++ b/gulp/translations.js @@ -44,7 +44,7 @@ function gulptasksTranslations($, gulp) { [h2]${storePage.what_others_say}[/h2] [list] - [*] [i]${storePage.northernlion_comment}[/i] [b]- Northernlion, YouTube[/b] + [*] [i]${storePage.nothernlion_comment}[/i] [b]- Northernlion, YouTube[/b] [*] [i]${storePage.notch_comment}[/i] [b]- Notch[/b] [*] [i]${storePage.steam_review_comment}[/i] [b]- Steam User[/b] [/list] diff --git a/gulp/yarn.lock b/gulp/yarn.lock index 703ee811..f4f3ba7f 100644 --- a/gulp/yarn.lock +++ b/gulp/yarn.lock @@ -13051,16 +13051,11 @@ yaml-loader@^0.6.0: loader-utils "^1.4.0" yaml "^1.8.3" -yaml@^1.10.0: +yaml@^1.10.0, yaml@^1.8.3: version "1.10.0" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e" integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg== -yaml@^1.8.3: - version "1.10.0" - resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz" - integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg== - yargs-parser@5.0.0-security.0: version "5.0.0-security.0" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz" diff --git a/res/ui/languages/fi.svg b/res/ui/languages/fi.svg new file mode 100644 index 00000000..483fdde3 --- /dev/null +++ b/res/ui/languages/fi.svg @@ -0,0 +1,38 @@ + + + diff --git a/res/ui/languages/ro.svg b/res/ui/languages/ro.svg new file mode 100644 index 00000000..041ecc3f --- /dev/null +++ b/res/ui/languages/ro.svg @@ -0,0 +1,38 @@ + + + diff --git a/res/ui/main_menu/opensea.png b/res/ui/main_menu/opensea.png new file mode 100644 index 00000000..33e2db44 Binary files /dev/null and b/res/ui/main_menu/opensea.png differ diff --git a/src/css/resources.scss b/src/css/resources.scss index 08bfa43f..5bb3ea99 100644 --- a/src/css/resources.scss +++ b/src/css/resources.scss @@ -67,7 +67,7 @@ $icons: notification_saved, notification_success, notification_upgrade; } $languages: en, de, cs, da, et, es-419, fr, it, pt-BR, sv, tr, el, ru, uk, zh-TW, zh-CN, nb, mt-MT, ar, nl, vi, - th, hu, pl, ja, kor, no, pt-PT; + th, hu, pl, ja, kor, no, pt-PT, fi, ro; @each $language in $languages { [data-languageicon="#{$language}"] { diff --git a/src/css/states/main_menu.scss b/src/css/states/main_menu.scss index 84a9a9d5..7d3872fb 100644 --- a/src/css/states/main_menu.scss +++ b/src/css/states/main_menu.scss @@ -43,9 +43,10 @@ .languageChoose { @include S(border-radius, 8px); border: solid #222428; - background-color: #fff; @include S(border-width, 2px); - background-size: cover; + background-color: #222428 !important; + background-size: contain !important; + background-position: center center !important; opacity: 0.8; } } @@ -182,7 +183,7 @@ .updateLabel { position: absolute; transform: translateX(50%) rotate(-5deg); - color: rgb(133, 58, 231); + color: #3291e9; @include Heading; font-weight: bold; @include S(right, 40px); @@ -444,7 +445,7 @@ justify-content: center; align-items: flex-end; width: 100%; - grid-template-columns: auto auto auto 1fr; + grid-template-columns: auto auto auto auto 1fr; @include S(padding, 10px); box-sizing: border-box; @include S(grid-gap, 4px); @@ -500,6 +501,15 @@ background-color: $linkBgHover; } + &.nftLink { + background-color: #3291e9; + color: #fff; + + &:hover { + background-color: darken(#3291e9, 5); + } + } + .thirdpartyLogo { display: inline-block; @include S(width, 50px); @@ -514,6 +524,12 @@ background-image: uiResource("main_menu/discord.png"); background-size: 95%; } + + &.nftLogo { + /* @load-async */ + background-image: uiResource("main_menu/opensea.png"); + background-size: 80%; + } } } diff --git a/src/js/changelog.js b/src/js/changelog.js index bdcedf39..4bdedab4 100644 --- a/src/js/changelog.js +++ b/src/js/changelog.js @@ -7,6 +7,7 @@ export const CHANGELOG = [ "There are now 45 Steam Achievements!", "Fixed constant signals being editable from the regular layer", "Fixed items still overlapping sometimes between buildings and belts", + "The game is now available in finish, italian, romanian and ukrainian! (Thanks to all contributors!)", "Updated translations (Thanks to all contributors!)", ], }, diff --git a/src/js/core/config.js b/src/js/core/config.js index d5dc7089..7f7e9ff1 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -16,6 +16,7 @@ export const THIRDPARTY_URLS = { github: "https://github.com/tobspr/shapez.io", reddit: "https://www.reddit.com/r/shapezio", shapeViewer: "https://viewer.shapez.io", + nftTokens: "https://opensea.io/collection/shapez", standaloneStorePage: "https://store.steampowered.com/app/1318690/shapezio/", diff --git a/src/js/languages.js b/src/js/languages.js index 4cc39f9b..6899ef09 100644 --- a/src/js/languages.js +++ b/src/js/languages.js @@ -8,120 +8,180 @@ export const LANGUAGES = { code: "en", region: "", }, - "de": { - name: "Deutsch", - data: require("./built-temp/base-de.json"), - code: "de", - region: "", + + "zh-CN": { + // simplified chinese + name: "简体中文", + data: require("./built-temp/base-zh-CN.json"), + code: "zh", + region: "CN", }, - "fr": { - name: "Français", - data: require("./built-temp/base-fr.json"), - code: "fr", - region: "", + + "zh-TW": { + // traditional chinese + name: "繁體中文", + data: require("./built-temp/base-zh-TW.json"), + code: "zh", + region: "TW", }, + "ja": { + // japanese name: "日本語", data: require("./built-temp/base-ja.json"), code: "ja", region: "", }, - "pt-PT": { - name: "Português (Portugal)", - data: require("./built-temp/base-pt-PT.json"), - code: "pt", - region: "PT", - }, - "pt-BR": { - name: "Português (Brasil)", - data: require("./built-temp/base-pt-BR.json"), - code: "pt", - region: "BR", - }, - "ru": { - name: "Русский", - data: require("./built-temp/base-ru.json"), - code: "ru", + + "kor": { + // korean + name: "한국어", + data: require("./built-temp/base-kor.json"), + code: "kor", region: "", }, + "cs": { + // czech name: "Čeština", data: require("./built-temp/base-cz.json"), code: "cs", region: "", }, + + "da": { + // danish + name: "Dansk", + data: require("./built-temp/base-da.json"), + code: "da", + region: "", + }, + + "de": { + // german + name: "Deutsch", + data: require("./built-temp/base-de.json"), + code: "de", + region: "", + }, + "es-419": { + // spanish name: "Español", data: require("./built-temp/base-es.json"), code: "es", region: "", }, - "pl": { - name: "Polski", - data: require("./built-temp/base-pl.json"), - code: "pl", + + "fr": { + // french + name: "Français", + data: require("./built-temp/base-fr.json"), + code: "fr", region: "", }, - "kor": { - name: "한국어", - data: require("./built-temp/base-kor.json"), - code: "kor", + + "it": { + // italian + name: "Italiano", + data: require("./built-temp/base-it.json"), + code: "it", + region: "", + }, + + "hu": { + // hungarian + name: "Magyar", + data: require("./built-temp/base-hu.json"), + code: "hu", region: "", }, + "nl": { + // dutch name: "Nederlands", data: require("./built-temp/base-nl.json"), code: "nl", region: "", }, + "no": { + // norwegian name: "Norsk", data: require("./built-temp/base-no.json"), code: "no", region: "", }, - "tr": { - name: "Türkçe", - data: require("./built-temp/base-tr.json"), - code: "tr", + "pl": { + // polish + name: "Polski", + data: require("./built-temp/base-pl.json"), + code: "pl", region: "", }, - "zh-CN": { - // simplified - name: "中文简体", - data: require("./built-temp/base-zh-CN.json"), - code: "zh", - region: "CN", + "pt-PT": { + // portuguese + name: "Português", + data: require("./built-temp/base-pt-PT.json"), + code: "pt", + region: "PT", }, - "zh-TW": { - // traditional - name: "中文繁體", - data: require("./built-temp/base-zh-TW.json"), - code: "zh", - region: "TW", + "pt-BR": { + // portuguese - brazil + name: "Português - Brasil", + data: require("./built-temp/base-pt-BR.json"), + code: "pt", + region: "BR", + }, + + "ro": { + // romanian + name: "Română", + data: require("./built-temp/base-ro.json"), + code: "pt", + region: "BR", + }, + + "ru": { + // russian + name: "Русский", + data: require("./built-temp/base-ru.json"), + code: "ru", + region: "", + }, + + "fi": { + // finish + name: "Suomi", + data: require("./built-temp/base-fi.json"), + code: "fi", + region: "", }, "sv": { + // swedish name: "Svenska", data: require("./built-temp/base-sv.json"), code: "sv", region: "", }, - "da": { - name: "Dansk", - data: require("./built-temp/base-da.json"), - code: "da", + "tr": { + // turkish + name: "Türkçe", + data: require("./built-temp/base-tr.json"), + code: "tr", region: "", }, - "hu": { - name: "Magyar", - data: require("./built-temp/base-hu.json"), - code: "hu", + "uk": { + // ukrainian + name: "Українська", + data: require("./built-temp/base-uk.json"), + code: "uk", region: "", }, }; diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js index f7d619f7..4e42fbe9 100644 --- a/src/js/states/main_menu.js +++ b/src/js/states/main_menu.js @@ -109,6 +109,17 @@ export class MainMenuState extends GameState { ${G_CHINA_VERSION ? "" : `${T.mainMenu.helpTranslate}`} + ${ + G_CHINA_VERSION + ? "" + : ` + + shapez.io NFT Tokens + + ` + } + +