Mini Johns Thing

.gitignore

@@ -0,0 +1,5 @@
+# gcc coverage testing tool files
+
+*.gcno
+*.gcda
+*.gcov

CompleteCook.resource_order

@@ -43,6 +43,7 @@
     {"name":"Bosses","order":19,"path":"folders/Sprites/Bosses.yy",},
     {"name":"Enemies","order":1,"path":"folders/Sprites/Enemies.yy",},
     {"name":"Forknight","order":1,"path":"folders/Sprites/Enemies/Forknight.yy",},
+    {"name":"Mini John","order":8,"path":"folders/Sprites/Enemies/Mini John.yy",},
     {"name":"Pizzard","order":4,"path":"folders/Sprites/Enemies/Pizzard.yy",},
     {"name":"Swedish Monkey","order":5,"path":"folders/Sprites/Enemies/Swedish Monkey.yy",},
     {"name":"gameframe","order":18,"path":"folders/Sprites/gameframe.yy",},
@@ -152,6 +153,7 @@
     {"name":"obj_metalblock_secret","order":13,"path":"objects/obj_metalblock_secret/obj_metalblock_secret.yy",},
     {"name":"obj_metalblock","order":5,"path":"objects/obj_metalblock/obj_metalblock.yy",},
     {"name":"obj_metaldetector","order":7,"path":"objects/obj_metaldetector/obj_metaldetector.yy",},
+    {"name":"obj_minijohn","order":12,"path":"objects/obj_minijohn/obj_minijohn.yy",},
     {"name":"obj_movingplatform_arrow","order":5,"path":"objects/obj_movingplatform_arrow/obj_movingplatform_arrow.yy",},
     {"name":"obj_movingplatform","order":4,"path":"objects/obj_movingplatform/obj_movingplatform.yy",},
     {"name":"obj_music","order":7,"path":"objects/obj_music/obj_music.yy",},
@@ -480,6 +482,7 @@
     {"name":"bg2","order":1,"path":"sprites/bg2/bg2.yy",},
     {"name":"fg_tower","order":4,"path":"sprites/fg_tower/fg_tower.yy",},
     {"name":"mask_bigcollect","order":5,"path":"sprites/mask_bigcollect/mask_bigcollect.yy",},
+    {"name":"mask_bighitbox","order":1,"path":"sprites/mask_bighitbox/mask_bighitbox.yy",},
     {"name":"mask_collect","order":5,"path":"sprites/mask_collect/mask_collect.yy",},
     {"name":"mask_parry","order":2,"path":"sprites/mask_parry/mask_parry.yy",},
     {"name":"mask_pepperman","order":3,"path":"sprites/mask_pepperman/mask_pepperman.yy",},
@@ -622,6 +625,10 @@
     {"name":"spr_metalblock","order":31,"path":"sprites/spr_metalblock/spr_metalblock.yy",},
     {"name":"spr_metalblockdebris","order":40,"path":"sprites/spr_metalblockdebris/spr_metalblockdebris.yy",},
     {"name":"spr_metaldetector_shotgun","order":10,"path":"sprites/spr_metaldetector_shotgun/spr_metaldetector_shotgun.yy",},
+    {"name":"spr_minijohn_dead","order":2,"path":"sprites/spr_minijohn_dead/spr_minijohn_dead.yy",},
+    {"name":"spr_minijohn_punch","order":4,"path":"sprites/spr_minijohn_punch/spr_minijohn_punch.yy",},
+    {"name":"spr_minijohn_punchstart","order":3,"path":"sprites/spr_minijohn_punchstart/spr_minijohn_punchstart.yy",},
+    {"name":"spr_minijohn_stun","order":1,"path":"sprites/spr_minijohn_stun/spr_minijohn_stun.yy",},
     {"name":"spr_monkey_dead","order":1,"path":"sprites/spr_monkey_dead/spr_monkey_dead.yy",},
     {"name":"spr_monkey_eat","order":4,"path":"sprites/spr_monkey_eat/spr_monkey_eat.yy",},
     {"name":"spr_monkey_move","order":5,"path":"sprites/spr_monkey_move/spr_monkey_move.yy",},

objects/obj_minijohn/Create_0.gml

@@ -0,0 +1,14 @@
+event_inherited()
+
+sprs.move = spr_minijohn_charge
+sprs.stun = spr_minijohn_stun
+sprs.dead = spr_minijohn_dead
+sprs.punchstart = spr_minijohn_punchstart
+sprs.punch = spr_minijohn_punch
+
+movespeed = 7
+momentum = 5
+
+cooldown = 0
+
+state_struct.normal = {state: states.normal, func: enemy_chase}

objects/obj_minijohn/Step_0.gml

@@ -0,0 +1,59 @@
+if escape_frozen
+{
+	visible = false
+
+	if (abs(obj_player.x - self.x) <= 500 && abs(obj_player.y - self.y) <= 100 && alarm[1] == -1 && global.panic.active)
+	{
+		with create_effect(x, y - 20, spr_pillarenemyspawner)
+			image_speed = 0.5
+		alarm[1] = 16
+	}
+
+	exit;
+}
+
+do_enemy_generics()
+
+var near_the_player = (abs(obj_player.x - self.x) <= 400 && abs(obj_player.y - self.y) <= 60)
+
+if (cooldown <= 0 && near_the_player && state == states.normal)
+{
+	xscale = x - obj_player.x >= 0 ? -1 : 1
+	hsp = 0
+	state = states.punch
+	cooldown = 100
+	reset_anim(sprs.punchstart)
+}
+else
+	cooldown--
+
+if state == states.punch {
+	if (sprite_index == sprs.punchstart)
+	{
+		image_speed = 0.35
+		hsp = approach(hsp, 0, 1)
+		if (floor(image_index) == (image_number - 1))
+		{
+			punchspd = 8
+			hsp = punchspd * xscale
+			reset_anim(sprs.punch)
+			image_speed = 0.25
+		}
+	}
+	else if (sprite_index == sprs.punch)
+	{
+		image_speed = 0.25
+		punchspd = approach(punchspd, 0, 0.25)
+		hsp = punchspd * xscale
+		with (instance_place((x + hsp), y, obj_destroyable))
+			instance_destroy()
+		if (floor(image_index) == (image_number - 1))
+		{
+			state = states.normal
+			cooldown = 100
+			reset_anim(sprs.move)
+		}
+	}
+}
+
+collide()

objects/par_enemy/Alarm_1.gml

@@ -1,6 +1,8 @@
 visible = true
-state = states.stun
+if object_index != obj_minijohn {
+	state = states.stun
+	stun_timer = 100
+}
 escape_frozen = false
-stun_timer = 100
 particle_create(x, y, particles.genericpoof)
 scr_sound_3d_pitched(sfx_pillarspawn, x, y)

objects/par_enemy/Step_2.gml

@@ -20,6 +20,12 @@ switch (object_index)
 		else if (sprite_index != sprs.move && hurtbox_id != -4)
 			destroy_hurtbox()
 		break;
+	case obj_minijohn:
+		if (sprite_index == sprs.punch && hurtbox_id == -4)
+			create_hurtbox()
+		else if (sprite_index != sprs.punch && hurtbox_id != -4)
+			destroy_hurtbox()
+		break;
 }
 
 if follow_player