diff --git a/src/info/sounds.h b/src/info/sounds.h index dc2dc3b40..580360fba 100644 --- a/src/info/sounds.h +++ b/src/info/sounds.h @@ -1,998 +1,999 @@ -_(None) - -// Skin Sounds -_(altdi1) -_(altdi2) -_(altdi3) -_(altdi4) -_(altow1) -_(altow2) -_(altow3) -_(altow4) -_(victr1) -_(victr2) -_(victr3) -_(victr4) -_(gasp) -_(jump) -_(pudpud) -_(putput) -_(spin) -_(spndsh) -_(thok) -_(zoom) -_(skid) - -// Ambience/background objects/etc -_(ambint) - -_(alarm) -_(buzz1) -_(buzz2) -_(buzz3) -_(buzz4) -_(crumbl) -_(fire) -_(grind) -_(laser) -_(mswing) -_(pstart) -_(pstop) -_(steam1) -_(steam2) -_(wbreak) -_(ambmac) -_(spsmsh) - -_(rainin) -_(litng1) -_(litng2) -_(litng3) -_(litng4) -_(athun1) -_(athun2) - -_(amwtr1) -_(amwtr2) -_(amwtr3) -_(amwtr4) -_(amwtr5) -_(amwtr6) -_(amwtr7) -_(amwtr8) -_(bubbl1) -_(bubbl2) -_(bubbl3) -_(bubbl4) -_(bubbl5) -_(floush) -_(splash) -_(splish) -_(wdrip1) -_(wdrip2) -_(wdrip3) -_(wdrip4) -_(wdrip5) -_(wdrip6) -_(wdrip7) -_(wdrip8) -_(wslap) - -_(doora1) -_(doorb1) -_(doorc1) -_(doorc2) -_(doord1) -_(doord2) -_(eleva1) -_(eleva2) -_(eleva3) -_(elevb1) -_(elevb2) -_(elevb3) - -_(ambin2) -_(lavbub) -_(rocks1) -_(rocks2) -_(rocks3) -_(rocks4) -_(rumbam) -_(rumble) - -// Game objects, etc -_(appear) -_(bkpoof) -_(bnce1) -_(bnce2) -_(cannon) -_(cgot) -_(cybdth) -_(deton) -_(ding) // old sfx_appear sound -_(dmpain) -_(drown) -_(fizzle) -_(gbeep) -_(wepfir) -_(ghit) -_(gloop) -_(gspray) -_(gravch) -_(itemup) -_(jet) -_(jshard) -_(lose) -_(lvpass) -_(mindig) -_(mixup) -_(monton) -_(pogo) -_(pop) -_(rail1) -_(rail2) -_(rlaunc) -_(shield) -_(wirlsg) -_(forcsg) -_(frcssg) -_(elemsg) -_(armasg) -_(attrsg) -_(shldls) -_(spdpad) -_(spkdth) -_(spring) -_(statu1) -_(statu2) -_(strpst) -_(supert) -_(telept) -_(tink) -_(token) -_(trfire) -_(trpowr) -_(turhit) -_(wdjump) -_(shrpsp) -_(shrpgo) -_(mswarp) -_(mspogo) -_(boingf) -_(corkp) -_(corkh) -_(alart) -_(vwre) -_(bowl) -_(chuchu) -//sfx_bsnipe, -_(sprong) -_(lvfal1) -_(pscree) -_(iceb) -_(shattr) -_(antiri) - -// Menu, interface -_(chchng) -_(dwnind) -_(emfind) -_(flgcap) -_(menu1) -_(oneup) -_(ptally) -_(radio) -_(wepchg) -_(wtrdng) -_(zelda) -_(adderr) -_(notadd) -_(addfil) - -// NiGHTS -_(ideya) -_(xideya) // Xmas -_(nbmper) -_(nxbump) // Xmas -_(ncchip) -_(ncitem) -_(nxitem) // Xmas -_(ngdone) -_(nxdone) // Xmas -_(drill1) -_(drill2) -_(ncspec) -_(nghurt) -_(ngskid) -_(hoop1) -_(hoop2) -_(hoop3) -_(hidden) -_(prloop) -_(timeup) -_(ngjump) -_(peww) - -// Halloween -_(lntsit) -_(lntdie) -_(pumpkn) -_(ghosty) - -// Mario -_(koopfr) -_(mario1) -_(mario2) -_(mario3) -_(mario4) -_(mario5) -_(mario6) -_(mario7) -_(mario8) -_(mario9) -_(marioa) -_(thwomp) - -// Black Eggman -_(bebomb) -_(bechrg) -_(becrsh) -_(bedeen) -_(bedie1) -_(bedie2) -_(beeyow) -_(befall) -_(befire) -_(beflap) -_(begoop) -_(begrnd) -_(behurt) -_(bejet1) -_(belnch) -_(beoutb) -_(beragh) -_(beshot) -_(bestep) -_(bestp2) -_(bewar1) -_(bewar2) -_(bewar3) -_(bewar4) -_(bexpld) -_(bgxpld) - -// Cy-Brak-Demon -_(beelec) // Electric barrier ambience -_(brakrl) // Rocket launcher -_(brakrx) // Rocket explodes - -// S1 sounds -_(s1a0) -_(s1a1) -_(s1a2) -_(s1a3) -_(s1a4) -_(s1a5) -_(s1a6) -_(s1a7) -_(s1a8) -_(s1a9) -_(s1aa) -_(s1ab) -_(s1ac) -_(s1ad) -_(s1ae) -_(s1af) -_(s1b0) -_(s1b1) -_(s1b2) -_(s1b3) -_(s1b4) -_(s1b5) -_(s1b6) -_(s1b7) -_(s1b8) -_(s1b9) -_(s1ba) -_(s1bb) -_(s1bc) -_(s1bd) -_(s1be) -_(s1bf) -_(s1c0) -_(s1c1) -_(s1c2) -_(s1c3) -_(s1c4) -_(s1c5) -_(s1c6) -_(s1c7) -_(s1c8) -_(s1c9) -_(s1ca) -_(s1cb) -_(s1cc) -_(s1cd) -_(s1ce) -_(s1cf) - -// S2 sounds -_(s220) -_(s221) -_(s222) -_(s223) -_(s224) -_(s225) -_(s226) -_(s227) -_(s228) -_(s229) -_(s22a) -_(s22b) -_(s22c) -_(s22d) -_(s22e) -_(s22f) -_(s230) -_(s231) -_(s232) -_(s233) -_(s234) -_(s235) -_(s236) -_(s237) -_(s238) -_(s239) -_(s23a) -_(s23b) -_(s23c) -_(s23d) -_(s23e) -_(s23f) -_(s240) -_(s241) -_(s242) -_(s243) -_(s244) -_(s245) -_(s246) -_(s247) -_(s248) -_(s249) -_(s24a) -_(s24b) -_(s24c) -_(s24d) -_(s24e) -_(s24f) -_(s250) -_(s251) -_(s252) -_(s253) -_(s254) -_(s255) -_(s256) -_(s257) -_(s258) -_(s259) -_(s25a) -_(s25b) -_(s25c) -_(s25d) -_(s25e) -_(s25f) -_(s260) -_(s261) -_(s262) -_(s263) -_(s264) -_(s265) -_(s266) -_(s267) -_(s268) -_(s269) -_(s26a) -_(s26b) -_(s26c) -_(s26d) -_(s26e) -_(s26f) -_(s270) - -// S3&K sounds -_(s3k2b) -_(s3k33) -_(s3k34) -_(s3k35) -_(s3k36) -_(s3k37) -_(s3k38) -_(s3k39) -_(s3k3a) -_(s3k3b) -_(s3k3c) -_(s3k3d) -_(s3k3e) -_(s3k3f) -_(s3k40) -_(s3k41) -_(s3k42) -_(s3k43) -_(s3k44) -_(s3k45) -_(s3k46) -_(s3k47) -_(s3k48) -_(s3k49) -_(s3k4a) -_(s3k4b) -_(s3k4c) -_(s3k4d) -_(s3k4e) -_(s3k4f) -_(s3k50) -_(s3k51) -_(s3k52) -_(s3k53) -_(s3k54) -_(s3k55) -_(s3k56) -_(s3k57) -_(s3k58) -_(s3k59) -_(s3k5a) -_(s3k5b) -_(s3k5c) -_(s3k5d) -_(s3k5e) -_(s3k5f) -_(s3k60) -_(s3k61) -_(s3k62) -_(s3k63) -_(s3k64) -_(s3k65) -_(s3k66) -_(s3k67) -_(s3k68) -_(s3k69) -_(s3k6a) -_(s3k6b) -_(s3k6c) -_(s3k6d) -_(s3k6e) -_(s3k6f) -_(s3k70) -_(s3k71) -_(s3k72) -_(s3k73) -_(s3k74) -_(s3k75) -_(s3k76) -_(s3k77) -_(s3k78) -_(s3k79) -_(s3k7a) -_(s3k7b) -_(s3k7c) -_(s3k7d) -_(s3k7e) -_(s3k7f) -_(s3k80) -_(s3k81) -_(s3k82) -_(s3k83) -_(s3k84) -_(s3k85) -_(s3k86) -_(s3k87) -_(s3k88) -_(s3k89) -_(s3k8a) -_(s3k8b) -_(s3k8c) -_(s3k8d) -_(s3k8e) -_(s3k8f) -_(s3k90) -_(s3k91) -_(s3k92) -_(s3k93) -_(s3k94) -_(s3k95) -_(s3k96) -_(s3k97) -_(s3k98) -_(s3k99) -_(s3k9a) -_(s3k9b) -_(s3k9c) -_(s3k9d) -_(s3k9e) -_(s3k9f) -_(s3ka0) -_(s3ka1) -_(s3ka2) -_(s3ka3) -_(s3ka4) -_(s3ka5) -_(s3ka6) -_(s3ka7) -_(s3ka8) -_(s3ka9) -_(s3kaa) -_(s3kab) -_(s3kab1) -_(s3kab2) -_(s3kab3) -_(s3kab4) -_(s3kab5) -_(s3kab6) -_(s3kab7) -_(s3kab8) -_(s3kab9) -_(s3kaba) -_(s3kabb) -_(s3kabc) -_(s3kabd) -_(s3kabe) -_(s3kabf) -_(s3kac) -_(s3kad) -_(s3kae) -_(s3kaf) -_(s3kb0) -_(s3kb1) -_(s3kb2) -_(s3kb3) -_(s3kb4) -_(s3kb5) -_(s3kb6) -_(s3kb7) -_(s3kb8) -_(s3kb9) -_(s3kba) -_(s3kbb) -_(s3kbcs) -_(s3kbcl) -_(s3kbds) -_(s3kbdl) -_(s3kbes) -_(s3kbel) -_(s3kbfs) -_(s3kbfl) -_(s3kc0s) -_(s3kc0l) -_(s3kc1s) -_(s3kc1l) -_(s3kc2s) -_(s3kc2l) -_(s3kc3s) -_(s3kc3l) -_(s3kc4s) -_(s3kc4l) -_(s3kc5s) -_(s3kc5l) -_(s3kc6s) -_(s3kc6l) -_(s3kc7s) -_(s3kc7l) -_(s3kc8s) -_(s3kc8l) -_(s3kc9s) -_(s3kc9l) -_(s3kcas) -_(s3kcal) -_(s3kcbs) -_(s3kcbl) -_(s3kccs) -_(s3kccl) -_(s3kcds) -_(s3kcdl) -_(s3kces) -_(s3kcel) -_(s3kcfs) -_(s3kcfl) -_(s3kd0s) -_(s3kd0l) -_(s3kd1s) -_(s3kd1l) -_(s3kd2s) -_(s3kd2l) -_(s3kd3s) -_(s3kd3l) -_(s3kd4s) -_(s3kd4l) -_(s3kd5s) -_(s3kd5l) -_(s3kd6s) -_(s3kd6l) -_(s3kd7s) -_(s3kd7l) -_(s3kd8s) -_(s3kd8l) -_(s3kd9s) -_(s3kd9l) -_(s3kdas) -_(s3kdal) -_(s3kdbs) -_(s3kdbl) - -// 3DB sounds -_(3db06) -_(3db09) -_(3db14) -_(3db16) - -// SCD sounds -_(cdfm00) -_(cdfm01) -_(cdfm02) -_(cdfm03) -_(cdfm04) -_(cdfm05) -_(cdfm06) -_(cdfm07) -_(cdfm08) -_(cdfm09) -_(cdfm10) -_(cdfm11) -_(cdfm12) -_(cdfm13) -_(cdfm14) -_(cdfm15) -_(cdfm16) -_(cdfm17) -_(cdfm18) -_(cdfm19) -_(cdfm20) -_(cdfm21) -_(cdfm22) -_(cdfm23) -_(cdfm24) -_(cdfm25) -_(cdfm26) -_(cdfm27) -_(cdfm28) -_(cdfm29) -_(cdfm30) -_(cdfm31) -_(cdfm32) -_(cdfm33) -_(cdfm34) -_(cdfm35) -_(cdfm36) -_(cdfm37) -_(cdfm38) -_(cdfm39) -_(cdfm40) -_(cdfm41) -_(cdfm42) -_(cdfm43) -_(cdfm44) -_(cdfm45) -_(cdfm46) -_(cdfm47) -_(cdfm48) -_(cdfm49) -_(cdfm50) -_(cdfm51) -_(cdfm52) -_(cdfm53) -_(cdfm54) -_(cdfm55) -_(cdfm56) -_(cdfm57) -_(cdfm58) -_(cdfm59) -_(cdfm60) -_(cdfm61) -_(cdfm62) -_(cdfm63) -_(cdfm64) -_(cdfm65) -_(cdfm66) -_(cdfm67) -_(cdfm68) -_(cdfm69) -_(cdfm70) -_(cdfm71) -_(cdfm72) -_(cdfm73) -_(cdfm74) -_(cdfm75) -_(cdfm76) -_(cdfm77) -_(cdfm78) -_(cdfm79) -_(cdpcm0) -_(cdpcm1) -_(cdpcm2) -_(cdpcm3) -_(cdpcm4) -_(cdpcm5) -_(cdpcm6) -_(cdpcm7) -_(cdpcm8) -_(cdpcm9) - -// KC sounds -_(kc2a) -_(kc2b) -_(kc2c) -_(kc2d) -_(kc2e) -_(kc2f) -_(kc30) -_(kc31) -_(kc32) -_(kc33) -_(kc34) -_(kc35) -_(kc36) -_(kc37) -_(kc38) -_(kc39) -_(kc3a) -_(kc3b) -_(kc3c) -_(kc3d) -_(kc3e) -_(kc3f) -_(kc40) -_(kc41) -_(kc42) -_(kc43) -_(kc44) -_(kc45) -_(kc46) -_(kc47) -_(kc48) -_(kc49) -_(kc4a) -_(kc4b) -_(kc4c) -_(kc4d) -_(kc4e) -_(kc4f) -_(kc50) -_(kc51) -_(kc52) -_(kc53) -_(kc54) -_(kc55) -_(kc56) -_(kc57) -_(kc58) -_(kc59) -_(kc5a) -_(kc5b) -_(kc5c) -_(kc5d) -_(kc5e) -_(kc5f) -_(kc60) -_(kc61) -_(kc62) -_(kc63) -_(kc64) -_(kc65) -_(kc66) -_(kc67) -_(kc68) -_(kc69) -_(kc6b) -_(kc6c) -_(kc6d) -_(kc6e) - -// SRB2kart -_(slip) -_(screec) -_(drift) -_(ruburn) -_(ddash) -_(tossed) -_(itpick) -_(peel) -_(hogbom) -_(zio3) -_(kpogos) -_(alarmi) -_(alarmg) -_(kinvnc) -_(kgrow) -_(itrol1) -_(itrol2) -_(itrol3) -_(itrol4) -_(itrol5) -_(itrol6) -_(itrol7) -_(itrol8) -_(itrolf) -_(itrolm) -_(itrolk) -_(itrole) -_(vroom) -_(chaooo) -_(yeeeah) -_(noooo1) -_(noooo2) -_(ruby1) -_(ruby2) -_(tcart) -_(bfare) -_(merry) -_(bowlh) -_(tppop) -_(hsdoor) -_(hstrn) -_(aspkb) -_(wind1) -_(fire2) -_(chain) -_(mkuma) -_(toada) -_(gemhit) -_(wrink) -_(bsnipe) -_(join) -_(leave) -_(requst) -_(syfail) -_(itfree) -_(dbgsal) - -// Chaining Sound -_(bstchn) - -// Low Ring Sound -_(ringlw) - -// Flip Over Sound -_(flipos) - -// Shout message sound effect -_(sysmsg) - -// Next up: UNIQUE ENGINE SOUNDS! Hoooooo boy... -// Engine class A - Low Speed, Low Weight -_(krta00) -_(krta01) -_(krta02) -_(krta03) -_(krta04) -_(krta05) -_(krta06) -_(krta07) -_(krta08) -_(krta09) -_(krta10) -_(krta11) -_(krta12) -// Engine class B - Average Speed, Low Weight -_(krtb00) -_(krtb01) -_(krtb02) -_(krtb03) -_(krtb04) -_(krtb05) -_(krtb06) -_(krtb07) -_(krtb08) -_(krtb09) -_(krtb10) -_(krtb11) -_(krtb12) -// Engine class C - High Speed, Low Weight -_(krtc00) -_(krtc01) -_(krtc02) -_(krtc03) -_(krtc04) -_(krtc05) -_(krtc06) -_(krtc07) -_(krtc08) -_(krtc09) -_(krtc10) -_(krtc11) -_(krtc12) -// Engine class D - Low Speed, Average Weight -_(krtd00) -_(krtd01) -_(krtd02) -_(krtd03) -_(krtd04) -_(krtd05) -_(krtd06) -_(krtd07) -_(krtd08) -_(krtd09) -_(krtd10) -_(krtd11) -_(krtd12) -// Engine class E - Average Speed, Average Weight -_(krte00) -_(krte01) -_(krte02) -_(krte03) -_(krte04) -_(krte05) -_(krte06) -_(krte07) -_(krte08) -_(krte09) -_(krte10) -_(krte11) -_(krte12) -// Engine class F - High Speed, Average Weight -_(krtf00) -_(krtf01) -_(krtf02) -_(krtf03) -_(krtf04) -_(krtf05) -_(krtf06) -_(krtf07) -_(krtf08) -_(krtf09) -_(krtf10) -_(krtf11) -_(krtf12) -// Engine class G - Low Speed, High Weight -_(krtg00) -_(krtg01) -_(krtg02) -_(krtg03) -_(krtg04) -_(krtg05) -_(krtg06) -_(krtg07) -_(krtg08) -_(krtg09) -_(krtg10) -_(krtg11) -_(krtg12) -// Engine class H - Average Speed, High Weight -_(krth00) -_(krth01) -_(krth02) -_(krth03) -_(krth04) -_(krth05) -_(krth06) -_(krth07) -_(krth08) -_(krth09) -_(krth10) -_(krth11) -_(krth12) -// Engine class I - High Speed, High Weight -_(krti00) -_(krti01) -_(krti02) -_(krti03) -_(krti04) -_(krti05) -_(krti06) -_(krti07) -_(krti08) -_(krti09) -_(krti10) -_(krti11) -_(krti12) - -// And LASTLY, Kart's skin sounds. -_(kwin) -_(klose) -_(khurt1) -_(khurt2) -_(kattk1) -_(kattk2) -_(kbost1) -_(kbost2) -_(kslow) -_(khitem) -_(kgloat) +_(None) + +// Skin Sounds +_(altdi1) +_(altdi2) +_(altdi3) +_(altdi4) +_(altow1) +_(altow2) +_(altow3) +_(altow4) +_(victr1) +_(victr2) +_(victr3) +_(victr4) +_(gasp) +_(jump) +_(pudpud) +_(putput) +_(spin) +_(spndsh) +_(thok) +_(zoom) +_(skid) + +// Ambience/background objects/etc +_(ambint) + +_(alarm) +_(buzz1) +_(buzz2) +_(buzz3) +_(buzz4) +_(crumbl) +_(fire) +_(grind) +_(laser) +_(mswing) +_(pstart) +_(pstop) +_(steam1) +_(steam2) +_(wbreak) +_(ambmac) +_(spsmsh) + +_(rainin) +_(litng1) +_(litng2) +_(litng3) +_(litng4) +_(athun1) +_(athun2) + +_(amwtr1) +_(amwtr2) +_(amwtr3) +_(amwtr4) +_(amwtr5) +_(amwtr6) +_(amwtr7) +_(amwtr8) +_(bubbl1) +_(bubbl2) +_(bubbl3) +_(bubbl4) +_(bubbl5) +_(floush) +_(splash) +_(splish) +_(wdrip1) +_(wdrip2) +_(wdrip3) +_(wdrip4) +_(wdrip5) +_(wdrip6) +_(wdrip7) +_(wdrip8) +_(wslap) + +_(doora1) +_(doorb1) +_(doorc1) +_(doorc2) +_(doord1) +_(doord2) +_(eleva1) +_(eleva2) +_(eleva3) +_(elevb1) +_(elevb2) +_(elevb3) + +_(ambin2) +_(lavbub) +_(rocks1) +_(rocks2) +_(rocks3) +_(rocks4) +_(rumbam) +_(rumble) + +// Game objects, etc +_(appear) +_(bkpoof) +_(bnce1) +_(bnce2) +_(cannon) +_(cgot) +_(cybdth) +_(deton) +_(ding) // old sfx_appear sound +_(dmpain) +_(drown) +_(fizzle) +_(gbeep) +_(wepfir) +_(ghit) +_(gloop) +_(gspray) +_(gravch) +_(itemup) +_(jet) +_(jshard) +_(lose) +_(lvpass) +_(mindig) +_(mixup) +_(monton) +_(pogo) +_(pop) +_(rail1) +_(rail2) +_(rlaunc) +_(shield) +_(wirlsg) +_(forcsg) +_(frcssg) +_(elemsg) +_(armasg) +_(attrsg) +_(shldls) +_(spdpad) +_(spkdth) +_(spring) +_(statu1) +_(statu2) +_(strpst) +_(supert) +_(telept) +_(tink) +_(token) +_(trfire) +_(trpowr) +_(turhit) +_(wdjump) +_(shrpsp) +_(shrpgo) +_(mswarp) +_(mspogo) +_(boingf) +_(corkp) +_(corkh) +_(alart) +_(vwre) +_(bowl) +_(chuchu) +//sfx_bsnipe, +_(sprong) +_(lvfal1) +_(pscree) +_(iceb) +_(shattr) +_(antiri) + +// Menu, interface +_(chchng) +_(dwnind) +_(emfind) +_(flgcap) +_(menu1) +_(oneup) +_(ptally) +_(radio) +_(wepchg) +_(wtrdng) +_(zelda) +_(adderr) +_(notadd) +_(addfil) + +// NiGHTS +_(ideya) +_(xideya) // Xmas +_(nbmper) +_(nxbump) // Xmas +_(ncchip) +_(ncitem) +_(nxitem) // Xmas +_(ngdone) +_(nxdone) // Xmas +_(drill1) +_(drill2) +_(ncspec) +_(nghurt) +_(ngskid) +_(hoop1) +_(hoop2) +_(hoop3) +_(hidden) +_(prloop) +_(timeup) +_(ngjump) +_(peww) + +// Halloween +_(lntsit) +_(lntdie) +_(pumpkn) +_(ghosty) + +// Mario +_(koopfr) +_(mario1) +_(mario2) +_(mario3) +_(mario4) +_(mario5) +_(mario6) +_(mario7) +_(mario8) +_(mario9) +_(marioa) +_(thwomp) + +// Black Eggman +_(bebomb) +_(bechrg) +_(becrsh) +_(bedeen) +_(bedie1) +_(bedie2) +_(beeyow) +_(befall) +_(befire) +_(beflap) +_(begoop) +_(begrnd) +_(behurt) +_(bejet1) +_(belnch) +_(beoutb) +_(beragh) +_(beshot) +_(bestep) +_(bestp2) +_(bewar1) +_(bewar2) +_(bewar3) +_(bewar4) +_(bexpld) +_(bgxpld) + +// Cy-Brak-Demon +_(beelec) // Electric barrier ambience +_(brakrl) // Rocket launcher +_(brakrx) // Rocket explodes + +// S1 sounds +_(s1a0) +_(s1a1) +_(s1a2) +_(s1a3) +_(s1a4) +_(s1a5) +_(s1a6) +_(s1a7) +_(s1a8) +_(s1a9) +_(s1aa) +_(s1ab) +_(s1ac) +_(s1ad) +_(s1ae) +_(s1af) +_(s1b0) +_(s1b1) +_(s1b2) +_(s1b3) +_(s1b4) +_(s1b5) +_(s1b6) +_(s1b7) +_(s1b8) +_(s1b9) +_(s1ba) +_(s1bb) +_(s1bc) +_(s1bd) +_(s1be) +_(s1bf) +_(s1c0) +_(s1c1) +_(s1c2) +_(s1c3) +_(s1c4) +_(s1c5) +_(s1c6) +_(s1c7) +_(s1c8) +_(s1c9) +_(s1ca) +_(s1cb) +_(s1cc) +_(s1cd) +_(s1ce) +_(s1cf) + +// S2 sounds +_(s220) +_(s221) +_(s222) +_(s223) +_(s224) +_(s225) +_(s226) +_(s227) +_(s228) +_(s229) +_(s22a) +_(s22b) +_(s22c) +_(s22d) +_(s22e) +_(s22f) +_(s230) +_(s231) +_(s232) +_(s233) +_(s234) +_(s235) +_(s236) +_(s237) +_(s238) +_(s239) +_(s23a) +_(s23b) +_(s23c) +_(s23d) +_(s23e) +_(s23f) +_(s240) +_(s241) +_(s242) +_(s243) +_(s244) +_(s245) +_(s246) +_(s247) +_(s248) +_(s249) +_(s24a) +_(s24b) +_(s24c) +_(s24d) +_(s24e) +_(s24f) +_(s250) +_(s251) +_(s252) +_(s253) +_(s254) +_(s255) +_(s256) +_(s257) +_(s258) +_(s259) +_(s25a) +_(s25b) +_(s25c) +_(s25d) +_(s25e) +_(s25f) +_(s260) +_(s261) +_(s262) +_(s263) +_(s264) +_(s265) +_(s266) +_(s267) +_(s268) +_(s269) +_(s26a) +_(s26b) +_(s26c) +_(s26d) +_(s26e) +_(s26f) +_(s270) + +// S3&K sounds +_(s3k2b) +_(s3k33) +_(s3k34) +_(s3k35) +_(s3k36) +_(s3k37) +_(s3k38) +_(s3k39) +_(s3k3a) +_(s3k3b) +_(s3k3c) +_(s3k3d) +_(s3k3e) +_(s3k3f) +_(s3k40) +_(s3k41) +_(s3k42) +_(s3k43) +_(s3k44) +_(s3k45) +_(s3k46) +_(s3k47) +_(s3k48) +_(s3k49) +_(s3k4a) +_(s3k4b) +_(s3k4c) +_(s3k4d) +_(s3k4e) +_(s3k4f) +_(s3k50) +_(s3k51) +_(s3k52) +_(s3k53) +_(s3k54) +_(s3k55) +_(s3k56) +_(s3k57) +_(s3k58) +_(s3k59) +_(s3k5a) +_(s3k5b) +_(s3k5c) +_(s3k5d) +_(s3k5e) +_(s3k5f) +_(s3k60) +_(s3k61) +_(s3k62) +_(s3k63) +_(s3k64) +_(s3k65) +_(s3k66) +_(s3k67) +_(s3k68) +_(s3k69) +_(s3k6a) +_(s3k6b) +_(s3k6c) +_(s3k6d) +_(s3k6e) +_(s3k6f) +_(s3k70) +_(s3k71) +_(s3k72) +_(s3k73) +_(s3k74) +_(s3k75) +_(s3k76) +_(s3k77) +_(s3k78) +_(s3k79) +_(s3k7a) +_(s3k7b) +_(s3k7c) +_(s3k7d) +_(s3k7e) +_(s3k7f) +_(s3k80) +_(s3k81) +_(s3k82) +_(s3k83) +_(s3k84) +_(s3k85) +_(s3k86) +_(s3k87) +_(s3k88) +_(s3k89) +_(s3k8a) +_(s3k8b) +_(s3k8c) +_(s3k8d) +_(s3k8e) +_(s3k8f) +_(s3k90) +_(s3k91) +_(s3k92) +_(s3k93) +_(s3k94) +_(s3k95) +_(s3k96) +_(s3k97) +_(s3k98) +_(s3k99) +_(s3k9a) +_(s3k9b) +_(s3k9c) +_(s3k9d) +_(s3k9e) +_(s3k9f) +_(s3ka0) +_(s3ka1) +_(s3ka2) +_(s3ka3) +_(s3ka4) +_(s3ka5) +_(s3ka6) +_(s3ka7) +_(s3ka8) +_(s3ka9) +_(s3kaa) +_(s3kab) +_(s3kab1) +_(s3kab2) +_(s3kab3) +_(s3kab4) +_(s3kab5) +_(s3kab6) +_(s3kab7) +_(s3kab8) +_(s3kab9) +_(s3kaba) +_(s3kabb) +_(s3kabc) +_(s3kabd) +_(s3kabe) +_(s3kabf) +_(s3kac) +_(s3kad) +_(s3kae) +_(s3kaf) +_(s3kb0) +_(s3kb1) +_(s3kb2) +_(s3kb3) +_(s3kb4) +_(s3kb5) +_(s3kb6) +_(s3kb7) +_(s3kb8) +_(s3kb9) +_(s3kba) +_(s3kbb) +_(s3kbcs) +_(s3kbcl) +_(s3kbds) +_(s3kbdl) +_(s3kbes) +_(s3kbel) +_(s3kbfs) +_(s3kbfl) +_(s3kc0s) +_(s3kc0l) +_(s3kc1s) +_(s3kc1l) +_(s3kc2s) +_(s3kc2l) +_(s3kc3s) +_(s3kc3l) +_(s3kc4s) +_(s3kc4l) +_(s3kc5s) +_(s3kc5l) +_(s3kc6s) +_(s3kc6l) +_(s3kc7s) +_(s3kc7l) +_(s3kc8s) +_(s3kc8l) +_(s3kc9s) +_(s3kc9l) +_(s3kcas) +_(s3kcal) +_(s3kcbs) +_(s3kcbl) +_(s3kccs) +_(s3kccl) +_(s3kcds) +_(s3kcdl) +_(s3kces) +_(s3kcel) +_(s3kcfs) +_(s3kcfl) +_(s3kd0s) +_(s3kd0l) +_(s3kd1s) +_(s3kd1l) +_(s3kd2s) +_(s3kd2l) +_(s3kd3s) +_(s3kd3l) +_(s3kd4s) +_(s3kd4l) +_(s3kd5s) +_(s3kd5l) +_(s3kd6s) +_(s3kd6l) +_(s3kd7s) +_(s3kd7l) +_(s3kd8s) +_(s3kd8l) +_(s3kd9s) +_(s3kd9l) +_(s3kdas) +_(s3kdal) +_(s3kdbs) +_(s3kdbl) + +// 3DB sounds +_(3db06) +_(3db09) +_(3db14) +_(3db16) + +// SCD sounds +_(cdfm00) +_(cdfm01) +_(cdfm02) +_(cdfm03) +_(cdfm04) +_(cdfm05) +_(cdfm06) +_(cdfm07) +_(cdfm08) +_(cdfm09) +_(cdfm10) +_(cdfm11) +_(cdfm12) +_(cdfm13) +_(cdfm14) +_(cdfm15) +_(cdfm16) +_(cdfm17) +_(cdfm18) +_(cdfm19) +_(cdfm20) +_(cdfm21) +_(cdfm22) +_(cdfm23) +_(cdfm24) +_(cdfm25) +_(cdfm26) +_(cdfm27) +_(cdfm28) +_(cdfm29) +_(cdfm30) +_(cdfm31) +_(cdfm32) +_(cdfm33) +_(cdfm34) +_(cdfm35) +_(cdfm36) +_(cdfm37) +_(cdfm38) +_(cdfm39) +_(cdfm40) +_(cdfm41) +_(cdfm42) +_(cdfm43) +_(cdfm44) +_(cdfm45) +_(cdfm46) +_(cdfm47) +_(cdfm48) +_(cdfm49) +_(cdfm50) +_(cdfm51) +_(cdfm52) +_(cdfm53) +_(cdfm54) +_(cdfm55) +_(cdfm56) +_(cdfm57) +_(cdfm58) +_(cdfm59) +_(cdfm60) +_(cdfm61) +_(cdfm62) +_(cdfm63) +_(cdfm64) +_(cdfm65) +_(cdfm66) +_(cdfm67) +_(cdfm68) +_(cdfm69) +_(cdfm70) +_(cdfm71) +_(cdfm72) +_(cdfm73) +_(cdfm74) +_(cdfm75) +_(cdfm76) +_(cdfm77) +_(cdfm78) +_(cdfm79) +_(cdpcm0) +_(cdpcm1) +_(cdpcm2) +_(cdpcm3) +_(cdpcm4) +_(cdpcm5) +_(cdpcm6) +_(cdpcm7) +_(cdpcm8) +_(cdpcm9) + +// KC sounds +_(kc2a) +_(kc2b) +_(kc2c) +_(kc2d) +_(kc2e) +_(kc2f) +_(kc30) +_(kc31) +_(kc32) +_(kc33) +_(kc34) +_(kc35) +_(kc36) +_(kc37) +_(kc38) +_(kc39) +_(kc3a) +_(kc3b) +_(kc3c) +_(kc3d) +_(kc3e) +_(kc3f) +_(kc40) +_(kc41) +_(kc42) +_(kc43) +_(kc44) +_(kc45) +_(kc46) +_(kc47) +_(kc48) +_(kc49) +_(kc4a) +_(kc4b) +_(kc4c) +_(kc4d) +_(kc4e) +_(kc4f) +_(kc50) +_(kc51) +_(kc52) +_(kc53) +_(kc54) +_(kc55) +_(kc56) +_(kc57) +_(kc58) +_(kc59) +_(kc5a) +_(kc5b) +_(kc5c) +_(kc5d) +_(kc5e) +_(kc5f) +_(kc60) +_(kc61) +_(kc62) +_(kc63) +_(kc64) +_(kc65) +_(kc66) +_(kc67) +_(kc68) +_(kc69) +_(kc6b) +_(kc6c) +_(kc6d) +_(kc6e) + +// SRB2kart +_(slip) +_(screec) +_(drift) +_(ruburn) +_(ddash) +_(tossed) +_(itpick) +_(peel) +_(hogbom) +_(zio3) +_(kpogos) +_(alarmi) +_(alarmg) +_(kinvnc) +_(kgrow) +_(itrol1) +_(itrol2) +_(itrol3) +_(itrol4) +_(itrol5) +_(itrol6) +_(itrol7) +_(itrol8) +_(itrolf) +_(itrolm) +_(itrolk) +_(itrole) +_(vroom) +_(chaooo) +_(yeeeah) +_(noooo1) +_(noooo2) +_(ruby1) +_(ruby2) +_(tcart) +_(bfare) +_(merry) +_(bowlh) +_(tppop) +_(hsdoor) +_(hstrn) +_(aspkb) +_(wind1) +_(fire2) +_(chain) +_(mkuma) +_(toada) +_(gemhit) +_(wrink) +_(bsnipe) +_(join) +_(leave) +_(requst) +_(syfail) +_(itfree) +_(dbgsal) +_(bhurry) // mine: wasn't here already? + +// Chaining Sound +_(bstchn) + +// Low Ring Sound +_(ringlw) + +// Flip Over Sound +_(flipos) + +// Shout message sound effect +_(sysmsg) + +// Next up: UNIQUE ENGINE SOUNDS! Hoooooo boy... +// Engine class A - Low Speed, Low Weight +_(krta00) +_(krta01) +_(krta02) +_(krta03) +_(krta04) +_(krta05) +_(krta06) +_(krta07) +_(krta08) +_(krta09) +_(krta10) +_(krta11) +_(krta12) +// Engine class B - Average Speed, Low Weight +_(krtb00) +_(krtb01) +_(krtb02) +_(krtb03) +_(krtb04) +_(krtb05) +_(krtb06) +_(krtb07) +_(krtb08) +_(krtb09) +_(krtb10) +_(krtb11) +_(krtb12) +// Engine class C - High Speed, Low Weight +_(krtc00) +_(krtc01) +_(krtc02) +_(krtc03) +_(krtc04) +_(krtc05) +_(krtc06) +_(krtc07) +_(krtc08) +_(krtc09) +_(krtc10) +_(krtc11) +_(krtc12) +// Engine class D - Low Speed, Average Weight +_(krtd00) +_(krtd01) +_(krtd02) +_(krtd03) +_(krtd04) +_(krtd05) +_(krtd06) +_(krtd07) +_(krtd08) +_(krtd09) +_(krtd10) +_(krtd11) +_(krtd12) +// Engine class E - Average Speed, Average Weight +_(krte00) +_(krte01) +_(krte02) +_(krte03) +_(krte04) +_(krte05) +_(krte06) +_(krte07) +_(krte08) +_(krte09) +_(krte10) +_(krte11) +_(krte12) +// Engine class F - High Speed, Average Weight +_(krtf00) +_(krtf01) +_(krtf02) +_(krtf03) +_(krtf04) +_(krtf05) +_(krtf06) +_(krtf07) +_(krtf08) +_(krtf09) +_(krtf10) +_(krtf11) +_(krtf12) +// Engine class G - Low Speed, High Weight +_(krtg00) +_(krtg01) +_(krtg02) +_(krtg03) +_(krtg04) +_(krtg05) +_(krtg06) +_(krtg07) +_(krtg08) +_(krtg09) +_(krtg10) +_(krtg11) +_(krtg12) +// Engine class H - Average Speed, High Weight +_(krth00) +_(krth01) +_(krth02) +_(krth03) +_(krth04) +_(krth05) +_(krth06) +_(krth07) +_(krth08) +_(krth09) +_(krth10) +_(krth11) +_(krth12) +// Engine class I - High Speed, High Weight +_(krti00) +_(krti01) +_(krti02) +_(krti03) +_(krti04) +_(krti05) +_(krti06) +_(krti07) +_(krti08) +_(krti09) +_(krti10) +_(krti11) +_(krti12) + +// And LASTLY, Kart's skin sounds. +_(kwin) +_(klose) +_(khurt1) +_(khurt2) +_(kattk1) +_(kattk2) +_(kbost1) +_(kbost2) +_(kslow) +_(khitem) +_(kgloat) diff --git a/src/k_hud.c b/src/k_hud.c index d86f852d4..54dcc23e2 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -1567,6 +1567,8 @@ void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT16 emblemmap, UI tic_t worktime; boolean dontdraw = false; + boolean overtime = false; + UINT8 *textcolor = 0; boolean emblemenabled = K_EmblemsEnabled(); INT32 splitflags = 0; @@ -1582,14 +1584,16 @@ void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT16 emblemmap, UI if (bossinfo.boss == true) ; else if (timelimitintics > 0 && (gametyperules & GTR_TIMELIMIT)) // TODO - { + { + if (drawtime >= (timelimitintics - 5*TICRATE) && ((drawtime*4)/TICRATE) % 2 == 0) + { + dontdraw = true; + } + if (drawtime >= timelimitintics) { - if (((drawtime-timelimitintics)/TICRATE) & 1) - { - dontdraw = true; - } - drawtime = 0; + overtime = true; + // drawtime = 0; } else { @@ -1614,6 +1618,30 @@ void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT16 emblemmap, UI V_DrawKartString(TX, TY+3, splitflags, va("--'--\"--")); else if (dontdraw) // overtime flash ; + else if (overtime) + { + if (((drawtime*2)/TICRATE) % 2 == 0) + { + textcolor = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_YELLOW, GTC_CACHE); + } + else + { + textcolor = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_ORANGE, GTC_CACHE); + } + + V_DrawStringScaledEx( + (TIME_X + 33) << FRACBITS, + (TIME_Y + 3) << FRACBITS, + FRACUNIT, + FRACUNIT, + FRACUNIT, + FRACUNIT, + splitflags, + textcolor, + KART_FONT, + va("OVERTIME!") + ); + } else if (worktime < 100) // 99:99:99 only { // zero minute diff --git a/src/p_inter.c b/src/p_inter.c index 0a4eb93cf..add7e5dac 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1042,6 +1042,13 @@ void P_CheckTimeLimit(void) spectators++; } +#ifdef TESTOVERTIMEINFREEPLAY + if (timelimitintics > 0 && (gametyperules & GTR_TIMELIMIT) && startedInFreePlay) + { + return; + } +#endif + if ((D_NumPlayers() - spectators) > 1) { // Play the starpost sfx after the first second of overtime. diff --git a/src/p_tick.c b/src/p_tick.c index 92c6f1623..a90673af9 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -821,6 +821,48 @@ void P_Ticker(boolean run) } } + if (timelimitintics > 0) + { + // last minute + if (timelimitintics > 60*TICRATE && leveltime == timelimitintics - 60*TICRATE + starttime) + { + S_StartSound(NULL, sfx_cdfm67); // guys it's a bell it's just like splatoon guys + } + if (timelimitintics > 60*TICRATE && leveltime == timelimitintics - 59*TICRATE + starttime) + { + S_StartSound(NULL, sfx_bhurry); // hurry up :)))) + } + + // overtime + if (gameaction != ga_completed && leveltime == timelimitintics + 1 + starttime) + { + S_StartSound(NULL, sfx_s3k50); // overtime warning + S_StartSound(NULL, sfx_s3k9d); + } + if (gameaction != ga_completed && leveltime == timelimitintics + 2*TICRATE + starttime) + { + S_StartSoundAtVolume(NULL, sfx_s3k50, 128); + } + if (gameaction != ga_completed && leveltime == timelimitintics + 4*TICRATE + starttime) + { + S_StartSoundAtVolume(NULL, sfx_s3k50, 96); + } + + // last five second countdown + if (leveltime == timelimitintics - 5 * TICRATE + starttime || + leveltime == timelimitintics - 4 * TICRATE + starttime) + { + S_StartSound(NULL, sfx_kc35); // 5, 4 + } + if (leveltime == timelimitintics - TICRATE + starttime || + leveltime == timelimitintics - 2 * TICRATE + starttime || + leveltime == timelimitintics - 3 * TICRATE + starttime) + { + S_StartSound(NULL, sfx_kc35); + S_StartSound(NULL, sfx_kc3d); // 3, 2, 1 + } + } + // Change timing of start music based on gametyperules { tic_t startingtime = (gametyperules & GTR_NOCOUNTDOWN) ? introtime : starttime;