diff --git a/thpj3/fonts/fn_contact/fn_contact.yy b/thpj3/fonts/fn_contact/fn_contact.yy index 73c1fe9..62f5d38 100644 --- a/thpj3/fonts/fn_contact/fn_contact.yy +++ b/thpj3/fonts/fn_contact/fn_contact.yy @@ -257,7 +257,7 @@ "maintainGms1Font": false, "parent": { "name": "disclaimer", - "path": "folders/disclaimer.yy", + "path": "folders/title/disclaimer.yy", }, "resourceVersion": "1.0", "name": "fn_contact", diff --git a/thpj3/fonts/fn_disclaimer/fn_disclaimer.yy b/thpj3/fonts/fn_disclaimer/fn_disclaimer.yy index 5b9d819..7b22bd9 100644 --- a/thpj3/fonts/fn_disclaimer/fn_disclaimer.yy +++ b/thpj3/fonts/fn_disclaimer/fn_disclaimer.yy @@ -1763,7 +1763,7 @@ "maintainGms1Font": false, "parent": { "name": "disclaimer", - "path": "folders/disclaimer.yy", + "path": "folders/title/disclaimer.yy", }, "resourceVersion": "1.0", "name": "fn_disclaimer", diff --git a/thpj3/objects/obj_UI_controller/Draw_0.gml b/thpj3/objects/obj_UI_controller/Draw_0.gml index 1adec4f..2a72187 100644 --- a/thpj3/objects/obj_UI_controller/Draw_0.gml +++ b/thpj3/objects/obj_UI_controller/Draw_0.gml @@ -35,4 +35,30 @@ draw_text( 910 + 1, 18 + 1, "Shine: " ); draw_set_color(c_white); draw_text( 135, 18, "Lives: " ); draw_text( 525, 18, "Spell: " ); -draw_text( 910, 18, "Shine: " ); \ No newline at end of file +draw_text( 910, 18, "Shine: " ); + +if ( instance_exists(obj_boss_parent) ) { + with( obj_boss_parent ) { + if ( phase_mode == MODE_CHARGE || phase_mode == MODE_ACTIVE ) { + if ( charge_timer ) { + draw_sprite_part( spr_UI_boss_fill, 0, 0, 0, (980 * ( BOSS_CHARGE_TIME - charge_timer) / BOSS_CHARGE_TIME ), 28, 150, 676); + } else { + draw_sprite_part( spr_UI_boss_fill, 0, 0, 0, (980 * ( hp / phase_hp[current_phase] ) ), 28, 150, 676); + } + draw_sprite( spr_UI_boss_bar, 0, 640, 690 ); + draw_set_halign( fa_right ); + draw_set_color( c_black ); + draw_text( 1090 + 1, 640 - 1, bossname ); + draw_text( 1090 - 1, 640 - 1, bossname ); + draw_text( 1090 + 1, 640 + 1, bossname ); + draw_text( 1090 - 1, 640 + 1, bossname ); + draw_set_color( c_white ); + draw_text( 1090, 640, bossname ); + draw_set_halign( fa_left ); + for( var i = 0; i < (phases - current_phase); i++ ) { + draw_sprite(spr_UI_boss_phases, 0, 1110 + (15 * i), 674 + (4 * (i % 2))); + } + } + } +} + \ No newline at end of file diff --git a/thpj3/objects/obj_boss_parent/Collision_obj_player_shot.gml b/thpj3/objects/obj_boss_parent/Collision_obj_player_shot.gml index 41d5c97..d8fe2e5 100644 --- a/thpj3/objects/obj_boss_parent/Collision_obj_player_shot.gml +++ b/thpj3/objects/obj_boss_parent/Collision_obj_player_shot.gml @@ -1,6 +1,15 @@ if (!invuln) { hp -= other.damage; } +obj_wriggle.hyper_current += .01; +if ( point_distance(x, y, obj_wriggle.x, obj_wriggle.y) < 192 ) { + obj_wriggle.hyper_current += .03; +} +if (hp < 60) { + audio_play_sound( snd_enemy_hit_deep, 0, false ); +} else { + audio_play_sound( snd_enemy_hit, 0, false ); +} with (other) { instance_destroy(); diff --git a/thpj3/objects/obj_boss_parent/Destroy_0.gml b/thpj3/objects/obj_boss_parent/Destroy_0.gml index a2f29ab..a75bcac 100644 --- a/thpj3/objects/obj_boss_parent/Destroy_0.gml +++ b/thpj3/objects/obj_boss_parent/Destroy_0.gml @@ -1 +1,6 @@ +effect_create_below(ef_ring, x, y, 2, c_orange); +effect_create_below(ef_ellipse, x, y, 2, c_fuchsia); +effect_create_below(ef_firework, x, y, 2, c_yellow); +effect_create_below(ef_smokeup, x, y, 2, c_silver); +audio_play_sound(snd_boss_destroy, 10, false); obj_stage_controller.timeline_running = true; \ No newline at end of file diff --git a/thpj3/objects/obj_boss_parent/Step_0.gml b/thpj3/objects/obj_boss_parent/Step_0.gml index 3286321..75fb04e 100644 --- a/thpj3/objects/obj_boss_parent/Step_0.gml +++ b/thpj3/objects/obj_boss_parent/Step_0.gml @@ -1,11 +1,15 @@ charge_timer--; if (hp <= 0) { + with (obj_enemy_bullet_parent) { + instance_destroy(); + } if ( current_phase < phases ) { current_phase++; hp = phase_hp[current_phase]; charge_timer = BOSS_CHARGE_TIME; phase_mode = MODE_CHARGE; + audio_play_sound( snd_boss_spellbreak, 1, false ); } else { instance_destroy(); } diff --git a/thpj3/objects/obj_bullet_test/obj_bullet_test.yy b/thpj3/objects/obj_bullet_ball/obj_bullet_ball.yy similarity index 83% rename from thpj3/objects/obj_bullet_test/obj_bullet_test.yy rename to thpj3/objects/obj_bullet_ball/obj_bullet_ball.yy index b9423d7..5ec52ff 100644 --- a/thpj3/objects/obj_bullet_test/obj_bullet_test.yy +++ b/thpj3/objects/obj_bullet_ball/obj_bullet_ball.yy @@ -1,7 +1,7 @@ { "spriteId": { - "name": "spr_bullet_test", - "path": "sprites/spr_bullet_test/spr_bullet_test.yy", + "name": "spr_bullet_ball", + "path": "sprites/spr_bullet_ball/spr_bullet_ball.yy", }, "solid": false, "visible": true, @@ -31,7 +31,7 @@ "path": "folders/enemies.yy", }, "resourceVersion": "1.0", - "name": "obj_bullet_test", + "name": "obj_bullet_ball", "tags": [], "resourceType": "GMObject", } \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_ball/obj_bullet_bead.yy b/thpj3/objects/obj_bullet_ball/obj_bullet_bead.yy new file mode 100644 index 0000000..25870cc --- /dev/null +++ b/thpj3/objects/obj_bullet_ball/obj_bullet_bead.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_pellet", + "path": "sprites/spr_bullet_pellet/spr_bullet_pellet.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_bead", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_ball/obj_bullet_pellet.yy b/thpj3/objects/obj_bullet_ball/obj_bullet_pellet.yy new file mode 100644 index 0000000..0376a19 --- /dev/null +++ b/thpj3/objects/obj_bullet_ball/obj_bullet_pellet.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_pellet", + "path": "sprites/spr_bullet_pellet/spr_bullet_pellet.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_pellet", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_bead/obj_bullet_bead.yy b/thpj3/objects/obj_bullet_bead/obj_bullet_bead.yy new file mode 100644 index 0000000..00067cd --- /dev/null +++ b/thpj3/objects/obj_bullet_bead/obj_bullet_bead.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_bead", + "path": "sprites/spr_bullet_bead/spr_bullet_bead.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_bead", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_bead/obj_bullet_pellet.yy b/thpj3/objects/obj_bullet_bead/obj_bullet_pellet.yy new file mode 100644 index 0000000..0376a19 --- /dev/null +++ b/thpj3/objects/obj_bullet_bead/obj_bullet_pellet.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_pellet", + "path": "sprites/spr_bullet_pellet/spr_bullet_pellet.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_pellet", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_blade/obj_bullet_ball.yy b/thpj3/objects/obj_bullet_blade/obj_bullet_ball.yy new file mode 100644 index 0000000..5ec52ff --- /dev/null +++ b/thpj3/objects/obj_bullet_blade/obj_bullet_ball.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_ball", + "path": "sprites/spr_bullet_ball/spr_bullet_ball.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_ball", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_blade/obj_bullet_bead.yy b/thpj3/objects/obj_bullet_blade/obj_bullet_bead.yy new file mode 100644 index 0000000..25870cc --- /dev/null +++ b/thpj3/objects/obj_bullet_blade/obj_bullet_bead.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_pellet", + "path": "sprites/spr_bullet_pellet/spr_bullet_pellet.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_bead", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_blade/obj_bullet_blade.yy b/thpj3/objects/obj_bullet_blade/obj_bullet_blade.yy new file mode 100644 index 0000000..fbf6738 --- /dev/null +++ b/thpj3/objects/obj_bullet_blade/obj_bullet_blade.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_blade", + "path": "sprites/spr_bullet_blade/spr_bullet_blade.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_blade", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_blade/obj_bullet_pellet.yy b/thpj3/objects/obj_bullet_blade/obj_bullet_pellet.yy new file mode 100644 index 0000000..0376a19 --- /dev/null +++ b/thpj3/objects/obj_bullet_blade/obj_bullet_pellet.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_pellet", + "path": "sprites/spr_bullet_pellet/spr_bullet_pellet.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_pellet", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_card/obj_bullet_ball.yy b/thpj3/objects/obj_bullet_card/obj_bullet_ball.yy new file mode 100644 index 0000000..5ec52ff --- /dev/null +++ b/thpj3/objects/obj_bullet_card/obj_bullet_ball.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_ball", + "path": "sprites/spr_bullet_ball/spr_bullet_ball.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_ball", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_card/obj_bullet_bead.yy b/thpj3/objects/obj_bullet_card/obj_bullet_bead.yy new file mode 100644 index 0000000..25870cc --- /dev/null +++ b/thpj3/objects/obj_bullet_card/obj_bullet_bead.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_pellet", + "path": "sprites/spr_bullet_pellet/spr_bullet_pellet.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_bead", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_card/obj_bullet_blade.yy b/thpj3/objects/obj_bullet_card/obj_bullet_blade.yy new file mode 100644 index 0000000..091cc99 --- /dev/null +++ b/thpj3/objects/obj_bullet_card/obj_bullet_blade.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_ball", + "path": "sprites/spr_bullet_ball/spr_bullet_ball.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_blade", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_card/obj_bullet_card.yy b/thpj3/objects/obj_bullet_card/obj_bullet_card.yy new file mode 100644 index 0000000..dbf92b7 --- /dev/null +++ b/thpj3/objects/obj_bullet_card/obj_bullet_card.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_card", + "path": "sprites/spr_bullet_card/spr_bullet_card.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_card", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_card/obj_bullet_pellet.yy b/thpj3/objects/obj_bullet_card/obj_bullet_pellet.yy new file mode 100644 index 0000000..0376a19 --- /dev/null +++ b/thpj3/objects/obj_bullet_card/obj_bullet_pellet.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_pellet", + "path": "sprites/spr_bullet_pellet/spr_bullet_pellet.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_pellet", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_diamond/obj_bullet_ball.yy b/thpj3/objects/obj_bullet_diamond/obj_bullet_ball.yy new file mode 100644 index 0000000..5ec52ff --- /dev/null +++ b/thpj3/objects/obj_bullet_diamond/obj_bullet_ball.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_ball", + "path": "sprites/spr_bullet_ball/spr_bullet_ball.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_ball", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_diamond/obj_bullet_bead.yy b/thpj3/objects/obj_bullet_diamond/obj_bullet_bead.yy new file mode 100644 index 0000000..25870cc --- /dev/null +++ b/thpj3/objects/obj_bullet_diamond/obj_bullet_bead.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_pellet", + "path": "sprites/spr_bullet_pellet/spr_bullet_pellet.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_bead", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_diamond/obj_bullet_blade.yy b/thpj3/objects/obj_bullet_diamond/obj_bullet_blade.yy new file mode 100644 index 0000000..091cc99 --- /dev/null +++ b/thpj3/objects/obj_bullet_diamond/obj_bullet_blade.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_ball", + "path": "sprites/spr_bullet_ball/spr_bullet_ball.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_blade", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_diamond/obj_bullet_card.yy b/thpj3/objects/obj_bullet_diamond/obj_bullet_card.yy new file mode 100644 index 0000000..705334d --- /dev/null +++ b/thpj3/objects/obj_bullet_diamond/obj_bullet_card.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_ball", + "path": "sprites/spr_bullet_ball/spr_bullet_ball.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_card", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_diamond/obj_bullet_diamond.yy b/thpj3/objects/obj_bullet_diamond/obj_bullet_diamond.yy new file mode 100644 index 0000000..ad3d03e --- /dev/null +++ b/thpj3/objects/obj_bullet_diamond/obj_bullet_diamond.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_diamond", + "path": "sprites/spr_bullet_diamond/spr_bullet_diamond.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_diamond", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_diamond/obj_bullet_pellet.yy b/thpj3/objects/obj_bullet_diamond/obj_bullet_pellet.yy new file mode 100644 index 0000000..0376a19 --- /dev/null +++ b/thpj3/objects/obj_bullet_diamond/obj_bullet_pellet.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_pellet", + "path": "sprites/spr_bullet_pellet/spr_bullet_pellet.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_pellet", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_bullet_pellet/obj_bullet_pellet.yy b/thpj3/objects/obj_bullet_pellet/obj_bullet_pellet.yy new file mode 100644 index 0000000..0376a19 --- /dev/null +++ b/thpj3/objects/obj_bullet_pellet/obj_bullet_pellet.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_bullet_pellet", + "path": "sprites/spr_bullet_pellet/spr_bullet_pellet.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_bullet_parent", + "path": "objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_bullet_pellet", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_dialogue/Draw_0.gml b/thpj3/objects/obj_dialogue/Draw_0.gml index c1e270b..33e307a 100644 --- a/thpj3/objects/obj_dialogue/Draw_0.gml +++ b/thpj3/objects/obj_dialogue/Draw_0.gml @@ -10,7 +10,6 @@ if (dialogue_mode) { // Draw dialogue box draw_self(); -//TODO: Draw current active character's name draw_set_font(fn_dialogue_names); draw_set_alpha(1); if ( last_active == LEFT_ACTOR ) { @@ -25,14 +24,11 @@ if (dialogue_mode) { draw_set_alpha(0); } draw_text( 128, 640, actor_left ); - draw_set_alpha(1); - -//TODO: Draw current active character's text, adding one character at a time + draw_set_font(fn_dialogue_text); draw_text( 145, 490, textspew ); -//TODO: If the current text has reached completion, draw an arrow in the corner if (text_advance_ready == TEXT_READY) { loopdoop++; draw_sprite( spr_text_arrow, round((loopdoop % 160) / 20), 1088, 608 ); diff --git a/thpj3/objects/obj_dialogue/Step_0.gml b/thpj3/objects/obj_dialogue/Step_0.gml index 736c9e5..1f71755 100644 --- a/thpj3/objects/obj_dialogue/Step_0.gml +++ b/thpj3/objects/obj_dialogue/Step_0.gml @@ -64,6 +64,7 @@ if (dialogue_mode) { if (text_advance_ready == TEXT_TYPING ) { textspew += string_char_at(texttarget, spewlength); + audio_play_sound( snd_typewriter, 0, false ); spewlength++; if (keyboard_check_pressed( ord("Z") ) ) { textspew = texttarget; diff --git a/thpj3/objects/obj_disclaimer/obj_disclaimer.yy b/thpj3/objects/obj_disclaimer/obj_disclaimer.yy index 6366738..a1825fb 100644 --- a/thpj3/objects/obj_disclaimer/obj_disclaimer.yy +++ b/thpj3/objects/obj_disclaimer/obj_disclaimer.yy @@ -26,7 +26,7 @@ "overriddenProperties": [], "parent": { "name": "disclaimer", - "path": "folders/disclaimer.yy", + "path": "folders/title/disclaimer.yy", }, "resourceVersion": "1.0", "name": "obj_disclaimer", diff --git a/thpj3/objects/obj_enemy_bullet_parent/Collision_obj_wriggle.gml b/thpj3/objects/obj_enemy_bullet_parent/Collision_obj_wriggle.gml index a2bf0c0..4f54433 100644 --- a/thpj3/objects/obj_enemy_bullet_parent/Collision_obj_wriggle.gml +++ b/thpj3/objects/obj_enemy_bullet_parent/Collision_obj_wriggle.gml @@ -2,5 +2,6 @@ if (!other.invuln) { with (other) { emergency = DEATHBOMB_WINDOW; } + audio_play_sound(snd_player_pchuuun, 20, false); } instance_destroy(); \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_bullet_parent/Destroy_0.gml b/thpj3/objects/obj_enemy_bullet_parent/Destroy_0.gml new file mode 100644 index 0000000..c7371dd --- /dev/null +++ b/thpj3/objects/obj_enemy_bullet_parent/Destroy_0.gml @@ -0,0 +1 @@ +effect_create_below( ef_spark, x, y, 0, c_fuchsia ); \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_bullet_parent/Step_0.gml b/thpj3/objects/obj_enemy_bullet_parent/Step_0.gml index 9cfd20a..093b873 100644 --- a/thpj3/objects/obj_enemy_bullet_parent/Step_0.gml +++ b/thpj3/objects/obj_enemy_bullet_parent/Step_0.gml @@ -5,7 +5,7 @@ if ( obj_wriggle.bombing || obj_wriggle.respawn || obj_dialogue.dialogue_mode ) instance_destroy(); } -if ( obj_wriggle.emergency ) { +if ( obj_wriggle.emergency && !temp_speed ) { temp_speed = speed; speed = 0; } @@ -14,7 +14,14 @@ if ( !obj_wriggle.emergency && temp_speed ) { temp_speed = 0; } +if ( point_distance( x, y, obj_wriggle.x, obj_wriggle.y ) < 64 ) { + obj_wriggle.hyper_current += .1; + audio_play_sound(snd_graze, 0, false); + effect_create_below(ef_spark, obj_wriggle.x, obj_wriggle.y, 0, c_white); +} if ( x < BOUNDARY_LEFT - 128 || x > BOUNDARY_RIGHT + 128 || y < BOUNDARY_TOP - 128 || y > BOUNDARY_BOTTOM + 128 ) { instance_destroy(); -} \ No newline at end of file +} + +image_angle = direction; \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy b/thpj3/objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy index e36c3bd..9f234bb 100644 --- a/thpj3/objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy +++ b/thpj3/objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy @@ -21,6 +21,7 @@ {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, {"isDnD":false,"eventNum":0,"eventType":4,"collisionObjectId":{"name":"obj_wriggle","path":"objects/obj_wriggle/obj_wriggle.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":1,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/thpj3/objects/obj_enemy_fairy_lane/Create_0.gml b/thpj3/objects/obj_enemy_fairy_lane/Create_0.gml new file mode 100644 index 0000000..107679c --- /dev/null +++ b/thpj3/objects/obj_enemy_fairy_lane/Create_0.gml @@ -0,0 +1,7 @@ +// Inherit the parent event +event_inherited(); + +hp = 60; + +pattern_delay = 40 + irandom(20); +pattern_delay_target = 60; \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_test/Step_0.gml b/thpj3/objects/obj_enemy_fairy_lane/Step_0.gml similarity index 56% rename from thpj3/objects/obj_enemy_test/Step_0.gml rename to thpj3/objects/obj_enemy_fairy_lane/Step_0.gml index 288470e..888684e 100644 --- a/thpj3/objects/obj_enemy_test/Step_0.gml +++ b/thpj3/objects/obj_enemy_fairy_lane/Step_0.gml @@ -3,7 +3,7 @@ event_inherited(); pattern_delay -= (1 + obj_wriggle.hyper_tier); -if ( pattern_delay <= 0 ) { - scr_pattern_fire( PATTERN_AIMED_WAVE, 5, obj_bullet_test ); +if ( pattern_delay <= 0 && x > 300 ) { + scr_pattern_fire( PATTERN_LANE, 6, obj_bullet_ball ); pattern_delay = pattern_delay_target; } \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_fairy_lane/obj_enemy_fairy_A.yy b/thpj3/objects/obj_enemy_fairy_lane/obj_enemy_fairy_A.yy new file mode 100644 index 0000000..54b71ec --- /dev/null +++ b/thpj3/objects/obj_enemy_fairy_lane/obj_enemy_fairy_A.yy @@ -0,0 +1,40 @@ +{ + "spriteId": { + "name": "spr_fairy", + "path": "sprites/spr_fairy/spr_fairy.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_parent", + "path": "objects/obj_enemy_parent/obj_enemy_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_enemy_fairy_A", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_fairy_lane/obj_enemy_fairy_lane.yy b/thpj3/objects/obj_enemy_fairy_lane/obj_enemy_fairy_lane.yy new file mode 100644 index 0000000..9003cf6 --- /dev/null +++ b/thpj3/objects/obj_enemy_fairy_lane/obj_enemy_fairy_lane.yy @@ -0,0 +1,40 @@ +{ + "spriteId": { + "name": "spr_fairy", + "path": "sprites/spr_fairy/spr_fairy.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_parent", + "path": "objects/obj_enemy_parent/obj_enemy_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_enemy_fairy_lane", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_fairy_lane/obj_enemy_fairy_shotgun.yy b/thpj3/objects/obj_enemy_fairy_lane/obj_enemy_fairy_shotgun.yy new file mode 100644 index 0000000..9b17923 --- /dev/null +++ b/thpj3/objects/obj_enemy_fairy_lane/obj_enemy_fairy_shotgun.yy @@ -0,0 +1,40 @@ +{ + "spriteId": { + "name": "spr_fairy", + "path": "sprites/spr_fairy/spr_fairy.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_parent", + "path": "objects/obj_enemy_parent/obj_enemy_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_enemy_fairy_shotgun", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_test/obj_enemy_test.yy b/thpj3/objects/obj_enemy_fairy_lane/obj_enemy_popcorn.yy similarity index 94% rename from thpj3/objects/obj_enemy_test/obj_enemy_test.yy rename to thpj3/objects/obj_enemy_fairy_lane/obj_enemy_popcorn.yy index bd38f66..a672759 100644 --- a/thpj3/objects/obj_enemy_test/obj_enemy_test.yy +++ b/thpj3/objects/obj_enemy_fairy_lane/obj_enemy_popcorn.yy @@ -34,7 +34,7 @@ "path": "folders/enemies.yy", }, "resourceVersion": "1.0", - "name": "obj_enemy_test", + "name": "obj_enemy_popcorn", "tags": [], "resourceType": "GMObject", } \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_fairy_shotgun/Create_0.gml b/thpj3/objects/obj_enemy_fairy_shotgun/Create_0.gml new file mode 100644 index 0000000..d4428ed --- /dev/null +++ b/thpj3/objects/obj_enemy_fairy_shotgun/Create_0.gml @@ -0,0 +1,7 @@ +// Inherit the parent event +event_inherited(); + +hp = 100; + +pattern_delay = 40 + irandom(20); +pattern_delay_target = 100; \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_fairy_shotgun/Step_0.gml b/thpj3/objects/obj_enemy_fairy_shotgun/Step_0.gml new file mode 100644 index 0000000..11a2dd9 --- /dev/null +++ b/thpj3/objects/obj_enemy_fairy_shotgun/Step_0.gml @@ -0,0 +1,9 @@ +// Inherit the parent event +event_inherited(); + +pattern_delay -= (1 + obj_wriggle.hyper_tier); + +if ( pattern_delay <= 0 && x > 300 ) { + scr_pattern_fire( PATTERN_SHOTGUN, 5, obj_bullet_diamond ); + pattern_delay = pattern_delay_target; +} \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_fairy_shotgun/obj_enemy_fairy_A.yy b/thpj3/objects/obj_enemy_fairy_shotgun/obj_enemy_fairy_A.yy new file mode 100644 index 0000000..54b71ec --- /dev/null +++ b/thpj3/objects/obj_enemy_fairy_shotgun/obj_enemy_fairy_A.yy @@ -0,0 +1,40 @@ +{ + "spriteId": { + "name": "spr_fairy", + "path": "sprites/spr_fairy/spr_fairy.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_parent", + "path": "objects/obj_enemy_parent/obj_enemy_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_enemy_fairy_A", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_fairy_shotgun/obj_enemy_fairy_shotgun.yy b/thpj3/objects/obj_enemy_fairy_shotgun/obj_enemy_fairy_shotgun.yy new file mode 100644 index 0000000..9b17923 --- /dev/null +++ b/thpj3/objects/obj_enemy_fairy_shotgun/obj_enemy_fairy_shotgun.yy @@ -0,0 +1,40 @@ +{ + "spriteId": { + "name": "spr_fairy", + "path": "sprites/spr_fairy/spr_fairy.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_parent", + "path": "objects/obj_enemy_parent/obj_enemy_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_enemy_fairy_shotgun", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_fairy_shotgun/obj_enemy_popcorn.yy b/thpj3/objects/obj_enemy_fairy_shotgun/obj_enemy_popcorn.yy new file mode 100644 index 0000000..a672759 --- /dev/null +++ b/thpj3/objects/obj_enemy_fairy_shotgun/obj_enemy_popcorn.yy @@ -0,0 +1,40 @@ +{ + "spriteId": { + "name": "spr_fluff", + "path": "sprites/spr_fluff/spr_fluff.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_parent", + "path": "objects/obj_enemy_parent/obj_enemy_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_enemy_popcorn", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_fairy_wave/Create_0.gml b/thpj3/objects/obj_enemy_fairy_wave/Create_0.gml new file mode 100644 index 0000000..0fde687 --- /dev/null +++ b/thpj3/objects/obj_enemy_fairy_wave/Create_0.gml @@ -0,0 +1,7 @@ +// Inherit the parent event +event_inherited(); + +hp = 120; + +pattern_delay = 40 + irandom(20); +pattern_delay_target = 100; \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_fairy_wave/Step_0.gml b/thpj3/objects/obj_enemy_fairy_wave/Step_0.gml new file mode 100644 index 0000000..b0446be --- /dev/null +++ b/thpj3/objects/obj_enemy_fairy_wave/Step_0.gml @@ -0,0 +1,9 @@ +// Inherit the parent event +event_inherited(); + +pattern_delay -= (1 + obj_wriggle.hyper_tier); + +if ( pattern_delay <= 0 && x > 300 ) { + scr_pattern_fire( PATTERN_AIMED_WAVE, 3, obj_bullet_bead ); + pattern_delay = pattern_delay_target; +} \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_fairy_wave/obj_enemy_fairy_wave.yy b/thpj3/objects/obj_enemy_fairy_wave/obj_enemy_fairy_wave.yy new file mode 100644 index 0000000..ec9ae8e --- /dev/null +++ b/thpj3/objects/obj_enemy_fairy_wave/obj_enemy_fairy_wave.yy @@ -0,0 +1,40 @@ +{ + "spriteId": { + "name": "spr_fairy", + "path": "sprites/spr_fairy/spr_fairy.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_parent", + "path": "objects/obj_enemy_parent/obj_enemy_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_enemy_fairy_wave", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_fairy_wave/obj_enemy_popcorn.yy b/thpj3/objects/obj_enemy_fairy_wave/obj_enemy_popcorn.yy new file mode 100644 index 0000000..a672759 --- /dev/null +++ b/thpj3/objects/obj_enemy_fairy_wave/obj_enemy_popcorn.yy @@ -0,0 +1,40 @@ +{ + "spriteId": { + "name": "spr_fluff", + "path": "sprites/spr_fluff/spr_fluff.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_parent", + "path": "objects/obj_enemy_parent/obj_enemy_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_enemy_popcorn", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_parent/Collision_obj_player_shot.gml b/thpj3/objects/obj_enemy_parent/Collision_obj_player_shot.gml index 083a6fa..cfdef6d 100644 --- a/thpj3/objects/obj_enemy_parent/Collision_obj_player_shot.gml +++ b/thpj3/objects/obj_enemy_parent/Collision_obj_player_shot.gml @@ -1,4 +1,13 @@ hp -= other.damage; +obj_wriggle.hyper_current += .01; +if ( point_distance(x, y, obj_wriggle.x, obj_wriggle.y) < 96 ) { + obj_wriggle.hyper_current += .03; +} +if (hp < 60) { + audio_play_sound( snd_enemy_hit_deep, 0, false ); +} else { + audio_play_sound( snd_enemy_hit, 0, false ); +} with (other) { instance_destroy(); diff --git a/thpj3/objects/obj_enemy_parent/Collision_obj_wriggle.gml b/thpj3/objects/obj_enemy_parent/Collision_obj_wriggle.gml index 3262bfd..54ae3d6 100644 --- a/thpj3/objects/obj_enemy_parent/Collision_obj_wriggle.gml +++ b/thpj3/objects/obj_enemy_parent/Collision_obj_wriggle.gml @@ -2,4 +2,5 @@ if (!other.invuln) { with (other) { emergency = DEATHBOMB_WINDOW; } + audio_play_sound(snd_player_pchuuun, 20, false); } \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_parent/Destroy_0.gml b/thpj3/objects/obj_enemy_parent/Destroy_0.gml new file mode 100644 index 0000000..fd18459 --- /dev/null +++ b/thpj3/objects/obj_enemy_parent/Destroy_0.gml @@ -0,0 +1,4 @@ +effect_create_below( ef_ellipse, x, y, 1, c_teal ); +effect_create_below( ef_smoke, x, y, 0, c_silver ); +audio_play_sound( snd_enemy_destroy, 0, false ); +obj_wriggle.hyper_current += 2; \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_parent/Step_0.gml b/thpj3/objects/obj_enemy_parent/Step_0.gml index 6cd166a..667d07b 100644 --- a/thpj3/objects/obj_enemy_parent/Step_0.gml +++ b/thpj3/objects/obj_enemy_parent/Step_0.gml @@ -1,8 +1,9 @@ -if ( hp <= 0 || obj_dialogue.dialogue_mode ) { +if ( obj_dialogue.dialogue_mode || y < BOUNDARY_TOP - 160 || y > BOUNDARY_BOTTOM + 160 || x < BOUNDARY_LEFT - 160 || x > BOUNDARY_RIGHT + 160 ) { instance_destroy(); - if ( !obj_dialogue.dialogue_mode ) { -//TODO: point system for kills - } +} +if (hp <= 0 ) { + instance_destroy(); + //TODO: point system for kills } if ( obj_wriggle.emergency && !temp_speed ) { temp_speed = speed; diff --git a/thpj3/objects/obj_enemy_parent/obj_enemy_parent.yy b/thpj3/objects/obj_enemy_parent/obj_enemy_parent.yy index 7b6cf37..a59a027 100644 --- a/thpj3/objects/obj_enemy_parent/obj_enemy_parent.yy +++ b/thpj3/objects/obj_enemy_parent/obj_enemy_parent.yy @@ -23,6 +23,7 @@ {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, {"isDnD":false,"eventNum":0,"eventType":4,"collisionObjectId":{"name":"obj_wriggle","path":"objects/obj_wriggle/obj_wriggle.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":1,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/thpj3/objects/obj_enemy_test/Create_0.gml b/thpj3/objects/obj_enemy_popcorn/Create_0.gml similarity index 100% rename from thpj3/objects/obj_enemy_test/Create_0.gml rename to thpj3/objects/obj_enemy_popcorn/Create_0.gml diff --git a/thpj3/objects/obj_enemy_popcorn/Step_0.gml b/thpj3/objects/obj_enemy_popcorn/Step_0.gml new file mode 100644 index 0000000..c2fbcf1 --- /dev/null +++ b/thpj3/objects/obj_enemy_popcorn/Step_0.gml @@ -0,0 +1,9 @@ +// Inherit the parent event +event_inherited(); + +pattern_delay -= (1 + obj_wriggle.hyper_tier); + +if ( pattern_delay <= 0 && x > 300 ) { + scr_pattern_fire( PATTERN_STREAM, 5, obj_bullet_blade ); + pattern_delay = pattern_delay_target; +} \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_popcorn/obj_enemy_popcorn.yy b/thpj3/objects/obj_enemy_popcorn/obj_enemy_popcorn.yy new file mode 100644 index 0000000..a672759 --- /dev/null +++ b/thpj3/objects/obj_enemy_popcorn/obj_enemy_popcorn.yy @@ -0,0 +1,40 @@ +{ + "spriteId": { + "name": "spr_fluff", + "path": "sprites/spr_fluff/spr_fluff.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_parent", + "path": "objects/obj_enemy_parent/obj_enemy_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "obj_enemy_popcorn", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_stage_controller/Create_0.gml b/thpj3/objects/obj_stage_controller/Create_0.gml index 9a0af11..ef37ff9 100644 --- a/thpj3/objects/obj_stage_controller/Create_0.gml +++ b/thpj3/objects/obj_stage_controller/Create_0.gml @@ -1,3 +1,4 @@ timeline_index = tl_stage1_logic; timeline_running = true; timeline_loop = false; +audio_play_sound(snd_music_stage1, 0, true); \ No newline at end of file diff --git a/thpj3/objects/obj_stage_controller/Step_0.gml b/thpj3/objects/obj_stage_controller/Step_0.gml index 2baf983..35cf208 100644 --- a/thpj3/objects/obj_stage_controller/Step_0.gml +++ b/thpj3/objects/obj_stage_controller/Step_0.gml @@ -2,4 +2,5 @@ if ( obj_dialogue.dialogue_mode || instance_exists(obj_boss_parent) ) { timeline_running = false; } else { timeline_running = true; -} \ No newline at end of file +} +effect_create_below(ef_rain, 0, 0, 0, c_teal); \ No newline at end of file diff --git a/thpj3/objects/obj_title_moon/Create_0.gml b/thpj3/objects/obj_title_moon/Create_0.gml index 4ed8663..543f73c 100644 --- a/thpj3/objects/obj_title_moon/Create_0.gml +++ b/thpj3/objects/obj_title_moon/Create_0.gml @@ -2,4 +2,6 @@ image_alpha = 0; counter = 0; -title_created = 0; \ No newline at end of file +title_created = 0; + +audio_play_sound( snd_music_title, 0, true ); \ No newline at end of file diff --git a/thpj3/objects/obj_wriggle/Step_0.gml b/thpj3/objects/obj_wriggle/Step_0.gml index 20bfbe5..1d99c50 100644 --- a/thpj3/objects/obj_wriggle/Step_0.gml +++ b/thpj3/objects/obj_wriggle/Step_0.gml @@ -35,6 +35,10 @@ if ( hyper_current > HYPER_MAX ) { } if ( emergency == 0 ) { lives_current -= 1; + effect_create_below( ef_ring, x, y, 2, c_aqua ); + for ( var i = 0; i < 20; i++ ) { + effect_create_below( ef_firework, x, y, 2, make_color_rgb( irandom(255), irandom(255), irandom(255) ) ); + } bombs_current = BOMBS_INIT; hyper_current += HYPER_COST; hyper_time = 0; @@ -65,6 +69,8 @@ if ( input_bomb && !bombing && !recovery && !respawn && !obj_dialogue.dialogue_m hyper_time = 420; hyper_tier = HYPER_TIER_3; emergency = -5; +//TODO: create hyper activation effect + audio_play_sound(snd_player_hyperactive, 3, false); } else if (bombs_current > 0 ) { bombs_current = 0; //costs all bombs bombing = 300; @@ -73,8 +79,8 @@ if ( input_bomb && !bombing && !recovery && !respawn && !obj_dialogue.dialogue_m if (hyper_time > 0) { hyper_time = 0; } -//TODO: create death bomb object instance_create_layer( 0, 0, "player", obj_bomber_topologic ); + audio_play_sound(snd_player_deathbomb, 3, false); } } else { if ( hyper_current >= HYPER_COST && hyper_tier == HYPER_INACTIVE ) { @@ -86,6 +92,8 @@ if ( input_bomb && !bombing && !recovery && !respawn && !obj_dialogue.dialogue_m } bombing = 60; invuln = 60; +//TODO: create hyper activation effect + audio_play_sound(snd_player_hyperactive, 3, false); } else if ( bombs_current > 0 ) { bombs_current -= 1; //costs 1 bomb bombing = 180; @@ -93,8 +101,8 @@ if ( input_bomb && !bombing && !recovery && !respawn && !obj_dialogue.dialogue_m if (hyper_time > 0) { hyper_time = 0; } -//TODO: create bomb object instance_create_layer( x, y, "player", obj_bomber ); + audio_play_sound(snd_player_bomber, 3, false); } } } @@ -151,6 +159,11 @@ if ( !emergency && !respawn && !obj_dialogue.dialogue_mode ) { if ( input_shot_left || input_shot_right ) { if ( shoot_delay <= 0 ) { shoot_delay = SHOT_DELAY; + if (hyper_time) { + audio_play_sound(snd_player_hypershot, 0, false); + } else { + audio_play_sound(snd_player_shot, 0, false); + } var shooty = instance_create_layer( x + (face_dir * 10), y + (TOP * 10), "player", obj_player_shot); with (shooty) { face_dir = other.face_dir; @@ -208,6 +221,7 @@ if ( !emergency && !respawn && !obj_dialogue.dialogue_mode ) { //death logic if ( lives_current == 0 ) { //TODO: add score and continue logic + audio_stop_all(); room_goto(rm_title); } diff --git a/thpj3/rooms/rm_disclaimer/rm_disclaimer.yy b/thpj3/rooms/rm_disclaimer/rm_disclaimer.yy index bf44ded..9d69693 100644 --- a/thpj3/rooms/rm_disclaimer/rm_disclaimer.yy +++ b/thpj3/rooms/rm_disclaimer/rm_disclaimer.yy @@ -19,7 +19,7 @@ {"spriteId":null,"colour":4278190080,"x":0,"y":0,"htiled":false,"vtiled":false,"hspeed":0.0,"vspeed":0.0,"stretch":false,"animationFPS":15.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Background","tags":[],"resourceType":"GMRBackgroundLayer",}, ], "inheritLayers": false, - "creationCodeFile": "", + "creationCodeFile": "${project_dir}/rooms/rm_disclaimer/RoomCreationCode.gml", "inheritCode": false, "instanceCreationOrder": [ {"name":"inst_4BF4F708","path":"rooms/rm_disclaimer/rm_disclaimer.yy",}, diff --git a/thpj3/rooms/rm_stage1/rm_stage1.yy b/thpj3/rooms/rm_stage1/rm_stage1.yy index 9921ddb..aa0a89d 100644 --- a/thpj3/rooms/rm_stage1/rm_stage1.yy +++ b/thpj3/rooms/rm_stage1/rm_stage1.yy @@ -26,12 +26,14 @@ {"properties":[],"isDnd":false,"objectId":{"name":"obj_darkfade","path":"objects/obj_darkfade/obj_darkfade.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":32.0,"y":32.0,"resourceVersion":"1.0","name":"inst_38CD0D4A","tags":[],"resourceType":"GMRInstance",}, ],"visible":true,"depth":300,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"controllers","tags":[],"resourceType":"GMRInstanceLayer",}, {"spriteId":{"name":"spr_bg_ground","path":"sprites/spr_bg_ground/spr_bg_ground.yy",},"colour":4294967295,"x":0,"y":0,"htiled":true,"vtiled":false,"hspeed":-10.0,"vspeed":0.0,"stretch":false,"animationFPS":30.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":400,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"ground","tags":[],"resourceType":"GMRBackgroundLayer",}, - {"spriteId":{"name":"spr_bg_forest","path":"sprites/spr_bg_forest/spr_bg_forest.yy",},"colour":4294967295,"x":0,"y":0,"htiled":true,"vtiled":false,"hspeed":-5.0,"vspeed":0.0,"stretch":false,"animationFPS":30.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":500,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"forest","tags":[],"resourceType":"GMRBackgroundLayer",}, + {"spriteId":{"name":"spr_bg_forest_front","path":"sprites/spr_bg_forest_front/spr_bg_forest_front.yy",},"colour":4294967295,"x":0,"y":0,"htiled":true,"vtiled":false,"hspeed":-5.0,"vspeed":0.0,"stretch":false,"animationFPS":30.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":500,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"forest_front","tags":[],"resourceType":"GMRBackgroundLayer",}, + {"spriteId":{"name":"spr_bg_forest_mid","path":"sprites/spr_bg_forest_mid/spr_bg_forest_mid.yy",},"colour":4294967295,"x":0,"y":0,"htiled":true,"vtiled":false,"hspeed":-3.5,"vspeed":0.0,"stretch":false,"animationFPS":30.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":600,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"forest_mid","tags":[],"resourceType":"GMRBackgroundLayer",}, + {"spriteId":{"name":"spr_bg_forest_back","path":"sprites/spr_bg_forest_back/spr_bg_forest_back.yy",},"colour":4294967295,"x":0,"y":0,"htiled":true,"vtiled":false,"hspeed":-2.0,"vspeed":0.0,"stretch":false,"animationFPS":30.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":700,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"forest_back","tags":[],"resourceType":"GMRBackgroundLayer",}, {"assets":[ {"spriteId":{"name":"spr_title_moon","path":"sprites/spr_title_moon/spr_title_moon.yy",},"headPosition":0.0,"rotation":0.0,"scaleX":0.46875,"scaleY":0.46875,"animationSpeed":1.0,"colour":4294967295,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":1024.0,"y":128.0,"resourceVersion":"1.0","name":"graphic_6AB766E1","tags":[],"resourceType":"GMRSpriteGraphic",}, - ],"visible":true,"depth":600,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"moon","tags":[],"resourceType":"GMRAssetLayer",}, - {"spriteId":{"name":"spr_bg_stars","path":"sprites/spr_bg_stars/spr_bg_stars.yy",},"colour":4294967295,"x":0,"y":0,"htiled":true,"vtiled":false,"hspeed":-0.3,"vspeed":0.0,"stretch":false,"animationFPS":30.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":700,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"stars","tags":[],"resourceType":"GMRBackgroundLayer",}, - {"spriteId":{"name":"spr_bg_sky","path":"sprites/spr_bg_sky/spr_bg_sky.yy",},"colour":4294967295,"x":0,"y":0,"htiled":true,"vtiled":false,"hspeed":-0.3,"vspeed":0.0,"stretch":false,"animationFPS":30.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":800,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"sky","tags":[],"resourceType":"GMRBackgroundLayer",}, + ],"visible":true,"depth":800,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"moon","tags":[],"resourceType":"GMRAssetLayer",}, + {"spriteId":{"name":"spr_bg_stars","path":"sprites/spr_bg_stars/spr_bg_stars.yy",},"colour":4294967295,"x":0,"y":0,"htiled":true,"vtiled":false,"hspeed":-0.3,"vspeed":0.0,"stretch":false,"animationFPS":30.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":900,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"stars","tags":[],"resourceType":"GMRBackgroundLayer",}, + {"spriteId":{"name":"spr_bg_sky","path":"sprites/spr_bg_sky/spr_bg_sky.yy",},"colour":4294967295,"x":0,"y":0,"htiled":true,"vtiled":false,"hspeed":-0.3,"vspeed":0.0,"stretch":false,"animationFPS":30.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":1000,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"sky","tags":[],"resourceType":"GMRBackgroundLayer",}, ], "inheritLayers": false, "creationCodeFile": "", diff --git a/thpj3/scripts/scr_initialize/scr_initialize.gml b/thpj3/scripts/scr_initialize/scr_initialize.gml index 40a3f11..21b655f 100644 --- a/thpj3/scripts/scr_initialize/scr_initialize.gml +++ b/thpj3/scripts/scr_initialize/scr_initialize.gml @@ -16,7 +16,7 @@ #macro BOUNDARY_LEFT 32 #macro BOUNDARY_RIGHT 1248 #macro BOUNDARY_TOP 132 -#macro BOUNDARY_BOTTOM 688 +#macro BOUNDARY_BOTTOM 656 #macro SPAWN_X 120 #macro SPAWN_Y 360 @@ -55,6 +55,10 @@ #macro PATTERN_STREAM 0 #macro PATTERN_AIMED_WAVE 1 +#macro PATTERN_SHOTGUN 2 +#macro PATTERN_LANE 3 +#macro PATTERN_RANDOM_BURST 4 +#macro PATTERN_RING 5 #macro MODE_APPROACH 0 #macro MODE_CHAT 1 diff --git a/thpj3/scripts/scr_pattern_fire/scr_pattern_fire.gml b/thpj3/scripts/scr_pattern_fire/scr_pattern_fire.gml index 0b1c816..c367cd7 100644 --- a/thpj3/scripts/scr_pattern_fire/scr_pattern_fire.gml +++ b/thpj3/scripts/scr_pattern_fire/scr_pattern_fire.gml @@ -7,35 +7,100 @@ function scr_pattern_fire( _pattern, _speed, _bullet ) { switch ( _pattern ) { case PATTERN_STREAM: + audio_play_sound( snd_enemy_bullet, 1, false ); exy = instance_create_layer( x, y, "enemy", _bullet ); with (exy) { speed = _speed; - friction = -.05 * obj_wriggle.hyper_tier; + friction = -.02 * obj_wriggle.hyper_tier; direction = point_direction( x, y, obj_wriggle.x, obj_wriggle.y ); } if ( obj_wriggle.hyper_tier > HYPER_TIER_1 ) { exy = instance_create_layer( x, y, "enemy", _bullet ); with (exy) { speed = _speed; - friction = -.05 * obj_wriggle.hyper_tier; + friction = -.02 * obj_wriggle.hyper_tier; direction = point_direction( x, y, obj_wriggle.x, obj_wriggle.y ) + 20; } exy = instance_create_layer( x, y, "enemy", _bullet ); with (exy) { speed = _speed; - friction = -.05 * obj_wriggle.hyper_tier; + friction = -.02 * obj_wriggle.hyper_tier; direction = point_direction( x, y, obj_wriggle.x, obj_wriggle.y ) - 20; } } break; case PATTERN_AIMED_WAVE: + audio_play_sound( snd_enemy_bullet, 1, false ); for ( var i = 0; i < 5 + (obj_wriggle.hyper_tier * 2); i++ ) { exy = instance_create_layer( x, y, "enemy", _bullet ); with (exy) { speed = _speed; - friction = -.05 * obj_wriggle.hyper_tier; + friction = -.02 * obj_wriggle.hyper_tier; direction = point_direction( x, y, obj_wriggle.x, obj_wriggle.y ) - - (30 + 10 * obj_wriggle.hyper_tier) + ( i * (60 + 10 * obj_wriggle.hyper_tier) / (5 + obj_wriggle.hyper_tier * 2) ); + - (30 + 10 * obj_wriggle.hyper_tier) + ( i * (50 + 10 * obj_wriggle.hyper_tier) / (5 + obj_wriggle.hyper_tier * 2) ); + } + } + break; + case PATTERN_SHOTGUN: + audio_play_sound( snd_enemy_bullet, 1, false ); + for ( var i = 0; i < 3 + (obj_wriggle.hyper_tier * 2); i++ ) { + exy = instance_create_layer( x, y, "enemy", _bullet ); + with (exy) { + speed = _speed - 1; + friction = -.02 * obj_wriggle.hyper_tier; + direction = point_direction( x, y, obj_wriggle.x, obj_wriggle.y ) + - (10 + 10 * obj_wriggle.hyper_tier) + ( i * (20 + 10 * obj_wriggle.hyper_tier) / (5 + obj_wriggle.hyper_tier * 2) ); + } + } + for ( var i = 0; i < 3 + (obj_wriggle.hyper_tier * 2); i++ ) { + exy = instance_create_layer( x, y, "enemy", _bullet ); + with (exy) { + speed = _speed - .5; + friction = -.02 * obj_wriggle.hyper_tier; + direction = point_direction( x, y, obj_wriggle.x, obj_wriggle.y ) + - (10 + 10 * obj_wriggle.hyper_tier) + ( i * (20 + 10 * obj_wriggle.hyper_tier) / (2 + obj_wriggle.hyper_tier * 2) ); + } + } + for ( var i = 0; i < 3 + (obj_wriggle.hyper_tier * 2); i++ ) { + exy = instance_create_layer( x, y, "enemy", _bullet ); + with (exy) { + speed = _speed; + friction = -.02 * obj_wriggle.hyper_tier; + direction = point_direction( x, y, obj_wriggle.x, obj_wriggle.y ) + - (10 + 10 * obj_wriggle.hyper_tier) + ( i * (20 + 10 * obj_wriggle.hyper_tier) / (2 + obj_wriggle.hyper_tier * 2) ); + } + } + break; + case PATTERN_LANE: + audio_play_sound( snd_enemy_bullet, 1, false ); + for ( var i = 0; i < 5 + (obj_wriggle.hyper_tier * 2); i++ ) { + exy = instance_create_layer( x, y, "enemy", _bullet ); + with (exy) { + speed = _speed - (i / 2); + friction = -.02 * obj_wriggle.hyper_tier; + direction = point_direction( x, y, obj_wriggle.x, obj_wriggle.y ); + } + } + break; + case PATTERN_RANDOM_BURST: + audio_play_sound( snd_enemy_bullet, 1, false ); + for ( var i = 0; i < 6 + (obj_wriggle.hyper_tier * 3); i++ ) { + exy = instance_create_layer( x, y, "enemy", _bullet ); + with (exy) { + speed = _speed + random(2); + friction = -.02 * obj_wriggle.hyper_tier; + direction = irandom(360); + } + } + break; + case PATTERN_RING: + audio_play_sound( snd_enemy_bullet, 1, false ); + for ( var i = 0; i < 12 + (obj_wriggle.hyper_tier * 6); i++ ) { + exy = instance_create_layer( x, y, "enemy", _bullet ); + with (exy) { + speed = _speed; + friction = -.02 * obj_wriggle.hyper_tier; + direction = i * (360 / (12 + obj_wriggle.hyper_tier * 6)); } } break; diff --git a/thpj3/sounds/snd_boss_destroy/snd_boss_destroy.yy b/thpj3/sounds/snd_boss_destroy/snd_boss_destroy.yy new file mode 100644 index 0000000..271c669 --- /dev/null +++ b/thpj3/sounds/snd_boss_destroy/snd_boss_destroy.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 0, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "snd_boss_destroy", + "duration": 0.0, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "snd_boss_destroy", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/thpj3/sounds/snd_boss_spellbreak/snd_boss_spellbreak.yy b/thpj3/sounds/snd_boss_spellbreak/snd_boss_spellbreak.yy new file mode 100644 index 0000000..46a6889 --- /dev/null +++ b/thpj3/sounds/snd_boss_spellbreak/snd_boss_spellbreak.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 0, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "snd_boss_spellbreak", + "duration": 0.0, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "snd_boss_spellbreak", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/thpj3/sounds/snd_enemy_bullet/snd_enemy_bullet.yy b/thpj3/sounds/snd_enemy_bullet/snd_enemy_bullet.yy new file mode 100644 index 0000000..f935186 --- /dev/null +++ b/thpj3/sounds/snd_enemy_bullet/snd_enemy_bullet.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 0, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "snd_enemy_bullet", + "duration": 0.0, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "snd_enemy_bullet", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/thpj3/sounds/snd_enemy_destroy/snd_enemy_destroy.yy b/thpj3/sounds/snd_enemy_destroy/snd_enemy_destroy.yy new file mode 100644 index 0000000..e53f0ff --- /dev/null +++ b/thpj3/sounds/snd_enemy_destroy/snd_enemy_destroy.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 0, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "snd_enemy_destroy", + "duration": 0.0, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "snd_enemy_destroy", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/thpj3/sounds/snd_enemy_hit/snd_enemy_hit.yy b/thpj3/sounds/snd_enemy_hit/snd_enemy_hit.yy new file mode 100644 index 0000000..629c8da --- /dev/null +++ b/thpj3/sounds/snd_enemy_hit/snd_enemy_hit.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 0, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "snd_enemy_hit", + "duration": 0.0, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "snd_enemy_hit", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/thpj3/sounds/snd_enemy_hit_deep/snd_enemy_hit_deep.yy b/thpj3/sounds/snd_enemy_hit_deep/snd_enemy_hit_deep.yy new file mode 100644 index 0000000..12ddb9a --- /dev/null +++ b/thpj3/sounds/snd_enemy_hit_deep/snd_enemy_hit_deep.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 0, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "snd_enemy_hit_deep", + "duration": 0.0, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "snd_enemy_hit_deep", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/thpj3/sounds/snd_graze/snd_graze.yy b/thpj3/sounds/snd_graze/snd_graze.yy new file mode 100644 index 0000000..2bb8e34 --- /dev/null +++ b/thpj3/sounds/snd_graze/snd_graze.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 0, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "snd_graze", + "duration": 0.0, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "snd_graze", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/thpj3/sounds/snd_music_stage1/snd_music_stage1.yy b/thpj3/sounds/snd_music_stage1/snd_music_stage1.yy new file mode 100644 index 0000000..aa93bce --- /dev/null +++ b/thpj3/sounds/snd_music_stage1/snd_music_stage1.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 0, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "snd_music_stage1", + "duration": 0.0, + "parent": { + "name": "stage", + "path": "folders/stage.yy", + }, + "resourceVersion": "1.0", + "name": "snd_music_stage1", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/thpj3/sounds/snd_music_title/snd_music_title.yy b/thpj3/sounds/snd_music_title/snd_music_title.yy new file mode 100644 index 0000000..76f7317 --- /dev/null +++ b/thpj3/sounds/snd_music_title/snd_music_title.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 0, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "snd_music_title", + "duration": 0.0, + "parent": { + "name": "title", + "path": "folders/title.yy", + }, + "resourceVersion": "1.0", + "name": "snd_music_title", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/thpj3/sounds/snd_player_bomber/snd_player_bomber.yy b/thpj3/sounds/snd_player_bomber/snd_player_bomber.yy new file mode 100644 index 0000000..fb7d76d --- /dev/null +++ b/thpj3/sounds/snd_player_bomber/snd_player_bomber.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 0, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "snd_player_bomber", + "duration": 0.0, + "parent": { + "name": "player", + "path": "folders/player.yy", + }, + "resourceVersion": "1.0", + "name": "snd_player_bomber", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/thpj3/sounds/snd_player_deathbomb/snd_player_deathbomb.yy b/thpj3/sounds/snd_player_deathbomb/snd_player_deathbomb.yy new file mode 100644 index 0000000..5c22567 --- /dev/null +++ b/thpj3/sounds/snd_player_deathbomb/snd_player_deathbomb.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 0, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "snd_player_deathbomb", + "duration": 0.0, + "parent": { + "name": "player", + "path": "folders/player.yy", + }, + "resourceVersion": "1.0", + "name": "snd_player_deathbomb", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/thpj3/sounds/snd_player_hyperactive/snd_player_hyperactive.yy b/thpj3/sounds/snd_player_hyperactive/snd_player_hyperactive.yy new file mode 100644 index 0000000..5a5a5c5 --- /dev/null +++ b/thpj3/sounds/snd_player_hyperactive/snd_player_hyperactive.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 0, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "snd_player_hyperactive", + "duration": 0.0, + "parent": { + "name": "player", + "path": "folders/player.yy", + }, + "resourceVersion": "1.0", + "name": "snd_player_hyperactive", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/thpj3/sounds/snd_player_hypershot/snd_player_hypershot.yy b/thpj3/sounds/snd_player_hypershot/snd_player_hypershot.yy new file mode 100644 index 0000000..11a5ab6 --- /dev/null +++ b/thpj3/sounds/snd_player_hypershot/snd_player_hypershot.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 0, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "snd_player_hypershot", + "duration": 0.0, + "parent": { + "name": "player", + "path": "folders/player.yy", + }, + "resourceVersion": "1.0", + "name": "snd_player_hypershot", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/thpj3/sounds/snd_player_hypershot/snd_player_shot.yy b/thpj3/sounds/snd_player_hypershot/snd_player_shot.yy new file mode 100644 index 0000000..3cc0d0a --- /dev/null +++ b/thpj3/sounds/snd_player_hypershot/snd_player_shot.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 0, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "snd_player_shot", + "duration": 0.0, + "parent": { + "name": "player", + "path": "folders/player.yy", + }, + "resourceVersion": "1.0", + "name": "snd_player_shot", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/thpj3/sounds/snd_player_pchuuun/snd_player_pchuuun.yy b/thpj3/sounds/snd_player_pchuuun/snd_player_pchuuun.yy new file mode 100644 index 0000000..6b36e9e --- /dev/null +++ b/thpj3/sounds/snd_player_pchuuun/snd_player_pchuuun.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 0, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "snd_player_pchuuun", + "duration": 0.0, + "parent": { + "name": "player", + "path": "folders/player.yy", + }, + "resourceVersion": "1.0", + "name": "snd_player_pchuuun", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/thpj3/sounds/snd_player_shot/snd_player_shot.yy b/thpj3/sounds/snd_player_shot/snd_player_shot.yy new file mode 100644 index 0000000..3cc0d0a --- /dev/null +++ b/thpj3/sounds/snd_player_shot/snd_player_shot.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 0, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "snd_player_shot", + "duration": 0.0, + "parent": { + "name": "player", + "path": "folders/player.yy", + }, + "resourceVersion": "1.0", + "name": "snd_player_shot", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/thpj3/sounds/snd_typewriter/snd_typewriter.yy b/thpj3/sounds/snd_typewriter/snd_typewriter.yy new file mode 100644 index 0000000..ce61fdf --- /dev/null +++ b/thpj3/sounds/snd_typewriter/snd_typewriter.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 0, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "snd_typewriter", + "duration": 0.0, + "parent": { + "name": "dialogue", + "path": "folders/dialogue.yy", + }, + "resourceVersion": "1.0", + "name": "snd_typewriter", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_UI_boss_bar/92f03cad-6e1d-454c-b472-6016483bb2e3.png b/thpj3/sprites/spr_UI_boss_bar/92f03cad-6e1d-454c-b472-6016483bb2e3.png new file mode 100644 index 0000000..1c17015 Binary files /dev/null and b/thpj3/sprites/spr_UI_boss_bar/92f03cad-6e1d-454c-b472-6016483bb2e3.png differ diff --git a/thpj3/sprites/spr_UI_boss_bar/layers/92f03cad-6e1d-454c-b472-6016483bb2e3/aff50d2d-54e1-40c3-8e36-0ec33791b287.png b/thpj3/sprites/spr_UI_boss_bar/layers/92f03cad-6e1d-454c-b472-6016483bb2e3/aff50d2d-54e1-40c3-8e36-0ec33791b287.png new file mode 100644 index 0000000..1c444c6 Binary files /dev/null and b/thpj3/sprites/spr_UI_boss_bar/layers/92f03cad-6e1d-454c-b472-6016483bb2e3/aff50d2d-54e1-40c3-8e36-0ec33791b287.png differ diff --git a/thpj3/sprites/spr_UI_boss_bar/layers/92f03cad-6e1d-454c-b472-6016483bb2e3/b316f6ef-a410-491c-b4d7-90bc860df1dc.png b/thpj3/sprites/spr_UI_boss_bar/layers/92f03cad-6e1d-454c-b472-6016483bb2e3/b316f6ef-a410-491c-b4d7-90bc860df1dc.png new file mode 100644 index 0000000..4dfe7b6 Binary files /dev/null and b/thpj3/sprites/spr_UI_boss_bar/layers/92f03cad-6e1d-454c-b472-6016483bb2e3/b316f6ef-a410-491c-b4d7-90bc860df1dc.png differ diff --git a/thpj3/sprites/spr_UI_boss_bar/layers/92f03cad-6e1d-454c-b472-6016483bb2e3/b373a4d1-3822-444d-a4de-324d37ecaf9b.png b/thpj3/sprites/spr_UI_boss_bar/layers/92f03cad-6e1d-454c-b472-6016483bb2e3/b373a4d1-3822-444d-a4de-324d37ecaf9b.png new file mode 100644 index 0000000..1428aeb Binary files /dev/null and b/thpj3/sprites/spr_UI_boss_bar/layers/92f03cad-6e1d-454c-b472-6016483bb2e3/b373a4d1-3822-444d-a4de-324d37ecaf9b.png differ diff --git a/thpj3/sprites/spr_UI_boss_bar/layers/92f03cad-6e1d-454c-b472-6016483bb2e3/d49131f6-2fa1-42f6-b090-f8b414c7aed3.png b/thpj3/sprites/spr_UI_boss_bar/layers/92f03cad-6e1d-454c-b472-6016483bb2e3/d49131f6-2fa1-42f6-b090-f8b414c7aed3.png new file mode 100644 index 0000000..18750cb Binary files /dev/null and b/thpj3/sprites/spr_UI_boss_bar/layers/92f03cad-6e1d-454c-b472-6016483bb2e3/d49131f6-2fa1-42f6-b090-f8b414c7aed3.png differ diff --git a/thpj3/sprites/spr_UI_boss_bar/spr_UI_boss_bar.yy b/thpj3/sprites/spr_UI_boss_bar/spr_UI_boss_bar.yy new file mode 100644 index 0000000..33ad0fd --- /dev/null +++ b/thpj3/sprites/spr_UI_boss_bar/spr_UI_boss_bar.yy @@ -0,0 +1,162 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 999, + "bbox_top": 0, + "bbox_bottom": 31, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 1000, + "height": 32, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": [ + 4278190335, + 4278255615, + 4278255360, + 4294967040, + 4294901760, + 4294902015, + 4294967295, + 4293717228, + 4293059298, + 4292335575, + 4291677645, + 4290230199, + 4287993237, + 4280556782, + 4278252287, + 4283540992, + 4293963264, + 4287770926, + 4287365357, + 4287203721, + 4286414205, + 4285558896, + 4284703587, + 4283782485, + 4281742902, + 2130706432, + 4286158839, + 4286688762, + 4287219453, + 4288280831, + 4288405444, + 4288468131, + 4288465538, + 4291349882, + 4294430829, + 4292454269, + 4291466115, + 4290675079, + 4290743485, + 4290943732, + 4288518390, + 4283395315, + 4283862775, + 4284329979, + 4285068799, + 4285781164, + 4285973884, + 4286101564, + 4290034460, + 4294164224, + 4291529796, + 4289289312, + 4289290373, + 4289291432, + 4289359601, + 4286410226, + 4280556782, + 4280444402, + 4280128760, + 4278252287, + 4282369933, + 4283086137, + 4283540992, + 4288522496, + 4293963264, + 4290540032, + 4289423360, + 4289090560, + 4287770926, + 4287704422, + 4287571858, + 4287365357, + 4284159214, + 4279176094, + 4279058848, + 4278870691, + 4278231211, + 4281367321, + ], + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"92f03cad-6e1d-454c-b472-6016483bb2e3","path":"sprites/spr_UI_boss_bar/spr_UI_boss_bar.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"92f03cad-6e1d-454c-b472-6016483bb2e3","path":"sprites/spr_UI_boss_bar/spr_UI_boss_bar.yy",},"LayerId":{"name":"b316f6ef-a410-491c-b4d7-90bc860df1dc","path":"sprites/spr_UI_boss_bar/spr_UI_boss_bar.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + {"FrameId":{"name":"92f03cad-6e1d-454c-b472-6016483bb2e3","path":"sprites/spr_UI_boss_bar/spr_UI_boss_bar.yy",},"LayerId":{"name":"d49131f6-2fa1-42f6-b090-f8b414c7aed3","path":"sprites/spr_UI_boss_bar/spr_UI_boss_bar.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + {"FrameId":{"name":"92f03cad-6e1d-454c-b472-6016483bb2e3","path":"sprites/spr_UI_boss_bar/spr_UI_boss_bar.yy",},"LayerId":{"name":"aff50d2d-54e1-40c3-8e36-0ec33791b287","path":"sprites/spr_UI_boss_bar/spr_UI_boss_bar.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + {"FrameId":{"name":"92f03cad-6e1d-454c-b472-6016483bb2e3","path":"sprites/spr_UI_boss_bar/spr_UI_boss_bar.yy",},"LayerId":{"name":"b373a4d1-3822-444d-a4de-324d37ecaf9b","path":"sprites/spr_UI_boss_bar/spr_UI_boss_bar.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_UI_boss_bar","path":"sprites/spr_UI_boss_bar/spr_UI_boss_bar.yy",},"resourceVersion":"1.0","name":"92f03cad-6e1d-454c-b472-6016483bb2e3","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_UI_boss_bar","path":"sprites/spr_UI_boss_bar/spr_UI_boss_bar.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 1.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"cab09991-4448-4a08-952e-7720550b56c1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"92f03cad-6e1d-454c-b472-6016483bb2e3","path":"sprites/spr_UI_boss_bar/spr_UI_boss_bar.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 500, + "yorigin": 16, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_UI_boss_bar","path":"sprites/spr_UI_boss_bar/spr_UI_boss_bar.yy",}, + "resourceVersion": "1.3", + "name": "spr_UI_boss_bar", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default (2)","resourceVersion":"1.0","name":"aff50d2d-54e1-40c3-8e36-0ec33791b287","tags":[],"resourceType":"GMImageLayer",}, + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"Layer 1","resourceVersion":"1.0","name":"b373a4d1-3822-444d-a4de-324d37ecaf9b","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "UI", + "path": "folders/UI.yy", + }, + "resourceVersion": "1.0", + "name": "spr_UI_boss_bar", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_UI_boss_fill/7a9734cc-3325-45f1-8093-5f1e3e53bb69.png b/thpj3/sprites/spr_UI_boss_fill/7a9734cc-3325-45f1-8093-5f1e3e53bb69.png new file mode 100644 index 0000000..e79c559 Binary files /dev/null and b/thpj3/sprites/spr_UI_boss_fill/7a9734cc-3325-45f1-8093-5f1e3e53bb69.png differ diff --git a/thpj3/sprites/spr_UI_boss_fill/layers/7a9734cc-3325-45f1-8093-5f1e3e53bb69/779b3ea1-4a31-4118-b689-4b150b108e1f.png b/thpj3/sprites/spr_UI_boss_fill/layers/7a9734cc-3325-45f1-8093-5f1e3e53bb69/779b3ea1-4a31-4118-b689-4b150b108e1f.png new file mode 100644 index 0000000..e79c559 Binary files /dev/null and b/thpj3/sprites/spr_UI_boss_fill/layers/7a9734cc-3325-45f1-8093-5f1e3e53bb69/779b3ea1-4a31-4118-b689-4b150b108e1f.png differ diff --git a/thpj3/sprites/spr_UI_boss_fill/spr_UI_boss_fill.yy b/thpj3/sprites/spr_UI_boss_fill/spr_UI_boss_fill.yy new file mode 100644 index 0000000..c33dbfc --- /dev/null +++ b/thpj3/sprites/spr_UI_boss_fill/spr_UI_boss_fill.yy @@ -0,0 +1,79 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 979, + "bbox_top": 0, + "bbox_bottom": 27, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 980, + "height": 28, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"7a9734cc-3325-45f1-8093-5f1e3e53bb69","path":"sprites/spr_UI_boss_fill/spr_UI_boss_fill.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"7a9734cc-3325-45f1-8093-5f1e3e53bb69","path":"sprites/spr_UI_boss_fill/spr_UI_boss_fill.yy",},"LayerId":{"name":"779b3ea1-4a31-4118-b689-4b150b108e1f","path":"sprites/spr_UI_boss_fill/spr_UI_boss_fill.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_UI_boss_fill","path":"sprites/spr_UI_boss_fill/spr_UI_boss_fill.yy",},"resourceVersion":"1.0","name":"7a9734cc-3325-45f1-8093-5f1e3e53bb69","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_UI_boss_fill","path":"sprites/spr_UI_boss_fill/spr_UI_boss_fill.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 1.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"668ff6e8-f3a8-45ec-81d5-5a0ab4da6025","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"7a9734cc-3325-45f1-8093-5f1e3e53bb69","path":"sprites/spr_UI_boss_fill/spr_UI_boss_fill.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 490, + "yorigin": 14, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_UI_boss_fill","path":"sprites/spr_UI_boss_fill/spr_UI_boss_fill.yy",}, + "resourceVersion": "1.3", + "name": "spr_UI_boss_fill", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"779b3ea1-4a31-4118-b689-4b150b108e1f","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "UI", + "path": "folders/UI.yy", + }, + "resourceVersion": "1.0", + "name": "spr_UI_boss_fill", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_UI_boss_phases/5fd7dbdb-aa37-4e91-9800-67a1667f0443.png b/thpj3/sprites/spr_UI_boss_phases/5fd7dbdb-aa37-4e91-9800-67a1667f0443.png new file mode 100644 index 0000000..54c7493 Binary files /dev/null and b/thpj3/sprites/spr_UI_boss_phases/5fd7dbdb-aa37-4e91-9800-67a1667f0443.png differ diff --git a/thpj3/sprites/spr_UI_boss_phases/layers/5fd7dbdb-aa37-4e91-9800-67a1667f0443/497005ef-b602-41a7-87d1-2a604a799b18.png b/thpj3/sprites/spr_UI_boss_phases/layers/5fd7dbdb-aa37-4e91-9800-67a1667f0443/497005ef-b602-41a7-87d1-2a604a799b18.png new file mode 100644 index 0000000..54c7493 Binary files /dev/null and b/thpj3/sprites/spr_UI_boss_phases/layers/5fd7dbdb-aa37-4e91-9800-67a1667f0443/497005ef-b602-41a7-87d1-2a604a799b18.png differ diff --git a/thpj3/sprites/spr_UI_boss_phases/spr_UI_boss_phases.yy b/thpj3/sprites/spr_UI_boss_phases/spr_UI_boss_phases.yy new file mode 100644 index 0000000..1bf4d48 --- /dev/null +++ b/thpj3/sprites/spr_UI_boss_phases/spr_UI_boss_phases.yy @@ -0,0 +1,79 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 15, + "bbox_top": 1, + "bbox_bottom": 15, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 16, + "height": 16, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"5fd7dbdb-aa37-4e91-9800-67a1667f0443","path":"sprites/spr_UI_boss_phases/spr_UI_boss_phases.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"5fd7dbdb-aa37-4e91-9800-67a1667f0443","path":"sprites/spr_UI_boss_phases/spr_UI_boss_phases.yy",},"LayerId":{"name":"497005ef-b602-41a7-87d1-2a604a799b18","path":"sprites/spr_UI_boss_phases/spr_UI_boss_phases.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_UI_boss_phases","path":"sprites/spr_UI_boss_phases/spr_UI_boss_phases.yy",},"resourceVersion":"1.0","name":"5fd7dbdb-aa37-4e91-9800-67a1667f0443","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_UI_boss_phases","path":"sprites/spr_UI_boss_phases/spr_UI_boss_phases.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 1.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"a77f0b17-d4f8-4362-8dc3-dbcffb901809","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5fd7dbdb-aa37-4e91-9800-67a1667f0443","path":"sprites/spr_UI_boss_phases/spr_UI_boss_phases.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 8, + "yorigin": 8, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_UI_boss_phases","path":"sprites/spr_UI_boss_phases/spr_UI_boss_phases.yy",}, + "resourceVersion": "1.3", + "name": "spr_UI_boss_phases", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"497005ef-b602-41a7-87d1-2a604a799b18","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "UI", + "path": "folders/UI.yy", + }, + "resourceVersion": "1.0", + "name": "spr_UI_boss_phases", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bg_forest/410206bd-1f6b-4641-81f9-2951d51d9384.png b/thpj3/sprites/spr_bg_forest/410206bd-1f6b-4641-81f9-2951d51d9384.png deleted file mode 100644 index c7df6ca..0000000 Binary files a/thpj3/sprites/spr_bg_forest/410206bd-1f6b-4641-81f9-2951d51d9384.png and /dev/null differ diff --git a/thpj3/sprites/spr_bg_forest/layers/410206bd-1f6b-4641-81f9-2951d51d9384/2fcad704-d1eb-4019-bc74-f62e0b85dbec.png b/thpj3/sprites/spr_bg_forest/layers/410206bd-1f6b-4641-81f9-2951d51d9384/2fcad704-d1eb-4019-bc74-f62e0b85dbec.png deleted file mode 100644 index c7df6ca..0000000 Binary files a/thpj3/sprites/spr_bg_forest/layers/410206bd-1f6b-4641-81f9-2951d51d9384/2fcad704-d1eb-4019-bc74-f62e0b85dbec.png and /dev/null differ diff --git a/thpj3/sprites/spr_bg_forest_back/410206bd-1f6b-4641-81f9-2951d51d9384.png b/thpj3/sprites/spr_bg_forest_back/410206bd-1f6b-4641-81f9-2951d51d9384.png new file mode 100644 index 0000000..e6b5fc6 Binary files /dev/null and b/thpj3/sprites/spr_bg_forest_back/410206bd-1f6b-4641-81f9-2951d51d9384.png differ diff --git a/thpj3/sprites/spr_bg_forest_back/layers/410206bd-1f6b-4641-81f9-2951d51d9384/2fcad704-d1eb-4019-bc74-f62e0b85dbec.png b/thpj3/sprites/spr_bg_forest_back/layers/410206bd-1f6b-4641-81f9-2951d51d9384/2fcad704-d1eb-4019-bc74-f62e0b85dbec.png new file mode 100644 index 0000000..e6b5fc6 Binary files /dev/null and b/thpj3/sprites/spr_bg_forest_back/layers/410206bd-1f6b-4641-81f9-2951d51d9384/2fcad704-d1eb-4019-bc74-f62e0b85dbec.png differ diff --git a/thpj3/sprites/spr_bg_forest_back/spr_bg_forest_back.yy b/thpj3/sprites/spr_bg_forest_back/spr_bg_forest_back.yy new file mode 100644 index 0000000..5fe219d --- /dev/null +++ b/thpj3/sprites/spr_bg_forest_back/spr_bg_forest_back.yy @@ -0,0 +1,79 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 0, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 719, + "bbox_top": 197, + "bbox_bottom": 719, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 720, + "height": 720, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"410206bd-1f6b-4641-81f9-2951d51d9384","path":"sprites/spr_bg_forest_back/spr_bg_forest_back.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"410206bd-1f6b-4641-81f9-2951d51d9384","path":"sprites/spr_bg_forest_back/spr_bg_forest_back.yy",},"LayerId":{"name":"2fcad704-d1eb-4019-bc74-f62e0b85dbec","path":"sprites/spr_bg_forest_back/spr_bg_forest_back.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bg_forest_back","path":"sprites/spr_bg_forest_back/spr_bg_forest_back.yy",},"resourceVersion":"1.0","name":"410206bd-1f6b-4641-81f9-2951d51d9384","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bg_forest_back","path":"sprites/spr_bg_forest_back/spr_bg_forest_back.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 1.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"a34e6add-de46-412e-a094-1fd758ba7d4a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"410206bd-1f6b-4641-81f9-2951d51d9384","path":"sprites/spr_bg_forest_back/spr_bg_forest_back.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 0, + "yorigin": 0, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bg_forest_back","path":"sprites/spr_bg_forest_back/spr_bg_forest_back.yy",}, + "resourceVersion": "1.3", + "name": "spr_bg_forest_back", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"2fcad704-d1eb-4019-bc74-f62e0b85dbec","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "stage", + "path": "folders/stage.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bg_forest_back", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bg_forest_front/410206bd-1f6b-4641-81f9-2951d51d9384.png b/thpj3/sprites/spr_bg_forest_front/410206bd-1f6b-4641-81f9-2951d51d9384.png new file mode 100644 index 0000000..aef4269 Binary files /dev/null and b/thpj3/sprites/spr_bg_forest_front/410206bd-1f6b-4641-81f9-2951d51d9384.png differ diff --git a/thpj3/sprites/spr_bg_forest_front/layers/410206bd-1f6b-4641-81f9-2951d51d9384/2fcad704-d1eb-4019-bc74-f62e0b85dbec.png b/thpj3/sprites/spr_bg_forest_front/layers/410206bd-1f6b-4641-81f9-2951d51d9384/2fcad704-d1eb-4019-bc74-f62e0b85dbec.png new file mode 100644 index 0000000..aef4269 Binary files /dev/null and b/thpj3/sprites/spr_bg_forest_front/layers/410206bd-1f6b-4641-81f9-2951d51d9384/2fcad704-d1eb-4019-bc74-f62e0b85dbec.png differ diff --git a/thpj3/sprites/spr_bg_forest/spr_bg_forest.yy b/thpj3/sprites/spr_bg_forest_front/spr_bg_forest.yy similarity index 100% rename from thpj3/sprites/spr_bg_forest/spr_bg_forest.yy rename to thpj3/sprites/spr_bg_forest_front/spr_bg_forest.yy diff --git a/thpj3/sprites/spr_bg_forest_front/spr_bg_forest_front.yy b/thpj3/sprites/spr_bg_forest_front/spr_bg_forest_front.yy new file mode 100644 index 0000000..9587a01 --- /dev/null +++ b/thpj3/sprites/spr_bg_forest_front/spr_bg_forest_front.yy @@ -0,0 +1,79 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 0, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 56, + "bbox_right": 610, + "bbox_top": 307, + "bbox_bottom": 719, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 720, + "height": 720, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"410206bd-1f6b-4641-81f9-2951d51d9384","path":"sprites/spr_bg_forest_front/spr_bg_forest_front.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"410206bd-1f6b-4641-81f9-2951d51d9384","path":"sprites/spr_bg_forest_front/spr_bg_forest_front.yy",},"LayerId":{"name":"2fcad704-d1eb-4019-bc74-f62e0b85dbec","path":"sprites/spr_bg_forest_front/spr_bg_forest_front.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bg_forest_front","path":"sprites/spr_bg_forest_front/spr_bg_forest_front.yy",},"resourceVersion":"1.0","name":"410206bd-1f6b-4641-81f9-2951d51d9384","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bg_forest_front","path":"sprites/spr_bg_forest_front/spr_bg_forest_front.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 1.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"e880fea2-1809-4295-b9fc-daa6777a4564","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"410206bd-1f6b-4641-81f9-2951d51d9384","path":"sprites/spr_bg_forest_front/spr_bg_forest_front.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 0, + "yorigin": 0, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bg_forest_front","path":"sprites/spr_bg_forest_front/spr_bg_forest_front.yy",}, + "resourceVersion": "1.3", + "name": "spr_bg_forest_front", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"2fcad704-d1eb-4019-bc74-f62e0b85dbec","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "stage", + "path": "folders/stage.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bg_forest_front", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bg_forest_mid/410206bd-1f6b-4641-81f9-2951d51d9384.png b/thpj3/sprites/spr_bg_forest_mid/410206bd-1f6b-4641-81f9-2951d51d9384.png new file mode 100644 index 0000000..1c686e2 Binary files /dev/null and b/thpj3/sprites/spr_bg_forest_mid/410206bd-1f6b-4641-81f9-2951d51d9384.png differ diff --git a/thpj3/sprites/spr_bg_forest_mid/layers/410206bd-1f6b-4641-81f9-2951d51d9384/2fcad704-d1eb-4019-bc74-f62e0b85dbec.png b/thpj3/sprites/spr_bg_forest_mid/layers/410206bd-1f6b-4641-81f9-2951d51d9384/2fcad704-d1eb-4019-bc74-f62e0b85dbec.png new file mode 100644 index 0000000..1c686e2 Binary files /dev/null and b/thpj3/sprites/spr_bg_forest_mid/layers/410206bd-1f6b-4641-81f9-2951d51d9384/2fcad704-d1eb-4019-bc74-f62e0b85dbec.png differ diff --git a/thpj3/sprites/spr_bg_forest_mid/spr_bg_forest.yy b/thpj3/sprites/spr_bg_forest_mid/spr_bg_forest.yy new file mode 100644 index 0000000..400301d --- /dev/null +++ b/thpj3/sprites/spr_bg_forest_mid/spr_bg_forest.yy @@ -0,0 +1,79 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 0, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 124, + "bbox_right": 719, + "bbox_top": 192, + "bbox_bottom": 719, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 720, + "height": 720, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"410206bd-1f6b-4641-81f9-2951d51d9384","path":"sprites/spr_bg_forest/spr_bg_forest.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"410206bd-1f6b-4641-81f9-2951d51d9384","path":"sprites/spr_bg_forest/spr_bg_forest.yy",},"LayerId":{"name":"2fcad704-d1eb-4019-bc74-f62e0b85dbec","path":"sprites/spr_bg_forest/spr_bg_forest.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bg_forest","path":"sprites/spr_bg_forest/spr_bg_forest.yy",},"resourceVersion":"1.0","name":"410206bd-1f6b-4641-81f9-2951d51d9384","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bg_forest","path":"sprites/spr_bg_forest/spr_bg_forest.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 1.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"a34e6add-de46-412e-a094-1fd758ba7d4a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"410206bd-1f6b-4641-81f9-2951d51d9384","path":"sprites/spr_bg_forest/spr_bg_forest.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 0, + "yorigin": 0, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bg_forest","path":"sprites/spr_bg_forest/spr_bg_forest.yy",}, + "resourceVersion": "1.3", + "name": "spr_bg_forest", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"2fcad704-d1eb-4019-bc74-f62e0b85dbec","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "stage", + "path": "folders/stage.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bg_forest", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bg_forest_mid/spr_bg_forest_mid.yy b/thpj3/sprites/spr_bg_forest_mid/spr_bg_forest_mid.yy new file mode 100644 index 0000000..38192de --- /dev/null +++ b/thpj3/sprites/spr_bg_forest_mid/spr_bg_forest_mid.yy @@ -0,0 +1,79 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 0, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 719, + "bbox_top": 290, + "bbox_bottom": 719, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 720, + "height": 720, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"410206bd-1f6b-4641-81f9-2951d51d9384","path":"sprites/spr_bg_forest_mid/spr_bg_forest_mid.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"410206bd-1f6b-4641-81f9-2951d51d9384","path":"sprites/spr_bg_forest_mid/spr_bg_forest_mid.yy",},"LayerId":{"name":"2fcad704-d1eb-4019-bc74-f62e0b85dbec","path":"sprites/spr_bg_forest_mid/spr_bg_forest_mid.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bg_forest_mid","path":"sprites/spr_bg_forest_mid/spr_bg_forest_mid.yy",},"resourceVersion":"1.0","name":"410206bd-1f6b-4641-81f9-2951d51d9384","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bg_forest_mid","path":"sprites/spr_bg_forest_mid/spr_bg_forest_mid.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 1.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"4b45364d-63dc-44c7-8533-862b5da6578e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"410206bd-1f6b-4641-81f9-2951d51d9384","path":"sprites/spr_bg_forest_mid/spr_bg_forest_mid.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 0, + "yorigin": 0, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bg_forest_mid","path":"sprites/spr_bg_forest_mid/spr_bg_forest_mid.yy",}, + "resourceVersion": "1.3", + "name": "spr_bg_forest_mid", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"2fcad704-d1eb-4019-bc74-f62e0b85dbec","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "stage", + "path": "folders/stage.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bg_forest_mid", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bullet_ball/665149da-5b9f-40ce-a356-ea77f159ef3c.png b/thpj3/sprites/spr_bullet_ball/665149da-5b9f-40ce-a356-ea77f159ef3c.png new file mode 100644 index 0000000..5884e30 Binary files /dev/null and b/thpj3/sprites/spr_bullet_ball/665149da-5b9f-40ce-a356-ea77f159ef3c.png differ diff --git a/thpj3/sprites/spr_bullet_ball/6b65effa-d8ee-432b-9951-8f29f4fe0bb4.png b/thpj3/sprites/spr_bullet_ball/6b65effa-d8ee-432b-9951-8f29f4fe0bb4.png new file mode 100644 index 0000000..2df00d7 Binary files /dev/null and b/thpj3/sprites/spr_bullet_ball/6b65effa-d8ee-432b-9951-8f29f4fe0bb4.png differ diff --git a/thpj3/sprites/spr_bullet_ball/fffce5c3-108a-4943-8278-2e69433f4208.png b/thpj3/sprites/spr_bullet_ball/fffce5c3-108a-4943-8278-2e69433f4208.png new file mode 100644 index 0000000..c3d3b9a Binary files /dev/null and b/thpj3/sprites/spr_bullet_ball/fffce5c3-108a-4943-8278-2e69433f4208.png differ diff --git a/thpj3/sprites/spr_bullet_ball/layers/665149da-5b9f-40ce-a356-ea77f159ef3c/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png b/thpj3/sprites/spr_bullet_ball/layers/665149da-5b9f-40ce-a356-ea77f159ef3c/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png new file mode 100644 index 0000000..5884e30 Binary files /dev/null and b/thpj3/sprites/spr_bullet_ball/layers/665149da-5b9f-40ce-a356-ea77f159ef3c/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png differ diff --git a/thpj3/sprites/spr_bullet_ball/layers/6b65effa-d8ee-432b-9951-8f29f4fe0bb4/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png b/thpj3/sprites/spr_bullet_ball/layers/6b65effa-d8ee-432b-9951-8f29f4fe0bb4/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png new file mode 100644 index 0000000..2df00d7 Binary files /dev/null and b/thpj3/sprites/spr_bullet_ball/layers/6b65effa-d8ee-432b-9951-8f29f4fe0bb4/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png differ diff --git a/thpj3/sprites/spr_bullet_ball/layers/fffce5c3-108a-4943-8278-2e69433f4208/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png b/thpj3/sprites/spr_bullet_ball/layers/fffce5c3-108a-4943-8278-2e69433f4208/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png new file mode 100644 index 0000000..c3d3b9a Binary files /dev/null and b/thpj3/sprites/spr_bullet_ball/layers/fffce5c3-108a-4943-8278-2e69433f4208/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png differ diff --git a/thpj3/sprites/spr_bullet_ball/spr_bullet_ball.yy b/thpj3/sprites/spr_bullet_ball/spr_bullet_ball.yy new file mode 100644 index 0000000..f6c5a08 --- /dev/null +++ b/thpj3/sprites/spr_bullet_ball/spr_bullet_ball.yy @@ -0,0 +1,87 @@ +{ + "bboxMode": 2, + "collisionKind": 2, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 5, + "bbox_right": 26, + "bbox_top": 5, + "bbox_bottom": 26, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 32, + "height": 32, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"fffce5c3-108a-4943-8278-2e69433f4208","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"665149da-5b9f-40ce-a356-ea77f159ef3c","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 10.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 3.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"26392d22-a34b-4bf6-86df-ecda8183cf19","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"be9b7674-5e19-4fc7-b283-a8292ae41f8b","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"03784b5e-fe53-4b38-8eb7-4251c51e8d23","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 16, + "yorigin": 16, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",}, + "resourceVersion": "1.3", + "name": "spr_bullet_ball", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bullet_ball", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bullet_ball/spr_bullet_bead.yy b/thpj3/sprites/spr_bullet_ball/spr_bullet_bead.yy new file mode 100644 index 0000000..6fc02df --- /dev/null +++ b/thpj3/sprites/spr_bullet_ball/spr_bullet_bead.yy @@ -0,0 +1,87 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 23, + "bbox_top": 0, + "bbox_bottom": 23, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 24, + "height": 24, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"fffce5c3-108a-4943-8278-2e69433f4208","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"665149da-5b9f-40ce-a356-ea77f159ef3c","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 10.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 3.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"3fd44805-c602-486e-8b46-2f20ed34fa6e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"734d0618-b4cb-4568-b531-4c9f7ffec74f","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"0a340e97-1ec8-43a2-8b41-c76ab997e713","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 12, + "yorigin": 12, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",}, + "resourceVersion": "1.3", + "name": "spr_bullet_bead", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bullet_bead", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bullet_bead/665149da-5b9f-40ce-a356-ea77f159ef3c.png b/thpj3/sprites/spr_bullet_bead/665149da-5b9f-40ce-a356-ea77f159ef3c.png new file mode 100644 index 0000000..9028479 Binary files /dev/null and b/thpj3/sprites/spr_bullet_bead/665149da-5b9f-40ce-a356-ea77f159ef3c.png differ diff --git a/thpj3/sprites/spr_bullet_bead/6b65effa-d8ee-432b-9951-8f29f4fe0bb4.png b/thpj3/sprites/spr_bullet_bead/6b65effa-d8ee-432b-9951-8f29f4fe0bb4.png new file mode 100644 index 0000000..84e3cb0 Binary files /dev/null and b/thpj3/sprites/spr_bullet_bead/6b65effa-d8ee-432b-9951-8f29f4fe0bb4.png differ diff --git a/thpj3/sprites/spr_bullet_bead/fffce5c3-108a-4943-8278-2e69433f4208.png b/thpj3/sprites/spr_bullet_bead/fffce5c3-108a-4943-8278-2e69433f4208.png new file mode 100644 index 0000000..d086767 Binary files /dev/null and b/thpj3/sprites/spr_bullet_bead/fffce5c3-108a-4943-8278-2e69433f4208.png differ diff --git a/thpj3/sprites/spr_bullet_bead/layers/665149da-5b9f-40ce-a356-ea77f159ef3c/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png b/thpj3/sprites/spr_bullet_bead/layers/665149da-5b9f-40ce-a356-ea77f159ef3c/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png new file mode 100644 index 0000000..9028479 Binary files /dev/null and b/thpj3/sprites/spr_bullet_bead/layers/665149da-5b9f-40ce-a356-ea77f159ef3c/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png differ diff --git a/thpj3/sprites/spr_bullet_bead/layers/6b65effa-d8ee-432b-9951-8f29f4fe0bb4/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png b/thpj3/sprites/spr_bullet_bead/layers/6b65effa-d8ee-432b-9951-8f29f4fe0bb4/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png new file mode 100644 index 0000000..84e3cb0 Binary files /dev/null and b/thpj3/sprites/spr_bullet_bead/layers/6b65effa-d8ee-432b-9951-8f29f4fe0bb4/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png differ diff --git a/thpj3/sprites/spr_bullet_bead/layers/fffce5c3-108a-4943-8278-2e69433f4208/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png b/thpj3/sprites/spr_bullet_bead/layers/fffce5c3-108a-4943-8278-2e69433f4208/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png new file mode 100644 index 0000000..d086767 Binary files /dev/null and b/thpj3/sprites/spr_bullet_bead/layers/fffce5c3-108a-4943-8278-2e69433f4208/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png differ diff --git a/thpj3/sprites/spr_bullet_bead/spr_bullet_bead.yy b/thpj3/sprites/spr_bullet_bead/spr_bullet_bead.yy new file mode 100644 index 0000000..5e80057 --- /dev/null +++ b/thpj3/sprites/spr_bullet_bead/spr_bullet_bead.yy @@ -0,0 +1,87 @@ +{ + "bboxMode": 2, + "collisionKind": 2, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 3, + "bbox_right": 20, + "bbox_top": 3, + "bbox_bottom": 20, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 24, + "height": 24, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"fffce5c3-108a-4943-8278-2e69433f4208","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"665149da-5b9f-40ce-a356-ea77f159ef3c","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 10.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 3.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"3fd44805-c602-486e-8b46-2f20ed34fa6e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"734d0618-b4cb-4568-b531-4c9f7ffec74f","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"0a340e97-1ec8-43a2-8b41-c76ab997e713","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 12, + "yorigin": 12, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",}, + "resourceVersion": "1.3", + "name": "spr_bullet_bead", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bullet_bead", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bullet_blade/bed3ebe9-f2c6-4eec-ac58-618d4476e989.png b/thpj3/sprites/spr_bullet_blade/bed3ebe9-f2c6-4eec-ac58-618d4476e989.png new file mode 100644 index 0000000..ddea53f Binary files /dev/null and b/thpj3/sprites/spr_bullet_blade/bed3ebe9-f2c6-4eec-ac58-618d4476e989.png differ diff --git a/thpj3/sprites/spr_bullet_blade/d87e80f4-ac5b-4447-b978-87e3b5f61fb0.png b/thpj3/sprites/spr_bullet_blade/d87e80f4-ac5b-4447-b978-87e3b5f61fb0.png new file mode 100644 index 0000000..60e3eef Binary files /dev/null and b/thpj3/sprites/spr_bullet_blade/d87e80f4-ac5b-4447-b978-87e3b5f61fb0.png differ diff --git a/thpj3/sprites/spr_bullet_blade/f35626e9-a4a0-49cc-bb59-7629e0836eb3.png b/thpj3/sprites/spr_bullet_blade/f35626e9-a4a0-49cc-bb59-7629e0836eb3.png new file mode 100644 index 0000000..f1db40d Binary files /dev/null and b/thpj3/sprites/spr_bullet_blade/f35626e9-a4a0-49cc-bb59-7629e0836eb3.png differ diff --git a/thpj3/sprites/spr_bullet_blade/layers/bed3ebe9-f2c6-4eec-ac58-618d4476e989/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png b/thpj3/sprites/spr_bullet_blade/layers/bed3ebe9-f2c6-4eec-ac58-618d4476e989/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png new file mode 100644 index 0000000..ddea53f Binary files /dev/null and b/thpj3/sprites/spr_bullet_blade/layers/bed3ebe9-f2c6-4eec-ac58-618d4476e989/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png differ diff --git a/thpj3/sprites/spr_bullet_blade/layers/d87e80f4-ac5b-4447-b978-87e3b5f61fb0/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png b/thpj3/sprites/spr_bullet_blade/layers/d87e80f4-ac5b-4447-b978-87e3b5f61fb0/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png new file mode 100644 index 0000000..60e3eef Binary files /dev/null and b/thpj3/sprites/spr_bullet_blade/layers/d87e80f4-ac5b-4447-b978-87e3b5f61fb0/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png differ diff --git a/thpj3/sprites/spr_bullet_blade/layers/f35626e9-a4a0-49cc-bb59-7629e0836eb3/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png b/thpj3/sprites/spr_bullet_blade/layers/f35626e9-a4a0-49cc-bb59-7629e0836eb3/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png new file mode 100644 index 0000000..f1db40d Binary files /dev/null and b/thpj3/sprites/spr_bullet_blade/layers/f35626e9-a4a0-49cc-bb59-7629e0836eb3/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png differ diff --git a/thpj3/sprites/spr_bullet_blade/spr_bullet_ball.yy b/thpj3/sprites/spr_bullet_blade/spr_bullet_ball.yy new file mode 100644 index 0000000..db728c2 --- /dev/null +++ b/thpj3/sprites/spr_bullet_blade/spr_bullet_ball.yy @@ -0,0 +1,87 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 32, + "height": 32, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"fffce5c3-108a-4943-8278-2e69433f4208","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"665149da-5b9f-40ce-a356-ea77f159ef3c","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 10.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 3.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"26392d22-a34b-4bf6-86df-ecda8183cf19","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"be9b7674-5e19-4fc7-b283-a8292ae41f8b","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"03784b5e-fe53-4b38-8eb7-4251c51e8d23","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 16, + "yorigin": 16, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",}, + "resourceVersion": "1.3", + "name": "spr_bullet_ball", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bullet_ball", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bullet_blade/spr_bullet_bead.yy b/thpj3/sprites/spr_bullet_blade/spr_bullet_bead.yy new file mode 100644 index 0000000..6fc02df --- /dev/null +++ b/thpj3/sprites/spr_bullet_blade/spr_bullet_bead.yy @@ -0,0 +1,87 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 23, + "bbox_top": 0, + "bbox_bottom": 23, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 24, + "height": 24, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"fffce5c3-108a-4943-8278-2e69433f4208","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"665149da-5b9f-40ce-a356-ea77f159ef3c","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 10.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 3.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"3fd44805-c602-486e-8b46-2f20ed34fa6e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"734d0618-b4cb-4568-b531-4c9f7ffec74f","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"0a340e97-1ec8-43a2-8b41-c76ab997e713","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 12, + "yorigin": 12, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",}, + "resourceVersion": "1.3", + "name": "spr_bullet_bead", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bullet_bead", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bullet_blade/spr_bullet_blade.yy b/thpj3/sprites/spr_bullet_blade/spr_bullet_blade.yy new file mode 100644 index 0000000..db3dc30 --- /dev/null +++ b/thpj3/sprites/spr_bullet_blade/spr_bullet_blade.yy @@ -0,0 +1,87 @@ +{ + "bboxMode": 2, + "collisionKind": 5, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 8, + "bbox_right": 18, + "bbox_top": 12, + "bbox_bottom": 19, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 32, + "height": 32, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"bed3ebe9-f2c6-4eec-ac58-618d4476e989","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"bed3ebe9-f2c6-4eec-ac58-618d4476e989","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_blade","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",},"resourceVersion":"1.0","name":"bed3ebe9-f2c6-4eec-ac58-618d4476e989","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"d87e80f4-ac5b-4447-b978-87e3b5f61fb0","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"d87e80f4-ac5b-4447-b978-87e3b5f61fb0","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_blade","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",},"resourceVersion":"1.0","name":"d87e80f4-ac5b-4447-b978-87e3b5f61fb0","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"f35626e9-a4a0-49cc-bb59-7629e0836eb3","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"f35626e9-a4a0-49cc-bb59-7629e0836eb3","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_blade","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",},"resourceVersion":"1.0","name":"f35626e9-a4a0-49cc-bb59-7629e0836eb3","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bullet_blade","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 10.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 3.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"c728f6ba-cb63-4e84-8a9f-576dff32a92c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bed3ebe9-f2c6-4eec-ac58-618d4476e989","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"c5d26fa1-0b3f-432e-837b-eb5384702a76","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d87e80f4-ac5b-4447-b978-87e3b5f61fb0","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"5f8fa3c3-a606-42ac-a396-ccbe79f19825","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f35626e9-a4a0-49cc-bb59-7629e0836eb3","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 16, + "yorigin": 16, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bullet_blade","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",}, + "resourceVersion": "1.3", + "name": "spr_bullet_blade", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bullet_blade", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bullet_blade/spr_bullet_card.yy b/thpj3/sprites/spr_bullet_blade/spr_bullet_card.yy new file mode 100644 index 0000000..443e42e --- /dev/null +++ b/thpj3/sprites/spr_bullet_blade/spr_bullet_card.yy @@ -0,0 +1,87 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 32, + "height": 32, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_card","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"resourceVersion":"1.0","name":"fffce5c3-108a-4943-8278-2e69433f4208","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_card","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"resourceVersion":"1.0","name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_card","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"resourceVersion":"1.0","name":"665149da-5b9f-40ce-a356-ea77f159ef3c","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bullet_card","path":"sprites/spr_bullet_card/spr_bullet_card.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 10.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 3.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"6eaa79fc-e650-4c60-b4ef-08c879b082c8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"54e11368-3e3f-4aa0-a797-adba227adba3","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"e56b0247-542d-4493-bcdc-8b5597543869","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 16, + "yorigin": 16, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bullet_card","path":"sprites/spr_bullet_card/spr_bullet_card.yy",}, + "resourceVersion": "1.3", + "name": "spr_bullet_card", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bullet_card", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bullet_blade/spr_bullet_diamond.yy b/thpj3/sprites/spr_bullet_blade/spr_bullet_diamond.yy new file mode 100644 index 0000000..71d69bd --- /dev/null +++ b/thpj3/sprites/spr_bullet_blade/spr_bullet_diamond.yy @@ -0,0 +1,87 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 32, + "height": 32, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_diamond","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"fffce5c3-108a-4943-8278-2e69433f4208","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_diamond","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_diamond","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"665149da-5b9f-40ce-a356-ea77f159ef3c","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bullet_diamond","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 10.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 3.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"79991ea3-be02-4516-a045-653d0f253c85","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4fd10b2a-1fd0-41c9-8cfd-eab6d79c5a89","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d3464e69-4327-47da-8a9a-58fee817b648","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 16, + "yorigin": 16, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bullet_diamond","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",}, + "resourceVersion": "1.3", + "name": "spr_bullet_diamond", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bullet_diamond", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bullet_card/270e4740-f7c3-4e35-a390-66e142442e4a.png b/thpj3/sprites/spr_bullet_card/270e4740-f7c3-4e35-a390-66e142442e4a.png new file mode 100644 index 0000000..5aa0138 Binary files /dev/null and b/thpj3/sprites/spr_bullet_card/270e4740-f7c3-4e35-a390-66e142442e4a.png differ diff --git a/thpj3/sprites/spr_bullet_card/layers/270e4740-f7c3-4e35-a390-66e142442e4a/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png b/thpj3/sprites/spr_bullet_card/layers/270e4740-f7c3-4e35-a390-66e142442e4a/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png new file mode 100644 index 0000000..5aa0138 Binary files /dev/null and b/thpj3/sprites/spr_bullet_card/layers/270e4740-f7c3-4e35-a390-66e142442e4a/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png differ diff --git a/thpj3/sprites/spr_bullet_card/spr_bullet_ball.yy b/thpj3/sprites/spr_bullet_card/spr_bullet_ball.yy new file mode 100644 index 0000000..db728c2 --- /dev/null +++ b/thpj3/sprites/spr_bullet_card/spr_bullet_ball.yy @@ -0,0 +1,87 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 32, + "height": 32, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"fffce5c3-108a-4943-8278-2e69433f4208","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"665149da-5b9f-40ce-a356-ea77f159ef3c","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 10.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 3.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"26392d22-a34b-4bf6-86df-ecda8183cf19","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"be9b7674-5e19-4fc7-b283-a8292ae41f8b","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"03784b5e-fe53-4b38-8eb7-4251c51e8d23","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 16, + "yorigin": 16, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",}, + "resourceVersion": "1.3", + "name": "spr_bullet_ball", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bullet_ball", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bullet_card/spr_bullet_bead.yy b/thpj3/sprites/spr_bullet_card/spr_bullet_bead.yy new file mode 100644 index 0000000..6fc02df --- /dev/null +++ b/thpj3/sprites/spr_bullet_card/spr_bullet_bead.yy @@ -0,0 +1,87 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 23, + "bbox_top": 0, + "bbox_bottom": 23, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 24, + "height": 24, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"fffce5c3-108a-4943-8278-2e69433f4208","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"665149da-5b9f-40ce-a356-ea77f159ef3c","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 10.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 3.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"3fd44805-c602-486e-8b46-2f20ed34fa6e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"734d0618-b4cb-4568-b531-4c9f7ffec74f","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"0a340e97-1ec8-43a2-8b41-c76ab997e713","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 12, + "yorigin": 12, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",}, + "resourceVersion": "1.3", + "name": "spr_bullet_bead", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bullet_bead", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bullet_card/spr_bullet_card.yy b/thpj3/sprites/spr_bullet_card/spr_bullet_card.yy new file mode 100644 index 0000000..0d0192d --- /dev/null +++ b/thpj3/sprites/spr_bullet_card/spr_bullet_card.yy @@ -0,0 +1,79 @@ +{ + "bboxMode": 2, + "collisionKind": 5, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 4, + "bbox_right": 28, + "bbox_top": 8, + "bbox_bottom": 23, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 32, + "height": 32, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"270e4740-f7c3-4e35-a390-66e142442e4a","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"270e4740-f7c3-4e35-a390-66e142442e4a","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_card","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"resourceVersion":"1.0","name":"270e4740-f7c3-4e35-a390-66e142442e4a","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bullet_card","path":"sprites/spr_bullet_card/spr_bullet_card.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 10.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 1.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"e710bf67-4688-4342-92d8-93d8bb18faf2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"270e4740-f7c3-4e35-a390-66e142442e4a","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 16, + "yorigin": 16, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bullet_card","path":"sprites/spr_bullet_card/spr_bullet_card.yy",}, + "resourceVersion": "1.3", + "name": "spr_bullet_card", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bullet_card", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bullet_card/spr_bullet_diamond.yy b/thpj3/sprites/spr_bullet_card/spr_bullet_diamond.yy new file mode 100644 index 0000000..71d69bd --- /dev/null +++ b/thpj3/sprites/spr_bullet_card/spr_bullet_diamond.yy @@ -0,0 +1,87 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 32, + "height": 32, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_diamond","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"fffce5c3-108a-4943-8278-2e69433f4208","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_diamond","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_diamond","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"665149da-5b9f-40ce-a356-ea77f159ef3c","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bullet_diamond","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 10.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 3.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"79991ea3-be02-4516-a045-653d0f253c85","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4fd10b2a-1fd0-41c9-8cfd-eab6d79c5a89","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"d3464e69-4327-47da-8a9a-58fee817b648","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 16, + "yorigin": 16, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bullet_diamond","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",}, + "resourceVersion": "1.3", + "name": "spr_bullet_diamond", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bullet_diamond", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bullet_diamond/27f65c95-197b-456a-8b8f-a6330a69c690.png b/thpj3/sprites/spr_bullet_diamond/27f65c95-197b-456a-8b8f-a6330a69c690.png new file mode 100644 index 0000000..bc0e675 Binary files /dev/null and b/thpj3/sprites/spr_bullet_diamond/27f65c95-197b-456a-8b8f-a6330a69c690.png differ diff --git a/thpj3/sprites/spr_bullet_diamond/5ab90d73-6f47-48a4-ab10-f6aa68aef89f.png b/thpj3/sprites/spr_bullet_diamond/5ab90d73-6f47-48a4-ab10-f6aa68aef89f.png new file mode 100644 index 0000000..b4ba863 Binary files /dev/null and b/thpj3/sprites/spr_bullet_diamond/5ab90d73-6f47-48a4-ab10-f6aa68aef89f.png differ diff --git a/thpj3/sprites/spr_bullet_diamond/ef4b4f38-61f6-4052-889f-ba819b5222c2.png b/thpj3/sprites/spr_bullet_diamond/ef4b4f38-61f6-4052-889f-ba819b5222c2.png new file mode 100644 index 0000000..fa1cb18 Binary files /dev/null and b/thpj3/sprites/spr_bullet_diamond/ef4b4f38-61f6-4052-889f-ba819b5222c2.png differ diff --git a/thpj3/sprites/spr_bullet_diamond/layers/27f65c95-197b-456a-8b8f-a6330a69c690/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png b/thpj3/sprites/spr_bullet_diamond/layers/27f65c95-197b-456a-8b8f-a6330a69c690/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png new file mode 100644 index 0000000..bc0e675 Binary files /dev/null and b/thpj3/sprites/spr_bullet_diamond/layers/27f65c95-197b-456a-8b8f-a6330a69c690/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png differ diff --git a/thpj3/sprites/spr_bullet_diamond/layers/5ab90d73-6f47-48a4-ab10-f6aa68aef89f/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png b/thpj3/sprites/spr_bullet_diamond/layers/5ab90d73-6f47-48a4-ab10-f6aa68aef89f/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png new file mode 100644 index 0000000..b4ba863 Binary files /dev/null and b/thpj3/sprites/spr_bullet_diamond/layers/5ab90d73-6f47-48a4-ab10-f6aa68aef89f/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png differ diff --git a/thpj3/sprites/spr_bullet_diamond/layers/ef4b4f38-61f6-4052-889f-ba819b5222c2/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png b/thpj3/sprites/spr_bullet_diamond/layers/ef4b4f38-61f6-4052-889f-ba819b5222c2/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png new file mode 100644 index 0000000..fa1cb18 Binary files /dev/null and b/thpj3/sprites/spr_bullet_diamond/layers/ef4b4f38-61f6-4052-889f-ba819b5222c2/e783c4b6-15d3-4ed3-8a12-65fbe256e8f1.png differ diff --git a/thpj3/sprites/spr_bullet_diamond/spr_bullet_ball.yy b/thpj3/sprites/spr_bullet_diamond/spr_bullet_ball.yy new file mode 100644 index 0000000..db728c2 --- /dev/null +++ b/thpj3/sprites/spr_bullet_diamond/spr_bullet_ball.yy @@ -0,0 +1,87 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 31, + "bbox_top": 0, + "bbox_bottom": 31, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 32, + "height": 32, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"fffce5c3-108a-4943-8278-2e69433f4208","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","name":"665149da-5b9f-40ce-a356-ea77f159ef3c","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 10.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 3.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"26392d22-a34b-4bf6-86df-ecda8183cf19","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"be9b7674-5e19-4fc7-b283-a8292ae41f8b","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"03784b5e-fe53-4b38-8eb7-4251c51e8d23","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 16, + "yorigin": 16, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",}, + "resourceVersion": "1.3", + "name": "spr_bullet_ball", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bullet_ball", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bullet_diamond/spr_bullet_bead.yy b/thpj3/sprites/spr_bullet_diamond/spr_bullet_bead.yy new file mode 100644 index 0000000..6fc02df --- /dev/null +++ b/thpj3/sprites/spr_bullet_diamond/spr_bullet_bead.yy @@ -0,0 +1,87 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 23, + "bbox_top": 0, + "bbox_bottom": 23, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 24, + "height": 24, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"fffce5c3-108a-4943-8278-2e69433f4208","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","name":"665149da-5b9f-40ce-a356-ea77f159ef3c","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 10.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 3.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"3fd44805-c602-486e-8b46-2f20ed34fa6e","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fffce5c3-108a-4943-8278-2e69433f4208","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"734d0618-b4cb-4568-b531-4c9f7ffec74f","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6b65effa-d8ee-432b-9951-8f29f4fe0bb4","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"0a340e97-1ec8-43a2-8b41-c76ab997e713","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"665149da-5b9f-40ce-a356-ea77f159ef3c","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 12, + "yorigin": 12, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",}, + "resourceVersion": "1.3", + "name": "spr_bullet_bead", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bullet_bead", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bullet_diamond/spr_bullet_diamond.yy b/thpj3/sprites/spr_bullet_diamond/spr_bullet_diamond.yy new file mode 100644 index 0000000..3cc4d98 --- /dev/null +++ b/thpj3/sprites/spr_bullet_diamond/spr_bullet_diamond.yy @@ -0,0 +1,166 @@ +{ + "bboxMode": 2, + "collisionKind": 5, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 12, + "bbox_right": 23, + "bbox_top": 12, + "bbox_bottom": 19, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 32, + "height": 32, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": [ + 4278190335, + 4278255615, + 4278255360, + 4294967040, + 4294901760, + 4294902015, + 4294967295, + 4293717228, + 4293059298, + 4292335575, + 4291677645, + 4290230199, + 4287993237, + 4280556782, + 4278252287, + 4283540992, + 4293963264, + 4287770926, + 4287365357, + 4287203721, + 4286414205, + 4285558896, + 4284703587, + 4283782485, + 4281742902, + 4278190080, + 4286158839, + 4286688762, + 4287219453, + 4288280831, + 4288405444, + 4288468131, + 4288465538, + 4291349882, + 4294430829, + 4292454269, + 4291466115, + 4290675079, + 4290743485, + 4290943732, + 4288518390, + 4283395315, + 4283862775, + 4284329979, + 4285068799, + 4285781164, + 4285973884, + 4286101564, + 4290034460, + 4294164224, + 4291529796, + 4289289312, + 4289290373, + 4289291432, + 4289359601, + 4286410226, + 4280556782, + 4280444402, + 4280128760, + 4278252287, + 4282369933, + 4283086137, + 4283540992, + 4288522496, + 4293963264, + 4290540032, + 4289423360, + 4289090560, + 4287770926, + 4287704422, + 4287571858, + 4287365357, + 4284159214, + 4279176094, + 4279058848, + 4278870691, + 4278231211, + 4281367321, + ], + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"27f65c95-197b-456a-8b8f-a6330a69c690","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"27f65c95-197b-456a-8b8f-a6330a69c690","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_diamond","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"27f65c95-197b-456a-8b8f-a6330a69c690","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"5ab90d73-6f47-48a4-ab10-f6aa68aef89f","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"5ab90d73-6f47-48a4-ab10-f6aa68aef89f","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_diamond","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"5ab90d73-6f47-48a4-ab10-f6aa68aef89f","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"ef4b4f38-61f6-4052-889f-ba819b5222c2","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"ef4b4f38-61f6-4052-889f-ba819b5222c2","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"LayerId":{"name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_diamond","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","name":"ef4b4f38-61f6-4052-889f-ba819b5222c2","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_bullet_diamond","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 10.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 3.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"2729d217-de5e-4377-8f53-aae6581abd8c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"27f65c95-197b-456a-8b8f-a6330a69c690","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"4f0733bc-4ea9-4860-a7f2-fa39b82051fb","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5ab90d73-6f47-48a4-ab10-f6aa68aef89f","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"6805e1ca-90bf-4878-a2b6-8d3ce3767887","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ef4b4f38-61f6-4052-889f-ba819b5222c2","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 16, + "yorigin": 16, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_bullet_diamond","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",}, + "resourceVersion": "1.3", + "name": "spr_bullet_diamond", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"e783c4b6-15d3-4ed3-8a12-65fbe256e8f1","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "spr_bullet_diamond", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_bullet_test/078aef8f-8e85-4de4-8c81-bff953e5b65b.png b/thpj3/sprites/spr_bullet_pellet/078aef8f-8e85-4de4-8c81-bff953e5b65b.png similarity index 100% rename from thpj3/sprites/spr_bullet_test/078aef8f-8e85-4de4-8c81-bff953e5b65b.png rename to thpj3/sprites/spr_bullet_pellet/078aef8f-8e85-4de4-8c81-bff953e5b65b.png diff --git a/thpj3/sprites/spr_bullet_test/0bd3ae89-2550-41c8-8380-366520a6149c.png b/thpj3/sprites/spr_bullet_pellet/0bd3ae89-2550-41c8-8380-366520a6149c.png similarity index 100% rename from thpj3/sprites/spr_bullet_test/0bd3ae89-2550-41c8-8380-366520a6149c.png rename to thpj3/sprites/spr_bullet_pellet/0bd3ae89-2550-41c8-8380-366520a6149c.png diff --git a/thpj3/sprites/spr_bullet_test/c4bca663-234e-40d7-bea4-ab550fc0a58d.png b/thpj3/sprites/spr_bullet_pellet/c4bca663-234e-40d7-bea4-ab550fc0a58d.png similarity index 100% rename from thpj3/sprites/spr_bullet_test/c4bca663-234e-40d7-bea4-ab550fc0a58d.png rename to thpj3/sprites/spr_bullet_pellet/c4bca663-234e-40d7-bea4-ab550fc0a58d.png diff --git a/thpj3/sprites/spr_bullet_test/layers/078aef8f-8e85-4de4-8c81-bff953e5b65b/122e66f5-b202-4588-9dcf-7cb4d06adf29.png b/thpj3/sprites/spr_bullet_pellet/layers/078aef8f-8e85-4de4-8c81-bff953e5b65b/122e66f5-b202-4588-9dcf-7cb4d06adf29.png similarity index 100% rename from thpj3/sprites/spr_bullet_test/layers/078aef8f-8e85-4de4-8c81-bff953e5b65b/122e66f5-b202-4588-9dcf-7cb4d06adf29.png rename to thpj3/sprites/spr_bullet_pellet/layers/078aef8f-8e85-4de4-8c81-bff953e5b65b/122e66f5-b202-4588-9dcf-7cb4d06adf29.png diff --git a/thpj3/sprites/spr_bullet_test/layers/0bd3ae89-2550-41c8-8380-366520a6149c/122e66f5-b202-4588-9dcf-7cb4d06adf29.png b/thpj3/sprites/spr_bullet_pellet/layers/0bd3ae89-2550-41c8-8380-366520a6149c/122e66f5-b202-4588-9dcf-7cb4d06adf29.png similarity index 100% rename from thpj3/sprites/spr_bullet_test/layers/0bd3ae89-2550-41c8-8380-366520a6149c/122e66f5-b202-4588-9dcf-7cb4d06adf29.png rename to thpj3/sprites/spr_bullet_pellet/layers/0bd3ae89-2550-41c8-8380-366520a6149c/122e66f5-b202-4588-9dcf-7cb4d06adf29.png diff --git a/thpj3/sprites/spr_bullet_test/layers/c4bca663-234e-40d7-bea4-ab550fc0a58d/122e66f5-b202-4588-9dcf-7cb4d06adf29.png b/thpj3/sprites/spr_bullet_pellet/layers/c4bca663-234e-40d7-bea4-ab550fc0a58d/122e66f5-b202-4588-9dcf-7cb4d06adf29.png similarity index 100% rename from thpj3/sprites/spr_bullet_test/layers/c4bca663-234e-40d7-bea4-ab550fc0a58d/122e66f5-b202-4588-9dcf-7cb4d06adf29.png rename to thpj3/sprites/spr_bullet_pellet/layers/c4bca663-234e-40d7-bea4-ab550fc0a58d/122e66f5-b202-4588-9dcf-7cb4d06adf29.png diff --git a/thpj3/sprites/spr_bullet_test/spr_bullet_test.yy b/thpj3/sprites/spr_bullet_pellet/spr_bullet_pellet.yy similarity index 51% rename from thpj3/sprites/spr_bullet_test/spr_bullet_test.yy rename to thpj3/sprites/spr_bullet_pellet/spr_bullet_pellet.yy index 37a35f9..05cafc6 100644 --- a/thpj3/sprites/spr_bullet_test/spr_bullet_test.yy +++ b/thpj3/sprites/spr_bullet_pellet/spr_bullet_pellet.yy @@ -24,18 +24,18 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"c4bca663-234e-40d7-bea4-ab550fc0a58d","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"c4bca663-234e-40d7-bea4-ab550fc0a58d","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"LayerId":{"name":"122e66f5-b202-4588-9dcf-7cb4d06adf29","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"spr_bullet_test","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"resourceVersion":"1.0","name":"c4bca663-234e-40d7-bea4-ab550fc0a58d","tags":[],"resourceType":"GMSpriteFrame",}, - {"compositeImage":{"FrameId":{"name":"078aef8f-8e85-4de4-8c81-bff953e5b65b","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"078aef8f-8e85-4de4-8c81-bff953e5b65b","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"LayerId":{"name":"122e66f5-b202-4588-9dcf-7cb4d06adf29","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"spr_bullet_test","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"resourceVersion":"1.0","name":"078aef8f-8e85-4de4-8c81-bff953e5b65b","tags":[],"resourceType":"GMSpriteFrame",}, - {"compositeImage":{"FrameId":{"name":"0bd3ae89-2550-41c8-8380-366520a6149c","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"0bd3ae89-2550-41c8-8380-366520a6149c","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"LayerId":{"name":"122e66f5-b202-4588-9dcf-7cb4d06adf29","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"spr_bullet_test","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"resourceVersion":"1.0","name":"0bd3ae89-2550-41c8-8380-366520a6149c","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"c4bca663-234e-40d7-bea4-ab550fc0a58d","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"c4bca663-234e-40d7-bea4-ab550fc0a58d","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",},"LayerId":{"name":"122e66f5-b202-4588-9dcf-7cb4d06adf29","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_pellet","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",},"resourceVersion":"1.0","name":"c4bca663-234e-40d7-bea4-ab550fc0a58d","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"078aef8f-8e85-4de4-8c81-bff953e5b65b","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"078aef8f-8e85-4de4-8c81-bff953e5b65b","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",},"LayerId":{"name":"122e66f5-b202-4588-9dcf-7cb4d06adf29","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_pellet","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",},"resourceVersion":"1.0","name":"078aef8f-8e85-4de4-8c81-bff953e5b65b","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"0bd3ae89-2550-41c8-8380-366520a6149c","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"0bd3ae89-2550-41c8-8380-366520a6149c","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",},"LayerId":{"name":"122e66f5-b202-4588-9dcf-7cb4d06adf29","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_bullet_pellet","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",},"resourceVersion":"1.0","name":"0bd3ae89-2550-41c8-8380-366520a6149c","tags":[],"resourceType":"GMSpriteFrame",}, ], "sequence": { - "spriteId": {"name":"spr_bullet_test","path":"sprites/spr_bullet_test/spr_bullet_test.yy",}, + "spriteId": {"name":"spr_bullet_pellet","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",}, "timeUnits": 1, "playback": 1, "playbackSpeed": 10.0, @@ -47,9 +47,9 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"eb42b16f-b252-4da5-9a80-1fcb4fa6c566","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c4bca663-234e-40d7-bea4-ab550fc0a58d","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"509ef5a8-967a-413c-9332-d05c525787b1","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"078aef8f-8e85-4de4-8c81-bff953e5b65b","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"39dd8e0a-8a2e-4e99-929c-70c324c48a06","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0bd3ae89-2550-41c8-8380-366520a6149c","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"eb42b16f-b252-4da5-9a80-1fcb4fa6c566","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c4bca663-234e-40d7-bea4-ab550fc0a58d","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"509ef5a8-967a-413c-9332-d05c525787b1","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"078aef8f-8e85-4de4-8c81-bff953e5b65b","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"39dd8e0a-8a2e-4e99-929c-70c324c48a06","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0bd3ae89-2550-41c8-8380-366520a6149c","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, ], "visibleRange": null, @@ -66,9 +66,9 @@ "yorigin": 6, "eventToFunction": {}, "eventStubScript": null, - "parent": {"name":"spr_bullet_test","path":"sprites/spr_bullet_test/spr_bullet_test.yy",}, + "parent": {"name":"spr_bullet_pellet","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",}, "resourceVersion": "1.3", - "name": "spr_bullet_test", + "name": "spr_bullet_pellet", "tags": [], "resourceType": "GMSequence", }, @@ -81,7 +81,7 @@ "path": "folders/enemies.yy", }, "resourceVersion": "1.0", - "name": "spr_bullet_test", + "name": "spr_bullet_pellet", "tags": [], "resourceType": "GMSprite", } \ No newline at end of file diff --git a/thpj3/sprites/spr_fairy/99730df6-a564-4908-9ed2-6130e1feeca1.png b/thpj3/sprites/spr_fairy/99730df6-a564-4908-9ed2-6130e1feeca1.png new file mode 100644 index 0000000..5b0d889 Binary files /dev/null and b/thpj3/sprites/spr_fairy/99730df6-a564-4908-9ed2-6130e1feeca1.png differ diff --git a/thpj3/sprites/spr_fairy/layers/99730df6-a564-4908-9ed2-6130e1feeca1/0d166532-c780-4f21-82a5-475b2b7c74c0.png b/thpj3/sprites/spr_fairy/layers/99730df6-a564-4908-9ed2-6130e1feeca1/0d166532-c780-4f21-82a5-475b2b7c74c0.png new file mode 100644 index 0000000..5b0d889 Binary files /dev/null and b/thpj3/sprites/spr_fairy/layers/99730df6-a564-4908-9ed2-6130e1feeca1/0d166532-c780-4f21-82a5-475b2b7c74c0.png differ diff --git a/thpj3/sprites/spr_fairy/spr_fairy.yy b/thpj3/sprites/spr_fairy/spr_fairy.yy new file mode 100644 index 0000000..00df967 --- /dev/null +++ b/thpj3/sprites/spr_fairy/spr_fairy.yy @@ -0,0 +1,79 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 1, + "bbox_right": 63, + "bbox_top": 3, + "bbox_bottom": 63, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 64, + "height": 64, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"99730df6-a564-4908-9ed2-6130e1feeca1","path":"sprites/spr_fairy/spr_fairy.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"99730df6-a564-4908-9ed2-6130e1feeca1","path":"sprites/spr_fairy/spr_fairy.yy",},"LayerId":{"name":"0d166532-c780-4f21-82a5-475b2b7c74c0","path":"sprites/spr_fairy/spr_fairy.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_fairy","path":"sprites/spr_fairy/spr_fairy.yy",},"resourceVersion":"1.0","name":"99730df6-a564-4908-9ed2-6130e1feeca1","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_fairy","path":"sprites/spr_fairy/spr_fairy.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 1.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"25bd76fd-ea39-4307-b985-5cec7a70af35","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"99730df6-a564-4908-9ed2-6130e1feeca1","path":"sprites/spr_fairy/spr_fairy.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 32, + "yorigin": 32, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_fairy","path":"sprites/spr_fairy/spr_fairy.yy",}, + "resourceVersion": "1.3", + "name": "spr_fairy", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"0d166532-c780-4f21-82a5-475b2b7c74c0","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "enemies", + "path": "folders/enemies.yy", + }, + "resourceVersion": "1.0", + "name": "spr_fairy", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_fluff/3d9ff4fd-38bc-4185-b5ab-f2322102f5ea.png b/thpj3/sprites/spr_fluff/3d9ff4fd-38bc-4185-b5ab-f2322102f5ea.png index d7e4aa0..ceaabfb 100644 Binary files a/thpj3/sprites/spr_fluff/3d9ff4fd-38bc-4185-b5ab-f2322102f5ea.png and b/thpj3/sprites/spr_fluff/3d9ff4fd-38bc-4185-b5ab-f2322102f5ea.png differ diff --git a/thpj3/sprites/spr_fluff/6318b594-701e-4090-a2bd-b4fdaf77fa8c.png b/thpj3/sprites/spr_fluff/6318b594-701e-4090-a2bd-b4fdaf77fa8c.png index 6b2c473..7c70ca4 100644 Binary files a/thpj3/sprites/spr_fluff/6318b594-701e-4090-a2bd-b4fdaf77fa8c.png and b/thpj3/sprites/spr_fluff/6318b594-701e-4090-a2bd-b4fdaf77fa8c.png differ diff --git a/thpj3/sprites/spr_fluff/993217e7-fb50-46df-aacd-eb60145b908f.png b/thpj3/sprites/spr_fluff/993217e7-fb50-46df-aacd-eb60145b908f.png index d16aca8..a7b133d 100644 Binary files a/thpj3/sprites/spr_fluff/993217e7-fb50-46df-aacd-eb60145b908f.png and b/thpj3/sprites/spr_fluff/993217e7-fb50-46df-aacd-eb60145b908f.png differ diff --git a/thpj3/sprites/spr_fluff/b4695467-7b63-4769-bb1c-d41f940fe2f3.png b/thpj3/sprites/spr_fluff/b4695467-7b63-4769-bb1c-d41f940fe2f3.png index c2c5ff8..702aacc 100644 Binary files a/thpj3/sprites/spr_fluff/b4695467-7b63-4769-bb1c-d41f940fe2f3.png and b/thpj3/sprites/spr_fluff/b4695467-7b63-4769-bb1c-d41f940fe2f3.png differ diff --git a/thpj3/sprites/spr_fluff/layers/3d9ff4fd-38bc-4185-b5ab-f2322102f5ea/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png b/thpj3/sprites/spr_fluff/layers/3d9ff4fd-38bc-4185-b5ab-f2322102f5ea/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png index d7e4aa0..ceaabfb 100644 Binary files a/thpj3/sprites/spr_fluff/layers/3d9ff4fd-38bc-4185-b5ab-f2322102f5ea/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png and b/thpj3/sprites/spr_fluff/layers/3d9ff4fd-38bc-4185-b5ab-f2322102f5ea/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png differ diff --git a/thpj3/sprites/spr_fluff/layers/6318b594-701e-4090-a2bd-b4fdaf77fa8c/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png b/thpj3/sprites/spr_fluff/layers/6318b594-701e-4090-a2bd-b4fdaf77fa8c/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png index 6b2c473..7c70ca4 100644 Binary files a/thpj3/sprites/spr_fluff/layers/6318b594-701e-4090-a2bd-b4fdaf77fa8c/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png and b/thpj3/sprites/spr_fluff/layers/6318b594-701e-4090-a2bd-b4fdaf77fa8c/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png differ diff --git a/thpj3/sprites/spr_fluff/layers/993217e7-fb50-46df-aacd-eb60145b908f/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png b/thpj3/sprites/spr_fluff/layers/993217e7-fb50-46df-aacd-eb60145b908f/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png index d16aca8..a7b133d 100644 Binary files a/thpj3/sprites/spr_fluff/layers/993217e7-fb50-46df-aacd-eb60145b908f/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png and b/thpj3/sprites/spr_fluff/layers/993217e7-fb50-46df-aacd-eb60145b908f/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png differ diff --git a/thpj3/sprites/spr_fluff/layers/b4695467-7b63-4769-bb1c-d41f940fe2f3/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png b/thpj3/sprites/spr_fluff/layers/b4695467-7b63-4769-bb1c-d41f940fe2f3/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png index c2c5ff8..702aacc 100644 Binary files a/thpj3/sprites/spr_fluff/layers/b4695467-7b63-4769-bb1c-d41f940fe2f3/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png and b/thpj3/sprites/spr_fluff/layers/b4695467-7b63-4769-bb1c-d41f940fe2f3/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png differ diff --git a/thpj3/thpj3.yyp b/thpj3/thpj3.yyp index c000dbd..b6a0377 100644 --- a/thpj3/thpj3.yyp +++ b/thpj3/thpj3.yyp @@ -1,50 +1,68 @@ { "resources": [ + {"id":{"name":"snd_player_shot","path":"sounds/snd_player_shot/snd_player_shot.yy",},"order":14,}, {"id":{"name":"fn_disclaimer","path":"fonts/fn_disclaimer/fn_disclaimer.yy",},"order":1,}, + {"id":{"name":"snd_boss_destroy","path":"sounds/snd_boss_destroy/snd_boss_destroy.yy",},"order":8,}, + {"id":{"name":"snd_enemy_bullet","path":"sounds/snd_enemy_bullet/snd_enemy_bullet.yy",},"order":10,}, {"id":{"name":"fn_title_text","path":"fonts/fn_title_text/fn_title_text.yy",},"order":0,}, + {"id":{"name":"spr_bullet_blade","path":"sprites/spr_bullet_blade/spr_bullet_blade.yy",},"order":21,}, {"id":{"name":"obj_options","path":"objects/obj_options/obj_options.yy",},"order":8,}, + {"id":{"name":"snd_enemy_hit_deep","path":"sounds/snd_enemy_hit_deep/snd_enemy_hit_deep.yy",},"order":11,}, {"id":{"name":"spr_player_shot","path":"sprites/spr_player_shot/spr_player_shot.yy",},"order":1,}, {"id":{"name":"obj_stage_controller","path":"objects/obj_stage_controller/obj_stage_controller.yy",},"order":0,}, {"id":{"name":"spr_byakuren","path":"sprites/spr_byakuren/spr_byakuren.yy",},"order":6,}, + {"id":{"name":"spr_fairy","path":"sprites/spr_fairy/spr_fairy.yy",},"order":26,}, {"id":{"name":"spr_mystia_0_neutral","path":"sprites/spr_mystia_0_neutral/spr_mystia_0_neutral.yy",},"order":0,}, {"id":{"name":"obj_disclaimer","path":"objects/obj_disclaimer/obj_disclaimer.yy",},"order":2,}, {"id":{"name":"obj_bomber_topologic","path":"objects/obj_bomber_topologic/obj_bomber_topologic.yy",},"order":13,}, {"id":{"name":"spr_UI_life","path":"sprites/spr_UI_life/spr_UI_life.yy",},"order":6,}, {"id":{"name":"spr_wriggle_hitbox","path":"sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.yy",},"order":3,}, + {"id":{"name":"spr_UI_boss_bar","path":"sprites/spr_UI_boss_bar/spr_UI_boss_bar.yy",},"order":9,}, {"id":{"name":"spr_byakuren_4_angry","path":"sprites/spr_byakuren_4_angry/spr_byakuren_4_angry.yy",},"order":4,}, {"id":{"name":"obj_title_moon","path":"objects/obj_title_moon/obj_title_moon.yy",},"order":1,}, {"id":{"name":"obj_option_shot","path":"objects/obj_option_shot/obj_option_shot.yy",},"order":7,}, {"id":{"name":"spr_title_star","path":"sprites/spr_title_star/spr_title_star.yy",},"order":7,}, - {"id":{"name":"obj_bullet_test","path":"objects/obj_bullet_test/obj_bullet_test.yy",},"order":3,}, + {"id":{"name":"obj_bullet_pellet","path":"objects/obj_bullet_pellet/obj_bullet_pellet.yy",},"order":3,}, {"id":{"name":"spr_wriggle_4_angry","path":"sprites/spr_wriggle_4_angry/spr_wriggle_4_angry.yy",},"order":4,}, {"id":{"name":"spr_fluff","path":"sprites/spr_fluff/spr_fluff.yy",},"order":1,}, {"id":{"name":"scr_dialogue_start","path":"scripts/scr_dialogue_start/scr_dialogue_start.yy",},"order":23,}, + {"id":{"name":"snd_typewriter","path":"sounds/snd_typewriter/snd_typewriter.yy",},"order":27,}, {"id":{"name":"rm_disclaimer","path":"rooms/rm_disclaimer/rm_disclaimer.yy",},"order":9,}, {"id":{"name":"obj_UI_controller","path":"objects/obj_UI_controller/obj_UI_controller.yy",},"order":1,}, {"id":{"name":"spr_UI_bomb","path":"sprites/spr_UI_bomb/spr_UI_bomb.yy",},"order":2,}, {"id":{"name":"spr_options","path":"sprites/spr_options/spr_options.yy",},"order":4,}, {"id":{"name":"spr_UI_wriggle","path":"sprites/spr_UI_wriggle/spr_UI_wriggle.yy",},"order":7,}, + {"id":{"name":"obj_bullet_ball","path":"objects/obj_bullet_ball/obj_bullet_ball.yy",},"order":17,}, {"id":{"name":"obj_title_text","path":"objects/obj_title_text/obj_title_text.yy",},"order":3,}, {"id":{"name":"obj_wriggle","path":"objects/obj_wriggle/obj_wriggle.yy",},"order":5,}, + {"id":{"name":"obj_bullet_bead","path":"objects/obj_bullet_bead/obj_bullet_bead.yy",},"order":15,}, {"id":{"name":"fn_dialogue_text","path":"fonts/fn_dialogue_text/fn_dialogue_text.yy",},"order":4,}, + {"id":{"name":"obj_enemy_fairy_lane","path":"objects/obj_enemy_fairy_lane/obj_enemy_fairy_lane.yy",},"order":28,}, + {"id":{"name":"spr_bullet_card","path":"sprites/spr_bullet_card/spr_bullet_card.yy",},"order":20,}, + {"id":{"name":"obj_enemy_fairy_shotgun","path":"objects/obj_enemy_fairy_shotgun/obj_enemy_fairy_shotgun.yy",},"order":27,}, {"id":{"name":"obj_boss_parent","path":"objects/obj_boss_parent/obj_boss_parent.yy",},"order":0,}, {"id":{"name":"spr_title_bg","path":"sprites/spr_title_bg/spr_title_bg.yy",},"order":5,}, {"id":{"name":"spr_UI_hyper_bar","path":"sprites/spr_UI_hyper_bar/spr_UI_hyper_bar.yy",},"order":4,}, {"id":{"name":"spr_wriggle","path":"sprites/spr_wriggle/spr_wriggle.yy",},"order":2,}, {"id":{"name":"obj_enemy_bullet_parent","path":"objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy",},"order":1,}, - {"id":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"order":2,}, + {"id":{"name":"obj_enemy_popcorn","path":"objects/obj_enemy_popcorn/obj_enemy_popcorn.yy",},"order":2,}, {"id":{"name":"spr_UI_hyper_fill","path":"sprites/spr_UI_hyper_fill/spr_UI_hyper_fill.yy",},"order":5,}, {"id":{"name":"spr_wriggle_1_happy","path":"sprites/spr_wriggle_1_happy/spr_wriggle_1_happy.yy",},"order":1,}, + {"id":{"name":"spr_bg_forest_front","path":"sprites/spr_bg_forest_front/spr_bg_forest_front.yy",},"order":7,}, {"id":{"name":"spr_byakuren_1_happy","path":"sprites/spr_byakuren_1_happy/spr_byakuren_1_happy.yy",},"order":1,}, {"id":{"name":"spr_mystia_4_angry","path":"sprites/spr_mystia_4_angry/spr_mystia_4_angry.yy",},"order":4,}, {"id":{"name":"spr_mystia_2_sad","path":"sprites/spr_mystia_2_sad/spr_mystia_2_sad.yy",},"order":2,}, + {"id":{"name":"snd_graze","path":"sounds/snd_graze/snd_graze.yy",},"order":9,}, {"id":{"name":"obj_player_shot","path":"objects/obj_player_shot/obj_player_shot.yy",},"order":6,}, {"id":{"name":"spr_wriggle_2_sad","path":"sprites/spr_wriggle_2_sad/spr_wriggle_2_sad.yy",},"order":2,}, {"id":{"name":"spr_bomber","path":"sprites/spr_bomber/spr_bomber.yy",},"order":11,}, + {"id":{"name":"snd_boss_spellbreak","path":"sounds/snd_boss_spellbreak/snd_boss_spellbreak.yy",},"order":14,}, {"id":{"name":"spr_wriggle_3_confused","path":"sprites/spr_wriggle_3_confused/spr_wriggle_3_confused.yy",},"order":3,}, {"id":{"name":"spr_UI_hyper","path":"sprites/spr_UI_hyper/spr_UI_hyper.yy",},"order":3,}, {"id":{"name":"spr_option_shot","path":"sprites/spr_option_shot/spr_option_shot.yy",},"order":0,}, - {"id":{"name":"spr_bullet_test","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"order":0,}, + {"id":{"name":"spr_bullet_diamond","path":"sprites/spr_bullet_diamond/spr_bullet_diamond.yy",},"order":19,}, + {"id":{"name":"spr_bullet_pellet","path":"sprites/spr_bullet_pellet/spr_bullet_pellet.yy",},"order":0,}, + {"id":{"name":"snd_player_bomber","path":"sounds/snd_player_bomber/snd_player_bomber.yy",},"order":19,}, {"id":{"name":"spr_bg_ground","path":"sprites/spr_bg_ground/spr_bg_ground.yy",},"order":2,}, {"id":{"name":"rm_stage1","path":"rooms/rm_stage1/rm_stage1.yy",},"order":10,}, {"id":{"name":"spr_mystia_3_confused","path":"sprites/spr_mystia_3_confused/spr_mystia_3_confused.yy",},"order":3,}, @@ -54,29 +72,46 @@ {"id":{"name":"spr_bg_stars","path":"sprites/spr_bg_stars/spr_bg_stars.yy",},"order":4,}, {"id":{"name":"spr_bg_sky","path":"sprites/spr_bg_sky/spr_bg_sky.yy",},"order":3,}, {"id":{"name":"scr_initialize","path":"scripts/scr_initialize/scr_initialize.yy",},"order":11,}, + {"id":{"name":"obj_enemy_fairy_wave","path":"objects/obj_enemy_fairy_wave/obj_enemy_fairy_wave.yy",},"order":25,}, {"id":{"name":"spr_text_arrow","path":"sprites/spr_text_arrow/spr_text_arrow.yy",},"order":1,}, {"id":{"name":"fn_contact","path":"fonts/fn_contact/fn_contact.yy",},"order":0,}, {"id":{"name":"obj_bomber","path":"objects/obj_bomber/obj_bomber.yy",},"order":10,}, {"id":{"name":"spr_title_moon","path":"sprites/spr_title_moon/spr_title_moon.yy",},"order":6,}, {"id":{"name":"obj_enemy_parent","path":"objects/obj_enemy_parent/obj_enemy_parent.yy",},"order":2,}, {"id":{"name":"spr_mystia_1_happy","path":"sprites/spr_mystia_1_happy/spr_mystia_1_happy.yy",},"order":1,}, - {"id":{"name":"spr_bg_forest","path":"sprites/spr_bg_forest/spr_bg_forest.yy",},"order":1,}, + {"id":{"name":"spr_bg_forest_back","path":"sprites/spr_bg_forest_back/spr_bg_forest_back.yy",},"order":1,}, {"id":{"name":"fn_GUI","path":"fonts/fn_GUI/fn_GUI.yy",},"order":0,}, {"id":{"name":"spr_byakuren_2_sad","path":"sprites/spr_byakuren_2_sad/spr_byakuren_2_sad.yy",},"order":2,}, + {"id":{"name":"spr_UI_boss_phases","path":"sprites/spr_UI_boss_phases/spr_UI_boss_phases.yy",},"order":11,}, + {"id":{"name":"snd_music_title","path":"sounds/snd_music_title/snd_music_title.yy",},"order":10,}, + {"id":{"name":"spr_bullet_bead","path":"sprites/spr_bullet_bead/spr_bullet_bead.yy",},"order":16,}, {"id":{"name":"obj_title_star","path":"objects/obj_title_star/obj_title_star.yy",},"order":2,}, {"id":{"name":"spr_wriggle_5_ouch","path":"sprites/spr_wriggle_5_ouch/spr_wriggle_5_ouch.yy",},"order":5,}, + {"id":{"name":"spr_UI_boss_fill","path":"sprites/spr_UI_boss_fill/spr_UI_boss_fill.yy",},"order":10,}, {"id":{"name":"spr_bomber_topologic","path":"sprites/spr_bomber_topologic/spr_bomber_topologic.yy",},"order":12,}, + {"id":{"name":"snd_player_deathbomb","path":"sounds/snd_player_deathbomb/snd_player_deathbomb.yy",},"order":18,}, {"id":{"name":"spr_text_box","path":"sprites/spr_text_box/spr_text_box.yy",},"order":2,}, + {"id":{"name":"snd_enemy_destroy","path":"sounds/snd_enemy_destroy/snd_enemy_destroy.yy",},"order":13,}, + {"id":{"name":"snd_player_pchuuun","path":"sounds/snd_player_pchuuun/snd_player_pchuuun.yy",},"order":16,}, {"id":{"name":"scr_pattern_fire","path":"scripts/scr_pattern_fire/scr_pattern_fire.yy",},"order":7,}, + {"id":{"name":"obj_bullet_card","path":"objects/obj_bullet_card/obj_bullet_card.yy",},"order":23,}, + {"id":{"name":"spr_bg_forest_mid","path":"sprites/spr_bg_forest_mid/spr_bg_forest_mid.yy",},"order":8,}, + {"id":{"name":"obj_bullet_diamond","path":"objects/obj_bullet_diamond/obj_bullet_diamond.yy",},"order":24,}, + {"id":{"name":"snd_music_stage1","path":"sounds/snd_music_stage1/snd_music_stage1.yy",},"order":9,}, {"id":{"name":"spr_wriggle_0_neutral","path":"sprites/spr_wriggle_0_neutral/spr_wriggle_0_neutral.yy",},"order":0,}, {"id":{"name":"fn_dialogue_names","path":"fonts/fn_dialogue_names/fn_dialogue_names.yy",},"order":3,}, {"id":{"name":"obj_title_title","path":"objects/obj_title_title/obj_title_title.yy",},"order":4,}, {"id":{"name":"spr_byakuren_0_neutral","path":"sprites/spr_byakuren_0_neutral/spr_byakuren_0_neutral.yy",},"order":0,}, + {"id":{"name":"snd_player_hyperactive","path":"sounds/snd_player_hyperactive/snd_player_hyperactive.yy",},"order":17,}, + {"id":{"name":"obj_bullet_blade","path":"objects/obj_bullet_blade/obj_bullet_blade.yy",},"order":22,}, {"id":{"name":"tl_stage1_logic","path":"timelines/tl_stage1_logic/tl_stage1_logic.yy",},"order":6,}, {"id":{"name":"obj_dialogue","path":"objects/obj_dialogue/obj_dialogue.yy",},"order":0,}, {"id":{"name":"obj_darkfade","path":"objects/obj_darkfade/obj_darkfade.yy",},"order":5,}, + {"id":{"name":"snd_enemy_hit","path":"sounds/snd_enemy_hit/snd_enemy_hit.yy",},"order":12,}, {"id":{"name":"spr_UI_backdrop","path":"sprites/spr_UI_backdrop/spr_UI_backdrop.yy",},"order":8,}, + {"id":{"name":"snd_player_hypershot","path":"sounds/snd_player_hypershot/snd_player_hypershot.yy",},"order":15,}, {"id":{"name":"spr_byakuren_5_ouch","path":"sprites/spr_byakuren_5_ouch/spr_byakuren_5_ouch.yy",},"order":5,}, + {"id":{"name":"spr_bullet_ball","path":"sprites/spr_bullet_ball/spr_bullet_ball.yy",},"order":18,}, {"id":{"name":"obj_boss_stage1_mid","path":"objects/obj_boss_stage1_mid/obj_boss_stage1_mid.yy",},"order":5,}, {"id":{"name":"rm_title","path":"rooms/rm_title/rm_title.yy",},"order":8,}, ], @@ -100,7 +135,7 @@ ], "Folders": [ {"folderPath":"folders/title.yy","order":0,"resourceVersion":"1.0","name":"title","tags":[],"resourceType":"GMFolder",}, - {"folderPath":"folders/disclaimer.yy","order":2,"resourceVersion":"1.0","name":"disclaimer","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/title/disclaimer.yy","order":9,"resourceVersion":"1.0","name":"disclaimer","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/dialogue.yy","order":1,"resourceVersion":"1.0","name":"dialogue","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/player.yy","order":3,"resourceVersion":"1.0","name":"player","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/enemies.yy","order":4,"resourceVersion":"1.0","name":"enemies","tags":[],"resourceType":"GMFolder",}, diff --git a/thpj3/timelines/tl_stage1_logic/moment_10000.gml b/thpj3/timelines/tl_stage1_logic/moment_10000.gml new file mode 100644 index 0000000..15253a8 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_10000.gml @@ -0,0 +1,3 @@ +/// @desc boss + +instance_create_layer(1350, 160, "enemy", obj_boss_stage1_mid); \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_10001.gml b/thpj3/timelines/tl_stage1_logic/moment_10001.gml new file mode 100644 index 0000000..c8250c1 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_10001.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(20); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1050.gml b/thpj3/timelines/tl_stage1_logic/moment_1050.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1050.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1070.gml b/thpj3/timelines/tl_stage1_logic/moment_1070.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1070.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1090.gml b/thpj3/timelines/tl_stage1_logic/moment_1090.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1090.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1110.gml b/thpj3/timelines/tl_stage1_logic/moment_1110.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1110.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1115.gml b/thpj3/timelines/tl_stage1_logic/moment_1115.gml new file mode 100644 index 0000000..7911e57 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1115.gml @@ -0,0 +1,8 @@ +/// @desc wave fairy down column + +var popcorn = instance_create_layer( 900, 0, "enemy", obj_enemy_fairy_wave ); +with ( popcorn ) { + face_dir = LEFT; + speed = 1.5; + direction = 270; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1120.gml b/thpj3/timelines/tl_stage1_logic/moment_1120.gml new file mode 100644 index 0000000..df7829f --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1120.gml @@ -0,0 +1,8 @@ +/// @desc wave fairy up column + +var popcorn = instance_create_layer( 900, 720, "enemy", obj_enemy_fairy_wave ); +with ( popcorn ) { + face_dir = LEFT; + speed = 1.5; + direction = 90; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1130.gml b/thpj3/timelines/tl_stage1_logic/moment_1130.gml new file mode 100644 index 0000000..7911e57 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1130.gml @@ -0,0 +1,8 @@ +/// @desc wave fairy down column + +var popcorn = instance_create_layer( 900, 0, "enemy", obj_enemy_fairy_wave ); +with ( popcorn ) { + face_dir = LEFT; + speed = 1.5; + direction = 270; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1135.gml b/thpj3/timelines/tl_stage1_logic/moment_1135.gml new file mode 100644 index 0000000..df7829f --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1135.gml @@ -0,0 +1,8 @@ +/// @desc wave fairy up column + +var popcorn = instance_create_layer( 900, 720, "enemy", obj_enemy_fairy_wave ); +with ( popcorn ) { + face_dir = LEFT; + speed = 1.5; + direction = 90; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1150.gml b/thpj3/timelines/tl_stage1_logic/moment_1150.gml new file mode 100644 index 0000000..8ee231e --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1150.gml @@ -0,0 +1,16 @@ +/// @desc popcorn corner burst + +for ( var i = 0; i < 5; i++ ) { + var popcorn = instance_create_layer( 1280, 100, "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 180 + 10 * i; + } + var popcorn = instance_create_layer( 1280, 100, "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 1 + random(1); + direction = 180 + 10 * i; + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1151.gml b/thpj3/timelines/tl_stage1_logic/moment_1151.gml new file mode 100644 index 0000000..7d0cd24 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1151.gml @@ -0,0 +1,16 @@ +/// @desc popcorn corner burst + +for ( var i = 0; i < 5; i++ ) { + var popcorn = instance_create_layer( 1280, 620, "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 180 - 10 * i; + } + var popcorn = instance_create_layer( 1280, 620, "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 1 + random(1); + direction = 180 - 10 * i; + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1180.gml b/thpj3/timelines/tl_stage1_logic/moment_1180.gml new file mode 100644 index 0000000..bd12f38 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1180.gml @@ -0,0 +1,11 @@ +/// @desc column of aimed lane fairies + +for ( var i = 0; i < 5; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + 120 * i, "enemy", obj_enemy_fairy_lane ); + with ( popcorn ) { + face_dir = LEFT; + speed = 1 + random(.5); + friction = -.02; + direction = point_direction(x, y, obj_wriggle.x, obj_wriggle.y); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1200.gml b/thpj3/timelines/tl_stage1_logic/moment_1200.gml new file mode 100644 index 0000000..8ee231e --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1200.gml @@ -0,0 +1,16 @@ +/// @desc popcorn corner burst + +for ( var i = 0; i < 5; i++ ) { + var popcorn = instance_create_layer( 1280, 100, "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 180 + 10 * i; + } + var popcorn = instance_create_layer( 1280, 100, "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 1 + random(1); + direction = 180 + 10 * i; + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1250.gml b/thpj3/timelines/tl_stage1_logic/moment_1250.gml new file mode 100644 index 0000000..7d0cd24 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1250.gml @@ -0,0 +1,16 @@ +/// @desc popcorn corner burst + +for ( var i = 0; i < 5; i++ ) { + var popcorn = instance_create_layer( 1280, 620, "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 180 - 10 * i; + } + var popcorn = instance_create_layer( 1280, 620, "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 1 + random(1); + direction = 180 - 10 * i; + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1280.gml b/thpj3/timelines/tl_stage1_logic/moment_1280.gml new file mode 100644 index 0000000..5940264 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1280.gml @@ -0,0 +1,11 @@ +/// @desc column of aimed lane fairies + +for ( var i = 0; i < 5; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + 120 * i, "enemy", obj_enemy_fairy_lane ); + with ( popcorn ) { + face_dir = LEFT; + speed = 1 + random(.5); + friction = -.02 + direction = point_direction(x, y, obj_wriggle.x, obj_wriggle.y); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1330.gml b/thpj3/timelines/tl_stage1_logic/moment_1330.gml new file mode 100644 index 0000000..2f1a08a --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1330.gml @@ -0,0 +1,8 @@ +/// @desc shotgun fairy row + +var popcorn = instance_create_layer( 1280, 300, "enemy", obj_enemy_fairy_shotgun ); +with ( popcorn ) { + face_dir = LEFT; + speed = 4; + direction = 180; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1335.gml b/thpj3/timelines/tl_stage1_logic/moment_1335.gml new file mode 100644 index 0000000..5456282 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1335.gml @@ -0,0 +1,8 @@ +/// @desc shotgun fairy row + +var popcorn = instance_create_layer( 1280, 420, "enemy", obj_enemy_fairy_shotgun ); +with ( popcorn ) { + face_dir = LEFT; + speed = 4; + direction = 180; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1340.gml b/thpj3/timelines/tl_stage1_logic/moment_1340.gml new file mode 100644 index 0000000..2f1a08a --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1340.gml @@ -0,0 +1,8 @@ +/// @desc shotgun fairy row + +var popcorn = instance_create_layer( 1280, 300, "enemy", obj_enemy_fairy_shotgun ); +with ( popcorn ) { + face_dir = LEFT; + speed = 4; + direction = 180; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1345.gml b/thpj3/timelines/tl_stage1_logic/moment_1345.gml new file mode 100644 index 0000000..5456282 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1345.gml @@ -0,0 +1,8 @@ +/// @desc shotgun fairy row + +var popcorn = instance_create_layer( 1280, 420, "enemy", obj_enemy_fairy_shotgun ); +with ( popcorn ) { + face_dir = LEFT; + speed = 4; + direction = 180; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1350.gml b/thpj3/timelines/tl_stage1_logic/moment_1350.gml new file mode 100644 index 0000000..2f1a08a --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1350.gml @@ -0,0 +1,8 @@ +/// @desc shotgun fairy row + +var popcorn = instance_create_layer( 1280, 300, "enemy", obj_enemy_fairy_shotgun ); +with ( popcorn ) { + face_dir = LEFT; + speed = 4; + direction = 180; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1355.gml b/thpj3/timelines/tl_stage1_logic/moment_1355.gml new file mode 100644 index 0000000..5456282 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1355.gml @@ -0,0 +1,8 @@ +/// @desc shotgun fairy row + +var popcorn = instance_create_layer( 1280, 420, "enemy", obj_enemy_fairy_shotgun ); +with ( popcorn ) { + face_dir = LEFT; + speed = 4; + direction = 180; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1360.gml b/thpj3/timelines/tl_stage1_logic/moment_1360.gml new file mode 100644 index 0000000..2f1a08a --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1360.gml @@ -0,0 +1,8 @@ +/// @desc shotgun fairy row + +var popcorn = instance_create_layer( 1280, 300, "enemy", obj_enemy_fairy_shotgun ); +with ( popcorn ) { + face_dir = LEFT; + speed = 4; + direction = 180; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1365.gml b/thpj3/timelines/tl_stage1_logic/moment_1365.gml new file mode 100644 index 0000000..5456282 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1365.gml @@ -0,0 +1,8 @@ +/// @desc shotgun fairy row + +var popcorn = instance_create_layer( 1280, 420, "enemy", obj_enemy_fairy_shotgun ); +with ( popcorn ) { + face_dir = LEFT; + speed = 4; + direction = 180; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1420.gml b/thpj3/timelines/tl_stage1_logic/moment_1420.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1420.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1440.gml b/thpj3/timelines/tl_stage1_logic/moment_1440.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1440.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1460.gml b/thpj3/timelines/tl_stage1_logic/moment_1460.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1460.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1480.gml b/thpj3/timelines/tl_stage1_logic/moment_1480.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1480.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_150.gml b/thpj3/timelines/tl_stage1_logic/moment_150.gml deleted file mode 100644 index 99df99e..0000000 --- a/thpj3/timelines/tl_stage1_logic/moment_150.gml +++ /dev/null @@ -1 +0,0 @@ -instance_create_layer(1350, 160, "enemy", obj_boss_stage1_mid); \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1500.gml b/thpj3/timelines/tl_stage1_logic/moment_1500.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1500.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1540.gml b/thpj3/timelines/tl_stage1_logic/moment_1540.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1540.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1560.gml b/thpj3/timelines/tl_stage1_logic/moment_1560.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1560.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1580.gml b/thpj3/timelines/tl_stage1_logic/moment_1580.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1580.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1600.gml b/thpj3/timelines/tl_stage1_logic/moment_1600.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1600.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1619.gml b/thpj3/timelines/tl_stage1_logic/moment_1619.gml new file mode 100644 index 0000000..15253a8 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1619.gml @@ -0,0 +1,3 @@ +/// @desc boss + +instance_create_layer(1350, 160, "enemy", obj_boss_stage1_mid); \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_1859.gml b/thpj3/timelines/tl_stage1_logic/moment_1859.gml new file mode 100644 index 0000000..15253a8 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_1859.gml @@ -0,0 +1,3 @@ +/// @desc boss + +instance_create_layer(1350, 160, "enemy", obj_boss_stage1_mid); \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_200.gml b/thpj3/timelines/tl_stage1_logic/moment_200.gml index 5284b50..92a15f1 100644 --- a/thpj3/timelines/tl_stage1_logic/moment_200.gml +++ b/thpj3/timelines/tl_stage1_logic/moment_200.gml @@ -1,10 +1,10 @@ -/// @desc moemura is cute +/// @desc advancing column of wave fairies for ( var i = 0; i < 5; i++ ) { - var popcorn = instance_create_layer( 1280, 100 + 120 * i, "enemy", obj_enemy_test ); + var popcorn = instance_create_layer( 1280, 100 + 120 * i, "enemy", obj_enemy_fairy_wave ); with ( popcorn ) { face_dir = LEFT; - speed = 2; + speed = 1; direction = 180; } } \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_260.gml b/thpj3/timelines/tl_stage1_logic/moment_260.gml new file mode 100644 index 0000000..7d0cd24 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_260.gml @@ -0,0 +1,16 @@ +/// @desc popcorn corner burst + +for ( var i = 0; i < 5; i++ ) { + var popcorn = instance_create_layer( 1280, 620, "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 180 - 10 * i; + } + var popcorn = instance_create_layer( 1280, 620, "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 1 + random(1); + direction = 180 - 10 * i; + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_400.gml b/thpj3/timelines/tl_stage1_logic/moment_400.gml new file mode 100644 index 0000000..e12531d --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_400.gml @@ -0,0 +1,10 @@ +/// @desc advancing column of wave fairies + +for ( var i = 0; i < 5; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + 120 * i, "enemy", obj_enemy_fairy_wave ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2; + direction = 180; + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_480.gml b/thpj3/timelines/tl_stage1_logic/moment_480.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_480.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_500.gml b/thpj3/timelines/tl_stage1_logic/moment_500.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_500.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_5000.gml b/thpj3/timelines/tl_stage1_logic/moment_5000.gml new file mode 100644 index 0000000..e11dd16 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_5000.gml @@ -0,0 +1,3 @@ +/// @desc midboss + +instance_create_layer(1350, 160, "enemy", obj_boss_stage1_mid); \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_520.gml b/thpj3/timelines/tl_stage1_logic/moment_520.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_520.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_540.gml b/thpj3/timelines/tl_stage1_logic/moment_540.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_540.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_560.gml b/thpj3/timelines/tl_stage1_logic/moment_560.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_560.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_60.gml b/thpj3/timelines/tl_stage1_logic/moment_60.gml index 5284b50..8ee231e 100644 --- a/thpj3/timelines/tl_stage1_logic/moment_60.gml +++ b/thpj3/timelines/tl_stage1_logic/moment_60.gml @@ -1,10 +1,16 @@ -/// @desc moemura is cute +/// @desc popcorn corner burst for ( var i = 0; i < 5; i++ ) { - var popcorn = instance_create_layer( 1280, 100 + 120 * i, "enemy", obj_enemy_test ); + var popcorn = instance_create_layer( 1280, 100, "enemy", obj_enemy_popcorn ); with ( popcorn ) { face_dir = LEFT; - speed = 2; - direction = 180; + speed = 2 + random(1); + direction = 180 + 10 * i; + } + var popcorn = instance_create_layer( 1280, 100, "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 1 + random(1); + direction = 180 + 10 * i; } } \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_600.gml b/thpj3/timelines/tl_stage1_logic/moment_600.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_600.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_620.gml b/thpj3/timelines/tl_stage1_logic/moment_620.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_620.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_640.gml b/thpj3/timelines/tl_stage1_logic/moment_640.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_640.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_660.gml b/thpj3/timelines/tl_stage1_logic/moment_660.gml new file mode 100644 index 0000000..1354d8c --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_660.gml @@ -0,0 +1,10 @@ +/// @desc popcorn spam + +for ( var i = 0; i < 4; i++ ) { + var popcorn = instance_create_layer( 1280, 100 + random(520), "enemy", obj_enemy_popcorn ); + with ( popcorn ) { + face_dir = LEFT; + speed = 2 + random(1); + direction = 160 + random(40); + } +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_800.gml b/thpj3/timelines/tl_stage1_logic/moment_800.gml new file mode 100644 index 0000000..2f1a08a --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_800.gml @@ -0,0 +1,8 @@ +/// @desc shotgun fairy row + +var popcorn = instance_create_layer( 1280, 300, "enemy", obj_enemy_fairy_shotgun ); +with ( popcorn ) { + face_dir = LEFT; + speed = 4; + direction = 180; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_810.gml b/thpj3/timelines/tl_stage1_logic/moment_810.gml new file mode 100644 index 0000000..2f1a08a --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_810.gml @@ -0,0 +1,8 @@ +/// @desc shotgun fairy row + +var popcorn = instance_create_layer( 1280, 300, "enemy", obj_enemy_fairy_shotgun ); +with ( popcorn ) { + face_dir = LEFT; + speed = 4; + direction = 180; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_820.gml b/thpj3/timelines/tl_stage1_logic/moment_820.gml new file mode 100644 index 0000000..2f1a08a --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_820.gml @@ -0,0 +1,8 @@ +/// @desc shotgun fairy row + +var popcorn = instance_create_layer( 1280, 300, "enemy", obj_enemy_fairy_shotgun ); +with ( popcorn ) { + face_dir = LEFT; + speed = 4; + direction = 180; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_830.gml b/thpj3/timelines/tl_stage1_logic/moment_830.gml new file mode 100644 index 0000000..2f1a08a --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_830.gml @@ -0,0 +1,8 @@ +/// @desc shotgun fairy row + +var popcorn = instance_create_layer( 1280, 300, "enemy", obj_enemy_fairy_shotgun ); +with ( popcorn ) { + face_dir = LEFT; + speed = 4; + direction = 180; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_860.gml b/thpj3/timelines/tl_stage1_logic/moment_860.gml new file mode 100644 index 0000000..7911e57 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_860.gml @@ -0,0 +1,8 @@ +/// @desc wave fairy down column + +var popcorn = instance_create_layer( 900, 0, "enemy", obj_enemy_fairy_wave ); +with ( popcorn ) { + face_dir = LEFT; + speed = 1.5; + direction = 270; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_875.gml b/thpj3/timelines/tl_stage1_logic/moment_875.gml new file mode 100644 index 0000000..7911e57 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_875.gml @@ -0,0 +1,8 @@ +/// @desc wave fairy down column + +var popcorn = instance_create_layer( 900, 0, "enemy", obj_enemy_fairy_wave ); +with ( popcorn ) { + face_dir = LEFT; + speed = 1.5; + direction = 270; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_900.gml b/thpj3/timelines/tl_stage1_logic/moment_900.gml new file mode 100644 index 0000000..5456282 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_900.gml @@ -0,0 +1,8 @@ +/// @desc shotgun fairy row + +var popcorn = instance_create_layer( 1280, 420, "enemy", obj_enemy_fairy_shotgun ); +with ( popcorn ) { + face_dir = LEFT; + speed = 4; + direction = 180; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_910.gml b/thpj3/timelines/tl_stage1_logic/moment_910.gml new file mode 100644 index 0000000..5456282 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_910.gml @@ -0,0 +1,8 @@ +/// @desc shotgun fairy row + +var popcorn = instance_create_layer( 1280, 420, "enemy", obj_enemy_fairy_shotgun ); +with ( popcorn ) { + face_dir = LEFT; + speed = 4; + direction = 180; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_920.gml b/thpj3/timelines/tl_stage1_logic/moment_920.gml new file mode 100644 index 0000000..5456282 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_920.gml @@ -0,0 +1,8 @@ +/// @desc shotgun fairy row + +var popcorn = instance_create_layer( 1280, 420, "enemy", obj_enemy_fairy_shotgun ); +with ( popcorn ) { + face_dir = LEFT; + speed = 4; + direction = 180; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_930.gml b/thpj3/timelines/tl_stage1_logic/moment_930.gml new file mode 100644 index 0000000..5456282 --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_930.gml @@ -0,0 +1,8 @@ +/// @desc shotgun fairy row + +var popcorn = instance_create_layer( 1280, 420, "enemy", obj_enemy_fairy_shotgun ); +with ( popcorn ) { + face_dir = LEFT; + speed = 4; + direction = 180; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_960.gml b/thpj3/timelines/tl_stage1_logic/moment_960.gml new file mode 100644 index 0000000..df7829f --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_960.gml @@ -0,0 +1,8 @@ +/// @desc wave fairy up column + +var popcorn = instance_create_layer( 900, 720, "enemy", obj_enemy_fairy_wave ); +with ( popcorn ) { + face_dir = LEFT; + speed = 1.5; + direction = 90; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/moment_975.gml b/thpj3/timelines/tl_stage1_logic/moment_975.gml new file mode 100644 index 0000000..df7829f --- /dev/null +++ b/thpj3/timelines/tl_stage1_logic/moment_975.gml @@ -0,0 +1,8 @@ +/// @desc wave fairy up column + +var popcorn = instance_create_layer( 900, 720, "enemy", obj_enemy_fairy_wave ); +with ( popcorn ) { + face_dir = LEFT; + speed = 1.5; + direction = 90; +} \ No newline at end of file diff --git a/thpj3/timelines/tl_stage1_logic/tl_stage1_logic.yy b/thpj3/timelines/tl_stage1_logic/tl_stage1_logic.yy index 88c075e..d9d414e 100644 --- a/thpj3/timelines/tl_stage1_logic/tl_stage1_logic.yy +++ b/thpj3/timelines/tl_stage1_logic/tl_stage1_logic.yy @@ -1,8 +1,63 @@ { "momentList": [ {"moment":60,"evnt":{"isDnD":false,"eventNum":60,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, - {"moment":150,"evnt":{"isDnD":false,"eventNum":150,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, {"moment":200,"evnt":{"isDnD":false,"eventNum":200,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":260,"evnt":{"isDnD":false,"eventNum":260,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":400,"evnt":{"isDnD":false,"eventNum":400,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":480,"evnt":{"isDnD":false,"eventNum":480,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":500,"evnt":{"isDnD":false,"eventNum":500,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":520,"evnt":{"isDnD":false,"eventNum":520,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":540,"evnt":{"isDnD":false,"eventNum":540,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":560,"evnt":{"isDnD":false,"eventNum":560,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":600,"evnt":{"isDnD":false,"eventNum":600,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":620,"evnt":{"isDnD":false,"eventNum":620,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":640,"evnt":{"isDnD":false,"eventNum":640,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":660,"evnt":{"isDnD":false,"eventNum":660,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":800,"evnt":{"isDnD":false,"eventNum":800,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":810,"evnt":{"isDnD":false,"eventNum":810,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":820,"evnt":{"isDnD":false,"eventNum":820,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":830,"evnt":{"isDnD":false,"eventNum":830,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":860,"evnt":{"isDnD":false,"eventNum":860,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":875,"evnt":{"isDnD":false,"eventNum":875,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":900,"evnt":{"isDnD":false,"eventNum":900,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":910,"evnt":{"isDnD":false,"eventNum":910,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":920,"evnt":{"isDnD":false,"eventNum":920,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":930,"evnt":{"isDnD":false,"eventNum":930,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":960,"evnt":{"isDnD":false,"eventNum":960,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":975,"evnt":{"isDnD":false,"eventNum":975,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1050,"evnt":{"isDnD":false,"eventNum":1050,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1070,"evnt":{"isDnD":false,"eventNum":1070,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1090,"evnt":{"isDnD":false,"eventNum":1090,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1110,"evnt":{"isDnD":false,"eventNum":1110,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1115,"evnt":{"isDnD":false,"eventNum":1115,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1120,"evnt":{"isDnD":false,"eventNum":1120,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1130,"evnt":{"isDnD":false,"eventNum":1130,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1135,"evnt":{"isDnD":false,"eventNum":1135,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1150,"evnt":{"isDnD":false,"eventNum":1150,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1151,"evnt":{"isDnD":false,"eventNum":1151,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1180,"evnt":{"isDnD":false,"eventNum":1180,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1200,"evnt":{"isDnD":false,"eventNum":1200,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1250,"evnt":{"isDnD":false,"eventNum":1250,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1280,"evnt":{"isDnD":false,"eventNum":1280,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1330,"evnt":{"isDnD":false,"eventNum":1330,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1335,"evnt":{"isDnD":false,"eventNum":1335,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1340,"evnt":{"isDnD":false,"eventNum":1340,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1345,"evnt":{"isDnD":false,"eventNum":1345,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1350,"evnt":{"isDnD":false,"eventNum":1350,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1355,"evnt":{"isDnD":false,"eventNum":1355,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1360,"evnt":{"isDnD":false,"eventNum":1360,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1365,"evnt":{"isDnD":false,"eventNum":1365,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1420,"evnt":{"isDnD":false,"eventNum":1420,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1440,"evnt":{"isDnD":false,"eventNum":1440,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1460,"evnt":{"isDnD":false,"eventNum":1460,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1480,"evnt":{"isDnD":false,"eventNum":1480,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1500,"evnt":{"isDnD":false,"eventNum":1500,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1540,"evnt":{"isDnD":false,"eventNum":1540,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1560,"evnt":{"isDnD":false,"eventNum":1560,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1580,"evnt":{"isDnD":false,"eventNum":1580,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":1600,"evnt":{"isDnD":false,"eventNum":1600,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":5000,"evnt":{"isDnD":false,"eventNum":5000,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, + {"moment":10000,"evnt":{"isDnD":false,"eventNum":10000,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",}, ], "parent": { "name": "stage",