From 520095a5f25ec327e3d6d87317123fee10d4acae Mon Sep 17 00:00:00 2001
From: SilicaAndPina <earsyum@gmail.com>
Date: Sat, 25 Jul 2020 20:10:48 +1200
Subject: [PATCH] CommitLog |

---
 objects/obj_bullet.object.gmx | 20 +++++++++++++++++++-
 objects/obj_player.object.gmx | 15 ++++++++-------
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/objects/obj_bullet.object.gmx b/objects/obj_bullet.object.gmx
index 313265f..cf90b02 100644
--- a/objects/obj_bullet.object.gmx
+++ b/objects/obj_bullet.object.gmx
@@ -49,7 +49,9 @@ image_speed = 0;
         <arguments>
           <argument>
             <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)
 {
@@ -60,6 +62,22 @@ if(step_counter == 60*room_speed || instance_position(x,y,obj_chunk) == noone)
         </arguments>
       </action>
     </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">
       <action>
         <libid>1</libid>
diff --git a/objects/obj_player.object.gmx b/objects/obj_player.object.gmx
index ec4b157..780ad42 100644
--- a/objects/obj_player.object.gmx
+++ b/objects/obj_player.object.gmx
@@ -63,20 +63,22 @@ hp = hp_max;
             <string>/// Player per frame
 if(dead == true)
 {
+    gravity = 0;
+    speed = 0;
+    direction = 0;
+    
     return 0;
 }
 
-if(hp &lt;= 0)
+if(hp &lt;= 0 &amp;&amp; !dead)
 {
     speed = 0;
     direction = 0;
     
-    audio_stop_all();
-    audio_play_sound(snd_boom,10,false);
+    instance_create(x,y,obj_boom_fx);
     sprite_index = spr_boom;
     image_speed = 1;
-    hp = -1;
-    dead = true
+    dead = true;
 }
 
 direction = image_angle
@@ -365,10 +367,9 @@ if(dead == false)
 {
     return 0;
 }
-
+visible = false;
 obj_controller.visible = false;
 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_respawn);