From aa039ee8fe602a38085f845f901cdeed76031a80 Mon Sep 17 00:00:00 2001 From: Tails2091 <40816748+Tails2091@users.noreply.github.com> Date: Wed, 22 Aug 2018 00:29:15 -0400 Subject: [PATCH 1/4] Claw Game Refactor --- code/modules/arcade/claw_game.dm | 8 +- code/modules/arcade/crane.html | 143 ++++++++++++++++--------------- code/modules/arcade/page.css | 4 + 3 files changed, 82 insertions(+), 73 deletions(-) diff --git a/code/modules/arcade/claw_game.dm b/code/modules/arcade/claw_game.dm index 8b85d70fd1a..ab141a66fb2 100644 --- a/code/modules/arcade/claw_game.dm +++ b/code/modules/arcade/claw_game.dm @@ -53,10 +53,12 @@ /obj/machinery/arcade/claw/win() icon_state = "clawmachine[machine_image]_win" - visible_message("[src.name] beeps, \"WINNER!\"") if(prob(bonus_prize_chance)) //double prize mania! + visible_message("[src.name] beeps, \"DOUBLE PRIZE!\"") new /obj/item/toy/prizeball(get_turf(src)) + else + visible_message("[src.name] beeps, \"WINNER!\"") new /obj/item/toy/prizeball(get_turf(src)) playsound(src.loc, 'sound/arcade/Win.ogg', 50, 1, extrarange = -3, falloff = 10) spawn(10) @@ -65,10 +67,10 @@ /obj/machinery/arcade/claw/start_play(mob/user as mob) ..() user << browse_rsc('page.css') - for(var/i=1, i<=img_resources.len, i++) + for(var/i in 1 to img_resources.len) user << browse_rsc(img_resources[i]) var/my_game_html = replacetext(claw_game_html, "/* ref src */", UID()) - user << browse(my_game_html, "window=[window_name];size=700x600") + user << browse(my_game_html, "window=[window_name];size=915x600;can_resize=0") /obj/machinery/arcade/claw/Topic(href, list/href_list) if(..()) diff --git a/code/modules/arcade/crane.html b/code/modules/arcade/crane.html index 3cf0fc67ae3..78d59aa8f8f 100644 --- a/code/modules/arcade/crane.html +++ b/code/modules/arcade/crane.html @@ -2,7 +2,7 @@ - Crane game + Claw Game @@ -278,8 +278,11 @@ -
-
+
+
+ + +
diff --git a/code/modules/arcade/page.css b/code/modules/arcade/page.css index 1c569967750..b6a9aa39f5a 100644 --- a/code/modules/arcade/page.css +++ b/code/modules/arcade/page.css @@ -1,3 +1,7 @@ +body { + /* Disables scroll bars */ + overflow:hidden; +} #background { width:900px; height:406px; From 7eb066510db47c3974fcceeebaa256ab80a6abe3 Mon Sep 17 00:00:00 2001 From: Tails2091 <40816748+Tails2091@users.noreply.github.com> Date: Wed, 22 Aug 2018 18:37:10 -0400 Subject: [PATCH 2/4] Reverted For Loop, Centered Buttons Not really centered but works. --- code/modules/arcade/crane.html | 26 ++++++++------------------ code/modules/arcade/page.css | 4 ++++ 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/code/modules/arcade/crane.html b/code/modules/arcade/crane.html index 78d59aa8f8f..5fef0d104dc 100644 --- a/code/modules/arcade/crane.html +++ b/code/modules/arcade/crane.html @@ -22,7 +22,6 @@ $(pic).append(ball); $('#game').append(pic); - //console.log(crane); this.GetState = function() {return state}; var CheckBoundaries = function () { @@ -95,7 +94,7 @@ top += vspd; if(state=='won' && top > 460) { - $('#prize'+id).remove();//css({visibility:'hidden'}); + $('#prize'+id).remove(); state='hidden'; gameShutDown(); } @@ -105,13 +104,11 @@ this.Repaint = function () { $('#prize'+id).css({'top':top, 'left':left}); - //$('#'+id+' #crane-handle-top').css({height: handleHeight}); }; }