CommitLog |

This commit is contained in:
SilicaAndPina 2020-07-27 10:30:29 +12:00
parent 2bde2d7dc7
commit 821f1768fa
4 changed files with 13 additions and 103 deletions

View File

@ -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>

View File

@ -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 &lt; 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;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 763 B

View File

@ -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>