From ddc1b3a6ce3673641eb1ced5ca52c43f949f6718 Mon Sep 17 00:00:00 2001
From: SilicaAndPina <earsyum@gmail.com>
Date: Mon, 27 Jul 2020 10:39:19 +1200
Subject: [PATCH] CommitLog |

---
 Spaceinator.project.gmx               |  8 +++++++-
 objects/obj_dropped_item.object.gmx   | 23 +++++++++++++++++++++++
 objects/obj_inv_controller.object.gmx | 23 +++++++++++++++++++++++
 objects/obj_player.object.gmx         |  2 ++
 4 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 objects/obj_dropped_item.object.gmx
 create mode 100644 objects/obj_inv_controller.object.gmx

diff --git a/Spaceinator.project.gmx b/Spaceinator.project.gmx
index 586a524..c0a6f0f 100644
--- a/Spaceinator.project.gmx
+++ b/Spaceinator.project.gmx
@@ -42,6 +42,7 @@
     </objects>
     <object>objects\obj_player</object>
     <object>objects\obj_controller_world_gen</object>
+    <object>objects\obj_inv_controller</object>
     <object>objects\obj_controller</object>
     <object>objects\obj_bullet</object>
     <object>objects\obj_chunk</object>
@@ -51,13 +52,18 @@
       <object>objects\obj_respawn</object>
       <object>objects\obj_gameover_overlay</object>
     </objects>
+    <objects name="items">
+      <object>objects\obj_dropped_item</object>
+    </objects>
   </objects>
   <rooms name="rooms">
     <room>rooms\rm_game</room>
   </rooms>
-  <constants number="2">
+  <constants number="4">
     <constant name="TILE_SIZE">32</constant>
     <constant name="CHUNK_SIZE">16</constant>
+    <constant name="STONEBRICK">0</constant>
+    <constant name="STONE">1</constant>
   </constants>
   <help>
     <rtf>help.rtf</rtf>
diff --git a/objects/obj_dropped_item.object.gmx b/objects/obj_dropped_item.object.gmx
new file mode 100644
index 0000000..c467ce8
--- /dev/null
+++ b/objects/obj_dropped_item.object.gmx
@@ -0,0 +1,23 @@
+<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
+<object>
+  <spriteName>spr_blocks</spriteName>
+  <solid>0</solid>
+  <visible>-1</visible>
+  <depth>0</depth>
+  <persistent>0</persistent>
+  <parentName>&lt;undefined&gt;</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_inv_controller.object.gmx b/objects/obj_inv_controller.object.gmx
new file mode 100644
index 0000000..eeed8ac
--- /dev/null
+++ b/objects/obj_inv_controller.object.gmx
@@ -0,0 +1,23 @@
+<!--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>
+  <solid>0</solid>
+  <visible>-1</visible>
+  <depth>0</depth>
+  <persistent>0</persistent>
+  <parentName>&lt;undefined&gt;</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 f486e7f..6f758c4 100644
--- a/objects/obj_player.object.gmx
+++ b/objects/obj_player.object.gmx
@@ -34,6 +34,8 @@ dead = false;
 invuln_counter_max = 1*room_speed;
 invuln_counter = invuln_counter_max;
 
+
+
 energy_max = 500;
 energy = energy_max