From 592e0fd9cb62359e5f3c47cda9899834407b5f44 Mon Sep 17 00:00:00 2001 From: magicalfeyfenny Date: Sat, 5 Jun 2021 04:58:44 -0400 Subject: [PATCH] Added player movement and bomb/hyper logic --- thpj3/objects/obj_dialogue/Create_0.gml | 50 ++------ thpj3/objects/obj_dialogue/Draw_0.gml | 6 +- thpj3/objects/obj_dialogue/Step_0.gml | 12 +- thpj3/objects/obj_dialogue/obj_dialogue.yy | 4 +- thpj3/objects/obj_title_text/Step_0.gml | 2 +- thpj3/objects/obj_wriggle/Create_0.gml | 15 +++ thpj3/objects/obj_wriggle/Draw_0.gml | 4 + thpj3/objects/obj_wriggle/Step_0.gml | 112 ++++++++++++++++++ thpj3/objects/obj_wriggle/obj_wriggle.yy | 38 ++++++ thpj3/options/linux/options_linux.yy | 10 +- thpj3/rooms/Room3/Room3.yy | 2 + thpj3/rooms/rm_title/RoomCreationCode.gml | 2 +- .../scr_dialogue_start/scr_dialogue_start.gml | 8 +- .../scripts/scr_initialize/scr_initialize.gml | 41 +++++++ .../scripts/scr_initialize/scr_initialize.yy | 12 ++ .../82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1.png | Bin 203 -> 0 bytes .../b2046bc7-37f9-401b-b711-c59dc3018c19.png | Bin 203 -> 0 bytes .../sprites/spr_text_arrow/spr_text_arrow.yy | 4 +- thpj3/sprites/spr_text_box/spr_text_box.yy | 4 +- .../68066b04-ff45-4bd8-a2cb-d8d36df51faa.png | Bin 0 -> 513 bytes .../10a3f643-2de7-444e-b563-07d9d088eff2.png | Bin 0 -> 513 bytes thpj3/sprites/spr_wriggle/spr_wriggle.yy | 79 ++++++++++++ .../82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1.png | Bin 0 -> 179 bytes .../b2046bc7-37f9-401b-b711-c59dc3018c19.png | Bin 0 -> 179 bytes .../spr_wriggle_hitbox.yy} | 30 ++--- thpj3/thpj3.yyp | 28 +++-- 26 files changed, 367 insertions(+), 96 deletions(-) create mode 100644 thpj3/objects/obj_wriggle/Create_0.gml create mode 100644 thpj3/objects/obj_wriggle/Draw_0.gml create mode 100644 thpj3/objects/obj_wriggle/Step_0.gml create mode 100644 thpj3/objects/obj_wriggle/obj_wriggle.yy create mode 100644 thpj3/scripts/scr_initialize/scr_initialize.gml create mode 100644 thpj3/scripts/scr_initialize/scr_initialize.yy delete mode 100644 thpj3/sprites/Sprite7/82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1.png delete mode 100644 thpj3/sprites/Sprite7/layers/82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1/b2046bc7-37f9-401b-b711-c59dc3018c19.png create mode 100644 thpj3/sprites/spr_wriggle/68066b04-ff45-4bd8-a2cb-d8d36df51faa.png create mode 100644 thpj3/sprites/spr_wriggle/layers/68066b04-ff45-4bd8-a2cb-d8d36df51faa/10a3f643-2de7-444e-b563-07d9d088eff2.png create mode 100644 thpj3/sprites/spr_wriggle/spr_wriggle.yy create mode 100644 thpj3/sprites/spr_wriggle_hitbox/82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1.png create mode 100644 thpj3/sprites/spr_wriggle_hitbox/layers/82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1/b2046bc7-37f9-401b-b711-c59dc3018c19.png rename thpj3/sprites/{Sprite7/Sprite7.yy => spr_wriggle_hitbox/spr_wriggle_hitbox.yy} (63%) diff --git a/thpj3/objects/obj_dialogue/Create_0.gml b/thpj3/objects/obj_dialogue/Create_0.gml index e44e839..76ddd22 100644 --- a/thpj3/objects/obj_dialogue/Create_0.gml +++ b/thpj3/objects/obj_dialogue/Create_0.gml @@ -2,53 +2,17 @@ dialogue_mode = false; textspew = ""; texttarget = ""; -actor_left = ""; -actor_left_emote = 0; -actor_right = ""; -actor_right_emote = 0; spewlength = 0; -last_active = 0; -text_advance_ready = -1; +actor_left = ""; +actor_left_emote = EMOTE_NEUTRAL; +actor_right = ""; +actor_right_emote = EMOTE_NEUTRAL; +last_active = LEFT; +text_advance_ready = TEXT_LOADING; name_test = ds_queue_create(); text_test = ds_queue_create(); active_test = ds_queue_create(); emote_test = ds_queue_create(); -loopdoop = 0; - -//ds_queue_enqueue(name_test, -// "", "", -// "Wriggle", "Mystia", -// "Wriggle", "Mystia", -// "Wriggle", "Mystia", -// "Wriggle", "Mystia", -// "Wriggle", "Mystia" -// ); -//ds_queue_enqueue(text_test, -// "", -// "So, what are you up to?", -// "on this fine day of Tuesday", -// "not much my good binch", -// "just drinking my soup", -// "cool cool" -// ); -//ds_queue_enqueue(active_test, -// 0, -// 0, -// 0, -// 1, -// 1, -// 0 -// ); -// -//ds_queue_enqueue(emote_test, -// 3, 2, -// 3, 2, -// 1, 2, -// 1, 2, -// 1, 2, -// 1, 5 -// ); - -scr_dialogue_start( "dialogue_test.txt" ); \ No newline at end of file +loopdoop = 0; \ 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 d7836a2..d66bc4c 100644 --- a/thpj3/objects/obj_dialogue/Draw_0.gml +++ b/thpj3/objects/obj_dialogue/Draw_0.gml @@ -12,7 +12,7 @@ if (dialogue_mode) { //TODO: Draw current active character's name draw_set_alpha(1); - if ( last_active == 0 ) { + if ( last_active == LEFT ) { draw_set_alpha(.5); } draw_set_halign( fa_right ); @@ -20,7 +20,7 @@ if (dialogue_mode) { draw_set_halign( fa_left ); draw_set_alpha(1); - if ( last_active == 1 ) { + if ( last_active == RIGHT ) { draw_set_alpha(.5); } draw_text( 128, 640, actor_left ); @@ -31,7 +31,7 @@ if (dialogue_mode) { draw_text( 128, 480, textspew ); //TODO: If the current text has reached completion, draw an arrow in the corner - if (text_advance_ready == 1) { + 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 1355903..b4ae831 100644 --- a/thpj3/objects/obj_dialogue/Step_0.gml +++ b/thpj3/objects/obj_dialogue/Step_0.gml @@ -1,6 +1,6 @@ if (dialogue_mode) { - if (text_advance_ready == -1 && !ds_queue_empty(name_test) && !ds_queue_empty(name_test) && !ds_queue_empty(active_test) && !ds_queue_empty(emote_test)) { - text_advance_ready = 0; + if (text_advance_ready == TEXT_LOADING && !ds_queue_empty(name_test) && !ds_queue_empty(name_test) && !ds_queue_empty(active_test) && !ds_queue_empty(emote_test)) { + text_advance_ready = TEXT_TYPING; actor_left = ds_queue_dequeue(name_test); actor_left_emote = ds_queue_dequeue(emote_test); actor_right = ""; @@ -14,7 +14,7 @@ if (dialogue_mode) { last_active = ds_queue_dequeue(active_test); } - if (text_advance_ready == 0 ) { + if (text_advance_ready == TEXT_TYPING ) { textspew += string_char_at(texttarget, spewlength); spewlength++; if (keyboard_check_pressed( ord("Z") ) ) { @@ -22,13 +22,13 @@ if (dialogue_mode) { keyboard_clear(ord("Z")); } if (textspew == texttarget) { - text_advance_ready = 1; + text_advance_ready = TEXT_READY; } } - if (text_advance_ready == 1) { + if (text_advance_ready == TEXT_READY) { if (keyboard_check_pressed( ord("Z") ) ) { - text_advance_ready = -1; + text_advance_ready = TEXT_LOADING; if (ds_queue_empty(name_test) || ds_queue_empty(text_test) || ds_queue_empty(active_test) || ds_queue_empty(emote_test)) { dialogue_mode = false; } diff --git a/thpj3/objects/obj_dialogue/obj_dialogue.yy b/thpj3/objects/obj_dialogue/obj_dialogue.yy index ee6b1b5..aa89a4d 100644 --- a/thpj3/objects/obj_dialogue/obj_dialogue.yy +++ b/thpj3/objects/obj_dialogue/obj_dialogue.yy @@ -28,8 +28,8 @@ "properties": [], "overriddenProperties": [], "parent": { - "name": "thpj3", - "path": "thpj3.yyp", + "name": "dialogue", + "path": "folders/dialogue.yy", }, "resourceVersion": "1.0", "name": "obj_dialogue", diff --git a/thpj3/objects/obj_title_text/Step_0.gml b/thpj3/objects/obj_title_text/Step_0.gml index bfe8690..d09bf0a 100644 --- a/thpj3/objects/obj_title_text/Step_0.gml +++ b/thpj3/objects/obj_title_text/Step_0.gml @@ -1,3 +1,3 @@ if (keyboard_check(vk_anykey)) { - + room_goto_next(); } \ No newline at end of file diff --git a/thpj3/objects/obj_wriggle/Create_0.gml b/thpj3/objects/obj_wriggle/Create_0.gml new file mode 100644 index 0000000..d5fa43d --- /dev/null +++ b/thpj3/objects/obj_wriggle/Create_0.gml @@ -0,0 +1,15 @@ +lives_current = LIVES_INIT; +bombs_current = BOMBS_INIT; +hyper_current = HYPER_INIT; + +face_dir = RIGHT; + +hitbox_rotator = 0; +bombing = 0; +invuln = 0; +recovery = 0; +emergency = 0; +hyper_time = 0; +hyper_tier = 0; +h_move = 0; +v_move = 0; \ No newline at end of file diff --git a/thpj3/objects/obj_wriggle/Draw_0.gml b/thpj3/objects/obj_wriggle/Draw_0.gml new file mode 100644 index 0000000..beaf843 --- /dev/null +++ b/thpj3/objects/obj_wriggle/Draw_0.gml @@ -0,0 +1,4 @@ +draw_sprite_ext( spr_wriggle, image_index, x, y, -1 + (2 * face_dir), 1, 0, c_white, 1 * ( max( 1, recovery ) % 3 ) ); + +draw_sprite_ext( spr_wriggle_hitbox, 0, x, y, 2, 2, hitbox_rotator, c_white, .75); +draw_sprite_ext( spr_wriggle_hitbox, 0, x, y, 1, 1, -hitbox_rotator, c_white, 1); \ No newline at end of file diff --git a/thpj3/objects/obj_wriggle/Step_0.gml b/thpj3/objects/obj_wriggle/Step_0.gml new file mode 100644 index 0000000..2d9190b --- /dev/null +++ b/thpj3/objects/obj_wriggle/Step_0.gml @@ -0,0 +1,112 @@ +hitbox_rotator++; +bombing--; +invuln--; +recovery--; +emergency--; +hyper_time--; +h_move = 0; +v_move = 0; + +input_up = keyboard_check( vk_up ); +input_down = keyboard_check( vk_down ); +input_left = keyboard_check( vk_left ); +input_right = keyboard_check( vk_right ); +input_shot_left = keyboard_check( ord( "Z" ) ); +input_shot_right = keyboard_check( ord( "C" ) ); +input_focus = keyboard_check( vk_shift ); +input_bomb = keyboard_check_pressed( ord("X") ); + +if ( hyper_time <= 0 ) { + hyper_tier = HYPER_INACTIVE; +} + +//bomb logic +if ( input_bomb && !bombing && !recovery) { + //death bomb + if ( emergency ) { + if ( hyper_current >= HYPER_COST && hyper_tier == HYPER_INACTIVE ) { + hyper_current -= hyper_current; //costs all hyper gauges, tier = maximum + bombing = 60; + invuln = 60; + hyper_time = 420; + hyper_tier = HYPER_TIER_3; + } else if (bombs_current > 0 ) { + bombs_current = 0; //costs all bombs + bombing = 300; + invuln = 360; +//TODO: create death bomb object + //instance_create + } + } else { + if ( hyper_current >= HYPER_COST && hyper_tier == HYPER_INACTIVE ) { + hyper_time = 240; + while ( hyper_current >= HYPER_COST ) { //costs all filled hyper gauges, tier = expended gauges + hyper_current -= HYPER_COST; + hyper_time += 60; + hyper_tier += 1; + } + bombing = 60; + invuln = 60; + } else if ( bombs_current > 0 ) { + bombs_current -= 1; //costs 1 bomb + bombing = 180; + invuln = 180; +//TODO: create bomb object + //instance_create + } + } +} + +//movement logic +if ( !emergency && !recovery ) { + //convert input bools to directions + if ( input_up ) { + v_move--; + } + if ( input_down ) { + v_move++; + } + if ( input_left ) { + h_move--; + } + if ( input_right ) { + h_move++; + } + //move + if ( h_move != 0 || v_move != 0 ) { + if ( input_focus ) { + x += lengthdir_x( FOCUS_SPEED, point_direction(0, 0, h_move, v_move) ); + y += lengthdir_y( FOCUS_SPEED, point_direction(0, 0, h_move, v_move) ); + } else { + x += lengthdir_x( UNFOC_SPEED, point_direction(0, 0, h_move, v_move) ); + y += lengthdir_y( UNFOC_SPEED, point_direction(0, 0, h_move, v_move) ); + } + } + //enforce screen border + if ( x > BOUNDARY_RIGHT ) { + x = BOUNDARY_RIGHT; + } + if ( x < BOUNDARY_LEFT ) { + x = BOUNDARY_LEFT; + } + if ( y > BOUNDARY_BOTTOM ) { + y = BOUNDARY_BOTTOM; + } + if ( y < BOUNDARY_TOP ) { + y = BOUNDARY_TOP; + } +} + +//shot and facing logic +if ( !emergency && !recovery ) { + //change directions if only one is held + if ( input_shot_left && !input_shot_right ) { + face_dir = LEFT; + } + if ( !input_shot_left && input_shot_right ) { + face_dir = RIGHT; + } + if ( input_shot_left || input_shot_right ) { +//TODO: shoot in facing direction + } +} \ No newline at end of file diff --git a/thpj3/objects/obj_wriggle/obj_wriggle.yy b/thpj3/objects/obj_wriggle/obj_wriggle.yy new file mode 100644 index 0000000..ec5a504 --- /dev/null +++ b/thpj3/objects/obj_wriggle/obj_wriggle.yy @@ -0,0 +1,38 @@ +{ + "spriteId": { + "name": "spr_wriggle", + "path": "sprites/spr_wriggle/spr_wriggle.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": null, + "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":0,"collisionObjectId":null,"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":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "thpj3", + "path": "thpj3.yyp", + }, + "resourceVersion": "1.0", + "name": "obj_wriggle", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/options/linux/options_linux.yy b/thpj3/options/linux/options_linux.yy index 25d6fc6..5f0c97c 100644 --- a/thpj3/options/linux/options_linux.yy +++ b/thpj3/options/linux/options_linux.yy @@ -1,9 +1,9 @@ { - "option_linux_display_name": "Created with GameMaker Studio 2", + "option_linux_display_name": "wriggle's imperishable night [preview]", "option_linux_version": "1.0.0.0", - "option_linux_maintainer_email": "", - "option_linux_homepage": "http://www.yoyogames.com", - "option_linux_short_desc": "", + "option_linux_maintainer_email": "jmhogueison@outlook.com", + "option_linux_homepage": "https://git.fenny.space/magicalfeyfenny/touhou-pride-jam-2021", + "option_linux_short_desc": "a touhou fangame", "option_linux_long_desc": "", "option_linux_splash_screen": "${base_options_dir}/linux/splash/splash.png", "option_linux_display_splash": false, @@ -11,7 +11,7 @@ "option_linux_start_fullscreen": false, "option_linux_allow_fullscreen": false, "option_linux_interpolate_pixels": true, - "option_linux_display_cursor": true, + "option_linux_display_cursor": false, "option_linux_sync": false, "option_linux_resize_window": false, "option_linux_scale": 0, diff --git a/thpj3/rooms/Room3/Room3.yy b/thpj3/rooms/Room3/Room3.yy index 113299b..65e4295 100644 --- a/thpj3/rooms/Room3/Room3.yy +++ b/thpj3/rooms/Room3/Room3.yy @@ -15,6 +15,7 @@ "layers": [ {"instances":[ {"properties":[],"isDnd":false,"objectId":{"name":"obj_dialogue","path":"objects/obj_dialogue/obj_dialogue.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":96.0,"y":448.0,"resourceVersion":"1.0","name":"inst_1ED821BC","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"obj_wriggle","path":"objects/obj_wriggle/obj_wriggle.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":96.0,"y":128.0,"resourceVersion":"1.0","name":"inst_61D7FC1F","tags":[],"resourceType":"GMRInstance",}, ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Instances","tags":[],"resourceType":"GMRInstanceLayer",}, {"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",}, ], @@ -23,6 +24,7 @@ "inheritCode": false, "instanceCreationOrder": [ {"name":"inst_1ED821BC","path":"rooms/Room3/Room3.yy",}, + {"name":"inst_61D7FC1F","path":"rooms/Room3/Room3.yy",}, ], "inheritCreationOrder": false, "sequenceId": null, diff --git a/thpj3/rooms/rm_title/RoomCreationCode.gml b/thpj3/rooms/rm_title/RoomCreationCode.gml index 3dd0871..56843a7 100644 --- a/thpj3/rooms/rm_title/RoomCreationCode.gml +++ b/thpj3/rooms/rm_title/RoomCreationCode.gml @@ -1 +1 @@ -randomize(); \ No newline at end of file +scr_initialize(); \ No newline at end of file diff --git a/thpj3/scripts/scr_dialogue_start/scr_dialogue_start.gml b/thpj3/scripts/scr_dialogue_start/scr_dialogue_start.gml index 33c5c83..bdc79b9 100644 --- a/thpj3/scripts/scr_dialogue_start/scr_dialogue_start.gml +++ b/thpj3/scripts/scr_dialogue_start/scr_dialogue_start.gml @@ -51,10 +51,10 @@ function scr_dialogue_start( _filename ) { obj_dialogue.textspew = ""; obj_dialogue.texttarget = ""; obj_dialogue.actor_left = ""; - obj_dialogue.actor_left_emote = 0; + obj_dialogue.actor_left_emote = EMOTE_NEUTRAL; obj_dialogue.actor_right = ""; - obj_dialogue.actor_right_emote = 0; + obj_dialogue.actor_right_emote = EMOTE_NEUTRAL; obj_dialogue.spewlength = 0; - obj_dialogue.last_active = 0; - obj_dialogue.text_advance_ready = -1; + obj_dialogue.last_active = LEFT; + obj_dialogue.text_advance_ready = TEXT_LOADING; } \ No newline at end of file diff --git a/thpj3/scripts/scr_initialize/scr_initialize.gml b/thpj3/scripts/scr_initialize/scr_initialize.gml new file mode 100644 index 0000000..64f9c1b --- /dev/null +++ b/thpj3/scripts/scr_initialize/scr_initialize.gml @@ -0,0 +1,41 @@ +/// @function scr_initialize(); + +//define global constants +#macro TEXT_LOADING -1 +#macro TEXT_TYPING 0 +#macro TEXT_READY 1 +#macro EMOTE_NEUTRAL 0 +#macro EMOTE_HAPPY 1 +#macro EMOTE_SAD 2 +#macro EMOTE_CONFUSED 3 +#macro EMOTE_ANGRY 4 +#macro EMOTE_OUCH 5 + +#macro LEFT 0 +#macro RIGHT 1 +#macro LIVES_INIT 3 +#macro LIVES_MAX 5 +#macro BOMBS_INIT 3 +#macro BOMBS_MAX 5 +#macro HYPER_INIT 0 +#macro HYPER_COST 100 +#macro HYPER_MAX 300 + +#macro FOCUS_SPEED 2 +#macro UNFOC_SPEED 5 + +#macro HYPER_INACTIVE 0 +#macro HYPER_TIER_1 1 +#macro HYPER_TIER_2 2 +#macro HYPER_TIER_3 3 + +#macro BOUNDARY_LEFT 32 +#macro BOUNDARY_RIGHT 1248 +#macro BOUNDARY_TOP 32 +#macro BOUNDARY_BOTTOM 688 + + + +function scr_initialize() { + randomize(); +} \ No newline at end of file diff --git a/thpj3/scripts/scr_initialize/scr_initialize.yy b/thpj3/scripts/scr_initialize/scr_initialize.yy new file mode 100644 index 0000000..0d1b311 --- /dev/null +++ b/thpj3/scripts/scr_initialize/scr_initialize.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "thpj3", + "path": "thpj3.yyp", + }, + "resourceVersion": "1.0", + "name": "scr_initialize", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/thpj3/sprites/Sprite7/82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1.png b/thpj3/sprites/Sprite7/82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1.png deleted file mode 100644 index e3f2170890128a24f217a2005fd1f4353fa68bc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=lRRA*=z2(XtCn9oRE?FEB)s3ZCSTK-V#Ny85}Sb4q9e03jPY AOaK4? diff --git a/thpj3/sprites/Sprite7/layers/82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1/b2046bc7-37f9-401b-b711-c59dc3018c19.png b/thpj3/sprites/Sprite7/layers/82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1/b2046bc7-37f9-401b-b711-c59dc3018c19.png deleted file mode 100644 index e3f2170890128a24f217a2005fd1f4353fa68bc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=lRRA*=z2(XtCn9oRE?FEB)s3ZCSTK-V#Ny85}Sb4q9e03jPY AOaK4? diff --git a/thpj3/sprites/spr_text_arrow/spr_text_arrow.yy b/thpj3/sprites/spr_text_arrow/spr_text_arrow.yy index 2536195..49f6b3d 100644 --- a/thpj3/sprites/spr_text_arrow/spr_text_arrow.yy +++ b/thpj3/sprites/spr_text_arrow/spr_text_arrow.yy @@ -97,8 +97,8 @@ ], "nineSlice": null, "parent": { - "name": "thpj3", - "path": "thpj3.yyp", + "name": "dialogue", + "path": "folders/dialogue.yy", }, "resourceVersion": "1.0", "name": "spr_text_arrow", diff --git a/thpj3/sprites/spr_text_box/spr_text_box.yy b/thpj3/sprites/spr_text_box/spr_text_box.yy index 28fa8df..bd4d3ae 100644 --- a/thpj3/sprites/spr_text_box/spr_text_box.yy +++ b/thpj3/sprites/spr_text_box/spr_text_box.yy @@ -71,8 +71,8 @@ ], "nineSlice": null, "parent": { - "name": "thpj3", - "path": "thpj3.yyp", + "name": "dialogue", + "path": "folders/dialogue.yy", }, "resourceVersion": "1.0", "name": "spr_text_box", diff --git a/thpj3/sprites/spr_wriggle/68066b04-ff45-4bd8-a2cb-d8d36df51faa.png b/thpj3/sprites/spr_wriggle/68066b04-ff45-4bd8-a2cb-d8d36df51faa.png new file mode 100644 index 0000000000000000000000000000000000000000..69dc29b1c564c98926d8db7b41558d57e0dbefaa GIT binary patch literal 513 zcmV+c0{;DpP)HrDgl3$h0gM3&2+vs720no~e^1@>}#@a^;K15ddv z1Z;&L-+3g^3-}d&{Tr(UY5{w~d!ZGe4R7rQlme_RZ;?PLAd^!-bp?yr z2H18XgqY`BE`?DG9B+6bRRB})L5hHkC9RcE0TIEGtuKTLU~cs_Ap*LD7vKUqg%@A~ zGJ>PWzu*$kt+l_gDc}g<_V6L#UxE)_1Tcq>82`dk0BiWD;DfYh0SRJ}?A`aDks`nw zAW}l80A!`3BrKzFbivVM7X`crYz0S1j_3tY0U521mf#k!r!v-!PU?4qUB>tfl>kd< zPb+5hf@O9gYfB?HK-Xo3-2~BdHmWS4)k=`{nPLm5fNtT1vMsT!X>NvFK=#W_G-d(T z)?*4Us0DcEb?bklPzlHipDC)%en1pykHhaU%m4yR04jKPuYm~Y8eT}-6=n=CP@E8{ zyjhkXldGO7)Egp}Q{2DG)07o~x(8@BDA>abrXk?1JWF`tJS0_d(dZYR8p>t?771Yj zSay77gg*_kO9&qVqnp2rVCeor>IspoYiTH73RiOn3Jw7nIlRi@00000NkvXXu0mjf Dzl+ze literal 0 HcmV?d00001 diff --git a/thpj3/sprites/spr_wriggle/layers/68066b04-ff45-4bd8-a2cb-d8d36df51faa/10a3f643-2de7-444e-b563-07d9d088eff2.png b/thpj3/sprites/spr_wriggle/layers/68066b04-ff45-4bd8-a2cb-d8d36df51faa/10a3f643-2de7-444e-b563-07d9d088eff2.png new file mode 100644 index 0000000000000000000000000000000000000000..69dc29b1c564c98926d8db7b41558d57e0dbefaa GIT binary patch literal 513 zcmV+c0{;DpP)HrDgl3$h0gM3&2+vs720no~e^1@>}#@a^;K15ddv z1Z;&L-+3g^3-}d&{Tr(UY5{w~d!ZGe4R7rQlme_RZ;?PLAd^!-bp?yr z2H18XgqY`BE`?DG9B+6bRRB})L5hHkC9RcE0TIEGtuKTLU~cs_Ap*LD7vKUqg%@A~ zGJ>PWzu*$kt+l_gDc}g<_V6L#UxE)_1Tcq>82`dk0BiWD;DfYh0SRJ}?A`aDks`nw zAW}l80A!`3BrKzFbivVM7X`crYz0S1j_3tY0U521mf#k!r!v-!PU?4qUB>tfl>kd< zPb+5hf@O9gYfB?HK-Xo3-2~BdHmWS4)k=`{nPLm5fNtT1vMsT!X>NvFK=#W_G-d(T z)?*4Us0DcEb?bklPzlHipDC)%en1pykHhaU%m4yR04jKPuYm~Y8eT}-6=n=CP@E8{ zyjhkXldGO7)Egp}Q{2DG)07o~x(8@BDA>abrXk?1JWF`tJS0_d(dZYR8p>t?771Yj zSay77gg*_kO9&qVqnp2rVCeor>IspoYiTH73RiOn3Jw7nIlRi@00000NkvXXu0mjf Dzl+ze literal 0 HcmV?d00001 diff --git a/thpj3/sprites/spr_wriggle/spr_wriggle.yy b/thpj3/sprites/spr_wriggle/spr_wriggle.yy new file mode 100644 index 0000000..030a4e2 --- /dev/null +++ b/thpj3/sprites/spr_wriggle/spr_wriggle.yy @@ -0,0 +1,79 @@ +{ + "bboxMode": 2, + "collisionKind": 2, + "type": 0, + "origin": 9, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 29, + "bbox_right": 34, + "bbox_top": 21, + "bbox_bottom": 26, + "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":"68066b04-ff45-4bd8-a2cb-d8d36df51faa","path":"sprites/spr_wriggle/spr_wriggle.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"68066b04-ff45-4bd8-a2cb-d8d36df51faa","path":"sprites/spr_wriggle/spr_wriggle.yy",},"LayerId":{"name":"10a3f643-2de7-444e-b563-07d9d088eff2","path":"sprites/spr_wriggle/spr_wriggle.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_wriggle","path":"sprites/spr_wriggle/spr_wriggle.yy",},"resourceVersion":"1.0","name":"68066b04-ff45-4bd8-a2cb-d8d36df51faa","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_wriggle","path":"sprites/spr_wriggle/spr_wriggle.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":"d163ddcf-05f6-4987-8aeb-08d511f18573","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"68066b04-ff45-4bd8-a2cb-d8d36df51faa","path":"sprites/spr_wriggle/spr_wriggle.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": 24, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_wriggle","path":"sprites/spr_wriggle/spr_wriggle.yy",}, + "resourceVersion": "1.3", + "name": "spr_wriggle", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"10a3f643-2de7-444e-b563-07d9d088eff2","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "thpj3", + "path": "thpj3.yyp", + }, + "resourceVersion": "1.0", + "name": "spr_wriggle", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/sprites/spr_wriggle_hitbox/82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1.png b/thpj3/sprites/spr_wriggle_hitbox/82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1.png new file mode 100644 index 0000000000000000000000000000000000000000..a8bcc7dc0914965f9fb0dc4e7607f4674566dd0b GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqRh}-6Ar*6yfByepZ>y}FtjsLN zFe#bQ^N`3%x9I=uo;Gn+Qv}tHF$pmkezV=bML$2#I^y}Ec`tuAB>5?rMKF4(du%e$ z;9SFSqKu`p(I@F(nz>Oz<4sN@u_eMs=8J^yyzd#rpU8T}(a*rWN#$Xm%Qv+XDl;w` c+-GF4yyvpCdh$#~peqy}FtjsLN zFe#bQ^N`3%x9I=uo;Gn+Qv}tHF$pmkezV=bML$2#I^y}Ec`tuAB>5?rMKF4(du%e$ z;9SFSqKu`p(I@F(nz>Oz<4sN@u_eMs=8J^yyzd#rpU8T}(a*rWN#$Xm%Qv+XDl;w` c+-GF4yyvpCdh$#~peq",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"59a5cd20-6c83-4df3-a73f-1aa6acedc239","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1","path":"sprites/Sprite7/Sprite7.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"59a5cd20-6c83-4df3-a73f-1aa6acedc239","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"82d298fd-0c66-42e4-bbd6-a1ea9b9c23f1","path":"sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.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, @@ -54,13 +54,13 @@ "backdropHeight": 768, "backdropXOffset": 0.0, "backdropYOffset": 0.0, - "xorigin": 0, - "yorigin": 0, + "xorigin": 4, + "yorigin": 4, "eventToFunction": {}, "eventStubScript": null, - "parent": {"name":"Sprite7","path":"sprites/Sprite7/Sprite7.yy",}, + "parent": {"name":"spr_wriggle_hitbox","path":"sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.yy",}, "resourceVersion": "1.3", - "name": "Sprite7", + "name": "spr_wriggle_hitbox", "tags": [], "resourceType": "GMSequence", }, @@ -73,7 +73,7 @@ "path": "thpj3.yyp", }, "resourceVersion": "1.0", - "name": "Sprite7", + "name": "spr_wriggle_hitbox", "tags": [], "resourceType": "GMSprite", } \ No newline at end of file diff --git a/thpj3/thpj3.yyp b/thpj3/thpj3.yyp index 21c3928..1b8446c 100644 --- a/thpj3/thpj3.yyp +++ b/thpj3/thpj3.yyp @@ -3,23 +3,26 @@ {"id":{"name":"fn_disclaimer","path":"fonts/fn_disclaimer/fn_disclaimer.yy",},"order":1,}, {"id":{"name":"fn_title_text","path":"fonts/fn_title_text/fn_title_text.yy",},"order":0,}, {"id":{"name":"obj_disclaimer","path":"objects/obj_disclaimer/obj_disclaimer.yy",},"order":2,}, - {"id":{"name":"Sprite7","path":"sprites/Sprite7/Sprite7.yy",},"order":9,}, + {"id":{"name":"spr_wriggle_hitbox","path":"sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.yy",},"order":9,}, {"id":{"name":"obj_title_moon","path":"objects/obj_title_moon/obj_title_moon.yy",},"order":1,}, - {"id":{"name":"spr_title_star","path":"sprites/spr_title_star/spr_title_star.yy",},"order":8,}, + {"id":{"name":"spr_title_star","path":"sprites/spr_title_star/spr_title_star.yy",},"order":7,}, {"id":{"name":"scr_dialogue_start","path":"scripts/scr_dialogue_start/scr_dialogue_start.yy",},"order":10,}, {"id":{"name":"rm_disclaimer","path":"rooms/rm_disclaimer/rm_disclaimer.yy",},"order":3,}, - {"id":{"name":"obj_title_text","path":"objects/obj_title_text/obj_title_text.yy",},"order":4,}, - {"id":{"name":"spr_title_bg","path":"sprites/spr_title_bg/spr_title_bg.yy",},"order":6,}, + {"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":11,}, + {"id":{"name":"spr_title_bg","path":"sprites/spr_title_bg/spr_title_bg.yy",},"order":5,}, + {"id":{"name":"spr_wriggle","path":"sprites/spr_wriggle/spr_wriggle.yy",},"order":14,}, {"id":{"name":"Room3","path":"rooms/Room3/Room3.yy",},"order":6,}, - {"id":{"name":"spr_title_title","path":"sprites/spr_title_title/spr_title_title.yy",},"order":9,}, - {"id":{"name":"spr_text_arrow","path":"sprites/spr_text_arrow/spr_text_arrow.yy",},"order":7,}, + {"id":{"name":"spr_title_title","path":"sprites/spr_title_title/spr_title_title.yy",},"order":8,}, + {"id":{"name":"scr_initialize","path":"scripts/scr_initialize/scr_initialize.yy",},"order":12,}, + {"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":"spr_title_moon","path":"sprites/spr_title_moon/spr_title_moon.yy",},"order":7,}, - {"id":{"name":"obj_title_star","path":"objects/obj_title_star/obj_title_star.yy",},"order":3,}, - {"id":{"name":"spr_text_box","path":"sprites/spr_text_box/spr_text_box.yy",},"order":1,}, - {"id":{"name":"obj_title_title","path":"objects/obj_title_title/obj_title_title.yy",},"order":5,}, + {"id":{"name":"spr_title_moon","path":"sprites/spr_title_moon/spr_title_moon.yy",},"order":6,}, + {"id":{"name":"obj_title_star","path":"objects/obj_title_star/obj_title_star.yy",},"order":2,}, + {"id":{"name":"spr_text_box","path":"sprites/spr_text_box/spr_text_box.yy",},"order":2,}, + {"id":{"name":"obj_title_title","path":"objects/obj_title_title/obj_title_title.yy",},"order":4,}, {"id":{"name":"obj_title_screen","path":"objects/obj_title_screen/obj_title_screen.yy",},"order":5,}, - {"id":{"name":"obj_dialogue","path":"objects/obj_dialogue/obj_dialogue.yy",},"order":8,}, + {"id":{"name":"obj_dialogue","path":"objects/obj_dialogue/obj_dialogue.yy",},"order":0,}, {"id":{"name":"rm_title","path":"rooms/rm_title/rm_title.yy",},"order":0,}, ], "Options": [ @@ -36,13 +39,14 @@ "children": [], }, "RoomOrderNodes": [ - {"roomId":{"name":"Room3","path":"rooms/Room3/Room3.yy",},}, {"roomId":{"name":"rm_disclaimer","path":"rooms/rm_disclaimer/rm_disclaimer.yy",},}, {"roomId":{"name":"rm_title","path":"rooms/rm_title/rm_title.yy",},}, + {"roomId":{"name":"Room3","path":"rooms/Room3/Room3.yy",},}, ], "Folders": [ {"folderPath":"folders/title.yy","order":2,"resourceVersion":"1.0","name":"title","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/disclaimer.yy","order":4,"resourceVersion":"1.0","name":"disclaimer","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/dialogue.yy","order":13,"resourceVersion":"1.0","name":"dialogue","tags":[],"resourceType":"GMFolder",}, ], "AudioGroups": [ {"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",},