diff --git a/eastern flames/eastern flames.yyp b/eastern flames/eastern flames.yyp index c27f16e..da2fcb3 100644 --- a/eastern flames/eastern flames.yyp +++ b/eastern flames/eastern flames.yyp @@ -65,9 +65,11 @@ {"id":{"name":"draw_circle_width","path":"scripts/draw_circle_width/draw_circle_width.yy",},"order":3,}, {"id":{"name":"gcd","path":"scripts/gcd/gcd.yy",},"order":5,}, {"id":{"name":"string_extend_digits","path":"scripts/string_extend_digits/string_extend_digits.yy",},"order":18,}, + {"id":{"name":"m_menu","path":"sounds/m_menu/m_menu.yy",},"order":3,}, {"id":{"name":"s_reisendown","path":"sprites/s_reisendown/s_reisendown.yy",},"order":2,}, {"id":{"name":"s_nitori","path":"sprites/s_nitori/s_nitori.yy",},"order":0,}, {"id":{"name":"c_charpush","path":"scripts/c_charpush/c_charpush.yy",},"order":1,}, + {"id":{"name":"m_null","path":"sounds/m_null/m_null.yy",},"order":5,}, {"id":{"name":"chardata","path":"scripts/chardata/chardata.yy",},"order":3,}, {"id":{"name":"music_set","path":"scripts/music_set/music_set.yy",},"order":0,}, {"id":{"name":"format_time","path":"scripts/format_time/format_time.yy",},"order":12,}, @@ -134,10 +136,12 @@ {"id":{"name":"c_moveunit","path":"scripts/c_moveunit/c_moveunit.yy",},"order":17,}, {"id":{"name":"se_play","path":"scripts/se_play/se_play.yy",},"order":5,}, {"id":{"name":"array_front","path":"scripts/array_front/array_front.yy",},"order":2,}, + {"id":{"name":"m_cutscene","path":"sounds/m_cutscene/m_cutscene.yy",},"order":4,}, {"id":{"name":"s_talkane","path":"sprites/s_talkane/s_talkane.yy",},"order":3,}, {"id":{"name":"model_load","path":"scripts/model_load/model_load.yy",},"order":3,}, {"id":{"name":"with_array","path":"scripts/with_array/with_array.yy",},"order":17,}, {"id":{"name":"matrux_transpose","path":"scripts/matrux_transpose/matrux_transpose.yy",},"order":1,}, + {"id":{"name":"m_map","path":"sounds/m_map/m_map.yy",},"order":2,}, {"id":{"name":"txt_momijiyaya","path":"scripts/txt_momijiyaya/txt_momijiyaya.yy",},"order":4,}, {"id":{"name":"point_me","path":"scripts/point_me/point_me.yy",},"order":15,}, {"id":{"name":"c_badpractice","path":"scripts/c_badpractice/c_badpractice.yy",},"order":0,}, diff --git a/eastern flames/objects/o_title/Create_0.gml b/eastern flames/objects/o_title/Create_0.gml index a59fa1c..5428e25 100644 --- a/eastern flames/objects/o_title/Create_0.gml +++ b/eastern flames/objects/o_title/Create_0.gml @@ -1,2 +1,4 @@ dir = DIR.UP; -draw_set_font(ft_chiaro); \ No newline at end of file +draw_set_font(ft_chiaro); +music_set(mus.menu); +//audio_play_sound(m_map, 0, 0) \ No newline at end of file diff --git a/eastern flames/scripts/song/song.gml b/eastern flames/scripts/song/song.gml index c024fd1..a70d64f 100644 --- a/eastern flames/scripts/song/song.gml +++ b/eastern flames/scripts/song/song.gml @@ -1,4 +1,10 @@ -function song(name_="among us trap remix", shortname="autr", audio_=[m_null], bpm_=100, description_="when the im.ogg", maps_=[sm_null], loopstart=0,loopend=audio_sound_length(audio_[0])) constructor { +#macro mus global.tracklist +global.tracklist = {}; +global.playingmusic = new song(); +global.playingmusicdata = 0; +global.playingmusictime = 0; + +function song(name_="among us trap remix", shortname="autr", audio_=[m_null], bpm_=100, description_="when the im.ogg", maps_=[c_null], loopstart=0,loopend=audio_sound_length(audio_[0])) constructor { name = name_; audio = audio_; bpm = bpm_; @@ -7,4 +13,8 @@ function song(name_="among us trap remix", shortname="autr", audio_=[m_null], bp self.loopStart = loopstart; self.loopEnd = loopend; variable_struct_set(global.tracklist, shortname, self); -} \ No newline at end of file +} + +nu song("menu", "menu", [m_menu]); +nu song("map", "map", [m_map]); +nu song("cutscene", "cutscene", [m_cutscene]); \ No newline at end of file diff --git a/eastern flames/scripts/txt_intro/txt_intro.gml b/eastern flames/scripts/txt_intro/txt_intro.gml index 013c869..3c522a3 100644 --- a/eastern flames/scripts/txt_intro/txt_intro.gml +++ b/eastern flames/scripts/txt_intro/txt_intro.gml @@ -1,5 +1,6 @@ function txt_intro() { ARTICULATOR.state = c_null; + music_set(mus.cutscene); msg = msglang([ txt("Checkmate!", MOMIJI.SMUG, SPRITEPOS.LEFT, s_black), @@ -37,5 +38,8 @@ function txt_intro() { ]) - endevent = function() {ARTICULATOR.state = st_control}; + endevent = function() { + ARTICULATOR.state = st_control; + music_set(mus.map); + }; } \ No newline at end of file diff --git a/eastern flames/scripts/txt_win/txt_win.gml b/eastern flames/scripts/txt_win/txt_win.gml index 5a4d2ec..d6327ed 100644 --- a/eastern flames/scripts/txt_win/txt_win.gml +++ b/eastern flames/scripts/txt_win/txt_win.gml @@ -1,5 +1,6 @@ function txt_win() { ARTICULATOR.state = c_null; + music_set(mus.cutscene); msg = msglang([ txt("Ow...", REISEN.WOBBLE, SPRITEPOS.RIGHT, s_black), diff --git a/eastern flames/sounds/m_cutscene/m_cutscene.ogg b/eastern flames/sounds/m_cutscene/m_cutscene.ogg new file mode 100644 index 0000000..99e1907 Binary files /dev/null and b/eastern flames/sounds/m_cutscene/m_cutscene.ogg differ diff --git a/eastern flames/sounds/m_cutscene/m_cutscene.yy b/eastern flames/sounds/m_cutscene/m_cutscene.yy new file mode 100644 index 0000000..6ec803d --- /dev/null +++ b/eastern flames/sounds/m_cutscene/m_cutscene.yy @@ -0,0 +1,23 @@ +{ + "compression": 3, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 1, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "m_cutscene.ogg", + "duration": 156.7375, + "parent": { + "name": "Music", + "path": "folders/Music.yy", + }, + "resourceVersion": "1.0", + "name": "m_cutscene", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/eastern flames/sounds/m_cutscene/m_map.yy b/eastern flames/sounds/m_cutscene/m_map.yy new file mode 100644 index 0000000..7f53f21 --- /dev/null +++ b/eastern flames/sounds/m_cutscene/m_map.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": "m_map", + "duration": 0.0, + "parent": { + "name": "Music", + "path": "folders/Music.yy", + }, + "resourceVersion": "1.0", + "name": "m_map", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/eastern flames/sounds/m_cutscene/m_menu.yy b/eastern flames/sounds/m_cutscene/m_menu.yy new file mode 100644 index 0000000..53778fc --- /dev/null +++ b/eastern flames/sounds/m_cutscene/m_menu.yy @@ -0,0 +1,23 @@ +{ + "compression": 3, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 1, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "m_menu.ogg", + "duration": 136.881241, + "parent": { + "name": "Music", + "path": "folders/Music.yy", + }, + "resourceVersion": "1.0", + "name": "m_menu", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/eastern flames/sounds/m_map/m_map.ogg b/eastern flames/sounds/m_map/m_map.ogg new file mode 100644 index 0000000..bc188f4 Binary files /dev/null and b/eastern flames/sounds/m_map/m_map.ogg differ diff --git a/eastern flames/sounds/m_map/m_map.yy b/eastern flames/sounds/m_map/m_map.yy new file mode 100644 index 0000000..5cf94f6 --- /dev/null +++ b/eastern flames/sounds/m_map/m_map.yy @@ -0,0 +1,23 @@ +{ + "compression": 0, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 1, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "m_map.ogg", + "duration": 127.024986, + "parent": { + "name": "Music", + "path": "folders/Music.yy", + }, + "resourceVersion": "1.0", + "name": "m_map", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/eastern flames/sounds/m_menu/m_map.yy b/eastern flames/sounds/m_menu/m_map.yy new file mode 100644 index 0000000..7f53f21 --- /dev/null +++ b/eastern flames/sounds/m_menu/m_map.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": "m_map", + "duration": 0.0, + "parent": { + "name": "Music", + "path": "folders/Music.yy", + }, + "resourceVersion": "1.0", + "name": "m_map", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/eastern flames/sounds/m_menu/m_menu.ogg b/eastern flames/sounds/m_menu/m_menu.ogg new file mode 100644 index 0000000..2297233 Binary files /dev/null and b/eastern flames/sounds/m_menu/m_menu.ogg differ diff --git a/eastern flames/sounds/m_menu/m_menu.yy b/eastern flames/sounds/m_menu/m_menu.yy new file mode 100644 index 0000000..53778fc --- /dev/null +++ b/eastern flames/sounds/m_menu/m_menu.yy @@ -0,0 +1,23 @@ +{ + "compression": 3, + "volume": 1.0, + "preload": false, + "bitRate": 128, + "sampleRate": 44100, + "type": 1, + "bitDepth": 1, + "audioGroupId": { + "name": "audiogroup_default", + "path": "audiogroups/audiogroup_default", + }, + "soundFile": "m_menu.ogg", + "duration": 136.881241, + "parent": { + "name": "Music", + "path": "folders/Music.yy", + }, + "resourceVersion": "1.0", + "name": "m_menu", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file diff --git a/eastern flames/sounds/m_null/m_null.yy b/eastern flames/sounds/m_null/m_null.yy new file mode 100644 index 0000000..71ea782 --- /dev/null +++ b/eastern flames/sounds/m_null/m_null.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": "m_null", + "duration": 0.0, + "parent": { + "name": "Music", + "path": "folders/Music.yy", + }, + "resourceVersion": "1.0", + "name": "m_null", + "tags": [], + "resourceType": "GMSound", +} \ No newline at end of file