From bd8069099e68f870d75ce33b22d1d32d97954078 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 19 Apr 2020 14:00:04 -0400 Subject: [PATCH 1/2] added credits --- docs/assets/js/index.js | 3 +- docs/assets/js/titleScreen/titleScreen.js | 45 ++++++++++++++++++++--- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/docs/assets/js/index.js b/docs/assets/js/index.js index 10fbdce..1d90b84 100644 --- a/docs/assets/js/index.js +++ b/docs/assets/js/index.js @@ -75,7 +75,7 @@ function draw() { // title screen case globalStates.titleScreen: - drawTitleScreen(); + break; // level transition case globalStates.levelTransition: @@ -107,6 +107,7 @@ function absoluteDraw() { // title screen case globalStates.titleScreen: drawTitleScreenUI(); + drawTitleScreen(); break; // level transition case globalStates.levelTransition: diff --git a/docs/assets/js/titleScreen/titleScreen.js b/docs/assets/js/titleScreen/titleScreen.js index cbf91fc..72593b9 100644 --- a/docs/assets/js/titleScreen/titleScreen.js +++ b/docs/assets/js/titleScreen/titleScreen.js @@ -16,17 +16,20 @@ function handleTitleScreen(){ } + + centerCameraOn(0,0) } function handleMainScreen(){ + if(rectpoint({x:415, y:200, w: 300, h: 50}, {x:cursor.x, y:cursor.y}) && mouseDown[0]){ + globalState = globalStates.levelTransition; + timer = 0; + } + if(timer > 20){ - if(rectpoint({x:415, y:200, w: 300, h: 50}, {x:cursor.x, y:cursor.y}) && mouseDown[0]){ - globalState = globalStates.levelTransition; - timer = 0; - } if(rectpoint({x:415, y:550, w: 300, h: 50}, {x:cursor.x, y:cursor.y}) && mouseDown[0]){ titleScreenState = "credits" timer = 0; @@ -38,7 +41,7 @@ function handleMainScreen(){ function handleCredits(){ - + //console.log(`X ${cursor.x}, Y ${cursor.y}`); if(timer > 20){ if(rectpoint({x:395, y:550, w: 140, h: 50}, {x:cursor.x, y:cursor.y}) && mouseDown[0]){ titleScreenState = "main"; @@ -47,7 +50,27 @@ function handleCredits(){ }else{ timer++; } - + + // Rsninja + if(rectpoint({x:400, y:145, w: 340, h: 30}, {x:cursor.x, y:cursor.y}) && mouseDown[0]){ + window.open('https://rsninja.dev/', '_blank'); + } + + // Silas + if(rectpoint({x:420, y:227, w: 350, h: 31}, {x:cursor.x, y:cursor.y}) && mouseDown[0]){ + window.open('https://exvacuum.dev', '_blank'); + } + + //Evan + if(rectpoint({x:430, y:307, w: 360, h: 50}, {x:cursor.x, y:cursor.y}) && mouseDown[0]){ + window.open('https://retrylife.ca/', '_blank'); + } + + // // William + if(rectpoint({x:460, y:382, w: 420, h: 50}, {x:cursor.x, y:cursor.y}) && mouseDown[0]){ + window.open('https://wm-c.dev', '_blank'); + } + } @@ -67,7 +90,15 @@ function drawTitleScreen(){ if(titleScreenState === "credits"){ text("CREDITS", 250, 50, "green", 8, 300); + text("rsninja dev", 250, 130, "green", 5, 1000); + text("Silas Bartha", 250, 210, "green", 5, 1000); + + text("Evan Pratten", 250, 290, "green", 5, 1000); + + text("William Meathrel", 250, 370, "green", 5, 1000) + + //text("Sally Lopez", 250, 320, "green", 5, 1000) rect(395, 550, 140, 50, "green"); text("Back", 345, 535, "white", 5, 150); @@ -78,4 +109,6 @@ function drawTitleScreen(){ + + } \ No newline at end of file From 46db1fe4f6e93bf335f7bbb264aa49fe2c531ceb Mon Sep 17 00:00:00 2001 From: William Date: Sun, 19 Apr 2020 14:08:40 -0400 Subject: [PATCH 2/2] added a note --- docs/assets/js/titleScreen/titleScreen.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/assets/js/titleScreen/titleScreen.js b/docs/assets/js/titleScreen/titleScreen.js index 72593b9..74348a0 100644 --- a/docs/assets/js/titleScreen/titleScreen.js +++ b/docs/assets/js/titleScreen/titleScreen.js @@ -103,6 +103,8 @@ function drawTitleScreen(){ rect(395, 550, 140, 50, "green"); text("Back", 345, 535, "white", 5, 150); + text("*Names are links to their pages", 705, 495, "green", 2, 100); + }