Mascali
/
shapez.io
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add music / sound / setting buttons (dysfunctional)

This commit is contained in:
tobspr 2020-05-11 15:17:30 +02:00
parent 653ddf9a3a
commit 21382a6f2e
10 changed files with 84 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/ui/icons/music_off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
res/ui/icons/music_on.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
res/ui/icons/settings.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
res/ui/icons/sound_off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
res/ui/icons/sound_on.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

27
res/ui/loading.svg
View File

@ -1,6 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: none; display: block; shape-rendering: auto;" width="200px" height="200px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
<circle cx="50" cy="50" fill="none" stroke="#393747" stroke-width="3" r="42" stroke-dasharray="197.92033717615698 67.97344572538566" transform="rotate(48.2654 50 50)">
<animateTransform attributeName="transform" type="rotate" repeatCount="indefinite" dur="5.555555555555555s" values="0 50 50;360 50 50" keyTimes="0;1"></animateTransform>
</circle>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: none; display: block; shape-rendering: auto; animation-play-state: running; animation-delay: 0s;" width="200px" height="200px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
<g transform="translate(50 50)" style="animation-play-state: running; animation-delay: 0s;">
<g transform="scale(0.8)" style="animation-play-state: running; animation-delay: 0s;">
<g transform="translate(-50 -50)" style="animation-play-state: running; animation-delay: 0s;">
<g style="animation-play-state: running; animation-delay: 0s;" transform="rotate(65.6099 50 50)">
<animateTransform attributeName="transform" type="rotate" repeatCount="indefinite" values="0 50 50;360 50 50" keyTimes="0;1" dur="1.3157894736842106s" style="animation-play-state: running; animation-delay: 0s;"></animateTransform>
<path fill-opacity="0.8" fill="#1d3f72" d="M50 50L50 0A50 50 0 0 1 100 50Z" style="animation-play-state: running; animation-delay: 0s;"></path>
</g>
<g style="animation-play-state: running; animation-delay: 0s;" transform="rotate(319.208 50 50)">
<animateTransform attributeName="transform" type="rotate" repeatCount="indefinite" values="0 50 50;360 50 50" keyTimes="0;1" dur="1.7543859649122806s" style="animation-play-state: running; animation-delay: 0s;"></animateTransform>
<path fill-opacity="0.8" fill="#5699d2" d="M50 50L50 0A50 50 0 0 1 100 50Z" transform="rotate(90 50 50)" style="animation-play-state: running; animation-delay: 0s;"></path>
</g>
<g style="animation-play-state: running; animation-delay: 0s;" transform="rotate(212.805 50 50)">
<animateTransform attributeName="transform" type="rotate" repeatCount="indefinite" values="0 50 50;360 50 50" keyTimes="0;1" dur="2.6315789473684212s" style="animation-play-state: running; animation-delay: 0s;"></animateTransform>
<path fill-opacity="0.8" fill="#d8ebf9" d="M50 50L50 0A50 50 0 0 1 100 50Z" transform="rotate(180 50 50)" style="animation-play-state: running; animation-delay: 0s;"></path>
</g>
<g style="animation-play-state: running; animation-delay: 0s;" transform="rotate(106.402 50 50)">
<animateTransform attributeName="transform" type="rotate" repeatCount="indefinite" values="0 50 50;360 50 50" keyTimes="0;1" dur="5.2631578947368425s" style="animation-play-state: running; animation-delay: 0s;"></animateTransform>
<path fill-opacity="0.8" fill="#71c2cc" d="M50 50L50 0A50 50 0 0 1 100 50Z" transform="rotate(270 50 50)" style="animation-play-state: running; animation-delay: 0s;"></path>
</g>
</g>
</g>
</g>
<!-- [ldio] generated by https://loading.io/ --></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 2.7 KiB

2
src/css/ingame_hud/building_placer.scss
View File

@ -1,6 +1,6 @@
#ingame_HUD_building_placer {
position: fixed;
@include S(top, 5q0px);
@include S(top, 50px);
@include S(right, 10px);
display: flex;

70
src/css/ingame_hud/game_menu.scss
View File

@ -1,37 +1,67 @@
#ingame_HUD_GameMenu {
position: absolute;
top: 0;
left: 50%;
display: grid;
transform: translateX(-50%);
@include S(grid-gap, 3px);
left: calc(50% - #{D(50px)});
right: 0;
display: flex;
grid-auto-flow: column;
button {
background: $colorGreenBright;
> .menuButtons {
position: relative;
display: flex;
flex-grow: 1;
@include S(padding, 5px, 4px);
justify-content: flex-end;
> .button {
@include S(width, 30px);
@include S(height, 30px);
display: inline-block;
background: center center / 60% no-repeat;
pointer-events: all;
cursor: pointer;
transition: all 0.12s ease-in-out;
transition-property: opacity, transform;
&:hover {
opacity: 0.9;
transform: translateY(3px);
}
&.music {
background-image: uiResource("icons/music_on.png");
}
&.sfx {
background-image: uiResource("icons/sound_on.png");
}
&.settings {
background-image: uiResource("icons/settings.png");
}
}
}
> button {
@include PlainText;
color: #fff;
border-color: rgba(0, 0, 0, 0.1);
@include S(padding, 5px, 5px, 5px);
transition: all 0.12s ease-in-out;
transition-property: opacity, transform;
&:hover {
opacity: 0.9;
transform: translateY(3px);
}
@include IncreasedClickArea(10px);
@include ButtonText;
border: #{D(2px)} solid rgba(0, 10, 20, 0.2);
@include S(border-width, 2px);
border-radius: 0 0 #{D(4px)} #{D(4px)};
@include S(border-top-width, 10px);
@include S(padding-left, 30px);
@include S(margin-top, -5px);
@include S(letter-spacing, 1px, $important: true);
background: center #{D(10px)} / #{D(20px)} no-repeat;
@include S(margin-right, 3px);
@include IncreasedClickArea(10px);
@include ButtonText;
@include S(min-height, 47px);
transition: all 0.12s ease-in-out;
transition-property: opacity, transform;
display: inline-flex;
background: center #{D(10px)} / #{D(20px)} no-repeat;
background-color: $colorGreenBright;
&[data-button-id="shop"] {
background-color: rgb(141, 70, 223);
@ -42,13 +72,17 @@
background-image: uiResource("icons/statistics.png");
}
&:hover {
opacity: 0.9;
transform: translateY(3px);
}
.keybinding {
border: 0;
color: #fff;
border-top-left-radius: 0;
border-top-right-radius: 0;
bottom: unset;
// background: rgba(0, 10, 20, 0.5);
background: transparent;
@include S(top, -5px);
right: unset;

6
src/js/game/hud/parts/game_menu.js
View File

@ -33,5 +33,11 @@ export class HUDGameMenu extends BaseHUDPart {
binding.appendLabelToElement(button);
}
});
const menuButtons = makeDiv(this.element, null, ["menuButtons"]);
this.musicButton = makeDiv(menuButtons, null, ["button", "music"]);
this.sfxButton = makeDiv(menuButtons, null, ["button", "sfx"]);
this.settingsButton = makeDiv(menuButtons, null, ["button", "settings"]);
}
}

4
src/js/game/upgrades.js
View File

@ -76,7 +76,7 @@ export const UPGRADES = {
description: improvement => "Speed +" + Math.floor(improvement * 100.0) + "%",
tiers: [
{
required: [{ shape: "RuRuRuRu", amount: 200 }],
required: [{ shape: "SuSuSuSu", amount: 200 }],
improvement: 1,
},
{
@ -99,7 +99,7 @@ export const UPGRADES = {
description: improvement => "Speed +" + Math.floor(improvement * 100.0) + "%",
tiers: [
{
required: [{ shape: "RuRuRuRu", amount: 200 }],
required: [{ shape: "WuWuWuWu", amount: 200 }],
improvement: 1,
},
{