The Uncle Appears

- Uncle Swordsman fully playable - That sweet, sweet Cool n Chill Secret music - In the middle of reworking backgrounds thanks to the mirror mode effect
JorJoe05 · Jul 19, 2023 · 609a2c4 · 609a2c4
1 parent 48e2f07
commit 609a2c4
Show file tree

Hide file tree

Showing 95 changed files with 1,196 additions and 96 deletions.
diff --git a/Super Freaks 1 Ultimate Edition.resource_order b/Super Freaks 1 Ultimate Edition.resource_order
diff --git a/Super Freaks 1 Ultimate Edition.yyp b/Super Freaks 1 Ultimate Edition.yyp
diff --git a/objects/obj_background_fruit/Draw_0.gml b/objects/obj_background_fruit/Draw_0.gml
diff --git a/objects/obj_background_fruit/Other_15.gml b/objects/obj_background_fruit/Other_15.gml
@@ -0,0 +1,6 @@
+/// @description Draw Background
+var _view_x1 = view_x1_get();
+var _view_y1 = view_y1_get();
+
+draw_sprite_tiled(spr_background_fruit_sky, alternate, (_view_x1 / 1.25) - _view_x1, (_view_y1 / 1.25) - _view_y1);
+draw_sprite_tiled(spr_background_fruit_juiceboxes, alternate, (_view_x1 / 1.5) - _view_x1, (_view_y1 / 1.5) - _view_y1);
diff --git a/objects/obj_background_fruit/obj_background_fruit.yy b/objects/obj_background_fruit/obj_background_fruit.yy
diff --git a/objects/obj_background_hippie/Draw_0.gml → objects/obj_background_hippie/Other_15.gml b/objects/obj_background_hippie/Draw_0.gml → objects/obj_background_hippie/Other_15.gml
@@ -1,12 +1,9 @@
-/// @description 
+/// @description Draw Background
 
 var _view_x1 = view_x1_get();
-var _view_y1 = view_y1_get();
 var _scroll_delta = lerp(scroll_previous, scroll, frame_delta_level_get());
 var _sky_color_top, _sky_color_bottom;
 
-event_inherited();
-
 if (alternate)
 {
 	_sky_color_top = make_color_rgb(255, 191, 236);
@@ -17,24 +14,11 @@ else
 	_sky_color_top = make_color_rgb(255, 173, 0);
 	_sky_color_bottom = c_orange;
 }
-draw_rectangle_color(view_x1_get(), view_y1_get(), view_x2_get(), view_y2_get(), _sky_color_top, _sky_color_top, _sky_color_bottom, _sky_color_bottom, false);
+draw_rectangle_color(0, 0, surface_get_width(surface), surface_get_height(surface), _sky_color_top, _sky_color_top, _sky_color_bottom, _sky_color_bottom, false);
 draw_set_color(c_white);
 
-surface_set_target(surface);
 //draw
 draw_sprite_parallax_x(spr_background_hippie_clouds,, _view_x1, view_height_get() - 64, 2, -_scroll_delta);
 draw_sprite_parallax_x(spr_background_hippie_flowers,, _view_x1, view_height_get(), 1.75, 0);
 draw_sprite_parallax_x(spr_background_hippie_clouds,, _view_x1, view_height_get() - 32, 1.5, -_scroll_delta * 3);
-draw_sprite_parallax_x(spr_background_hippie_clouds,, _view_x1, view_height_get(), 1, -_scroll_delta * 5);
-shader_reset();
-surface_reset_target();
-
-if (background_blur_get())
-{
-	shader_set(shader_blur);
-	shader_set_uniform_f(shader_get_uniform(shader_blur, "texture_size"), surface_get_width(surface), surface_get_height(surface));
-	draw_surface(surface, _view_x1, _view_y1);
-	shader_reset();
-}
-else
-	draw_surface(surface, _view_x1, _view_y1);
+draw_sprite_parallax_x(spr_background_hippie_clouds,, _view_x1, view_height_get(), 1, -_scroll_delta * 5);
diff --git a/objects/obj_background_hippie/obj_background_hippie.yy b/objects/obj_background_hippie/obj_background_hippie.yy
diff --git a/objects/obj_background_sky/Draw_0.gml b/objects/obj_background_sky/Draw_0.gml
diff --git a/objects/obj_background_sky/Other_15.gml b/objects/obj_background_sky/Other_15.gml
@@ -0,0 +1,13 @@
+/// @description Draw Background
+
+var _view_x1 = view_x1_get();
+var _view_height = view_height_get();
+var _scroll_delta = lerp(scroll_previous, scroll, frame_delta_level_get());
+
+draw_set_color(make_colour_rgb(0, 152, 255));
+draw_rectangle(0, 0, surface_get_width(surface), surface_get_height(surface), false);
+draw_set_color(c_white);
+
+draw_sprite_parallax_x(spr_background_sky_clouds,, _view_x1, _view_height - 64, 2, -_scroll_delta);
+draw_sprite_parallax_x(spr_background_sky_clouds,, _view_x1, _view_height - 32, 1.5, -_scroll_delta * 3);
+draw_sprite_parallax_x(spr_background_sky_clouds,, _view_x1, _view_height, 1, -_scroll_delta * 5);
diff --git a/objects/obj_background_sky/obj_background_sky.yy b/objects/obj_background_sky/obj_background_sky.yy
diff --git a/objects/obj_manager/Draw_72.gml b/objects/obj_manager/Draw_72.gml
@@ -4,7 +4,7 @@ if (!surface_exists(global.surface_HUD))
 	global.surface_HUD = surface_create(screen_width_get(), screen_height_get());
 else
 	surface_resize(global.surface_HUD, screen_width_get(), screen_height_get());
-	
+
 surface_set_target(global.surface_HUD);
 draw_clear_alpha(c_black, 0);
 surface_reset_target();
diff --git a/rooms/rm_secretice_1/RoomCreationCode.gml b/rooms/rm_secretice_1/RoomCreationCode.gml
@@ -1,4 +1,4 @@
-room_header(game_states.gameplay, msc_ice, room_directions.right);
+room_header(game_states.gameplay, msc_ice_secret, room_directions.right);
 tile_data_array_level_ice();
 with (global.view)
 {

diff --git a/rooms/rm_secretice_1/rm_secretice_1.yy b/rooms/rm_secretice_1/rm_secretice_1.yy
diff --git a/rooms/rm_secretice_2/RoomCreationCode.gml b/rooms/rm_secretice_2/RoomCreationCode.gml
@@ -1,2 +1,2 @@
-room_header(game_states.gameplay, msc_ice, room_directions.right);
+room_header(game_states.gameplay, msc_ice_secret, room_directions.right);
 tile_data_array_level_ice();
diff --git a/rooms/rm_secretice_2/rm_secretice_2.yy b/rooms/rm_secretice_2/rm_secretice_2.yy
diff --git a/rooms/rm_secretice_3/RoomCreationCode.gml b/rooms/rm_secretice_3/RoomCreationCode.gml
@@ -1,4 +1,4 @@
-room_header(game_states.gameplay, msc_ice, room_directions.up);
+room_header(game_states.gameplay, msc_ice_secret, room_directions.up);
 tile_data_array_level_ice();
 with (global.view)
 {