Skip to content

Commit 9b9c36e

Browse files
committed
final release for htn
1 parent 1c7132a commit 9b9c36e

File tree

77 files changed

+1680
-155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1680
-155
lines changed

htn.yyp

Lines changed: 11 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

objects/oBlink/Create_0.gml

Whitespace-only changes.

objects/oBlink/Draw_64.gml

Lines changed: 0 additions & 18 deletions
This file was deleted.

objects/oEnemy/Create_0.gml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
1+
grav = 0.1;
2+
maxGrav = 10;
3+
4+
hsp = 0;
5+
khsp = 0;
6+
vsp = 0;
7+
kvsp = 0;
8+
9+
fireAngle = 0;
10+
fireDelay = 360;
11+
bulletSpeed = 16;
12+
triple = false;
13+
14+
moveSpd = 0;
15+
dir = 1;
16+
117
alarms = array_create(16, infinity);
18+
219
switch(oGame.theme)
320
{
4-
case "blue": image_index = 0; colour = make_color_rgb(242, 152, 73);
21+
case "blue": colour = make_color_rgb(242, 152, 73);
522
break;
6-
case "green": image_index = 1; colour = make_color_rgb(245, 86, 86);
23+
case "green": colour = make_color_rgb(245, 86, 86);
724
break;
825
}
9-
10-
grav = 0.1;
11-
maxGrav = 10;
26+
image_blend = colour;

objects/oEnemy/Draw_0.gml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
if(alarms[1] != infinity)
3+
{
4+
var xx = x-30, yy = y-30;
5+
draw_healthbar(xx, yy-20, xx+60, yy-10, (1-alarms[1]/fireDelay)*100,
6+
c_black, colour, colour, 0, true, true);
7+
}
8+
draw_self();

objects/oEnemy/Other_10.gml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
hsp = moveSpd*dir;
2+
vsp = approach(vsp, maxGrav, grav);
3+
4+
if(instance_exists(oPlayer))
5+
{
6+
if(!collision_line(x, y, oPlayer.x, oPlayer.y, oGround, false, false))
7+
{
8+
fireAngle = angle_approach(fireAngle,
9+
point_direction(x, y, oPlayer.x, oPlayer.y), 3);
10+
}
11+
else fireAngle = dir == 1 ? 0 : 180;
12+
}
13+
else
14+
{
15+
fireAngle = dir == 1 ? 0 : 180;
16+
}
17+
collision();
18+
if(place_meeting(x-1, y, oGround) ||
19+
place_meeting(x+1, y, oGround) ||
20+
place_meeting(x-1, y, oInvis) ||
21+
place_meeting(x+1, y, oInvis)) dir *= -1;
22+
123
if(place_meeting(x, y, oSword))
224
{
325
if(oSword.image_alpha == 1)
@@ -8,4 +30,16 @@ if(place_meeting(x, y, oSword))
830
}
931
instance_destroy();
1032
}
33+
}
34+
if(place_meeting(x, y, oProjectile))
35+
{
36+
var b = instance_nearest(x, y, oProjectile);
37+
if(b.friendly)
38+
{
39+
with(oPlayer)
40+
{
41+
canBlink = true; alarms[4] = infinity;
42+
}
43+
instance_destroy();
44+
}
1145
}

objects/oEnemy/Other_11.gml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
if(inView())
2+
{
3+
audio_play_sound(aShoot, 0, false);
4+
var b = instance_create_layer(x+lengthdir_x(60, fireAngle), y+lengthdir_y(60, fireAngle), "Below", oProjectile);
5+
b.direction = fireAngle; b.image_angle = fireAngle; b.speed = bulletSpeed;
6+
b.colour = colour;
7+
if(triple)
8+
{
9+
var b1 = instance_create_layer(x+lengthdir_x(60, fireAngle-15), y+lengthdir_y(60, fireAngle-15), "Below", oProjectile);
10+
b1.direction = fireAngle-15; b1.image_angle = fireAngle-15; b1.speed = bulletSpeed;
11+
b1.colour = colour;
12+
var b2 = instance_create_layer(x+lengthdir_x(60, fireAngle+15), y+lengthdir_y(60, fireAngle+15), "Below", oProjectile);
13+
b2.direction = fireAngle+15; b2.image_angle = fireAngle+15; b2.speed = bulletSpeed;
14+
b2.colour = colour;
15+
}
16+
}
17+
alarms[1] += fireDelay;

objects/oEnemy/oEnemy.yy

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

objects/oGame/Draw_64.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
draw_set_font(fMain);
2-
var str = "Level " + string(room);
2+
var str = "Level " + string_digits(room_get_name(room));
33
draw_set_colour(c_white);
44
draw_set_halign(fa_left);
55
draw_set_valign(fa_bottom);

0 commit comments

Comments
 (0)