From 1a17694633eec9d08e40b5cd406151a4458e8c96 Mon Sep 17 00:00:00 2001 From: Nicky Case Date: Thu, 13 Jul 2017 11:41:43 -0400 Subject: [PATCH] HUGE refactor --- assets/sounds/scratch_in.mp3 | Bin 0 -> 7200 bytes assets/sounds/scratch_out.mp3 | Bin 0 -> 9216 bytes css/slides.css | 13 +++++++++++++ index.html | 1 + js/core/Scratcher.js | 13 +++++++++++++ js/sims/Tournament.js | 1 + 6 files changed, 28 insertions(+) create mode 100644 assets/sounds/scratch_in.mp3 create mode 100644 assets/sounds/scratch_out.mp3 diff --git a/assets/sounds/scratch_in.mp3 b/assets/sounds/scratch_in.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..f8c9b42fd3378eca2201e7bc3281c653dec38739 GIT binary patch literal 7200 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 TF!;FwflmnkU-$Tb*SY@!AL{MC literal 0 HcmV?d00001 diff --git a/assets/sounds/scratch_out.mp3 b/assets/sounds/scratch_out.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..e55b17ab6a859ac2b2a292fb32017581434152be GIT binary patch literal 9216 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 literal 0 HcmV?d00001 diff --git a/css/slides.css b/css/slides.css index 453f461..b5f0676 100644 --- a/css/slides.css +++ b/css/slides.css @@ -97,6 +97,9 @@ body{ -moz-user-select: none; /* Firefox all */ -ms-user-select: none; /* IE 10+ */ user-select: none; + + transform-origin: 97.5px 27.5px; + transition: transform 0.1s ease-out; } .button #background{ position: absolute; @@ -130,6 +133,7 @@ body{ } .button[hover=yes]{ z-index: 100; + transform: scale(1.02, 1.02); } .button[hover=yes] #background{ background-position: 0px -125px !important; @@ -143,6 +147,9 @@ body{ .button[deactivated=yes] #hitbox{ display: none; } +.button[size=short]{ + transform-origin: 57.5px 27.5px; +} .button[size=short] #background{ background: url(../assets/ui/button_short.png); background-size: 100%; @@ -154,6 +161,9 @@ body{ .button[size=short] #hitbox{ width:115px; } +.button[size=long]{ + transform-origin: 172.5px 27.5px; +} .button[size=long] #background{ background: url(../assets/ui/button_long.png); background-size: 100%; @@ -166,6 +176,9 @@ body{ .button[size=long] #hitbox{ width:345px; } +.button:active{ + transform: scale(0.95, 0.95); +} /*************************/ diff --git a/index.html b/index.html index 11f3e22..2450d99 100644 --- a/index.html +++ b/index.html @@ -25,6 +25,7 @@ + diff --git a/js/core/Scratcher.js b/js/core/Scratcher.js index d071709..8caa840 100644 --- a/js/core/Scratcher.js +++ b/js/core/Scratcher.js @@ -1,3 +1,8 @@ +Loader.addToManifest(Loader.manifest,{ + scratch_in: "assets/sounds/scratch_in.mp3", + scratch_out: "assets/sounds/scratch_out.mp3" +}); + (function(exports){ var Scratcher = {}; @@ -41,6 +46,7 @@ subscribe("slideshow/scratch", Scratcher.scratch); Scratcher.scratchAnim = function(scratchIn){ + var dom = $("#scratcher"); var deferred = Q.defer(); var frame = 0; @@ -53,7 +59,14 @@ Scratcher.scratchAnim = function(scratchIn){ Scratcher.gotoFrame(scratchIn, frame); } },40); + + setTimeout(function(){ + var sound = scratchIn ? Loader.sounds.scratch_in : Loader.sounds.scratch_out; + sound.volume(0.7).play(); + },100); + return deferred.promise; + }; Scratcher.gotoFrame = function(scratchIn, frame){ var dom = $("#scratcher"); diff --git a/js/sims/Tournament.js b/js/sims/Tournament.js index af92d7f..4b5c04e 100644 --- a/js/sims/Tournament.js +++ b/js/sims/Tournament.js @@ -379,6 +379,7 @@ function Tournament(config){ // TODO: KILL ALL LISTENERS, TOO. // TODO: Don't screw up when paused or looking at new tab self.remove = function(INSTANT){ + _stopAutoPlay(); for(var i=0; i