diff --git a/Spaceinator.project.gmx b/Spaceinator.project.gmx index 1ea62eb..5375ec3 100644 --- a/Spaceinator.project.gmx +++ b/Spaceinator.project.gmx @@ -14,7 +14,7 @@ sprites\spr_bullets sprites\spr_blocks sprites\spr_blackhole - sprites\spr_enemy + sprites\spr_broken_ship sprites\spr_asteroid sprites\spr_boom sprites\spr_chunk @@ -23,6 +23,7 @@ sprites\spr_button sprites\spr_hotbar sprites\spr_intentory + sprites\s @@ -41,6 +42,7 @@ objects\obj_asteriod + objects\obj_broken_ship objects\obj_chunk_item objects\obj_black_hole @@ -69,11 +71,12 @@ rooms\rm_title rooms\rm_game - + 32 16 0 1 + 2 help.rtf diff --git a/objects/obj_broken_ship.object.gmx b/objects/obj_broken_ship.object.gmx new file mode 100644 index 0000000..1a986b3 --- /dev/null +++ b/objects/obj_broken_ship.object.gmx @@ -0,0 +1,155 @@ + + + spr_broken_ship + 0 + -1 + 0 + 0 + obj_chunk_item + <undefined> + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + /// Init +image_speed = 0; +image_index = 0; +angle = random_range(0,180); +direction = angle; +image_angle = angle; + + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + with(instance_create(x,y,obj_dropped_item)) +{ + item_id = METAL; +} + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + /// Slow down if too fast +if(speed > 0) +{ + speed -= 1 +} + + +pull_towards_black_holes(); + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + speed = -20; + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + instance_destroy(id); + + + + + + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/objects/obj_bullet.object.gmx b/objects/obj_bullet.object.gmx index 9c9f3ae..3da98d7 100644 --- a/objects/obj_bullet.object.gmx +++ b/objects/obj_bullet.object.gmx @@ -57,6 +57,31 @@ if(step_counter == 60*room_speed || instance_position(x,y,obj_chunk) == noone) { instance_destroy(self); } + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + instance_destroy(other); +instance_create(other.x,other.y,obj_boom_fx) +instance_destroy(id); diff --git a/objects/obj_chunk.object.gmx b/objects/obj_chunk.object.gmx index 9da5575..73072d3 100644 --- a/objects/obj_chunk.object.gmx +++ b/objects/obj_chunk.object.gmx @@ -29,15 +29,26 @@ instance_list = ds_list_create(); loaded = true; var hasGeneratedBlackHole = false; +var hasGeneratedBrokenShip = false; // GENERATION for(var xx = 0; xx < CHUNK_SIZE*TILE_SIZE; xx+= TILE_SIZE) { for(var yy = 0; yy < CHUNK_SIZE*TILE_SIZE; yy+= TILE_SIZE) { - var rnd = random_range(0,5000); - - if(floor(rnd) == 1000) + var rnd = random_range(0,10000); + if(floor(rnd % 10000) == 8103) + { + if(hasGeneratedBrokenShip) + continue; + var inst = instance_create(x+xx,y+yy, obj_broken_ship); + inst.CHUNK_CONTAINED = self.id; + ds_list_add(instance_list, inst); + + hasGeneratedBrokenShip = true; + continue; + } + if(floor(rnd % 5000) == 1000) { if(hasGeneratedBlackHole) continue; diff --git a/objects/obj_controller.object.gmx b/objects/obj_controller.object.gmx index 3225f6d..c6da8cf 100644 --- a/objects/obj_controller.object.gmx +++ b/objects/obj_controller.object.gmx @@ -26,6 +26,7 @@ 1 global.debug = false +global.hide = false; @@ -50,15 +51,17 @@ 1 /// Draw HUD -if(!global.debug) -{ - draw_set_color(c_white); - draw_healthbar(10,10,500,30,(obj_player.energy/obj_player.energy_max)*100,c_gray,c_blue,c_navy,0,true,false); - draw_text(11,13,string(obj_player.energy)+" / "+string(obj_player.energy_max)); - - draw_healthbar(10,40,300,60,(obj_player.hp/obj_player.hp_max)*100,c_gray,c_red,c_green,0,true,false); - draw_text(11,43,string(obj_player.hp)+" / "+string(obj_player.hp_max)); - +if(!global.hide){ + if(!global.debug) + { + draw_set_color(c_white); + draw_healthbar(10,10,500,30,(obj_player.energy/obj_player.energy_max)*100,c_gray,c_blue,c_navy,0,true,false); + draw_text(11,13,string(obj_player.energy)+" / "+string(obj_player.energy_max)); + + draw_healthbar(10,40,300,60,(obj_player.hp/obj_player.hp_max)*100,c_gray,c_red,c_green,0,true,false); + draw_text(11,43,string(obj_player.hp)+" / "+string(obj_player.hp_max)); + + } } @@ -184,6 +187,38 @@ else { global.debug = false } + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + if(!global.hide) +{ + global.hide = true; + instance_destroy(obj_hotbar); +} +else +{ + global.hide = false + instance_create(0,0,obj_hotbar); +} diff --git a/objects/obj_player.object.gmx b/objects/obj_player.object.gmx index 52ed596..0307686 100644 --- a/objects/obj_player.object.gmx +++ b/objects/obj_player.object.gmx @@ -96,7 +96,7 @@ if(speed > 0) speed -= 1 } -if(energy >= 10 && is_moving && keyboard_check(vk_shift)) +if((energy >= 10 && is_moving && keyboard_check(vk_shift)) || (energy >= 10 && is_moving && gamepad_button_check(0,gp_face3))) { if(speed > 30) { @@ -258,6 +258,40 @@ if((mouse_check_button_pressed(mb_left) && os_type != os_psvita) || game } + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + damage_player(5); + +instance_create(other.x,other.y,obj_boom_fx); +other.direction = direction; +other.image_angle = image_angle; +other.speed = 20; + +speed = -20; + + + + diff --git a/sprites/images/s_0.png b/sprites/images/s_0.png new file mode 100644 index 0000000..cc19862 Binary files /dev/null and b/sprites/images/s_0.png differ diff --git a/sprites/images/spr_blocks_2.png b/sprites/images/spr_blocks_2.png new file mode 100644 index 0000000..e4c61f6 Binary files /dev/null and b/sprites/images/spr_blocks_2.png differ diff --git a/sprites/images/spr_broken_ship_0.png b/sprites/images/spr_broken_ship_0.png new file mode 100644 index 0000000..da20d49 Binary files /dev/null and b/sprites/images/spr_broken_ship_0.png differ diff --git a/sprites/images/spr_crafting_0.png b/sprites/images/spr_crafting_0.png new file mode 100644 index 0000000..79ac3df Binary files /dev/null and b/sprites/images/spr_crafting_0.png differ diff --git a/sprites/images/spr_final_0.png b/sprites/images/spr_final_0.png new file mode 100644 index 0000000..c954e80 Binary files /dev/null and b/sprites/images/spr_final_0.png differ diff --git a/sprites/images/spr_intentory_0.png b/sprites/images/spr_intentory_0.png index be676e3..2358ecf 100644 Binary files a/sprites/images/spr_intentory_0.png and b/sprites/images/spr_intentory_0.png differ diff --git a/sprites/spr_blocks.sprite.gmx b/sprites/spr_blocks.sprite.gmx index 042d5c7..1246b24 100644 --- a/sprites/spr_blocks.sprite.gmx +++ b/sprites/spr_blocks.sprite.gmx @@ -22,5 +22,6 @@ images\spr_blocks_0.png images\spr_blocks_1.png + images\spr_blocks_2.png diff --git a/sprites/spr_enemy.sprite.gmx b/sprites/spr_broken_ship.sprite.gmx similarity index 91% rename from sprites/spr_enemy.sprite.gmx rename to sprites/spr_broken_ship.sprite.gmx index 13e797a..542d20f 100644 --- a/sprites/spr_enemy.sprite.gmx +++ b/sprites/spr_broken_ship.sprite.gmx @@ -20,6 +20,6 @@ 32 32 - images\spr_enemy_0.png + images\spr_broken_ship_0.png diff --git a/sprites/spr_crafting.sprite.gmx b/sprites/spr_crafting.sprite.gmx new file mode 100644 index 0000000..ac9de69 --- /dev/null +++ b/sprites/spr_crafting.sprite.gmx @@ -0,0 +1,25 @@ + + + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 148 + 0 + 148 + 0 + 0 + + 0 + + 0 + 149 + 149 + + images\spr_crafting_0.png + + diff --git a/sprites/spr_final.sprite.gmx b/sprites/spr_final.sprite.gmx new file mode 100644 index 0000000..ee76453 --- /dev/null +++ b/sprites/spr_final.sprite.gmx @@ -0,0 +1,25 @@ + + + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 148 + 0 + 148 + 0 + 0 + + 0 + + 0 + 149 + 149 + + images\spr_final_0.png + +