From bc21fc51414b2580f39e1419064766786d6a57ca Mon Sep 17 00:00:00 2001
From: SilicaAndPina <earsyum@gmail.com>
Date: Sat, 25 Jul 2020 18:03:40 +1200
Subject: [PATCH] CommitLog |

---
 objects/obj_asteriod.object.gmx             |   2 +-
 objects/obj_controller_world_gen.object.gmx |   7 ++++---
 objects/obj_player.object.gmx               |   4 +++-
 objects/obj_respawn.object.gmx              |   2 ++
 sprites/images/spr_asteroid_2.png           | Bin 0 -> 324 bytes
 sprites/spr_asteroid.sprite.gmx             |   5 +++--
 6 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 sprites/images/spr_asteroid_2.png

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 @@
           <argument>
             <kind>1</kind>
             <string>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 @@
         </arguments>
       </action>
     </event>
-    <event eventtype="2" enumb="0">
+    <event eventtype="3" enumb="2">
       <action>
         <libid>1</libid>
         <id>603</id>
@@ -55,6 +55,7 @@ for(var i = 0; i &lt; 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 &lt; 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 &lt; 16; i ++)
         </arguments>
       </action>
     </event>
-    <event eventtype="3" enumb="0">
+    <event eventtype="3" enumb="1">
       <action>
         <libid>1</libid>
         <id>603</id>
@@ -140,7 +142,6 @@ for(var xx = 0; xx &lt; 4; xx++)
     }
 }
 
-alarm[0] = 1;
 
 </string>
           </argument>
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 &gt;= 20)
         <arguments>
           <argument>
             <kind>1</kind>
-            <string>if(dead == false)
+            <string>/// 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 0000000000000000000000000000000000000000..8e8a041f6691796d78ff4f8b5c67a46e0268aa87
GIT binary patch
literal 324
zcmV-K0lWT*P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003CNkl<Zc%1E4
zyAH!J2+WUV>OW;@r7r!4jQQ169$X=c;SQWFNJwoSzT?ahFUuWw1aa*9X(jti3iz?E
zzwC>Cw#@|d?w7!y@7EuR5m^6UBB3j{RIsi^s=(kHKq?TWexFuAE)W5u_hAB3E(SCr
zLKCpI0ae1<g5Hp60usQhHnJ#0pe@iBVXN2gX+l#J@CaDHX$MHg83*X=DGPcwL}x;K
zF4Y4}14d+|nv@fmCXAAHM0OS+Bp^qOzH;n#jG7VZ2kY~itzJ(_xEC~$44}6i5CM+_
zItQkbV6CWorgTC=rz3Kjq6xIHToHk!XF;SwH7O@pBr?bHQuQ;{C;@wfEP|JST@hbz
Wg%@)xypyK@0000<MNUMnLSTaNE`cim

literal 0
HcmV?d00001

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 @@
   <sepmasks>0</sepmasks>
   <bboxmode>0</bboxmode>
   <bbox_left>1</bbox_left>
-  <bbox_right>25</bbox_right>
+  <bbox_right>29</bbox_right>
   <bbox_top>4</bbox_top>
-  <bbox_bottom>24</bbox_bottom>
+  <bbox_bottom>30</bbox_bottom>
   <HTile>0</HTile>
   <VTile>0</VTile>
   <TextureGroups>
@@ -22,5 +22,6 @@
   <frames>
     <frame index="0">images\spr_asteroid_0.png</frame>
     <frame index="1">images\spr_asteroid_1.png</frame>
+    <frame index="2">images\spr_asteroid_2.png</frame>
   </frames>
 </sprite>