From 821f1768faf2766eed543498a7ac4a5245d4f17f Mon Sep 17 00:00:00 2001
From: SilicaAndPina <earsyum@gmail.com>
Date: Mon, 27 Jul 2020 10:30:29 +1200
Subject: [PATCH] CommitLog |
---
objects/obj_controller.object.gmx | 5 ++
objects/obj_player.object.gmx | 95 ------------------------------
sprites/images/spr_hotbar_0.png | Bin 3176 -> 763 bytes
sprites/spr_hotbar.sprite.gmx | 16 ++---
4 files changed, 13 insertions(+), 103 deletions(-)
diff --git a/objects/obj_controller.object.gmx b/objects/obj_controller.object.gmx
index 2f5a501..850b39f 100644
--- a/objects/obj_controller.object.gmx
+++ b/objects/obj_controller.object.gmx
@@ -58,7 +58,12 @@ if(!global.debug)
draw_healthbar(10,40,300,60,(obj_player.hp/obj_player.hp_max)*100,c_gray,c_red,c_green,0,true,false);
draw_text(11,43,string(obj_player.hp)+" / "+string(obj_player.hp_max));
+
+ // Draw hotbar
+ draw_sprite(spr_hotbar,0,960/2,544);
}
+
+
</string>
</argument>
</arguments>
diff --git a/objects/obj_player.object.gmx b/objects/obj_player.object.gmx
index 7daf2f6..f486e7f 100644
--- a/objects/obj_player.object.gmx
+++ b/objects/obj_player.object.gmx
@@ -33,7 +33,6 @@ is_moving = false;
dead = false;
invuln_counter_max = 1*room_speed;
invuln_counter = invuln_counter_max;
-s_pressed = false;
energy_max = 500;
energy = energy_max
@@ -247,39 +246,6 @@ speed = -20;
direction = image_angle
speed += 5
-</string>
- </argument>
- </arguments>
- </action>
- </event>
- <event eventtype="5" enumb="83">
- <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>if(dead == true || speed < 0)
-{
- return 0;
-}
-if(!s_pressed){
-s_pressed = true
-image_angle+=180
-}
-direction = image_angle
-speed += 5
-
</string>
</argument>
</arguments>
@@ -465,37 +431,6 @@ instance_create(view_xview[0]+(view_wview[0]/2),view_yview[0]+(view_hview[0]/2),
is_moving = true;
audio_play_sound(snd_engine,1,true);
image_index = ship_type+1;
-</string>
- </argument>
- </arguments>
- </action>
- </event>
- <event eventtype="9" enumb="83">
- <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>if(dead == true)
-{
- return 0;
-}
-
-is_moving = true;
-audio_play_sound(snd_engine,1,true);
-image_index = ship_type+1;
-
</string>
</argument>
</arguments>
@@ -523,36 +458,6 @@ image_index = ship_type+1;
return 0;
}
-is_moving = false;
-audio_stop_sound(snd_engine)
-image_index = ship_type;
-</string>
- </argument>
- </arguments>
- </action>
- </event>
- <event eventtype="10" enumb="83">
- <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>if(dead == true)
-{
- return 0;
-}
-s_pressed = false
is_moving = false;
audio_stop_sound(snd_engine)
image_index = ship_type;
diff --git a/sprites/images/spr_hotbar_0.png b/sprites/images/spr_hotbar_0.png
index d12d7866011e5dab10bad0ad818e756bb7d457bd..b1db597708837691c4caff2508c5feb887814eec 100644
GIT binary patch
literal 763
zcmeAS@N?(olHy`uVBq!ia0y~yU~C1ltvT3$<diAXeljpH9rAQ>45^s&_Uguo5uQBG
z2RU<{Z=ZSZ#du<2GylTg^ouW>4uAjs`}cem&-$v&29=lAdrcfBeVH34rQrF?PoH;!
zO6~ILY#x*LUG`>H@x1@?@7oWbKL=mm|G;1R&As5y@7BJnKl)B{%9S_UcHh<iwk7%M
zC}%Vb@TY^iDy~UO_ToxlOBp9EdH>}SgXg7kNP7Is|1hZAvh$5d1~5@Gc)I$ztaD0e
F0suNl)3g8p
literal 3176
zcmeAS@N?(olHy`uVBq!ia0y~yU_QXWz@)&z1{Cpn%CMG!fk)rd#WAE}&fDu3Gi4nF
zSR7lwIR!r}V`FDB%)J(B!1?9;-MU&vpz={L8UmvsFd71*Aut*OLm>nlUjF|5yMN})
znK$?E`n8_rfa2H1X+ZET>TfvHg9*O^je($g?LTeC0*}8dfXZg>4f{Wp!D30>l`}vP
zxB9;qgG`Wp7D&(ftM#f3d@JQmfm$|Sf3;tTq5Vq#ERfOJU*kC&oL{-01!{S-71Nse
zHV*U8Ki@x3EGlDRE0Fm3TUX`)!x@W)+L$dDoVazjTv(Lzkby1X7~`AAi$Ds1s#3Yx
z4H%6166D2!(jYY&(H0GiGYT1g?|>Mx(DmjaMxFyb%r}m^f{XyFIVHxIz>p?$z)lZp
zQQ)=$24;iD4BrYbf~|4t-qgx0(ICmbp}!mIm?@)984VRsnj1|kLo)}>1ePwK;^{Tn
f#S_V;pvGTTy9#T2+xL^!f$9KHS3j3^P6<r_Lj6&Y
diff --git a/sprites/spr_hotbar.sprite.gmx b/sprites/spr_hotbar.sprite.gmx
index 3e3e22d..924bcc2 100644
--- a/sprites/spr_hotbar.sprite.gmx
+++ b/sprites/spr_hotbar.sprite.gmx
@@ -1,24 +1,24 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<sprite>
<type>0</type>
- <xorig>0</xorig>
- <yorigin>0</yorigin>
+ <xorig>194</xorig>
+ <yorigin>59</yorigin>
<colkind>1</colkind>
<coltolerance>0</coltolerance>
<sepmasks>0</sepmasks>
<bboxmode>0</bboxmode>
- <bbox_left>31</bbox_left>
- <bbox_right>0</bbox_right>
- <bbox_top>31</bbox_top>
- <bbox_bottom>0</bbox_bottom>
+ <bbox_left>0</bbox_left>
+ <bbox_right>388</bbox_right>
+ <bbox_top>0</bbox_top>
+ <bbox_bottom>58</bbox_bottom>
<HTile>0</HTile>
<VTile>0</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
- <width>960</width>
- <height>544</height>
+ <width>389</width>
+ <height>59</height>
<frames>
<frame index="0">images\spr_hotbar_0.png</frame>
</frames>