From 1f9feb0d71f52152b2984ad97bab8c908198e6ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= Date: Thu, 6 Feb 2020 19:07:25 +0100 Subject: [PATCH] Add sound --- assets/sfx_plasma.raw | 1 + main.c | 20 +++++++++++++++- sounds.h | 54 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 assets/sfx_plasma.raw diff --git a/assets/sfx_plasma.raw b/assets/sfx_plasma.raw new file mode 100644 index 0000000..fef9ba4 --- /dev/null +++ b/assets/sfx_plasma.raw @@ -0,0 +1 @@ +‚„„„ƒ…„„„ƒ‚|{wtrnljhe_]_``ekry€‡Ž”› ¨°²µ¶²²¯¬ª’~rlf_TNGED@GLPWaiw†Žœ§«³¹¿ÅÅý²ª¦œŽ‚wleaYQQMO[dx¡¹ÑÛÙÛÛÛÛÛÚÚÙÙØÙØØ××ÕÕÎ¥m3#%#$""!!  !!!!""#"$#*OyÅ××ØØÙÙÙÚÚÛÛÛÜÜÜÝÝÞßßßàààààààßßàÙ´Œb:00..,,++*)('&&%$#"" #Lv“µÇÉËÌÍÏÏÏÎÍÌÍÎÐÑÔØÚÚÝÜÚÙØØØÙÛÛÝÞààÞÞо­—‹‚fYG0323110110/))*-/00-.-*Fu’³ÒÖÓØØÔÕÓÐÐÏÊÈÅÀ¿ÀÂÂÅÇÊÍÍÊÊÇÇÈÈÊÊÐÑÊ»ª–‚rS8-15679:998984144353243@l“¶ÚàÞÜÚÛÝÞÞÜÙØÖÖÔÔÒÏÕÓÏÎÍÉÉÇÁ¿¾¿¿½¼½¸°¤weW?%! &.58;@>?>;7467Fg‘°½ÖäßÛÕÕÖÕÕÙÛÚÜßÞÙ××ÕÔÖÖÑÑ×ÙÖ×ÙÙÜÚ×ÖÌÈÁ¸¨‘„lO3(" $$" !!!#&(0Ol‹¥¾ÏÑÒÒÕÒÒÌÆÃÃÆÆÈÉÈÊÈÄÂÁÀÃÇÊÏÓÕ×ÙÜÜÝÞÛÜн«š‹x^PRLHEGGA@@:8:975/-)-;IXeu„‡‰ƒ‚‚€~‚‚‚„Š‘—¤¯´¸¶¶º»¹´³´¶µ´¸¼¿À»ªœŠyl`Y\^cjmorvsputome_a``d`\[XZTQQMHJNPVZchmy†“Ÿ£¥¬­±±®­®ª©¬¬­®¯ªš†vncUMKGCJNPSY^djkr{€€ˆ†|ykgkhfhklmmnnlc\TKNV_p„’ž£Ÿž£¢¦®¯³¸¹¼¾¿º±³®ª¨¢¢ £¤§ª¨¤£š—†~vmj_OD?8;79BDLW[^^Z]\QLNPXdjotromf[\`cku}€…‰•ž¢¬·¾ÅÎÕÜáæèçéåáÞÔÐ˵£‚uh`WPIHIOU[afkqpppoh^XPLHEB@=<92,,-/37@JT\bgmu}„‹’™¤¯¸¿ÆÏÒÑÐÏÎËÉÄ¿¼¶±«¥¡Ÿœ™•‘“–•“Œ†}zvspjgfimoqttrqprsrsne\TLD=<;<>CO^ly‚‡–œ¡¡¤¡›˜‘Šƒ}}~†„‚~yuvw{}}}}{{zuy{…Š’–˜—”…‚†‰”˜”‹‚zslghddjv‚Œ—Ÿ¥¦§¤¤§¥œ˜”Š†…‚}~|xrmlkmmqtpkf_ZUONRSXcktxzzwuwzyxx{|ytqmcZTSSZcksyˆ‹‘’—œ¡§¬¬®¬©¥££¥¦¦¦¦¦¢Ÿ›—‘Œ‡ƒ}wuvy~€‚†††‡†‡‹‹…xqlha[WSRSUVX^dmxˆ‘™¡§«©£›’Œ‡„‚€~zwwxxz{{xtoheehnt|„‹‘”–˜œœ›—‘‹†„{vqliheddefkquy|€„–ž¤§¦¡—„~{yxuqnmmmoqrsuvuspnnosx|‚‰‘—œŸ¢¥¦£ž˜‘‹‰…ƒƒ{wwwwxxwwtpnnqv}‚„‚}wsonnoqsstwz~„†ˆˆ…yxyz{|~†‹’˜›ž¡£¢œ•Žˆƒ€~|{{zyz}~{xvsqoptx|~}|zxusqpnljjkmorvyz{zxwuuuwz~ƒ‡•ž§®²´±ª¢™‘Š†ƒ‚‚ƒ…†…ƒ‚‚‚‚€}zwtsrpprtvxyzzxvsomjhhjmquwxwutsstuvwy|€„Š–›Ÿ££¡—”ŒŠˆ‡ˆ‰‹‹ˆ…ƒ€€~{xurpponkhfeegijkosuvutrommmnquz€†”™ž¡¡¡ žœš˜–”“’“–˜™–‘Œ‡ƒ|ywuutqnlkklmnpqrqqrrrsuvxz{ywusppppppprv|‚‰’“”””“’’’’““”“’‘Ž‹ˆ…‚‚ƒƒƒ‚€~{yxxxxxxwtrqqpqqponnmlkkkklmmpsw}‚‡‹ŽŽŽŽ‘’’‘ŒŒŒ‘’’’‘‘ŽŒ‹ŠŠ‰ˆ†„‚|ywtqnljhffeeeefhjlmmlmoqtx}‚‡‹ŽŽ‘‘‘‘ŽŒŠ‰ˆˆˆˆˆ†…„ƒ€~|zxvsqomlkjjklmopqstuvvvwwy|~„†‡ˆ‰ŠŠ‹‹‹ŒŽŽŽŽŽ‹Š‰ˆ†…ƒ~|{{|}}~~}{zyyxxwvvuttuuvwxxyyyzz|}~€‚„…†‡ˆ‰‰Š‹ŒŒŒ‹‹Š‰ˆ‡…„ƒ€~|{zyyyz{{{|||||{{{{|||}}}}}}}||{||}}~~~~~€€‚ƒƒ„„……††††††……„ƒ‚~}}}}}}}}}}}}}}}}}}}}}}~~€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€ \ No newline at end of file diff --git a/main.c b/main.c index c81c73b..e66b558 100755 --- a/main.c +++ b/main.c @@ -1832,7 +1832,25 @@ void SFG_gameStep() if (canShoot) { - SFG_playSoundSafe(0,255); + uint8_t sound; + + switch (SFG_player.weapon) + { + case SFG_WEAPON_KNIFE: sound = 255; break; + case SFG_WEAPON_ROCKET_LAUNCHER: + case SFG_WEAPON_SHOTGUN: sound = 2; break; + case SFG_WEAPON_PLASMAGUN: + case SFG_WEAPON_SOLUTION: sound = 4; break; + default: sound = 0; break; + } + + if (sound != 255) + SFG_playSoundSafe(sound,255); + + if (SFG_player.weapon != SFG_WEAPON_KNIFE) + SFG_playSoundSafe( + (SFG_player.weapon == SFG_WEAPON_SHOTGUN || + SFG_player.weapon == SFG_WEAPON_MACHINE_GUN) ? 0 : 4,255); if (ammo != SFG_AMMO_NONE) SFG_player.ammo[ammo] -= projectileCount; diff --git a/sounds.h b/sounds.h index ac5cfc3..d311f03 100644 --- a/sounds.h +++ b/sounds.h @@ -243,6 +243,60 @@ SFG_PROGRAM_MEMORY uint8_t SFG_sounds[][SFG_SFX_SIZE] = 136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136, 136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136, 136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136, +136,136,136,136,136 + }, + { // 4, plasma shot, teleport +136,136,136,136,136,136,119,119,118,102,102,85,86,102,103,120,136,153,170, +187,187,187,170,169,152,119,102,85,68,68,68,69,86,103,136,154,171,187,204, +203,186,169,136,118,102,85,84,69,103,138,189,221,221,221,221,221,221,221,221, +221,220,166,50,34,34,34,33,33,34,34,34,34,34,34,34,34,71,156,221, +221,221,221,221,221,221,221,221,221,222,238,238,238,221,237,184,99,51,34,34, +34,34,34,34,34,34,34,17,17,36,121,188,204,204,204,204,204,204,221,221, +221,221,221,221,221,221,221,238,221,219,169,136,101,67,51,51,51,51,50,34, +34,35,50,34,36,121,189,221,221,221,221,220,204,204,188,204,204,204,204,204, +204,204,205,220,186,152,117,50,51,51,51,51,51,51,51,51,51,51,52,105, +189,237,221,221,221,221,221,221,221,205,220,204,204,204,187,187,187,187,186,135, +101,50,17,17,18,34,35,51,67,51,51,51,52,105,187,222,221,221,221,221, +221,221,221,221,221,221,221,221,221,221,221,221,204,203,169,134,67,34,17,17, +17,34,34,33,34,34,34,52,104,171,205,221,221,220,204,204,204,204,204,204, +204,204,204,221,221,221,221,221,219,169,135,85,84,68,68,68,67,51,51,50, +34,35,69,103,136,136,136,136,135,136,136,136,153,170,187,187,187,187,187,187, +187,187,203,169,135,102,85,86,102,103,119,119,118,102,86,102,102,85,85,85, +84,68,69,85,102,103,137,154,170,171,186,170,170,170,170,170,152,118,101,68, +68,68,85,85,102,103,120,136,135,118,102,102,102,102,102,102,101,84,69,87, +137,154,153,170,170,171,187,187,187,187,170,170,169,170,170,170,170,153,152,135, +118,101,68,51,51,52,68,85,85,85,85,68,85,102,103,118,102,85,102,103, +120,136,153,170,187,204,221,238,238,238,237,221,204,186,152,118,101,84,68,69, +86,102,119,119,102,85,84,68,68,51,51,34,34,51,68,85,102,103,120,137, +154,171,188,205,221,204,204,203,187,186,170,153,153,153,153,153,136,136,119,119, +118,102,102,103,119,119,119,119,118,101,84,67,51,51,68,86,120,137,153,170, +170,153,152,135,119,136,136,119,119,119,119,119,119,119,119,136,137,153,153,136, +136,136,153,153,136,119,102,102,102,120,137,154,170,170,170,153,152,136,135,119, +119,102,102,103,119,102,85,84,69,85,102,119,119,119,119,119,119,119,119,102, +85,85,86,103,120,136,153,153,154,170,170,170,170,170,170,170,170,153,153,136, +135,119,119,120,136,136,136,136,136,136,136,119,102,101,85,85,85,85,102,120, +136,153,170,170,169,152,136,136,135,119,119,119,119,119,102,102,102,119,136,137, +153,153,153,153,136,136,119,118,102,102,102,102,119,119,136,137,154,170,169,136, +119,119,119,102,102,103,119,119,119,118,102,119,120,137,153,154,170,169,153,136, +136,136,135,119,119,119,119,119,102,119,120,136,119,118,102,103,119,119,119,136, +136,136,135,119,119,119,136,137,153,154,170,153,136,136,135,119,119,119,120,119, +119,119,103,119,119,135,119,119,119,118,102,102,102,119,119,119,119,119,119,119, +136,137,154,171,187,170,153,136,136,136,136,136,136,136,135,119,119,119,119,119, +119,119,119,118,102,102,102,119,119,119,119,119,119,119,120,136,153,153,170,169, +153,152,136,136,136,136,153,152,136,136,136,136,136,119,119,119,118,102,102,102, +102,102,103,119,119,118,102,102,119,120,136,153,154,170,169,153,153,153,153,153, +153,152,136,136,119,119,119,118,102,102,102,119,119,119,119,119,119,119,119,119, +119,119,119,119,119,136,137,153,153,153,153,153,153,153,153,136,136,136,136,136, +136,135,119,119,119,119,119,119,119,119,118,102,102,102,102,102,103,119,120,136, +136,136,136,153,153,136,136,136,137,153,153,153,152,136,136,136,136,136,135,119, +119,102,102,102,102,102,102,102,102,102,103,119,120,136,136,136,153,153,153,153, +136,137,153,153,136,136,136,136,136,136,136,136,119,119,119,118,102,102,102,102, +103,119,119,119,119,119,119,136,136,136,136,136,136,136,136,136,136,136,136,136, +136,136,119,119,119,119,136,135,119,119,119,119,119,119,119,119,119,119,119,119, +119,120,136,136,136,136,136,136,136,136,136,136,136,136,136,135,119,119,119,119, +119,119,119,119,119,119,119,119,119,119,119,119,119,119,119,119,120,136,136,136, +136,136,136,136,136,136,136,136,136,136,135,119,119,119,119,119,119,119,119,119, +119,119,119,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136, 136,136,136,136,136 } };