diff --git a/Spaceinator.project.gmx b/Spaceinator.project.gmx
index cc42410..b3ad1a6 100644
--- a/Spaceinator.project.gmx
+++ b/Spaceinator.project.gmx
@@ -3,6 +3,7 @@
Configs\Default
+
sound\snd_engine
@@ -13,7 +14,6 @@
sprites\spr_player
sprites\spr_bullets
sprites\spr_blocks
- sprites\spr_blackhole
sprites\spr_broken_ship
sprites\spr_asteroid
sprites\spr_boom
@@ -24,6 +24,7 @@
sprites\spr_hotbar
sprites\spr_intentory
sprites\spr_crafting
+ sprites\spr_blackhole
sprites\spr_final
@@ -61,6 +62,7 @@
+
diff --git a/objects/obj_bullet.object.gmx b/objects/obj_bullet.object.gmx
index 3da98d7..6c8bcc4 100644
--- a/objects/obj_bullet.object.gmx
+++ b/objects/obj_bullet.object.gmx
@@ -57,31 +57,6 @@ if(step_counter == 60*room_speed || instance_position(x,y,obj_chunk) == noone)
{
instance_destroy(self);
}
-
-
-
-
-
-
-
- 1
- 603
- 7
- 0
- 0
- -1
- 2
-
-
- self
- 0
- 0
-
-
- 1
- instance_destroy(other);
-instance_create(other.x,other.y,obj_boom_fx)
-instance_destroy(id);
@@ -128,6 +103,31 @@ instance_destroy(id);
0
+
+
+ 1
+ 603
+ 7
+ 0
+ 0
+ -1
+ 2
+
+
+ self
+ 0
+ 0
+
+
+ 1
+ instance_destroy(other);
+instance_create(other.x,other.y,obj_boom_fx)
+instance_destroy(id);
+
+
+
+
+
1
diff --git a/objects/obj_crafting.object.gmx b/objects/obj_crafting.object.gmx
new file mode 100644
index 0000000..7e7bc14
--- /dev/null
+++ b/objects/obj_crafting.object.gmx
@@ -0,0 +1,191 @@
+
+
diff --git a/objects/obj_inventory.object.gmx b/objects/obj_inventory.object.gmx
index 800be95..b6de0e8 100644
--- a/objects/obj_inventory.object.gmx
+++ b/objects/obj_inventory.object.gmx
@@ -30,6 +30,32 @@
move_slot = false;
selected_item = 0;
selected_total = 0;
+
+crafting_menu = instance_create(0,0,obj_crafting);
+
+
+
+
+
+
+
+
+ 1
+ 603
+ 7
+ 0
+ 0
+ -1
+ 2
+
+
+ self
+ 0
+ 0
+
+
+ 1
+ instance_destroy(crafting_menu);
diff --git a/objects/obj_player.object.gmx b/objects/obj_player.object.gmx
index 0307686..06a4111 100644
--- a/objects/obj_player.object.gmx
+++ b/objects/obj_player.object.gmx
@@ -258,40 +258,6 @@ if((mouse_check_button_pressed(mb_left) && os_type != os_psvita) || game
}
-
-
-
-
-
-
-
- 1
- 603
- 7
- 0
- 0
- -1
- 2
-
-
- self
- 0
- 0
-
-
- 1
- damage_player(5);
-
-instance_create(other.x,other.y,obj_boom_fx);
-other.direction = direction;
-other.image_angle = image_angle;
-other.speed = 20;
-
-speed = -20;
-
-
-
-
@@ -370,6 +336,40 @@ if(didAdd)
1
damage_player(hp_max);
+
+
+
+
+
+
+
+ 1
+ 603
+ 7
+ 0
+ 0
+ -1
+ 2
+
+
+ self
+ 0
+ 0
+
+
+ 1
+ damage_player(5);
+
+instance_create(other.x,other.y,obj_boom_fx);
+other.direction = direction;
+other.image_angle = image_angle;
+other.speed = 20;
+
+speed = -20;
+
+
+
+
diff --git a/sprites/images/spr_broken_ship_0.png b/sprites/images/spr_broken_ship_0.png
index da20d49..5cb114a 100644
Binary files a/sprites/images/spr_broken_ship_0.png and b/sprites/images/spr_broken_ship_0.png differ