Added Circles

BenjaminHalko · Aug 11, 2023 · 3831442 · 3831442
1 parent 25a1692
commit 3831442
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 12 deletions.
diff --git a/Audio/Shapes Normalized/Circle.mp3 b/Audio/Shapes Normalized/Circle.mp3
diff --git a/Audio/Shapes RAW/Circle.mp3 b/Audio/Shapes RAW/Circle.mp3
diff --git 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
diff --git a/fonts/fontGui/fontGui.yy b/fonts/fontGui/fontGui.yy
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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
diff --git a/sounds/snCircle/snCircle.yy b/sounds/snCircle/snCircle.yy
-Original file line number
+Diff line change
@@ Expand Up / @@ -263,7 +263,7 @@ if os_type == os_android { @@
     					if _percent <= 0 break;
     				}
-    				draw_line_shadow(_shapeArrayCol,4);
+    				draw_line_shadow(_shapeArrayCol,5);
     			}
     		}
     	}
@@ Expand Down @@