From feb3a5ddec97b00b4eaedf48702490913e57c333 Mon Sep 17 00:00:00 2001
From: SilicaAndPina <earsyum@gmail.com>
Date: Wed, 22 Jul 2020 15:45:22 +1200
Subject: [PATCH] CommitLog |

---
 ..._base.object.gmx => obj_bullet.object.gmx} |  28 ++++++++++++++++--
 objects/obj_laser_bullet.object.gmx           |  23 --------------
 objects/obj_player.object.gmx                 |   4 +--
 sprites/images/spr_bullets_0.png              | Bin 0 -> 131 bytes
 sprites/images/spr_bullets_1.png              | Bin 0 -> 130 bytes
 sprites/images/spr_bullets_2.png              | Bin 0 -> 125 bytes
 ...llet.sprite.gmx => spr_bullets.sprite.gmx} |   6 ++--
 7 files changed, 31 insertions(+), 30 deletions(-)
 rename objects/{obj_bullet_base.object.gmx => obj_bullet.object.gmx} (58%)
 delete mode 100644 objects/obj_laser_bullet.object.gmx
 create mode 100644 sprites/images/spr_bullets_0.png
 create mode 100644 sprites/images/spr_bullets_1.png
 create mode 100644 sprites/images/spr_bullets_2.png
 rename sprites/{spr_lazer_bullet.sprite.gmx => spr_bullets.sprite.gmx} (77%)

diff --git a/objects/obj_bullet_base.object.gmx b/objects/obj_bullet.object.gmx
similarity index 58%
rename from objects/obj_bullet_base.object.gmx
rename to objects/obj_bullet.object.gmx
index eeed8ac..4950851 100644
--- a/objects/obj_bullet_base.object.gmx
+++ b/objects/obj_bullet.object.gmx
@@ -1,13 +1,37 @@
 <!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
 <object>
-  <spriteName>&lt;undefined&gt;</spriteName>
+  <spriteName>spr_bullets</spriteName>
   <solid>0</solid>
   <visible>-1</visible>
   <depth>0</depth>
   <persistent>0</persistent>
   <parentName>&lt;undefined&gt;</parentName>
   <maskName>&lt;undefined&gt;</maskName>
-  <events/>
+  <events>
+    <event eventtype="0" enumb="0">
+      <action>
+        <libid>1</libid>
+        <id>603</id>
+        <kind>7</kind>
+        <userelative>0</userelative>
+        <isquestion>0</isquestion>
+        <useapplyto>-1</useapplyto>
+        <exetype>2</exetype>
+        <functionname></functionname>
+        <codestring></codestring>
+        <whoName>self</whoName>
+        <relative>0</relative>
+        <isnot>0</isnot>
+        <arguments>
+          <argument>
+            <kind>1</kind>
+            <string>image_speed = 0;
+</string>
+          </argument>
+        </arguments>
+      </action>
+    </event>
+  </events>
   <PhysicsObject>0</PhysicsObject>
   <PhysicsObjectSensor>0</PhysicsObjectSensor>
   <PhysicsObjectShape>0</PhysicsObjectShape>
diff --git a/objects/obj_laser_bullet.object.gmx b/objects/obj_laser_bullet.object.gmx
deleted file mode 100644
index e831ec6..0000000
--- a/objects/obj_laser_bullet.object.gmx
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
-<object>
-  <spriteName>spr_lazer_bullet</spriteName>
-  <solid>0</solid>
-  <visible>-1</visible>
-  <depth>0</depth>
-  <persistent>0</persistent>
-  <parentName>obj_bullet_base</parentName>
-  <maskName>&lt;undefined&gt;</maskName>
-  <events/>
-  <PhysicsObject>0</PhysicsObject>
-  <PhysicsObjectSensor>0</PhysicsObjectSensor>
-  <PhysicsObjectShape>0</PhysicsObjectShape>
-  <PhysicsObjectDensity>0.5</PhysicsObjectDensity>
-  <PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
-  <PhysicsObjectGroup>0</PhysicsObjectGroup>
-  <PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
-  <PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
-  <PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
-  <PhysicsObjectAwake>-1</PhysicsObjectAwake>
-  <PhysicsObjectKinematic>0</PhysicsObjectKinematic>
-  <PhysicsShapePoints/>
-</object>
diff --git a/objects/obj_player.object.gmx b/objects/obj_player.object.gmx
index c0bb900..974014a 100644
--- a/objects/obj_player.object.gmx
+++ b/objects/obj_player.object.gmx
@@ -151,9 +151,9 @@ speed += 5
         <arguments>
           <argument>
             <kind>1</kind>
-            <string>var new_bullet = instance_create(x,y,obj_laser_bullet);
+            <string>var new_bullet = instance_create(x,y,obj_bullet);
 new_bullet.image_angle = image_angle;
-new_bullet.speed = speed;
+new_bullet.speed = speed + 1;
 
 </string>
           </argument>
diff --git a/sprites/images/spr_bullets_0.png b/sprites/images/spr_bullets_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..806d9f1c29ebeb31fb856be5b1360522ee995b38
GIT binary patch
literal 131
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzFHaZ8kcv6U2@<S}6GVEN0u8v_
z7zH|7_x<Vbi9J*|`3QUBs))X`2{jVS<lKUfes7U!K0i^Uoyk(sVd8uDgBmbx3@i-q
XudGrj-pkYoG?l^A)z4*}Q$iB}ay=={

literal 0
HcmV?d00001

diff --git a/sprites/images/spr_bullets_1.png b/sprites/images/spr_bullets_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..5996eb1bad418dc50604a88135a5ea5fe90d9931
GIT binary patch
literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzPfr)ekcv5PFC63qO0*{4UR?d!
z-0$`j*%rRU5V`;Sa*8f1l^7TtrfSvt=Dl1skMn2E_YLB^^V3g!S)R5>ZU6QUn;O@@
cWMpWNI%3^gZJH7C6lf@er>mdKI;Vst0PgWE!~g&Q

literal 0
HcmV?d00001

diff --git a/sprites/images/spr_bullets_2.png b/sprites/images/spr_bullets_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecc487d876707d4f307b3c0893cad12b043fb63d
GIT binary patch
literal 125
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz7f%<*kcv5PFP!FNP~dSn_;$Z6
zx0j|=zLL<zCqLMxJvdsU!ocug)|Klw9#=10^7G|mjcr#az0E)D;=FAAhvLR7-xwGU
Y@TxLYe=S|62{Mnt)78&qol`;+0Jse=IRF3v

literal 0
HcmV?d00001

diff --git a/sprites/spr_lazer_bullet.sprite.gmx b/sprites/spr_bullets.sprite.gmx
similarity index 77%
rename from sprites/spr_lazer_bullet.sprite.gmx
rename to sprites/spr_bullets.sprite.gmx
index 53c7fcf..314cf82 100644
--- a/sprites/spr_lazer_bullet.sprite.gmx
+++ b/sprites/spr_bullets.sprite.gmx
@@ -20,8 +20,8 @@
   <width>32</width>
   <height>32</height>
   <frames>
-    <frame index="0">images\spr_lazer_bullet_0.png</frame>
-    <frame index="1">images\spr_lazer_bullet_1.png</frame>
-    <frame index="2">images\spr_lazer_bullet_2.png</frame>
+    <frame index="0">images\spr_bullets_0.png</frame>
+    <frame index="1">images\spr_bullets_1.png</frame>
+    <frame index="2">images\spr_bullets_2.png</frame>
   </frames>
 </sprite>