magicalfeyfenny
/
sunflowers-in-the-rain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v1.1: Added healthbars. Fixed bugs present in jam release

This commit is contained in:
Jennifer Hogueison 2022-07-27 22:48:04 -07:00
parent 867c6e5bb6
commit 7d79223a3f
12 changed files with 166 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
objects/obj_UI/Draw_0.gml
View File

@ -1,7 +1,7 @@
draw_set_halign(fa_left);
var dx = camera_get_view_x(global.camera);
var dy = camera_get_view_y(global.camera);
dx = camera_get_view_x(global.camera);
dy = camera_get_view_y(global.camera);
//draw_text( 5 + dx, 5 + dy, fps );draw_text( 20 + dx,300 + dy, scr_input_get( INPUT_LEFT ) );
//draw_text( 70 + dx,300 + dy, scr_input_get( INPUT_RIGHT ) );
@ -51,5 +51,52 @@ if (!global.cutscene_mode) {
}
draw_set_halign(fa_left);
}
if (instance_exists(obj_boss_wriggle)) {
draw_set_color(c_black);
draw_set_alpha(0.7);
draw_rectangle(dx + 24, dy + 324, dx + 615, dy + 335, false);
draw_set_color(c_maroon);
draw_set_alpha(1);
draw_rectangle(dx + 24, dy + 324, dx + 24 + (591 * obj_boss_wriggle.hp / 1000), dy + 335, false);
draw_set_color(c_white);
draw_sprite(spr_healthbar, 0, dx + 320, dy + 330);
draw_set_font(fn_cursive);
draw_set_halign(fa_left);
draw_set_color(c_black);
draw_text(dx + 61, dy + 301, "Wriggle Nightbug");
draw_text(dx + 59, dy + 301, "Wriggle Nightbug");
draw_text(dx + 61, dy + 299, "Wriggle Nightbug");
draw_text(dx + 59, dy + 299, "Wriggle Nightbug");
draw_set_color(c_white);
draw_text(dx + 60, dy + 300, "Wriggle Nightbug");
//draw_text_ext_transformed_color_border(dx + 60, dy + 305, "Wriggle Nightbug", 20, 1, 1, 1, 0, c_white, c_white, c_white, c_white, 1, 1, c_black);
}
if (instance_exists(obj_boss_yuuka)) {
draw_set_color(c_black);
draw_set_alpha(0.7);
draw_rectangle(dx + 24, dy + 324, dx + 615, dy + 335, false);
draw_set_color(c_maroon);
draw_set_alpha(1);
draw_rectangle(dx + 24, dy + 324, dx + 24 + (591 * obj_boss_yuuka.hp / 1500), dy + 335, false);
draw_set_color(c_white);
draw_sprite(spr_healthbar, 0, dx + 320, dy + 330);
draw_set_font(fn_cursive);
draw_set_halign(fa_left);
draw_set_color(c_black);
draw_text(dx + 61, dy + 301, "Yuuka Kazami");
draw_text(dx + 59, dy + 301, "Yuuka Kazami");
draw_text(dx + 61, dy + 299, "Yuuka Kazami");
draw_text(dx + 59, dy + 299, "Yuuka Kazami");
draw_set_color(c_white);
draw_text(dx + 60, dy + 300, "Yuuka Kazami");
//draw_text_ext_transformed_color_border(dx + 60, dy + 305, "Yuuka Kazami", 20, 1, 1, 1, 0, c_white, c_white, c_white, c_white, 1, 1, c_black);
}
}

2
objects/obj_cutscene_final/Create_0.gml
View File

@ -4,4 +4,4 @@ if (!global.cutscene_mode) {
timeline_index = tml_cutscene_final;
}
cutscene_mover = false;

9
objects/obj_cutscene_final/Step_0.gml
View File

@ -6,3 +6,12 @@ if (global.cutscene_mode) {
timeline_running = true;
}
}
if (cutscene_mover) {
move_towards_point( 736, 668, 2.5 );
if (x > 734 && x < 738 && y > 666 && y < 670 ) {
cutscene_mover = false;
speed = 0;
direction = 270;
}
}

15
objects/obj_marisa/Step_0.gml
View File

@ -149,12 +149,6 @@ if (!global.cutscene_mode) {
}
}
}
if (!shoot) {
if ( audio_is_playing(snd_flames) ) {
audio_stop_sound(snd_flames);
}
}
if ( move ) {
if ( dspeed < target_speed ) {
@ -262,6 +256,13 @@ if ( global.cutscene_mode ) {
}
}
if (!shoot || global.cutscene_mode == true || powerup != PLAYER_POWERUP_FLAMES ) {
if ( audio_is_playing(snd_flames) ) {
audio_stop_sound(snd_flames);
}
}
invuln -= 1;
@ -281,5 +282,7 @@ invuln -= 1;

25
objects/obj_title/Draw_0.gml
View File

@ -2,29 +2,29 @@ switch ( title_mode ) {
case TITLE_MODE_START_FADEIN: {
draw_set_font (fn_cursivelarge);
draw_set_halign(fa_center);
scr_draw_text_ext_transformed_color_border(190, 100, "Sunflowers", 15, 1000, 1, 1, 25, c_yellow, c_yellow, c_orange, c_orange, ( 100 - title_switch_timer ) / 100, 1, c_maroon );
scr_draw_text_ext_transformed_color_border(460, 160, "Rain", 15, 1000, 1, 1, 25, c_dkgray, c_dkgray, c_silver, c_silver, ( 100 - title_switch_timer ) / 100, 1, c_navy );
draw_text_ext_transformed_color_border(190, 100, "Sunflowers", 15, 1000, 1, 1, 25, c_yellow, c_yellow, c_orange, c_orange, ( 100 - title_switch_timer ) / 100, 1, c_maroon );
draw_text_ext_transformed_color_border(460, 160, "Rain", 15, 1000, 1, 1, 25, c_dkgray, c_dkgray, c_silver, c_silver, ( 100 - title_switch_timer ) / 100, 1, c_navy );
draw_set_font(fn_cursive);
scr_draw_text_ext_transformed_color_border(360, 140, "in the", 15, 1000, 1, 1, 0, c_white, c_white, c_white, c_white, ( 100 - title_switch_timer ) / 100, 1, c_black );
draw_text_ext_transformed_color_border(360, 140, "in the", 15, 1000, 1, 1, 0, c_white, c_white, c_white, c_white, ( 100 - title_switch_timer ) / 100, 1, c_black );
break;
}
case TITLE_MODE_START_READY: {
draw_set_font (fn_cursivelarge);
draw_set_halign(fa_center);
scr_draw_text_ext_transformed_color_border(190, 100, "Sunflowers", 15, 1000, 1, 1, 25, c_yellow, c_yellow, c_orange, c_orange, 1, 1, c_maroon );
scr_draw_text_ext_transformed_color_border(460, 160, "Rain", 15, 1000, 1, 1, 25, c_dkgray, c_dkgray, c_silver, c_silver, 1, 1, c_navy );
draw_text_ext_transformed_color_border(190, 100, "Sunflowers", 15, 1000, 1, 1, 25, c_yellow, c_yellow, c_orange, c_orange, 1, 1, c_maroon );
draw_text_ext_transformed_color_border(460, 160, "Rain", 15, 1000, 1, 1, 25, c_dkgray, c_dkgray, c_silver, c_silver, 1, 1, c_navy );
draw_set_font(fn_cursive);
scr_draw_text_ext_transformed_color_border(360, 140, "in the", 15, 1000, 1, 1, 0, c_silver, c_silver, c_white, c_white, 1, 1, c_black );
draw_text_ext_transformed_color_border(360, 140, "in the", 15, 1000, 1, 1, 0, c_silver, c_silver, c_white, c_white, 1, 1, c_black );
draw_text_color(320, 250, "~~press any key~~", c_white, c_white, c_white, c_white, dsin(abs(title_switch_timer) * 2) );
break;
}
case TITLE_MODE_MENU_FADEIN: {
draw_set_font (fn_cursivelarge);
draw_set_halign(fa_center);
scr_draw_text_ext_transformed_color_border(190 - (100 - (2 * title_switch_timer)), 100 + (50 - (1 * title_switch_timer)), "Sunflowers", 15, 1000, 1, 1, 25 + (760 - (13.2 * title_switch_timer)), c_yellow, c_yellow, c_orange, c_orange, 1, 1, c_maroon );
scr_draw_text_ext_transformed_color_border(460 - (280 - (5.6 * title_switch_timer)), 160 - (20 - (0.4 * title_switch_timer)), "Rain", 15, 1000, 1, 1, 25 + (760 - (13.2 * title_switch_timer)), c_dkgray, c_dkgray, c_silver, c_silver, 1, 1, c_navy );
draw_text_ext_transformed_color_border(190 - (100 - (2 * title_switch_timer)), 100 + (50 - (1 * title_switch_timer)), "Sunflowers", 15, 1000, 1, 1, 25 + (760 - (13.2 * title_switch_timer)), c_yellow, c_yellow, c_orange, c_orange, 1, 1, c_maroon );
draw_text_ext_transformed_color_border(460 - (280 - (5.6 * title_switch_timer)), 160 - (20 - (0.4 * title_switch_timer)), "Rain", 15, 1000, 1, 1, 25 + (760 - (13.2 * title_switch_timer)), c_dkgray, c_dkgray, c_silver, c_silver, 1, 1, c_navy );
draw_set_font(fn_cursive);
scr_draw_text_ext_transformed_color_border(360 - (210 - (4.2 * title_switch_timer)), 140 + (100 - (2 * title_switch_timer)), "in the", 15, 1000, 1, 1, 2225 - (44.5 * title_switch_timer), c_silver, c_silver, c_white, c_white, 1, 1, c_black );
draw_text_ext_transformed_color_border(360 - (210 - (4.2 * title_switch_timer)), 140 + (100 - (2 * title_switch_timer)), "in the", 15, 1000, 1, 1, 2225 - (44.5 * title_switch_timer), c_silver, c_silver, c_white, c_white, 1, 1, c_black );
draw_set_color(c_white);
draw_set_alpha(.20 * ((100 - (2 * title_switch_timer)) / 100));
draw_triangle(641, -400, 641, 760, 640 - (350 - (7 * title_switch_timer)), 370, false);
@ -50,10 +50,10 @@ switch ( title_mode ) {
case TITLE_MODE_MENU_READY: {
draw_set_font (fn_cursivelarge);
draw_set_halign(fa_center);
scr_draw_text_ext_transformed_color_border(90, 150, "Sunflowers", 15, 1000, 1, 1, 65, c_yellow, c_yellow, c_orange, c_orange, 1, 1, c_maroon );
scr_draw_text_ext_transformed_color_border(180, 140, "Rain", 15, 1000, 1, 1, 65, c_dkgray, c_dkgray, c_silver, c_silver, 1,1, c_navy );
draw_text_ext_transformed_color_border(90, 150, "Sunflowers", 15, 1000, 1, 1, 65, c_yellow, c_yellow, c_orange, c_orange, 1, 1, c_maroon );
draw_text_ext_transformed_color_border(180, 140, "Rain", 15, 1000, 1, 1, 65, c_dkgray, c_dkgray, c_silver, c_silver, 1,1, c_navy );
draw_set_font(fn_cursive);
scr_draw_text_ext_transformed_color_border(150, 240, "in the", 15, 1000, 1, 1, 65, c_silver, c_silver, c_white, c_white, 1, 1, c_black );
draw_text_ext_transformed_color_border(150, 240, "in the", 15, 1000, 1, 1, 65, c_silver, c_silver, c_white, c_white, 1, 1, c_black );
draw_set_color(c_white);
draw_set_alpha(.20);
draw_triangle(641, -400, 641, 760, 290, 370, false);
@ -100,5 +100,6 @@ switch ( title_mode ) {

2
objects/obj_victory/Draw_0.gml
View File

@ -2,5 +2,5 @@ draw_set_alpha( ( 300 - countdown ) / 100 );//draw CG
draw_sprite(spr_endscene, 0, 0, 0);
draw_set_font(fn_cursive);
draw_set_halign(fa_right)
scr_draw_text_ext_transformed_color_border(630, 330, "Next dream...", 20, 500, 1, 1, 0, c_fuchsia, c_fuchsia, c_orange, c_orange, ( 200 - countdown ) / 100, 1, c_white);
draw_text_ext_transformed_color_border(630, 330, "Next dream...", 20, 500, 1, 1, 0, c_fuchsia, c_fuchsia, c_orange, c_orange, ( 200 - countdown ) / 100, 1, c_white);

2
scripts/scr_draw_text_border/scr_draw_text_border.gml
View File

@ -1,4 +1,4 @@
function scr_draw_text_ext_transformed_color_border(_x, _y, _string, _sep, _w, _xscale, _yscale, _angle, _c1, _c2, _c3, _c4, _alpha, _border_width, _border_color) {
function draw_text_ext_transformed_color_border(_x, _y, _string, _sep, _w, _xscale, _yscale, _angle, _c1, _c2, _c3, _c4, _alpha, _border_width, _border_color) {
draw_text_ext_transformed_color(_x - _border_width, _y - _border_width, _string, _sep, _w, _xscale, _yscale, _angle, _border_color, _border_color, _border_color, _border_color, _alpha);
draw_text_ext_transformed_color(_x - _border_width, _y + _border_width, _string, _sep, _w, _xscale, _yscale, _angle, _border_color, _border_color, _border_color, _border_color, _alpha);
draw_text_ext_transformed_color(_x + _border_width, _y - _border_width, _string, _sep, _w, _xscale, _yscale, _angle, _border_color, _border_color, _border_color, _border_color, _alpha);

BIN
sprites/spr_healthbar/40358e51-0f0d-4a47-a96f-72b04c7543e6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 542 B

BIN
sprites/spr_healthbar/layers/40358e51-0f0d-4a47-a96f-72b04c7543e6/7c7a041a-2202-425d-b16d-3452ca979b2e.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 542 B

79
sprites/spr_healthbar/spr_healthbar.yy Normal file
View File

@ -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": 599,
"bbox_top": 8,
"bbox_bottom": 23,
"HTile": false,
"VTile": false,
"For3D": false,
"width": 600,
"height": 32,
"textureGroupId": {
"name": "Default",
"path": "texturegroups/Default",
},
"swatchColours": null,
"gridX": 0,
"gridY": 0,
"frames": [
{"compositeImage":{"FrameId":{"name":"40358e51-0f0d-4a47-a96f-72b04c7543e6","path":"sprites/spr_healthbar/spr_healthbar.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
{"FrameId":{"name":"40358e51-0f0d-4a47-a96f-72b04c7543e6","path":"sprites/spr_healthbar/spr_healthbar.yy",},"LayerId":{"name":"7c7a041a-2202-425d-b16d-3452ca979b2e","path":"sprites/spr_healthbar/spr_healthbar.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
],"parent":{"name":"spr_healthbar","path":"sprites/spr_healthbar/spr_healthbar.yy",},"resourceVersion":"1.0","name":"40358e51-0f0d-4a47-a96f-72b04c7543e6","tags":[],"resourceType":"GMSpriteFrame",},
],
"sequence": {
"spriteId": {"name":"spr_healthbar","path":"sprites/spr_healthbar/spr_healthbar.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<MessageEventKeyframe>",},
"moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
"tracks": [
{"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
{"id":"73ed4717-6edc-4a74-9158-8f169311831a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"40358e51-0f0d-4a47-a96f-72b04c7543e6","path":"sprites/spr_healthbar/spr_healthbar.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],},
],
"visibleRange": null,
"lockOrigin": false,
"showBackdrop": true,
"showBackdropImage": false,
"backdropImagePath": "",
"backdropImageOpacity": 0.5,
"backdropWidth": 1366,
"backdropHeight": 768,
"backdropXOffset": 0.0,
"backdropYOffset": 0.0,
"xorigin": 300,
"yorigin": 16,
"eventToFunction": {},
"eventStubScript": null,
"parent": {"name":"spr_healthbar","path":"sprites/spr_healthbar/spr_healthbar.yy",},
"resourceVersion": "1.4",
"name": "spr_healthbar",
"tags": [],
"resourceType": "GMSequence",
},
"layers": [
{"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"7c7a041a-2202-425d-b16d-3452ca979b2e","tags":[],"resourceType":"GMImageLayer",},
],
"nineSlice": null,
"parent": {
"name": "sunflowers-in-the-rain",
"path": "sunflowers-in-the-rain.yyp",
},
"resourceVersion": "1.0",
"name": "spr_healthbar",
"tags": [],
"resourceType": "GMSprite",
}

1
sunflowers-in-the-rain.yyp
View File

@ -128,6 +128,7 @@
{"id":{"name":"snd_boss_laugh","path":"sounds/snd_boss_laugh/snd_boss_laugh.yy",},"order":33,},
{"id":{"name":"snd_boss_destroy","path":"sounds/snd_boss_destroy/snd_boss_destroy.yy",},"order":16,},
{"id":{"name":"spr_noname_3_confused","path":"sprites/spr_noname_3_confused/spr_noname_3_confused.yy",},"order":3,},
{"id":{"name":"spr_healthbar","path":"sprites/spr_healthbar/spr_healthbar.yy",},"order":40,},
{"id":{"name":"tml_spawnzone_C","path":"timelines/tml_spawnzone_C/tml_spawnzone_C.yy",},"order":12,},
{"id":{"name":"obj_powerup","path":"objects/obj_powerup/obj_powerup.yy",},"order":23,},
{"id":{"name":"spr_menuselect","path":"sprites/spr_menuselect/spr_menuselect.yy",},"order":0,},

3
timelines/tml_cutscene_opening/moment_5.gml
View File

@ -1,2 +1,5 @@
with (obj_marisa) { cutscene_mover = true;
}
with (obj_cutscene_final) {
cutscene_mover = true;
}