From d849ce09fc80b7ee00a2f464e6ac232119790912 Mon Sep 17 00:00:00 2001 From: math-pixel <59537610+math-pixel@users.noreply.github.com> Date: Wed, 3 May 2023 23:55:00 +0200 Subject: [PATCH 1/3] bug fix video start --- src/configuration.js | 1 - src/menu/Menu.js | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/configuration.js b/src/configuration.js index 4c14b55..31721a7 100644 --- a/src/configuration.js +++ b/src/configuration.js @@ -314,7 +314,6 @@ function loadAsset(){ vidShamisen = createVideo("assets/video/test-shamisen-transparent.mp4").hide() vidBackgroundUi = createVideo("assets/video/Background_UI.mp4").hide() - vidBackgroundUi.loop() } diff --git a/src/menu/Menu.js b/src/menu/Menu.js index 19407e8..90a99a3 100644 --- a/src/menu/Menu.js +++ b/src/menu/Menu.js @@ -92,6 +92,7 @@ function clickStart(){ if(mouseIsPressed === true){ setTimeout(() => { setUpTransition(25, "startMenu") + vidBackgroundUi.loop() }, 150) } } From 39534a89a3c975a703a2b22f10ae6d25ca2295d3 Mon Sep 17 00:00:00 2001 From: math-pixel <59537610+math-pixel@users.noreply.github.com> Date: Thu, 4 May 2023 01:12:24 +0200 Subject: [PATCH 2/3] bugfix map --- JSON/engine1/allMaps.json | 10 +++++----- src/engine1/interaction.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/JSON/engine1/allMaps.json b/JSON/engine1/allMaps.json index 88bcabf..8fe811f 100644 --- a/JSON/engine1/allMaps.json +++ b/JSON/engine1/allMaps.json @@ -46,7 +46,7 @@ }, "tilemap_11": { "name": "tilemap_11", - "layers": [[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[755,755,755,755,755,755,755,755,755,755,755],[755,755,755,755,755,755,755,755,755,755,755]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[17,17,17,17,17,17,17,17,17,17,17],[17,17,17,17,17,17,17,17,17,17,17],[17,17,17,17,17,17,17,17,17,17,17],[17,17,17,17,17,17,17,17,17,17,17],[17,17,17,17,17,17,17,17,17,17,17],[17,17,17,17,17,17,17,17,17,17,17],[17,17,17,17,17,17,17,17,17,17,17],[17,17,17,17,17,17,17,17,17,17,17],[17,17,17,17,17,17,17,17,17,17,17],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]]] + "layers": [[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[755,755,755,755,755,755,755,755,755,755,755],[755,755,755,755,755,755,755,755,755,755,755]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[17,17,17,17,17,17,17,17,17,17,17],[17,17,17,17,17,17,17,17,17,17,17],[17,17,17,17,17,17,17,17,17,17,17],[17,17,17,17,17,17,17,17,17,17,17],[17,17,17,17,17,17,17,17,17,17,17],[17,17,17,17,17,17,17,17,17,17,17],[17,17,17,17,17,17,17,17,17,17,17],[17,17,17,17,17,17,17,17,17,17,17],[17,17,17,17,17,17,17,17,17,17,17],[0,0,0,0,0,0,0,0,0,0,1],[0,0,0,0,0,0,0,0,0,0,1]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]]] }, "tilemap_12": { "name": "tilemap_12", @@ -94,11 +94,11 @@ }, "tilemap_23": { "name": "tilemap_23", - "layers": [[[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,220,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,37,1,1,1,1,1,1,1,1,1]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,9,0,0,0,0],[0,0,0,0,0,0,0,9,0,0,163],[0,0,0,0,0,0,0,0,0,0,174],[0,382,383,384,0,0,0,0,0,0,174],[0,393,394,0,0,0,0,0,0,0,174],[0,0,0,0,0,0,315,316,317,318,174],[0,0,0,0,0,0,326,327,328,329,174],[0,18,0,0,0,0,0,0,0,0,174],[0,0,121,122,123,124,0,0,0,121,122,123,124],[37,0,132,133,134,135,90,90,90,132,133,134,135]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[240,240,240,240,241,0,0,0,0,0,0],[250,250,250,251,210,0,0,0,0,0,0],[0,0,0,220,210,0,0,0,0,0,0],[0,371,0,0,221,0,0,0,0,0,0],[0,0,0,220,210,0,0,0,0,0,0],[0,0,0,220,210,0,0,305,306,0,0],[0,0,0,220,210,0,0,0,0,0,0],[0,0,0,220,221,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,339,340,0,0,0,0,0,0,0],[0,349,350,351,0,0,0,0,0,0,0],[359,360,361,362,0,0,271,272,273,274,0],[0,6,372,373,0,0,282,283,284,285,0],[0,0,0,395,0,0,293,294,295,296,0],[0,0,0,0,0,0,0,6,18,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]]] + "layers": [[[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,220,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,37,1,1,1,1,1,1,1,1,1]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,9,0,0,0,0],[0,0,0,0,0,0,0,9,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,382,383,384,0,0,0,0,0,0,0],[0,393,394,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,315,316,317,318,0],[0,0,0,0,0,0,326,327,328,329,0],[0,18,0,0,0,0,0,0,0,0,0],[0,0,121,122,123,124,0,0,0,121,122,123,124],[37,0,132,133,134,135,90,90,90,132,133,134,135]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[240,240,240,240,241,0,0,0,0,0,0],[250,250,250,251,210,0,0,0,0,0,163],[0,0,0,220,210,0,0,0,0,0,174],[0,371,0,0,221,0,0,0,0,0,174],[0,0,0,220,210,0,0,0,0,0,174],[0,0,0,220,210,0,0,305,306,0,174],[0,0,0,220,210,0,0,0,0,0,174],[0,0,0,220,221,0,0,0,0,0,174],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,339,340,0,0,0,0,0,0,0],[0,349,350,351,0,0,0,0,0,0,0],[359,360,361,362,0,0,271,272,273,274,0],[0,6,372,373,0,0,282,283,284,285,0],[0,0,0,395,0,0,293,294,295,296,0],[0,0,0,0,0,0,0,6,18,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]]] }, "tilemap_24": { "name": "tilemap_24", - "layers": [[[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[123,1,1,1,1,1,1,1,1,1,1],[133,134,38,39,41,37,39,39,37,39,41]],[[0,0,0,0,0,0,0,0,0,0,0],[0,19,0,0,0,0,18,0,0,5,0],[0,0,19,0,19,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,19],[0,0,18,0,0,5,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,19],[0,7,0,0,0,19,0,0,0,0,0],[0,0,0,5,0,0,0,19,0,0,0],[0,0,0,0,19,0,0,7,0,0,5],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,268,0,0,0],[241,0,0,0,0,0,0,269,94,0,0],[252,0,0,0,0,0,0,269,0,0,0],[252,0,0,0,0,0,0,269,0,0,0],[186,0,0,0,0,0,0,269,0,0,0],[161,257,257,257,257,257,257,280,0,0,0],[186,0,0,0,0,0,0,0,0,0,0],[186,0,0,0,0,0,0,0,0,0,0],[0,124,0,0,0,0,0,0,0,0,0],[0,135,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]]] + "layers": [[[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[123,1,1,1,1,1,1,1,1,1,1],[133,37,38,39,41,37,39,39,37,39,41]],[[0,0,0,0,0,0,0,0,0,0,0],[0,19,0,0,0,0,18,0,0,5,0],[0,0,19,0,19,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,19],[0,0,18,0,0,5,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,19],[0,7,0,0,0,19,0,0,0,0,0],[0,0,0,5,0,0,0,19,0,0,0],[0,124,0,0,19,0,0,7,0,0,5],[0,135,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,268,0,0,0],[241,0,0,0,0,0,0,269,94,0,0],[252,0,0,0,0,0,0,269,0,0,0],[252,0,0,0,0,0,0,269,0,0,0],[186,0,0,0,0,0,0,269,0,0,0],[161,257,257,257,257,257,257,280,0,0,0],[186,0,0,0,0,0,0,0,0,0,0],[186,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]]] }, "tilemap_25": { "name": "tilemap_25", @@ -458,11 +458,11 @@ }, "tilemap_114": { "name": "tilemap_114", - "layers": [[[1,1,1,1,1,0,1,1,1,1,1],[1,1,1,1,1,0,1,1,1,1,1],[1,1,1,1,0,0,1,1,1,1,1],[1,1,1,1,1,0,1,1,1,1,1],[1,1,1,1,1,0,1,1,1,115,116],[1,1,1,1,1,0,1,1,1,126,1],[1,1,1,1,1,0,1,1,1,126,1],[1,1,1,1,1,0,1,1,1,126,1],[1,1,1,1,1,0,1,1,1,137,116],[1,1,1,1,1,0,1,1,1,1,1],[1,1,1,1,1,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,18,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,513,514,515,0,0],[0,0,0,0,0,0,524,525,526,0,616],[0,0,0,0,0,0,0,0,0,0,627],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[173,170,173,172,171,202,0,0,0,0,0],[172,173,170,172,172,199,0,0,0,0,0],[173,172,171,170,173,210,0,0,0,0,0],[172,171,170,173,172,199,0,0,0,0,0],[171,172,173,170,173,202,0,0,0,0,0],[172,171,170,173,172,199,119,78,79,0,0],[173,170,171,172,173,210,93,0,0,0,0],[172,173,170,171,172,199,93,0,0,0,605],[171,172,173,170,171,210,93,0,0,0,0],[172,171,170,171,172,199,130,78,78,78,78],[173,170,171,170,173,205,206,177,178,179,180]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,469,470,471,0,0],[0,0,0,0,0,479,480,481,482,483,572],[0,0,0,0,0,490,491,492,493,494,583],[0,0,0,0,0,0,0,503,0,0,594,483],[0,0,0,0,0,0,0,0,0,0,0,494],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]]] + "layers": [[[1,1,1,1,1,0,1,1,1,1,1],[1,1,1,1,1,0,1,1,1,1,1],[1,1,1,1,0,0,1,1,1,1,1],[1,1,1,1,1,0,1,1,1,1,1],[1,1,1,1,1,0,1,1,1,115,116],[1,1,1,1,1,0,1,1,1,126,1],[1,1,1,1,1,0,1,1,1,126,1],[1,1,1,1,1,0,1,1,1,126,1],[1,1,1,1,1,0,1,1,1,137,116],[1,1,1,1,1,0,1,1,1,1,1],[1,1,1,1,1,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,18,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,513,514,515,0,0],[0,0,0,0,0,0,524,525,526,0,616],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[173,170,173,172,171,202,0,0,0,0,0],[172,173,170,172,172,199,0,0,0,0,0],[173,172,171,170,173,210,0,0,0,0,0],[172,171,170,173,172,199,0,0,0,0,0],[171,172,173,170,173,202,0,0,0,0,0],[172,171,170,173,172,199,119,78,79,0,0],[173,170,171,172,173,210,93,0,0,0,0],[172,173,170,171,172,199,93,0,0,0,605],[171,172,173,170,171,210,93,0,0,0,0],[172,171,170,171,172,199,130,78,78,78,78],[173,170,171,170,173,205,206,177,178,179,180]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,469,470,471,0,0],[0,0,0,0,0,479,480,481,482,483,572],[0,0,0,0,0,490,491,492,493,494,583],[0,0,0,0,0,0,0,503,0,0,594,483],[0,0,0,0,0,0,0,0,0,0,0,494],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]]] }, "tilemap_115": { "name": "tilemap_115", - "layers": [[[1,1,1,126,1,1,1,1,1,1,1],[1,1,1,137,116,116,117,1,1,1,1],[1,1,1,1,1,1,126,1,1,1,1],[1,1,1,1,1,1,126,1,1,1,1],[116,116,116,141,116,116,139,1,1,1,1],[1,1,1,126,1,1,1,1,1,1,1],[1,1,1,126,1,1,1,1,1,1,1],[1,1,1,126,1,1,1,1,1,1,1],[149,150,116,138,116,116,116,116,116,116,116],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1]],[[0,0,0,0,0,513,514,515,0,315,316],[0,9,0,0,0,524,525,526,0,326,327],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,315,316,317,318],[0,0,0,0,0,0,0,326,327,328,329],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,19,0,0,0],[618,618,619,0,0,0,0,0,0,0,0],[628,629,630,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,503,0,0,0,305],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,305,306,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[606,607,608,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[78,78,78,78,78,79,0,0,0,0,0],[233,240,207,233,240,207,233,240,207,233,240]],[[0,0,0,0,0,0,0,271,272,273,274],[0,0,0,0,0,0,0,282,283,284,285],[0,0,0,0,0,0,0,293,294,295,296],[0,0,0,0,0,0,0,0,0,0,0],[573,574,575,0,0,0,0,0,0,0,0],[584,585,586,0,0,0,0,0,0,0,0],[595,596,597,0,0,0,0,0,0,0,0,483],[0,0,0,0,0,0,0,0,0,0,0,494],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]]] + "layers": [[[1,1,1,126,1,1,1,1,1,1,1],[1,1,1,137,116,116,117,1,1,1,1],[1,1,1,1,1,1,126,1,1,1,1],[1,1,1,1,1,1,126,1,1,1,1],[116,116,116,141,116,116,139,1,1,1,1],[1,1,1,126,1,1,1,1,1,1,1],[1,1,1,126,1,1,1,1,1,1,1],[1,1,1,126,1,1,1,1,1,1,1],[149,150,116,138,116,116,116,116,116,116,116],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1]],[[0,0,0,0,0,513,514,515,0,315,316],[0,9,0,0,0,524,525,526,0,326,327],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,315,316,317,318],[0,0,0,0,0,0,0,326,327,328,329],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,19,0,0,0],[618,618,619,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,503,0,0,0,305],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,305,306,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[606,607,608,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[78,78,78,78,78,79,0,0,0,0,0],[233,240,207,233,240,207,233,240,207,233,240]],[[0,0,0,0,0,0,0,271,272,273,274],[0,0,0,0,0,0,0,282,283,284,285],[0,0,0,0,0,0,0,293,294,295,296],[0,0,0,0,0,0,0,0,0,0,0],[573,574,575,0,0,0,0,0,0,0,0],[584,585,586,0,0,0,0,0,0,0,0],[595,596,597,0,0,0,0,0,0,0,0,483],[0,0,0,0,0,0,0,0,0,0,0,494],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]]] }, "tilemap_116": { "name": "tilemap_116", diff --git a/src/engine1/interaction.js b/src/engine1/interaction.js index 4654dfb..4b3b02f 100644 --- a/src/engine1/interaction.js +++ b/src/engine1/interaction.js @@ -132,7 +132,7 @@ function drawinteraction(x,y,w,h, array){ } } - console.log(playerNearToTheRock, playerNearToLandslide) + // console.log(playerNearToTheRock, playerNearToLandslide) } function addFrameScintillement(){ From 82cd5c8e3e4e339278e06eac799cddb2ded31a07 Mon Sep 17 00:00:00 2001 From: math-pixel <59537610+math-pixel@users.noreply.github.com> Date: Thu, 4 May 2023 01:16:02 +0200 Subject: [PATCH 3/3] bugfix map 70 --- JSON/engine1/allMaps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JSON/engine1/allMaps.json b/JSON/engine1/allMaps.json index 8fe811f..cc9c8a1 100644 --- a/JSON/engine1/allMaps.json +++ b/JSON/engine1/allMaps.json @@ -282,7 +282,7 @@ }, "tilemap_70": { "name": "tilemap_70", - "layers": [[[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,11,12,1],[1,1,1,1,1,1,1,1,22,15,13],[1,1,1,1,1,1,1,1,33,23,1],[116,116,116,116,116,1,1,116,14,54,1],[1,1,1,1,1,1,1,1,33,65,1],[1,1,1,1,1,1,1,1,33,54,1],[1,1,1,1,1,1,1,1,33,65,1],[1,1,1,1,1,1,1,1,33,54,1],[1,1,1,1,1,1,1,1,1,1,1]],[[10,0,0,0,0,0,0,0,6,0,0],[0,0,0,0,0,0,0,10,19,6,19],[6,19,6,0,0,0,0,6,0,0,0],[6,0,0,19,0,0,0,0,0,0,0],[0,19,0,6,0,0,0,0,0,0,0],[0,0,0,0,132,133,134,135,0,0,6],[0,10,0,0,0,187,186,0,0,0,0],[0,6,0,10,0,0,0,10,0,0,0],[0,0,19,19,0,0,0,19,0,0,10],[0,19,0,0,10,0,0,0,0,0,6],[0,6,0,10,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,187,205,182,177,241,0,0,0,0],[0,0,242,189,189,215,252,0,0,0,0],[0,0,0,0,0,187,186,0,0,0,0],[0,0,0,0,0,187,252,105,0,0,0],[0,0,0,0,121,122,123,124,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,143,144,145,146,0,0,0],[0,0,0,0,0,187,186,0,0,0,0],[0,0,0,0,0,209,252,0,0,0,0],[0,0,0,0,0,187,186,0,0,0,0],[0,0,0,0,0,209,161,162,162,257,258]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]]] + "layers": [[[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,1,1,1],[1,1,1,1,1,1,1,1,11,12,1],[1,1,1,1,1,1,1,1,22,15,13],[1,1,1,1,1,1,1,1,33,23,1],[116,116,116,116,116,1,1,116,14,54,1],[1,1,1,1,1,1,1,1,33,65,1],[1,1,1,1,1,1,1,1,33,54,1],[1,1,1,1,1,1,1,1,33,65,1],[1,1,1,1,1,1,1,1,33,54,1],[1,1,1,1,1,1,1,1,1,1,1]],[[10,0,0,0,0,0,0,0,6,0,0],[0,0,0,0,0,0,0,10,19,6,19],[6,19,6,0,0,0,0,6,0,0,0],[6,0,0,19,0,0,0,0,0,0,0],[0,19,0,6,121,122,123,124,0,0,0],[0,0,0,0,132,133,134,135,0,0,6],[0,10,0,0,0,187,186,0,0,0,0],[0,6,0,10,0,0,0,10,0,0,0],[0,0,19,19,0,0,0,19,0,0,10],[0,19,0,0,10,0,0,0,0,0,6],[0,6,0,10,0,0,0,0,0,0,0]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]],[[0,0,187,205,182,177,241,0,0,0,0],[0,0,242,189,189,215,252,0,0,0,0],[0,0,0,0,0,187,186,0,0,0,0],[0,0,0,0,0,187,252,105,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,143,144,145,146,0,0,0],[0,0,0,0,0,187,186,0,0,0,0],[0,0,0,0,0,209,252,0,0,0,0],[0,0,0,0,0,187,186,0,0,0,0],[0,0,0,0,0,209,161,162,162,257,258]],[[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0]]] }, "tilemap_71": { "name": "tilemap_71",