Skip to content

Commit

Permalink
Your honor, League of Legends
Browse files Browse the repository at this point in the history
DEATH, aka Barrel Secret hard mode
  • Loading branch information
SuperFreaksDev committed Feb 2, 2023
1 parent bef07f3 commit 9042031
Show file tree
Hide file tree
Showing 12 changed files with 233 additions and 58 deletions.
33 changes: 17 additions & 16 deletions Super Freaks 1 Ultimate Edition.resource_order
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{"name":"Mega Klaw","order":4,"path":"folders/Objects/Bosses/Mega Klaw.yy",},
{"name":"Milk Man","order":3,"path":"folders/Objects/Bosses/Milk Man.yy",},
{"name":"Enemies","order":4,"path":"folders/Objects/Enemies.yy",},
{"name":"Enemy Behaviors","order":33,"path":"folders/Objects/Enemies/Enemy Behaviors.yy",},
{"name":"Enemy Behaviors","order":34,"path":"folders/Objects/Enemies/Enemy Behaviors.yy",},
{"name":"Level Design","order":2,"path":"folders/Objects/Level Design.yy",},
{"name":"Levels","order":1,"path":"folders/Objects/Levels.yy",},
{"name":"Castle Kranion","order":8,"path":"folders/Objects/Levels/Castle Kranion.yy",},
Expand Down Expand Up @@ -222,7 +222,7 @@
{"name":"msc_toy","order":6,"path":"sounds/msc_toy/msc_toy.yy",},
{"name":"path_park_2_normal_4","order":5,"path":"paths/path_park_2_normal_4/path_park_2_normal_4.yy",},
{"name":"spr_skulljar","order":3,"path":"sprites/spr_skulljar/spr_skulljar.yy",},
{"name":"obj_drillobee","order":27,"path":"objects/obj_drillobee/obj_drillobee.yy",},
{"name":"obj_drillobee","order":28,"path":"objects/obj_drillobee/obj_drillobee.yy",},
{"name":"path_secretice_3_number_star_1","order":4,"path":"paths/path_secretice_3_number_star_1/path_secretice_3_number_star_1.yy",},
{"name":"path_hippie_1_normal_1","order":1,"path":"paths/path_hippie_1_normal_1/path_hippie_1_normal_1.yy",},
{"name":"msc_castle","order":14,"path":"sounds/msc_castle/msc_castle.yy",},
Expand Down Expand Up @@ -290,7 +290,7 @@
{"name":"path_ice_5_normal_5","order":18,"path":"paths/path_ice_5_normal_5/path_ice_5_normal_5.yy",},
{"name":"spr_platform_card","order":2,"path":"sprites/spr_platform_card/spr_platform_card.yy",},
{"name":"path_toy_time_star_1","order":4,"path":"paths/path_toy_time_star_1/path_toy_time_star_1.yy",},
{"name":"obj_hivemind","order":26,"path":"objects/obj_hivemind/obj_hivemind.yy",},
{"name":"obj_hivemind","order":27,"path":"objects/obj_hivemind/obj_hivemind.yy",},
{"name":"path_star_2_normal_3","order":8,"path":"paths/path_star_2_normal_3/path_star_2_normal_3.yy",},
{"name":"sfx_stararrow","order":32,"path":"sounds/sfx_stararrow/sfx_stararrow.yy",},
{"name":"obj_platform_redblue_controller","order":2,"path":"objects/obj_platform_redblue_controller/obj_platform_redblue_controller.yy",},
Expand Down Expand Up @@ -357,9 +357,9 @@
{"name":"sky_number_star_path_1","order":1,"path":"paths/sky_number_star_path_1/sky_number_star_path_1.yy",},
{"name":"obj_view_trapper","order":3,"path":"objects/obj_view_trapper/obj_view_trapper.yy",},
{"name":"path_lightning_3_normal_1","order":3,"path":"paths/path_lightning_3_normal_1/path_lightning_3_normal_1.yy",},
{"name":"obj_enemy_fireball","order":28,"path":"objects/obj_enemy_fireball/obj_enemy_fireball.yy",},
{"name":"obj_enemy_fireball","order":29,"path":"objects/obj_enemy_fireball/obj_enemy_fireball.yy",},
{"name":"path_park_4_normal_2","order":15,"path":"paths/path_park_4_normal_2/path_park_4_normal_2.yy",},
{"name":"obj_buckler","order":23,"path":"objects/obj_buckler/obj_buckler.yy",},
{"name":"obj_buckler","order":24,"path":"objects/obj_buckler/obj_buckler.yy",},
{"name":"obj_crackerbarrel","order":15,"path":"objects/obj_crackerbarrel/obj_crackerbarrel.yy",},
{"name":"spr_cutscene_intro_5","order":4,"path":"sprites/spr_cutscene_intro_5/spr_cutscene_intro_5.yy",},
{"name":"rm_ship_4","order":5,"path":"rooms/rm_ship_4/rm_ship_4.yy",},
Expand All @@ -372,7 +372,7 @@
{"name":"spr_font_title_card","order":2,"path":"sprites/spr_font_title_card/spr_font_title_card.yy",},
{"name":"msc_canyon","order":8,"path":"sounds/msc_canyon/msc_canyon.yy",},
{"name":"path_star_2_hard_1","order":15,"path":"paths/path_star_2_hard_1/path_star_2_hard_1.yy",},
{"name":"obj_headshot","order":20,"path":"objects/obj_headshot/obj_headshot.yy",},
{"name":"obj_headshot","order":21,"path":"objects/obj_headshot/obj_headshot.yy",},
{"name":"path_ice_4_normal_6","order":10,"path":"paths/path_ice_4_normal_6/path_ice_4_normal_6.yy",},
{"name":"path_ice_5_normal_3","order":16,"path":"paths/path_ice_5_normal_3/path_ice_5_normal_3.yy",},
{"name":"scr_collider_attach","order":2,"path":"scripts/scr_collider_attach/scr_collider_attach.yy",},
Expand Down Expand Up @@ -421,7 +421,7 @@
{"name":"path_lightning_3_time_star_1","order":8,"path":"paths/path_lightning_3_time_star_1/path_lightning_3_time_star_1.yy",},
{"name":"obj_boss_cinge_heat_haze","order":1,"path":"objects/obj_boss_cinge_heat_haze/obj_boss_cinge_heat_haze.yy",},
{"name":"path_secretice_4_normal_6","order":11,"path":"paths/path_secretice_4_normal_6/path_secretice_4_normal_6.yy",},
{"name":"obj_fusey","order":18,"path":"objects/obj_fusey/obj_fusey.yy",},
{"name":"obj_fusey","order":19,"path":"objects/obj_fusey/obj_fusey.yy",},
{"name":"spr_menu_arrow_16","order":4,"path":"sprites/spr_menu_arrow_16/spr_menu_arrow_16.yy",},
{"name":"sfx_yell_wilhelm","order":39,"path":"sounds/sfx_yell_wilhelm/sfx_yell_wilhelm.yy",},
{"name":"spr_player_hang_gambi","order":12,"path":"sprites/spr_player_hang_gambi/spr_player_hang_gambi.yy",},
Expand Down Expand Up @@ -468,14 +468,14 @@
{"name":"rm_toy_2","order":1,"path":"rooms/rm_toy_2/rm_toy_2.yy",},
{"name":"obj_gameplay_parent","order":4,"path":"objects/obj_gameplay_parent/obj_gameplay_parent.yy",},
{"name":"path_secrethippie_1_normal_1","order":1,"path":"paths/path_secrethippie_1_normal_1/path_secrethippie_1_normal_1.yy",},
{"name":"obj_jawnsy","order":24,"path":"objects/obj_jawnsy/obj_jawnsy.yy",},
{"name":"obj_jawnsy","order":25,"path":"objects/obj_jawnsy/obj_jawnsy.yy",},
{"name":"tileset_park","order":1,"path":"tilesets/tileset_park/tileset_park.yy",},
{"name":"obj_platform_fan","order":1,"path":"objects/obj_platform_fan/obj_platform_fan.yy",},
{"name":"obj_yorb_physics","order":2,"path":"objects/obj_yorb_physics/obj_yorb_physics.yy",},
{"name":"spr_happy_heart","order":2,"path":"sprites/spr_happy_heart/spr_happy_heart.yy",},
{"name":"sky_mesh_path_7","order":8,"path":"paths/sky_mesh_path_7/sky_mesh_path_7.yy",},
{"name":"msc_victory","order":19,"path":"sounds/msc_victory/msc_victory.yy",},
{"name":"obj_explosion_bomb","order":32,"path":"objects/obj_explosion_bomb/obj_explosion_bomb.yy",},
{"name":"obj_explosion_bomb","order":33,"path":"objects/obj_explosion_bomb/obj_explosion_bomb.yy",},
{"name":"path_hippie_4_normal_8","order":27,"path":"paths/path_hippie_4_normal_8/path_hippie_4_normal_8.yy",},
{"name":"path_hippie_4_normal_5","order":24,"path":"paths/path_hippie_4_normal_5/path_hippie_4_normal_5.yy",},
{"name":"scr_visual_shaders","order":4,"path":"scripts/scr_visual_shaders/scr_visual_shaders.yy",},
Expand Down Expand Up @@ -520,7 +520,7 @@
{"name":"rm_canyon_3","order":3,"path":"rooms/rm_canyon_3/rm_canyon_3.yy",},
{"name":"spr_cannon_flower","order":5,"path":"sprites/spr_cannon_flower/spr_cannon_flower.yy",},
{"name":"sfx_walk_rapid","order":36,"path":"sounds/sfx_walk_rapid/sfx_walk_rapid.yy",},
{"name":"obj_spinesweeper","order":19,"path":"objects/obj_spinesweeper/obj_spinesweeper.yy",},
{"name":"obj_spinesweeper","order":20,"path":"objects/obj_spinesweeper/obj_spinesweeper.yy",},
{"name":"path_star_1_normal_4","order":4,"path":"paths/path_star_1_normal_4/path_star_1_normal_4.yy",},
{"name":"spr_player_pole_turn_quincy","order":11,"path":"sprites/spr_player_pole_turn_quincy/spr_player_pole_turn_quincy.yy",},
{"name":"spr_rolling_apple","order":2,"path":"sprites/spr_rolling_apple/spr_rolling_apple.yy",},
Expand All @@ -545,11 +545,12 @@
{"name":"obj_platform_redblue","order":3,"path":"objects/obj_platform_redblue/obj_platform_redblue.yy",},
{"name":"spr_megaklaw_fly","order":1,"path":"sprites/spr_megaklaw_fly/spr_megaklaw_fly.yy",},
{"name":"tileset_stadium","order":1,"path":"tilesets/tileset_stadium/tileset_stadium.yy",},
{"name":"obj_kranibomb","order":31,"path":"objects/obj_kranibomb/obj_kranibomb.yy",},
{"name":"obj_kranibomb","order":32,"path":"objects/obj_kranibomb/obj_kranibomb.yy",},
{"name":"spr_player_pole_turn_tikiman","order":11,"path":"sprites/spr_player_pole_turn_tikiman/spr_player_pole_turn_tikiman.yy",},
{"name":"path_park_2_normal_6","order":7,"path":"paths/path_park_2_normal_6/path_park_2_normal_6.yy",},
{"name":"spr_boss_cinge_shoot_prepare","order":1,"path":"sprites/spr_boss_cinge_shoot_prepare/spr_boss_cinge_shoot_prepare.yy",},
{"name":"obj_room_transition_level","order":4,"path":"objects/obj_room_transition_level/obj_room_transition_level.yy",},
{"name":"obj_crackerball_giant","order":18,"path":"objects/obj_crackerball_giant/obj_crackerball_giant.yy",},
{"name":"tileset_canyon","order":1,"path":"tilesets/tileset_canyon/tileset_canyon.yy",},
{"name":"spr_megaklaw_stuck","order":3,"path":"sprites/spr_megaklaw_stuck/spr_megaklaw_stuck.yy",},
{"name":"obj_flower_propeller","order":4,"path":"objects/obj_flower_propeller/obj_flower_propeller.yy",},
Expand Down Expand Up @@ -579,7 +580,7 @@
{"name":"path_secrethippie_3_normal_5","order":10,"path":"paths/path_secrethippie_3_normal_5/path_secrethippie_3_normal_5.yy",},
{"name":"spr_background_ice","order":2,"path":"sprites/spr_background_ice/spr_background_ice.yy",},
{"name":"Victory Messages","order":7,"path":"notes/Victory Messages/Victory Messages.yy",},
{"name":"obj_germa","order":25,"path":"objects/obj_germa/obj_germa.yy",},
{"name":"obj_germa","order":26,"path":"objects/obj_germa/obj_germa.yy",},
{"name":"sfx_fall","order":14,"path":"sounds/sfx_fall/sfx_fall.yy",},
{"name":"spr_background_lightning_clouds","order":6,"path":"sprites/spr_background_lightning_clouds/spr_background_lightning_clouds.yy",},
{"name":"path_park_4_normal_4","order":17,"path":"paths/path_park_4_normal_4/path_park_4_normal_4.yy",},
Expand Down Expand Up @@ -611,7 +612,7 @@
{"name":"secretcanyon_3_path_number_star_1","order":4,"path":"paths/secretcanyon_3_path_number_star_1/secretcanyon_3_path_number_star_1.yy",},
{"name":"obj_trophy","order":14,"path":"objects/obj_trophy/obj_trophy.yy",},
{"name":"rm_secretfruit_3","order":2,"path":"rooms/rm_secretfruit_3/rm_secretfruit_3.yy",},
{"name":"obj_mcginty","order":21,"path":"objects/obj_mcginty/obj_mcginty.yy",},
{"name":"obj_mcginty","order":22,"path":"objects/obj_mcginty/obj_mcginty.yy",},
{"name":"spr_background_park","order":4,"path":"sprites/spr_background_park/spr_background_park.yy",},
{"name":"scr_sprites","order":6,"path":"scripts/scr_sprites/scr_sprites.yy",},
{"name":"scr_collider_detectors","order":5,"path":"scripts/scr_collider_detectors/scr_collider_detectors.yy",},
Expand Down Expand Up @@ -656,7 +657,7 @@
{"name":"scr_rooms","order":1,"path":"scripts/scr_rooms/scr_rooms.yy",},
{"name":"path_stadium_3_normal_7","order":11,"path":"paths/path_stadium_3_normal_7/path_stadium_3_normal_7.yy",},
{"name":"path_park_5_normal_2","order":22,"path":"paths/path_park_5_normal_2/path_park_5_normal_2.yy",},
{"name":"obj_plughead","order":22,"path":"objects/obj_plughead/obj_plughead.yy",},
{"name":"obj_plughead","order":23,"path":"objects/obj_plughead/obj_plughead.yy",},
{"name":"spr_star_background_bricks","order":4,"path":"sprites/spr_star_background_bricks/spr_star_background_bricks.yy",},
{"name":"path_secrethippie_3_time_star_1","order":8,"path":"paths/path_secrethippie_3_time_star_1/path_secrethippie_3_time_star_1.yy",},
{"name":"sfx_bite","order":1,"path":"sounds/sfx_bite/sfx_bite.yy",},
Expand Down Expand Up @@ -755,7 +756,7 @@
{"name":"obj_hint_screen","order":6,"path":"objects/obj_hint_screen/obj_hint_screen.yy",},
{"name":"spr_path_orb","order":5,"path":"sprites/spr_path_orb/spr_path_orb.yy",},
{"name":"obj_skulljar","order":4,"path":"objects/obj_skulljar/obj_skulljar.yy",},
{"name":"obj_enemy_shockwave","order":29,"path":"objects/obj_enemy_shockwave/obj_enemy_shockwave.yy",},
{"name":"obj_enemy_shockwave","order":30,"path":"objects/obj_enemy_shockwave/obj_enemy_shockwave.yy",},
{"name":"player_state_dropin","order":1,"path":"scripts/player_state_dropin/player_state_dropin.yy",},
{"name":"spr_boss_cinge_getup","order":6,"path":"sprites/spr_boss_cinge_getup/spr_boss_cinge_getup.yy",},
{"name":"spr_cutscene_xfreaks_5","order":4,"path":"sprites/spr_cutscene_xfreaks_5/spr_cutscene_xfreaks_5.yy",},
Expand Down Expand Up @@ -797,7 +798,7 @@
{"name":"rm_cutscene_antifreaks_intro","order":2,"path":"rooms/rm_cutscene_antifreaks_intro/rm_cutscene_antifreaks_intro.yy",},
{"name":"Menus","order":2,"path":"notes/Menus/Menus.yy",},
{"name":"scr_zones","order":3,"path":"scripts/scr_zones/scr_zones.yy",},
{"name":"obj_enemy_electric_ball","order":30,"path":"objects/obj_enemy_electric_ball/obj_enemy_electric_ball.yy",},
{"name":"obj_enemy_electric_ball","order":31,"path":"objects/obj_enemy_electric_ball/obj_enemy_electric_ball.yy",},
{"name":"obj_heavy_door_block","order":19,"path":"objects/obj_heavy_door_block/obj_heavy_door_block.yy",},
{"name":"spr_gamepad_buttons_switchjoyconl","order":8,"path":"sprites/spr_gamepad_buttons_switchjoyconl/spr_gamepad_buttons_switchjoyconl.yy",},
{"name":"spr_player_skid_quincy","order":3,"path":"sprites/spr_player_skid_quincy/spr_player_skid_quincy.yy",},
Expand Down
1 change: 1 addition & 0 deletions Super Freaks 1 Ultimate Edition.yyp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 4 additions & 12 deletions objects/obj_crackerball/Collision_obj_player.gml
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
/// @description

if (!indestructible)
{
with (other)
player_hurt();
instance_create_layer(x, y, "layer_instances", obj_explosion_bomb);
instance_destroy();
}
else
{
with (other)
state_next_set(player_states.death, 999999);
}
with (other)
player_hurt();
instance_create_layer(x, y, "layer_instances", obj_explosion_bomb);
instance_destroy();
4 changes: 1 addition & 3 deletions objects/obj_crackerball/obj_crackerball.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions objects/obj_crackerball_giant/Collision_obj_player.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/// @description

with (other)
state_next_set(player_states.death, 999999);
6 changes: 6 additions & 0 deletions objects/obj_crackerball_giant/Create_0.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/// @description Init

// Inherit the parent event
event_inherited();

can_despawn = false;
44 changes: 44 additions & 0 deletions objects/obj_crackerball_giant/obj_crackerball_giant.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion objects/obj_yorb_star/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,8 @@ animate_speed = 0.125;
flashlight_radius = 48;
depth = 4;

if (hearts_maximum_get() >= 10 || global.checkpoint_death_count < CHECKPOINT_DEATH_MAX || checkpoint_id != checkpoint_id_get() || (global.game_mode != game_modes.normal && global.game_mode != game_modes.free_play))
if (hearts_maximum_get() != clamp(hearts_maximum_get(), 1, 10)
|| global.checkpoint_death_count < CHECKPOINT_DEATH_MAX
|| checkpoint_id != checkpoint_id_get()
|| (global.game_mode != game_modes.normal && global.game_mode != game_modes.free_play))
instance_destroy();
Loading

0 comments on commit 9042031

Please sign in to comment.