Mascali
/
shapez
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tobspr/shapez.io

This commit is contained in:
tobspr 2021-06-20 17:15:43 +02:00
parent a5879b2123 d70fa78ff2
commit 2765e6e81d
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -26,6 +26,7 @@ COPY translations ./translations
COPY src/js ./src/js COPY src/js ./src/js
COPY res_raw ./res_raw COPY res_raw ./res_raw
COPY .git ./.git COPY .git ./.git
COPY electron ./electron
WORKDIR /shapez.io/gulp WORKDIR /shapez.io/gulp
ENTRYPOINT ["yarn", "gulp"] ENTRYPOINT ["yarn", "gulp"]

8
src/js/game/modes/regular.js
View File

@ -38,6 +38,7 @@ import { HUDInteractiveTutorial } from "../hud/parts/interactive_tutorial";
import { HUDSandboxController } from "../hud/parts/sandbox_controller"; import { HUDSandboxController } from "../hud/parts/sandbox_controller";
import { queryParamOptions } from "../../core/query_parameters"; import { queryParamOptions } from "../../core/query_parameters";
import { MetaBlockBuilding } from "../buildings/block"; import { MetaBlockBuilding } from "../buildings/block";
import { MetaItemProducerBuilding } from "../buildings/item_producer";
/** @typedef {{ /** @typedef {{
* shape: string, * shape: string,
@ -586,7 +587,12 @@ export class RegularGameMode extends GameMode {
} }
/** @type {(typeof MetaBuilding)[]} */ /** @type {(typeof MetaBuilding)[]} */
this.hiddenBuildings = [MetaConstantProducerBuilding, MetaGoalAcceptorBuilding, MetaBlockBuilding]; this.hiddenBuildings = [
MetaConstantProducerBuilding,
MetaGoalAcceptorBuilding,
MetaBlockBuilding,
MetaItemProducerBuilding,
];
} }
/** /**

6
src/js/states/main_menu.js
View File

@ -71,11 +71,7 @@ export class MainMenuState extends GameState {
<div class="logo"> <div class="logo">
<img src="${cachebust("res/" + getLogoSprite())}" alt="shapez.io Logo"> <img src="${cachebust("res/" + getLogoSprite())}" alt="shapez.io Logo">
${ ${G_WEGAME_VERSION ? "" : `<span class="updateLabel">v${G_BUILD_VERSION}!</span>`}
G_WEGAME_VERSION
? ""
: `<span class="updateLabel">v${G_BUILD_VERSION} - Puzzle DLC!</span>`
}
</div> </div>
<div class="mainWrapper ${showDemoBadges ? "demo" : "noDemo"}" data-columns="${ <div class="mainWrapper ${showDemoBadges ? "demo" : "noDemo"}" data-columns="${

8
translations/base-es.yaml
View File

@ -53,7 +53,7 @@ global:
escape: ESC escape: ESC
shift: SHIFT shift: SHIFT
space: ESPACIO space: ESPACIO
loggingIn: Logging in loggingIn: Iniciando sesión
demoBanners: demoBanners:
title: Versión de prueba title: Versión de prueba
intro: ¡Obtén el juego completo para desbloquear todas las características! intro: ¡Obtén el juego completo para desbloquear todas las características!
@ -75,9 +75,9 @@ mainMenu:
savegameUnnamed: Sin nombre savegameUnnamed: Sin nombre
puzzleMode: Modo Puzle puzzleMode: Modo Puzle
back: Atrás back: Atrás
puzzleDlcText: ¿Disfrutas compactando y optimizando fábricas? ¡Consigue ahora el puzzleDlcText: ¿Disfrutas compactando y optimizando fábricas?
DLC de Puzles en Steam para aún más diversión! ¡Consigue ahora el DLC de Puzles en Steam para aún más diversión!
puzzleDlcWishlist: Añádelo ahora a tu lista de deseos! puzzleDlcWishlist: ¡Añádelo ahora a tu lista de deseos!
dialogs: dialogs:
buttons: buttons:
ok: OK ok: OK