diff --git a/Audio/Shapes Normalized/Circle.mp3 b/Audio/Shapes Normalized/Circle.mp3 new file mode 100644 index 0000000..c9a9c7e Binary files /dev/null and b/Audio/Shapes Normalized/Circle.mp3 differ diff --git a/Audio/Shapes RAW/Circle.mp3 b/Audio/Shapes RAW/Circle.mp3 new file mode 100644 index 0000000..3fe8554 Binary files /dev/null and b/Audio/Shapes RAW/Circle.mp3 differ diff --git a/Shapeion.resource_order b/Shapeion.resource_order index 298b3b2..c7b04ce 100644 --- a/Shapeion.resource_order +++ b/Shapeion.resource_order @@ -29,6 +29,7 @@ {"name":"snStart","order":3,"path":"sounds/snStart/snStart.yy",}, {"name":"oAfter","order":2,"path":"objects/oAfter/oAfter.yy",}, {"name":"snSquare","order":1,"path":"sounds/snSquare/snSquare.yy",}, + {"name":"snCircle","order":6,"path":"sounds/snCircle/snCircle.yy",}, {"name":"gxc_api_config","order":3,"path":"scripts/gxc_api_config/gxc_api_config.yy",}, {"name":"snSeptagon","order":5,"path":"sounds/snSeptagon/snSeptagon.yy",}, ], diff --git a/Shapeion.yyp b/Shapeion.yyp index ccd9187..c7e7867 100644 --- a/Shapeion.yyp +++ b/Shapeion.yyp @@ -25,7 +25,7 @@ "isEcma": false, "LibraryEmitters": [], "MetaData": { - "IDEVersion": "2023.4.0.84", + "IDEVersion": "2023.6.0.92", }, "resources": [ {"id":{"name":"oWall","path":"objects/oWall/oWall.yy",},}, @@ -60,6 +60,7 @@ {"id":{"name":"snGameOver","path":"sounds/snGameOver/snGameOver.yy",},}, {"id":{"name":"oAfter","path":"objects/oAfter/oAfter.yy",},}, {"id":{"name":"snSquare","path":"sounds/snSquare/snSquare.yy",},}, + {"id":{"name":"snCircle","path":"sounds/snCircle/snCircle.yy",},}, {"id":{"name":"gxc_api_config","path":"scripts/gxc_api_config/gxc_api_config.yy",},}, {"id":{"name":"snSeptagon","path":"sounds/snSeptagon/snSeptagon.yy",},}, {"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},}, diff --git a/fonts/fontGui/fontGui.yy b/fonts/fontGui/fontGui.yy index 4f24a14..c8c27ab 100644 --- a/fonts/fontGui/fontGui.yy +++ b/fonts/fontGui/fontGui.yy @@ -57,6 +57,7 @@ "italic": false, "kerningPairs": [], "last": 0, + "lineHeight": 0, "maintainGms1Font": false, "parent": { "name": "Global", @@ -75,6 +76,7 @@ ], "regenerateBitmap": false, "sampleText": "abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", + "sdfSpread": 8, "size": 12.0, "styleName": "Regular", "textureGroupId": { @@ -82,4 +84,5 @@ "path": "texturegroups/Default", }, "TTFName": "${project_dir}\\fonts\\Font3\\PressStart2P-vaV7.ttf", + "usesSDF": false, } \ No newline at end of file diff --git a/objects/oGlobalController/Create_0.gml b/objects/oGlobalController/Create_0.gml index 578c222..0c04566 100644 --- a/objects/oGlobalController/Create_0.gml +++ b/objects/oGlobalController/Create_0.gml @@ -263,7 +263,7 @@ if os_type == os_android { if _percent <= 0 break; } - draw_line_shadow(_shapeArrayCol,4); + draw_line_shadow(_shapeArrayCol,5); } } } diff --git a/objects/oGlobalController/Draw_0.gml b/objects/oGlobalController/Draw_0.gml index 83d2262..25b98d4 100644 --- a/objects/oGlobalController/Draw_0.gml +++ b/objects/oGlobalController/Draw_0.gml @@ -112,7 +112,7 @@ if(title) { } setColorOpposite(); - draw_line_shadow(_shapeArrayCol,4); + draw_line_shadow(_shapeArrayCol,5); // Settings if settingsMenuAlpha != 0 { diff --git a/objects/oWall/Create_0.gml b/objects/oWall/Create_0.gml index e2587ff..c36be87 100644 --- a/objects/oWall/Create_0.gml +++ b/objects/oWall/Create_0.gml @@ -2,9 +2,9 @@ shapes = []; size = (120-20*global.hardMode)*sizeRatio; -var _shapeArray = [3,4,6,5,8,7]; -var _soundArray = [snTriangle,snSquare,snHexagon,snPentagon,snOctagon,snSeptagon]; -var _shapeTextArray = ["TRIANGLE","SQUARE","HEXAGON","PENTAGON","OCTAGON","SEPTAGON"]; +var _shapeArray = [24,3,4,6,5,8,7]; +var _soundArray = [snCircle,snTriangle,snSquare,snHexagon,snPentagon,snOctagon,snSeptagon]; +var _shapeTextArray = ["CIRCLE","TRIANGLE","SQUARE","HEXAGON","PENTAGON","OCTAGON","SEPTAGON"]; var _shapeNum = -1; @@ -20,7 +20,7 @@ while(array_length(shapes) < min(5,2+(global.score >= 1000)+(global.score >= 300 _x = irandom_range(xMin+size,xMax-size); _y = irandom_range(yMin+size,yMax-size); - _index = irandom(min(5,3+(global.score >= 2000)+(global.score >= 8000)+global.hardMode*2)); + _index = irandom(min(5,3+(global.score >= 500)+(global.score >= 2000)+(global.score >= 8000)+global.hardMode*2)); var _shape = _shapeArray[_index]; if(array_length(shapes) == 0) _shapeNum = _index; diff --git a/objects/oWall/Draw_0.gml b/objects/oWall/Draw_0.gml index e354454..320c22c 100644 --- a/objects/oWall/Draw_0.gml +++ b/objects/oWall/Draw_0.gml @@ -72,7 +72,7 @@ for(var j = 0; j < array_length(shapes); j++) { draw_set_color(c_white); draw_line_shadow(_shapeArray); setColorOpposite(); - draw_line_shadow(_shapeArrayCol,4); + draw_line_shadow(_shapeArrayCol,5); /* for(var i = 0; i < array_length(_shapeArrayCol); i++) { draw_line_width(_shapeArrayCol[i][0],_shapeArrayCol[i][1],_shapeArrayCol[i][2],_shapeArrayCol[i][3],4); diff --git a/options/operagx/options_operagx.yy b/options/operagx/options_operagx.yy index c7c4648..2b1de27 100644 --- a/options/operagx/options_operagx.yy +++ b/options/operagx/options_operagx.yy @@ -9,7 +9,7 @@ "option_operagx_internalShareUrl": "https://gxc.gg/games/3tyac9/shapeion/tracks/f08a0bc7-67b3-4530-bd4a-85659b579ee4/", "option_operagx_interpolate_pixels": false, "option_operagx_mod_editUrl": "", - "option_operagx_mod_game_name": "${project_name}", + "option_operagx_mod_game_name": "Shapeion", "option_operagx_mod_guid": "", "option_operagx_mod_internalShareUrl": "", "option_operagx_mod_next_version": "1.0.0.0", diff --git a/scripts/Scripts/Scripts.gml b/scripts/Scripts/Scripts.gml index 305be08..caa7ec0 100644 --- a/scripts/Scripts/Scripts.gml +++ b/scripts/Scripts/Scripts.gml @@ -39,9 +39,9 @@ function scale_canvas() { ResizeScreen(); } -function draw_line_shadow(_array,_width=2,_col=c_black) { - if(_col != c_black) for(var i = 0; i < array_length(_array); i++) draw_line_width_color(_array[i][0],_array[i][1],_array[i][2],_array[i][3],_width+4,_col,_col); - for(var i = 0; i < array_length(_array); i++) draw_line_width_color(_array[i][0],_array[i][1],_array[i][2],_array[i][3],_width+2,c_black,c_black); +function draw_line_shadow(_array,_width=3,_col=c_black) { + if(_col != c_black) for(var i = 0; i < array_length(_array); i++) draw_line_width_color(_array[i][0],_array[i][1],_array[i][2],_array[i][3],_width+6,_col,_col); + for(var i = 0; i < array_length(_array); i++) draw_line_width_color(_array[i][0],_array[i][1],_array[i][2],_array[i][3],_width+4,c_black,c_black); for(var i = 0; i < array_length(_array); i++) draw_line_width(_array[i][0],_array[i][1],_array[i][2],_array[i][3],_width); } diff --git a/sounds/snCircle/snCircle.mp3 b/sounds/snCircle/snCircle.mp3 new file mode 100644 index 0000000..c9a9c7e Binary files /dev/null and b/sounds/snCircle/snCircle.mp3 differ diff --git a/sounds/snCircle/snCircle.yy b/sounds/snCircle/snCircle.yy new file mode 100644 index 0000000..2089182 --- /dev/null +++ b/sounds/snCircle/snCircle.yy @@ -0,0 +1,23 @@ +{ + "resourceType": "GMSound", + "resourceVersion": "1.0", + "name": "snCircle", + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "bitDepth": 1, + "bitRate": 128, + "compression": 0, + "conversionMode": 0, + "duration": 0.739437, + "parent": { + "name": "Sounds", + "path": "folders/Wall/Sounds.yy", + }, + "preload": false, + "sampleRate": 44100, + "soundFile": "snCircle.mp3", + "type": 0, + "volume": 1.0, +} \ No newline at end of file