diff --git a/Spaceinator.project.gmx b/Spaceinator.project.gmx index 6fc0227..b753b55 100644 --- a/Spaceinator.project.gmx +++ b/Spaceinator.project.gmx @@ -7,6 +7,7 @@ sound\snd_engine sound\snd_shoot + sound\snd_boom sprites\spr_player @@ -29,6 +30,8 @@ objects\obj_bullet objects\obj_asteriod objects\obj_chunk + objects\obj_boom_fx + objects\obj_chunk_item rooms\rm_game diff --git a/help.rtf b/help.rtf index 980a10c..727f5b8 100644 Binary files a/help.rtf and b/help.rtf differ diff --git a/objects/obj_asteriod.object.gmx b/objects/obj_asteriod.object.gmx index b10635e..783f7f4 100644 --- a/objects/obj_asteriod.object.gmx +++ b/objects/obj_asteriod.object.gmx @@ -5,7 +5,7 @@ -1 0 0 - <undefined> + obj_chunk_item <undefined> diff --git a/objects/obj_boom_fx.object.gmx b/objects/obj_boom_fx.object.gmx new file mode 100644 index 0000000..7a3806b --- /dev/null +++ b/objects/obj_boom_fx.object.gmx @@ -0,0 +1,63 @@ + + + spr_boom + 0 + -1 + -60 + 0 + <undefined> + <undefined> + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + audio_play_sound(snd_boom,3,false); + + + + + + + + 1 + 203 + 0 + 0 + 0 + -1 + 1 + action_kill_object + + self + 0 + 0 + + + + 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 bdad9cc..853247e 100644 --- a/objects/obj_bullet.object.gmx +++ b/objects/obj_bullet.object.gmx @@ -63,31 +63,26 @@ if(step_counter == 60*room_speed) 1 - 203 - 0 + 603 + 7 0 0 -1 - 1 - action_kill_object - - other - 0 - 0 - - - 1 - 203 - 0 - 0 - 0 - -1 - 1 - action_kill_object + 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 efacbea..4d8b132 100644 --- a/objects/obj_chunk.object.gmx +++ b/objects/obj_chunk.object.gmx @@ -26,10 +26,7 @@ 1 /// GENERATE CHUNK -var total_size = CHUNK_SIZE*TILE_SIZE; - -instance_list = array_create(total_size); -cur_inst = 0; +instance_list = ds_list_create(); loaded = true; // GENERATION @@ -37,10 +34,12 @@ for(var xx = 0; xx < CHUNK_SIZE*TILE_SIZE; xx+= TILE_SIZE) { for(var yy = 0; yy < CHUNK_SIZE*TILE_SIZE; yy+= TILE_SIZE) { - if(random_range(0,100) > 50) + if(random_range(0,100) < 5) { - instance_list[cur_inst] = instance_create(x+xx,y+yy, obj_asteriod); - cur_inst ++; + var inst = instance_create(x+xx,y+yy, obj_asteriod); + inst.CHUNK_CONTAINED = id; + + ds_list_add(instance_list, inst); } } } @@ -98,9 +97,9 @@ if(distance_to_object(obj_player) > chunk_total_size*3) 1 /// load -for(var i = 0; i < cur_inst; i++) +for(var i = 0; i < ds_list_size(instance_list); i++) { - instance_activate_object(instance_list[i]); + instance_activate_object(instance_list[| i]); } loaded = true; @@ -126,12 +125,11 @@ loaded = true; 1 /// unload -for(var i = 0; i < cur_inst; i++) +for(var i = 0; i < ds_list_size(instance_list); i++) { - instance_deactivate_object(instance_list[i]); + instance_deactivate_object(instance_list[| i]); } loaded = false; -show_debug_message("Unloading chunk: "+string(x)+","+string(y)); instance_deactivate_object(id); diff --git a/objects/obj_chunk_item.object.gmx b/objects/obj_chunk_item.object.gmx new file mode 100644 index 0000000..6fcb0b3 --- /dev/null +++ b/objects/obj_chunk_item.object.gmx @@ -0,0 +1,48 @@ + + + <undefined> + 0 + -1 + 0 + 0 + <undefined> + <undefined> + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + var indx = ds_list_find_index(CHUNK_CONTAINED.instance_list,id); +ds_list_delete(CHUNK_CONTAINED.instance_list,indx); + + + + + + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/objects/obj_controller_world_gen.object.gmx b/objects/obj_controller_world_gen.object.gmx index 148579b..9af7238 100644 --- a/objects/obj_controller_world_gen.object.gmx +++ b/objects/obj_controller_world_gen.object.gmx @@ -32,14 +32,12 @@ 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])); instance_create(cX[i],cY[i],obj_chunk); } else // load { if(chunkat.loaded = false) { - show_debug_message("Loading chunk: #"+string(chunkat)+" "+string(cX[i])+","+string(cY[i])); with(chunkat){ event_user(1); } diff --git a/objects/obj_player.object.gmx b/objects/obj_player.object.gmx index 616cfd5..9952387 100644 --- a/objects/obj_player.object.gmx +++ b/objects/obj_player.object.gmx @@ -3,7 +3,7 @@ spr_player 0 -1 - 0 + -100 0 <undefined> <undefined> diff --git a/sound/audio/snd_boom.wav b/sound/audio/snd_boom.wav new file mode 100644 index 0000000..48f9a73 Binary files /dev/null and b/sound/audio/snd_boom.wav differ diff --git a/sound/audio/sound2_435415__v-ktor__explosion10.wav b/sound/audio/sound2_435415__v-ktor__explosion10.wav new file mode 100644 index 0000000..48f9a73 Binary files /dev/null and b/sound/audio/sound2_435415__v-ktor__explosion10.wav differ diff --git a/sound/snd_boom.sound.gmx b/sound/snd_boom.sound.gmx new file mode 100644 index 0000000..3727040 --- /dev/null +++ b/sound/snd_boom.sound.gmx @@ -0,0 +1,29 @@ + + + 0 + .wav + sound\audio\snd_boom.wav + 0 + + 1 + + 0 + + 192 + + + 44100 + + + 1 + + + 16 + + -1 + snd_boom.wav + 1 + 1 + 0 + 0 + diff --git a/sound/sound2_435415__v-ktor__explosion10.sound.gmx b/sound/sound2_435415__v-ktor__explosion10.sound.gmx new file mode 100644 index 0000000..580cfec --- /dev/null +++ b/sound/sound2_435415__v-ktor__explosion10.sound.gmx @@ -0,0 +1,29 @@ + + + 0 + .wav + sound\audio\sound2_435415__v-ktor__explosion10.wav + 0 + + 1 + + 0 + + 192 + + + 44100 + + + 0 + + + 16 + + -1 + sound2_435415__v-ktor__explosion10.wav + 0 + 0 + 0 + 0 + diff --git a/sprites/images/spr_boom_0.png b/sprites/images/spr_boom_0.png index 84a3ef1..0b7a4a6 100644 Binary files a/sprites/images/spr_boom_0.png and b/sprites/images/spr_boom_0.png differ diff --git a/sprites/images/spr_boom_1.png b/sprites/images/spr_boom_1.png index c10cb9e..0004890 100644 Binary files a/sprites/images/spr_boom_1.png and b/sprites/images/spr_boom_1.png differ diff --git a/sprites/images/spr_boom_10.png b/sprites/images/spr_boom_10.png index fbaf9bb..bb27841 100644 Binary files a/sprites/images/spr_boom_10.png and b/sprites/images/spr_boom_10.png differ diff --git a/sprites/images/spr_boom_11.png b/sprites/images/spr_boom_11.png index 476b4fd..dbf7077 100644 Binary files a/sprites/images/spr_boom_11.png and b/sprites/images/spr_boom_11.png differ diff --git a/sprites/images/spr_boom_12.png b/sprites/images/spr_boom_12.png index 7ef52ad..49af930 100644 Binary files a/sprites/images/spr_boom_12.png and b/sprites/images/spr_boom_12.png differ diff --git a/sprites/images/spr_boom_13.png b/sprites/images/spr_boom_13.png index 5b930d0..38f64b1 100644 Binary files a/sprites/images/spr_boom_13.png and b/sprites/images/spr_boom_13.png differ diff --git a/sprites/images/spr_boom_14.png b/sprites/images/spr_boom_14.png index 951b812..d73eb3b 100644 Binary files a/sprites/images/spr_boom_14.png and b/sprites/images/spr_boom_14.png differ diff --git a/sprites/images/spr_boom_15.png b/sprites/images/spr_boom_15.png index adfb265..26509ad 100644 Binary files a/sprites/images/spr_boom_15.png and b/sprites/images/spr_boom_15.png differ diff --git a/sprites/images/spr_boom_16.png b/sprites/images/spr_boom_16.png index 53ee74f..db4c05d 100644 Binary files a/sprites/images/spr_boom_16.png and b/sprites/images/spr_boom_16.png differ diff --git a/sprites/images/spr_boom_17.png b/sprites/images/spr_boom_17.png index 0b75398..7fdb6c1 100644 Binary files a/sprites/images/spr_boom_17.png and b/sprites/images/spr_boom_17.png differ diff --git a/sprites/images/spr_boom_18.png b/sprites/images/spr_boom_18.png index 7eecf7b..29247b3 100644 Binary files a/sprites/images/spr_boom_18.png and b/sprites/images/spr_boom_18.png differ diff --git a/sprites/images/spr_boom_19.png b/sprites/images/spr_boom_19.png index 8b8122f..0593645 100644 Binary files a/sprites/images/spr_boom_19.png and b/sprites/images/spr_boom_19.png differ diff --git a/sprites/images/spr_boom_2.png b/sprites/images/spr_boom_2.png index 8f8da52..53f9c88 100644 Binary files a/sprites/images/spr_boom_2.png and b/sprites/images/spr_boom_2.png differ diff --git a/sprites/images/spr_boom_20.png b/sprites/images/spr_boom_20.png new file mode 100644 index 0000000..ccc667c Binary files /dev/null and b/sprites/images/spr_boom_20.png differ diff --git a/sprites/images/spr_boom_21.png b/sprites/images/spr_boom_21.png new file mode 100644 index 0000000..b4c1f93 Binary files /dev/null and b/sprites/images/spr_boom_21.png differ diff --git a/sprites/images/spr_boom_22.png b/sprites/images/spr_boom_22.png new file mode 100644 index 0000000..3dc346a Binary files /dev/null and b/sprites/images/spr_boom_22.png differ diff --git a/sprites/images/spr_boom_3.png b/sprites/images/spr_boom_3.png index bf94f6d..cd7707b 100644 Binary files a/sprites/images/spr_boom_3.png and b/sprites/images/spr_boom_3.png differ diff --git a/sprites/images/spr_boom_4.png b/sprites/images/spr_boom_4.png index 24ea3cd..82f486a 100644 Binary files a/sprites/images/spr_boom_4.png and b/sprites/images/spr_boom_4.png differ diff --git a/sprites/images/spr_boom_5.png b/sprites/images/spr_boom_5.png index 57b342f..31709d7 100644 Binary files a/sprites/images/spr_boom_5.png and b/sprites/images/spr_boom_5.png differ diff --git a/sprites/images/spr_boom_6.png b/sprites/images/spr_boom_6.png index c6ae13e..b0dd3a5 100644 Binary files a/sprites/images/spr_boom_6.png and b/sprites/images/spr_boom_6.png differ diff --git a/sprites/images/spr_boom_7.png b/sprites/images/spr_boom_7.png index 74ba19b..15f1034 100644 Binary files a/sprites/images/spr_boom_7.png and b/sprites/images/spr_boom_7.png differ diff --git a/sprites/images/spr_boom_8.png b/sprites/images/spr_boom_8.png index 7d6b1ff..78a894b 100644 Binary files a/sprites/images/spr_boom_8.png and b/sprites/images/spr_boom_8.png differ diff --git a/sprites/images/spr_boom_9.png b/sprites/images/spr_boom_9.png index 98f64cc..2ee396c 100644 Binary files a/sprites/images/spr_boom_9.png and b/sprites/images/spr_boom_9.png differ diff --git a/sprites/spr_asteroid.sprite.gmx b/sprites/spr_asteroid.sprite.gmx index e4a9d9f..e92ac39 100644 --- a/sprites/spr_asteroid.sprite.gmx +++ b/sprites/spr_asteroid.sprite.gmx @@ -1,8 +1,8 @@ 0 - 0 - 0 + 16 + 16 1 0 0 diff --git a/sprites/spr_boom.sprite.gmx b/sprites/spr_boom.sprite.gmx index 715ef65..eafc3bb 100644 --- a/sprites/spr_boom.sprite.gmx +++ b/sprites/spr_boom.sprite.gmx @@ -1,24 +1,24 @@ 0 - 0 - 0 + 16 + 16 1 0 0 0 0 - 511 + 31 0 - 183 + 31 0 0 0 0 - 512 - 256 + 32 + 32 images\spr_boom_0.png images\spr_boom_1.png @@ -40,5 +40,8 @@ images\spr_boom_17.png images\spr_boom_18.png images\spr_boom_19.png + images\spr_boom_20.png + images\spr_boom_21.png + images\spr_boom_22.png