audio done

This commit is contained in:
the me 2022-08-23 03:09:17 -07:00
parent 54f1b7c75d
commit b31b8ba5d7
40 changed files with 637 additions and 4 deletions

View File

@ -18,6 +18,7 @@
{"id":{"name":"c_getstats","path":"scripts/c_getstats/c_getstats.yy",},"order":16,},
{"id":{"name":"s_nitoritalk","path":"sprites/s_nitoritalk/s_nitoritalk.yy",},"order":1,},
{"id":{"name":"stat","path":"scripts/stat/stat.yy",},"order":3,},
{"id":{"name":"se_move","path":"sounds/se_move/se_move.yy",},"order":2,},
{"id":{"name":"vlambeer","path":"scripts/vlambeer/vlambeer.yy",},"order":1,},
{"id":{"name":"txt_momijiyreisen","path":"scripts/txt_momijiyreisen/txt_momijiyreisen.yy",},"order":8,},
{"id":{"name":"da_title","path":"rooms/da_title/da_title.yy",},"order":1,},
@ -25,6 +26,7 @@
{"id":{"name":"x_skillstuff","path":"scripts/x_skillstuff/x_skillstuff.yy",},"order":12,},
{"id":{"name":"s_bunnyup","path":"sprites/s_bunnyup/s_bunnyup.yy",},"order":1,},
{"id":{"name":"st_textadv","path":"scripts/st_textadv/st_textadv.yy",},"order":6,},
{"id":{"name":"se_hurt","path":"sounds/se_hurt/se_hurt.yy",},"order":1,},
{"id":{"name":"c_decolor","path":"scripts/c_decolor/c_decolor.yy",},"order":10,},
{"id":{"name":"s_spacetext15","path":"sprites/s_spacetext15/s_spacetext15.yy",},"order":3,},
{"id":{"name":"c_errorstring","path":"scripts/c_errorstring/c_errorstring.yy",},"order":31,},
@ -79,6 +81,7 @@
{"id":{"name":"ncm","path":"scripts/ncm/ncm.yy",},"order":14,},
{"id":{"name":"s_robotalk","path":"sprites/s_robotalk/s_robotalk.yy",},"order":6,},
{"id":{"name":"txt_","path":"scripts/txt_/txt_.yy",},"order":0,},
{"id":{"name":"se_miss","path":"sounds/se_miss/se_miss.yy",},"order":5,},
{"id":{"name":"ft_chiaro","path":"fonts/ft_chiaro/ft_chiaro.yy",},"order":1,},
{"id":{"name":"s_black","path":"sprites/s_black/s_black.yy",},"order":11,},
{"id":{"name":"Model","path":"scripts/Model/Model.yy",},"order":2,},
@ -106,6 +109,7 @@
{"id":{"name":"s_cursor","path":"sprites/s_cursor/s_cursor.yy",},"order":5,},
{"id":{"name":"cpp","path":"scripts/cpp/cpp.yy",},"order":1,},
{"id":{"name":"log","path":"scripts/log/log.yy",},"order":10,},
{"id":{"name":"se_kill","path":"sounds/se_kill/se_kill.yy",},"order":3,},
{"id":{"name":"c_fulleval","path":"scripts/c_fulleval/c_fulleval.yy",},"order":18,},
{"id":{"name":"keyboard_check_advanced","path":"scripts/keyboard_check_advanced/keyboard_check_advanced.yy",},"order":8,},
{"id":{"name":"s_spacetext","path":"sprites/s_spacetext/s_spacetext.yy",},"order":2,},
@ -164,6 +168,8 @@
{"id":{"name":"array_find_index","path":"scripts/array_find_index/array_find_index.yy",},"order":1,},
{"id":{"name":"array_greatest","path":"scripts/array_greatest/array_greatest.yy",},"order":4,},
{"id":{"name":"c_null","path":"scripts/c_null/c_null.yy",},"order":4,},
{"id":{"name":"se_select","path":"sounds/se_select/se_select.yy",},"order":6,},
{"id":{"name":"se_recruit","path":"sounds/se_recruit/se_recruit.yy",},"order":4,},
{"id":{"name":"array_contains_within","path":"scripts/array_contains_within/array_contains_within.yy",},"order":19,},
{"id":{"name":"x_bunnies","path":"scripts/x_bunnies/x_bunnies.yy",},"order":33,},
{"id":{"name":"c_passableeval","path":"scripts/c_passableeval/c_passableeval.yy",},"order":25,},

View File

@ -2,5 +2,6 @@ state();
if data.hp.val <= 0 {
c_deselectunit(id);
c_deleteunit(pos.x, pos.y, id);
se_play(se_kill);
}
//depth = x;

View File

@ -1,5 +1,6 @@
function c_generatecombatstack(combatants=[]) {
log(combatants);
se_play(se_hurt);
//c_doallhook(hooks.precombat);
for (i=0; i<array_length(combatants); i++) {
c_resetbattlevar(combatants[i]);

View File

@ -12,7 +12,10 @@ function st_control() {
if global.map[mousex][mousey].contents[i].object_index == o_unit {
var dude = global.map[mousex][mousey].contents[i];
if dude.alignment == global.turn {
if selectedunit == noone c_selectunit(dude);
if selectedunit == noone {
c_selectunit(dude);
se_play(se_select);
}
} else {
c_markunit(dude);
}

View File

@ -150,6 +150,7 @@ function st_moving() {
c_deselectunit(id);
}
if dir == DIR.NONE && select && stop {
se_play(se_move);
c_moveunit(id, c_gettile(x, y, true));
waiting = true;
c_deselectunit(id);

View File

@ -25,5 +25,5 @@ function txt_momijiyaya() {
])
endevent = function() {ARTICULATOR.state = st_control};
endevent = function() {ARTICULATOR.state = st_control; se_play(se_recruit);};
}

View File

@ -26,5 +26,5 @@ function txt_momijiytkn() {
])
endevent = function() {ARTICULATOR.state = st_control};
endevent = function() {ARTICULATOR.state = st_control; se_play(se_recruit);};
}

View File

@ -27,5 +27,5 @@ function txt_nitoriytkn() {
])
endevent = function() {ARTICULATOR.state = st_control};
endevent = function() {ARTICULATOR.state = st_control; se_play(se_recruit);};
}

Binary file not shown.

View File

@ -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": "se_hurt.wav",
"duration": 0.296281,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_hurt",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_null",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_null",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_hurt",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_hurt",
"tags": [],
"resourceType": "GMSound",
}

Binary file not shown.

View File

@ -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": "se_kill.wav",
"duration": 0.686009,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_kill",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_move",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_move",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_null",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_null",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_hurt",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_hurt",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_kill",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_kill",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_miss",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_miss",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_move",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_move",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_null",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_null",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_recruit",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_recruit",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_hurt",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_hurt",
"tags": [],
"resourceType": "GMSound",
}

Binary file not shown.

View File

@ -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": "se_move.wav",
"duration": 0.151066,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_move",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_null",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_null",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_hurt",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_hurt",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_kill",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_kill",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_move",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_move",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_null",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_null",
"tags": [],
"resourceType": "GMSound",
}

Binary file not shown.

View File

@ -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": "se_recruit.wav",
"duration": 0.849138,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_recruit",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_hurt",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_hurt",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_kill",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_kill",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_miss",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_miss",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_move",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_move",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_null",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_null",
"tags": [],
"resourceType": "GMSound",
}

View File

@ -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": "se_recruit",
"duration": 0.0,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_recruit",
"tags": [],
"resourceType": "GMSound",
}

Binary file not shown.

View File

@ -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": "se_select.wav",
"duration": 0.278639,
"parent": {
"name": "Sounds",
"path": "folders/Sounds.yy",
},
"resourceVersion": "1.0",
"name": "se_select",
"tags": [],
"resourceType": "GMSound",
}