diff --git a/objects/obj_asteriod.object.gmx b/objects/obj_asteriod.object.gmx index f0cf1a9..8e18131 100644 --- a/objects/obj_asteriod.object.gmx +++ b/objects/obj_asteriod.object.gmx @@ -26,7 +26,7 @@ 1 image_speed = 0; -image_index = random_range(0,1); +image_index = random_range(0,2); angle = random_range(0,180); direction = angle; image_angle = angle; diff --git a/objects/obj_controller_world_gen.object.gmx b/objects/obj_controller_world_gen.object.gmx index ee8635e..c660b06 100644 --- a/objects/obj_controller_world_gen.object.gmx +++ b/objects/obj_controller_world_gen.object.gmx @@ -31,7 +31,7 @@ - + 1 603 @@ -55,6 +55,7 @@ for(var i = 0; i < 16; i ++) var chunkat = instance_position(cX[i], cY[i],obj_chunk); if(chunkat == noone) // create { + show_debug_message("Generating Chunk: "+string(cX[i])+","+string(cY[i])); var chunkInstId = instance_create(cX[i],cY[i],obj_chunk); ds_list_add(global.allchunks,chunkInstId); } @@ -62,6 +63,7 @@ for(var i = 0; i < 16; i ++) { if(chunkat.loaded = false) { + show_debug_message("Loading Chunk: "+string(cX[i])+","+string(cY[i])); with(chunkat){ event_user(1); } @@ -73,7 +75,7 @@ for(var i = 0; i < 16; i ++) - + 1 603 @@ -140,7 +142,6 @@ for(var xx = 0; xx < 4; xx++) } } -alarm[0] = 1; diff --git a/objects/obj_player.object.gmx b/objects/obj_player.object.gmx index eaf8c56..3b1d240 100644 --- a/objects/obj_player.object.gmx +++ b/objects/obj_player.object.gmx @@ -313,7 +313,9 @@ if(energy >= 20) 1 - if(dead == false) + /// Show Game over screen + +if(dead == false) { return 0; } diff --git a/objects/obj_respawn.object.gmx b/objects/obj_respawn.object.gmx index de93cd8..1d8ab23 100644 --- a/objects/obj_respawn.object.gmx +++ b/objects/obj_respawn.object.gmx @@ -56,6 +56,8 @@ obj_player.y = obj_player.ystart; obj_player.energy = obj_player.energy_max; obj_player.hp = obj_player.hp_max; +obj_player.speed = 0; +obj_player.invuln_counter = 0; obj_player.dead = false; obj_player.visible = true; obj_player.image_speed = 0; diff --git a/sprites/images/spr_asteroid_2.png b/sprites/images/spr_asteroid_2.png new file mode 100644 index 0000000..8e8a041 Binary files /dev/null and b/sprites/images/spr_asteroid_2.png differ diff --git a/sprites/spr_asteroid.sprite.gmx b/sprites/spr_asteroid.sprite.gmx index e92ac39..59c8f98 100644 --- a/sprites/spr_asteroid.sprite.gmx +++ b/sprites/spr_asteroid.sprite.gmx @@ -8,9 +8,9 @@ 0 0 1 - 25 + 29 4 - 24 + 30 0 0 @@ -22,5 +22,6 @@ images\spr_asteroid_0.png images\spr_asteroid_1.png + images\spr_asteroid_2.png