DiamondCreeper75/spaceinator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator

Browse Source
This commit is contained in:
JoshuanBurger12 2020-07-25 20:35:58 +12:00
commit 3652f71f76
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
objects/obj_bullet.object.gmx
View File

@ -49,7 +49,9 @@ image_speed = 0;
<arguments> <arguments>
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string>step_counter ++; <string>pull_towards_black_holes();
step_counter ++;
if(step_counter == 60*room_speed || instance_position(x,y,obj_chunk) == noone) if(step_counter == 60*room_speed || instance_position(x,y,obj_chunk) == noone)
{ {
@ -60,6 +62,22 @@ if(step_counter == 60*room_speed || instance_position(x,y,obj_chunk) == noone)
</arguments> </arguments>
</action> </action>
</event> </event>
<event eventtype="4" ename="obj_black_hole">
<action>
<libid>1</libid>
<id>203</id>
<kind>0</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>1</exetype>
<functionname>action_kill_object</functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
</action>
</event>
<event eventtype="4" ename="obj_asteriod"> <event eventtype="4" ename="obj_asteriod">
<action> <action>
<libid>1</libid> <libid>1</libid>

15
objects/obj_player.object.gmx
View File

@ -63,20 +63,22 @@ hp = hp_max;
<string>/// Player per frame <string>/// Player per frame
if(dead == true) if(dead == true)
{ {
gravity = 0;
speed = 0;
direction = 0;
return 0; return 0;
} }
if(hp &lt;= 0) if(hp &lt;= 0 &amp;&amp; !dead)
{ {
speed = 0; speed = 0;
direction = 0; direction = 0;
audio_stop_all(); instance_create(x,y,obj_boom_fx);
audio_play_sound(snd_boom,10,false);
sprite_index = spr_boom; sprite_index = spr_boom;
image_speed = 1; image_speed = 1;
hp = -1; dead = true;
dead = true
} }
direction = image_angle direction = image_angle
@ -365,10 +367,9 @@ if(dead == false)
{ {
return 0; return 0;
} }
visible = false;
obj_controller.visible = false; obj_controller.visible = false;
image_speed = 0; image_speed = 0;
visible = false;
instance_create(view_xview[0]+(view_wview[0]/2),view_yview[0]+(view_hview[0]/2),obj_gameover_overlay); instance_create(view_xview[0]+(view_wview[0]/2),view_yview[0]+(view_hview[0]/2),obj_gameover_overlay);
instance_create(view_xview[0]+(view_wview[0]/2),view_yview[0]+(view_hview[0]/2),obj_respawn); instance_create(view_xview[0]+(view_wview[0]/2),view_yview[0]+(view_hview[0]/2),obj_respawn);