Skip to content

Commit

Permalink
A bunch of stuff, new features!
Browse files Browse the repository at this point in the history
  • Loading branch information
doktorocelot committed Nov 21, 2019
1 parent bc88f59 commit d20013f
Show file tree
Hide file tree
Showing 136 changed files with 5,238 additions and 118 deletions.
2 changes: 1 addition & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ document.addEventListener('DOMContentLoaded', () => {
menu.load('root');
menu.show();
// TEMP BELOW
gameHandler.newGame('marathon');
// gameHandler.newGame('marathon');
});


File renamed without changes.
Binary file added bgm/handheld/korobeiniki-loop.ogg
Binary file not shown.
Binary file added bgm/handheld/korobeiniki-start.ogg
Binary file not shown.
Binary file added bgm/handheld/menuet-loop.ogg
Binary file not shown.
Binary file added bgm/handheld/menuet-start.ogg
Binary file not shown.
Binary file added bgm/handheld/minuet-loop.ogg
Binary file not shown.
Binary file added bgm/handheld/minuet-start.ogg
Binary file not shown.
Binary file added bgm/handheld/themeb-loop.ogg
Binary file not shown.
Binary file added bgm/handheld/themeb-start.ogg
Binary file not shown.
Binary file added bgm/marathon/marathon-loop.ogg
Binary file not shown.
Binary file added bgm/marathon/marathon-start.ogg
Binary file not shown.
Binary file added bgm/marathon/old/marathon-loop.ogg
Binary file not shown.
Binary file added bgm/marathon/old/marathon-start.ogg
Binary file not shown.
64 changes: 54 additions & 10 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* --current-background: url("https://wallpaperaccess.com/full/28488.jpg"); */
--main-font: 'Roboto', sans-serif;
--cell-size: (2em);
--peek-zone: .5;
--peek-zone: .25;
--matrix-width: 10;
--matrix-height-base: 20;
}
Expand All @@ -20,6 +20,14 @@
from {filter: brightness(1.1)}
to {filter: brightness(0.9)}
}
@keyframes pulse-opacity {
from {opacity: 1}
to {opacity: 0.25}
}
@keyframes bob {
from {padding-left: .15em}
to {padding-left: .35em}
}
body {
margin: 0;
padding: 0;
Expand All @@ -45,9 +53,15 @@ body {
margin-left: 1rem;
color: #fff;
}
#menu-container.hidden {
#menu-container.hidden,
#game-container.hidden
{
display: none;
}
#game-container.faded
{
opacity: 0.1;
}
#vertical-menu {
margin-left: 0;
overflow-y: auto;
Expand All @@ -70,17 +84,21 @@ body {
transition: font-size .1s, border-left-width .1s;
cursor: pointer;
}
@keyframes bob {
from {padding-left: .15em}
to {padding-left: .35em}
}

.pulse {
animation-name: pulse;
animation-duration: .5s;
animation-iteration-count: infinite;
animation-direction: alternate;
animation-timing-function: ease-in-out;
}
#vertical-menu li.control-name {
text-transform: uppercase;
font-size: 0.8em;
font-weight: 500;
letter-spacing: .2em;
cursor: auto;
}
#vertical-menu li.selected {
font-weight: 300;
font-size: 2em;
Expand Down Expand Up @@ -162,7 +180,6 @@ body {
.game {
display: inline-block;
padding: 2em;
overflow: auto;
margin: auto;

}
Expand All @@ -177,7 +194,7 @@ body {
float: none;
}
.stats {
height: 31em;
height: calc(--matrix-height-base * 1.55);
display: flex;
justify-content: flex-end;
flex-direction: column;
Expand Down Expand Up @@ -221,7 +238,7 @@ body {
width: calc(var(--matrix-width) * var(--cell-size));
height: calc(var(--matrix-height) * var(--cell-size));
background-size: calc(100% / var(--matrix-width)) calc(100% / var(--matrix-height));
background-color: #0008;
background-color: #000a;
background-image: url(../img/tetrion/grid-bg-cross.svg);
background-position: left bottom;
outline-color: #fff;
Expand Down Expand Up @@ -346,6 +363,10 @@ progress[value]::-moz-progress-bar {
display: none;
}
.game.paused .pause {
animation-name: pulse-opacity;
animation-duration: .5s;
animation-iteration-count: infinite;
animation-timing-function: ease-in-out;
display: block;
color: white;
font-size: 3em;
Expand All @@ -354,4 +375,27 @@ progress[value]::-moz-progress-bar {
top: 2em;
width: 100%;
}

.game .main-message {
animation-name: pulse-opacity;
animation-duration: .2s;
animation-iteration-count: infinite;
animation-timing-function: ease-in-out;
display: block;
color: white;
font-size: 3em;
font-weight: 300;
position: absolute;
top: 6em;
width: 100%;
}
.game .main-message.dissolve {
animation-name: dissolve;
animation-duration: 1s;
animation-iteration-count: 1;
animation-fill-mode: forwards;
}
@keyframes dissolve {
0% {transform: scale(1);}
20% {opacity: 1;}
100% {opacity: 0; transform: scale(5); display: none;}
}
36 changes: 36 additions & 0 deletions gametypes/handheld.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"settings": {
"width": 10,
"height": 18,
"hiddenHeight": 4,
"pieces": "standard",
"unfavored": null,
"randomizer": "handheld",
"rotationSystem": "handheld",
"skin": "retro",
"soundbank": "handheld",
"music": "korobeiniki",
"scoreTable": "retro",
"background": "handheld.png"
},
"piece": {
"areLimit": 33.3333333333,
"areLineLimit": 183.333333333,
"areLimitLineModifier": 1333.33333333,
"ghostIsVisible": false,
"useSpecialI": true
},
"stack": {
"flashLineClear": true,
"flashClearRate": 200,
"useMinoSkin": true
},
"next": {
"nextLength": 1
},
"stats": [
"score",
"level",
"line"
]
}
12 changes: 11 additions & 1 deletion gametypes/marathon.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,17 @@
"pieces": "standard",
"unfavored": "standardUnfavored",
"randomizer": "bag",
"rotationSystem": "srs"
"rotationSystem": "srs",
"skin": "standard",
"soundbank": "standard",
"music": "marathon",
"scoreTable": "guideline",
"background": "marathon.jpg"
},
"piece": {
"areLimit": 100,
"areLineLimit": 166.666666667,
"areLimitLineModifier": 166.666666667
},
"stats": [
"score",
Expand Down
31 changes: 31 additions & 0 deletions gametypes/retro.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"settings": {
"width": 10,
"height": 20,
"hiddenHeight": 4,
"pieces": "standard",
"unfavored": null,
"randomizer": "handheld",
"rotationSystem": "retro",
"skin": "retro",
"scoreTable": "retro"
},
"piece": {
"areLimit": 166.666666667,
"areLineLimit": 166.666666667,
"areLimitLineModifier": 300,
"ghostIsVisible": false,
"useSpecialI": true
},
"stack": {
"useMinoSkin": true
},
"next": {
"nextLength": 1
},
"stats": [
"score",
"level",
"line"
]
}
Binary file added img/bg/handheld.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/bg/marathon.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2,497 changes: 2,497 additions & 0 deletions img/skin/dshock.ai

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions img/skin/dshock/ghost-black.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/skin/dshock/ghost-blue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/skin/dshock/ghost-green.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/skin/dshock/ghost-lightBlue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/skin/dshock/ghost-orange.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/skin/dshock/ghost-purple.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/skin/dshock/ghost-red.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/skin/dshock/ghost-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/skin/dshock/ghost-yellow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/skin/dshock/mino-black.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/skin/dshock/mino-blue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/skin/dshock/mino-green.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d20013f

Please sign in to comment.