From d7bf7512316e64a21efe6c201f0dad34d2b11263 Mon Sep 17 00:00:00 2001 From: array-in-a-matrix <> Date: Tue, 10 Aug 2021 00:07:54 -0400 Subject: [PATCH] game dev stuff idk --- Opera GX + GameMaker game jam - Space Jam.yyp | 2 +- objects/obj_laser/Collision_obj_rock.gml | 4 ++-- objects/obj_laser/Collision_obj_satalite_.gml | 12 ++++++++++++ objects/obj_level/Draw_0.gml | 2 +- objects/obj_level/Step_0.gml | 9 ++++++--- objects/obj_player_1/Step_0.gml | 3 ++- objects/obj_rock/Create_0.gml | 6 ++++-- objects/obj_rock/Step_0.gml | 7 ++++++- 8 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 objects/obj_laser/Collision_obj_satalite_.gml diff --git a/Opera GX + GameMaker game jam - Space Jam.yyp b/Opera GX + GameMaker game jam - Space Jam.yyp index be48298..a26990e 100644 --- a/Opera GX + GameMaker game jam - Space Jam.yyp +++ b/Opera GX + GameMaker game jam - Space Jam.yyp @@ -1,7 +1,6 @@ { "resources": [ {"id":{"name":"obj_player_2","path":"objects/obj_player_2/obj_player_2.yy",},"order":1,}, - {"id":{"name":"spr_rock_s","path":"sprites/spr_rock_s/spr_rock_s.yy",},"order":1,}, {"id":{"name":"obj_rock","path":"objects/obj_rock/obj_rock.yy",},"order":0,}, {"id":{"name":"rm_gameover","path":"rooms/rm_gameover/rm_gameover.yy",},"order":2,}, {"id":{"name":"spr_player_1","path":"sprites/spr_player_1/spr_player_1.yy",},"order":0,}, @@ -12,6 +11,7 @@ {"id":{"name":"obj_level","path":"objects/obj_level/obj_level.yy",},"order":0,}, {"id":{"name":"rm_level_1","path":"rooms/rm_level_1/rm_level_1.yy",},"order":0,}, {"id":{"name":"spr_rock","path":"sprites/spr_rock/spr_rock.yy",},"order":0,}, + {"id":{"name":"spr_rock_s","path":"sprites/spr_rock_s/spr_rock_s.yy",},"order":1,}, {"id":{"name":"nt_todo","path":"notes/nt_todo/nt_todo.yy",},"order":0,}, {"id":{"name":"obj_dust","path":"objects/obj_dust/obj_dust.yy",},"order":0,}, {"id":{"name":"rm_title","path":"rooms/rm_title/rm_title.yy",},"order":3,}, diff --git a/objects/obj_laser/Collision_obj_rock.gml b/objects/obj_laser/Collision_obj_rock.gml index 7aa758d..505dc4f 100644 --- a/objects/obj_laser/Collision_obj_rock.gml +++ b/objects/obj_laser/Collision_obj_rock.gml @@ -12,8 +12,8 @@ with(other){ }; if(sprite_index == spr_rock){ - var extra_life = choose( irandom_range(1, 10)); - if(extra_life == 2){ + var one_out_of_ten = choose( irandom_range(1, 10)); + if(one_out_of_ten == 2){ instance_create_layer(x,y,"Instances", obj_life); }; repeat(3){ diff --git a/objects/obj_laser/Collision_obj_satalite_.gml b/objects/obj_laser/Collision_obj_satalite_.gml new file mode 100644 index 0000000..6e15d21 --- /dev/null +++ b/objects/obj_laser/Collision_obj_satalite_.gml @@ -0,0 +1,12 @@ +/// @description Insert description here +// You can write your code in this editor +instance_destroy(); + +with(other){ + + instance_destroy(); + repeat(15){ + instance_create_layer(x,y,"Instances",obj_dust); + }; + +}; \ No newline at end of file diff --git a/objects/obj_level/Draw_0.gml b/objects/obj_level/Draw_0.gml index 8940744..7f4633a 100644 --- a/objects/obj_level/Draw_0.gml +++ b/objects/obj_level/Draw_0.gml @@ -21,7 +21,7 @@ switch (room){ draw_set_halign(fa_center) draw_text_transformed_color(room_width/2, 100, "Eternal Space", 3, 3, 0, c_yellow, c_white, c_yellow, c_white, 1); draw_text(room_width/2, room_height/2, "Grab a friend and try to last as long as possible!"); - draw_text(room_width/2, room_height/2 + 50, ">> Press enter to start <<"); + draw_text(room_width/2, room_height/2 + 50, ">> (solo) Press enter to start <<"); draw_set_halign(fa_left) break; }; \ No newline at end of file diff --git a/objects/obj_level/Step_0.gml b/objects/obj_level/Step_0.gml index a2def32..2c3b889 100644 --- a/objects/obj_level/Step_0.gml +++ b/objects/obj_level/Step_0.gml @@ -1,15 +1,18 @@ /// @description Insert description here // You can write your code in this editor -if(room == rm_level_1 && lives <= 0){ +if((room == rm_level_1)&& lives <= 0){ room_goto(rm_gameover); }; -if((room == rm_gameover || room == rm_title) && keyboard_check_pressed(vk_enter)){ +if((room == rm_gameover || room == rm_title)){ lives = 3; score = 0; + if(keyboard_check_pressed(vk_enter)){ room_goto(rm_level_1); + }; + }; if (score >= highscore){ highscore = score; -}; \ No newline at end of file +}; diff --git a/objects/obj_player_1/Step_0.gml b/objects/obj_player_1/Step_0.gml index d9ac716..1e5b1a3 100644 --- a/objects/obj_player_1/Step_0.gml +++ b/objects/obj_player_1/Step_0.gml @@ -15,7 +15,7 @@ move_wrap(true, true, sprite_height/2); // DEBUG - +/* if(keyboard_check(ord("Q"))){ instance_create_layer(x,y, "Instances", obj_laser); }; @@ -27,3 +27,4 @@ if(keyboard_check(ord("D"))){ if(keyboard_check(ord("A"))){ score += 100000; }; +*/ \ No newline at end of file diff --git a/objects/obj_rock/Create_0.gml b/objects/obj_rock/Create_0.gml index da5ca9c..626fe25 100644 --- a/objects/obj_rock/Create_0.gml +++ b/objects/obj_rock/Create_0.gml @@ -1,7 +1,9 @@ /// @description Insert description here // You can write your code in this editor - +sprite_index = choose(spr_rock,spr_rock_s); direction = irandom_range(160, 200); image_angle = irandom_range(0, 359); -speed = 5; \ No newline at end of file +speed = 5; + +angle = choose(irandom_range(0, 1)); \ No newline at end of file diff --git a/objects/obj_rock/Step_0.gml b/objects/obj_rock/Step_0.gml index f9c4439..540094a 100644 --- a/objects/obj_rock/Step_0.gml +++ b/objects/obj_rock/Step_0.gml @@ -1,3 +1,8 @@ /// @description Insert description here // You can write your code in this editor -image_angle += 1; \ No newline at end of file + +if(angle){ + image_angle -= 1; +}else{ + image_angle += 1; +};