diff --git a/config/defaults.cfg b/config/defaults.cfg index 50aa4ac5..e58a844e 100644 --- a/config/defaults.cfg +++ b/config/defaults.cfg @@ -8,7 +8,7 @@ loadcrosshair default.png // choose another crosshair, see packages/misc/crossha skin 0 // change your look autoreload 1 // reload the guns automatically -alias maxmusicvol 120 // set higher if you want (max 255) +musicvol 128 alias primary [ weapon (currentprimary) ] alias secondary [ weapon 1 ] @@ -111,13 +111,9 @@ alias delta_spect_0 [ followplayer $arg1 ] alias timeremain [ echo time remaining: ($minutesremaining) ] alias toggleshowmap [ showmap 1; onrelease [ showmap 0 ] ] -music ac.ogg -musicvol 0 + alias start_intermission [ - // play once (1:40) - musicvol $maxmusicvol - fade 0 - sleep 10000 [ fade 1 ] + // say "gg" ] diff --git a/config/firstrun.cfg b/config/firstrun.cfg index e51e64e0..4aacaf2e 100644 --- a/config/firstrun.cfg +++ b/config/firstrun.cfg @@ -1,9 +1,8 @@ sleep 100 welcome alias welcome [ - musicvol $maxmusicvol - fade 0 - music "pingpong/03-pp-kamikadze.ogg" - sleep 60000 fade 1 - showmenu "QUICK setup" + sleep 500 [ + music "pingpong/03-pp-kamikadze.ogg" (* 89 1000) " " // 90 secs, fade + showmenu "QUICK setup" + ] ] \ No newline at end of file diff --git a/config/sounds.cfg b/config/sounds.cfg index 44f3161f..75c3006e 100755 --- a/config/sounds.cfg +++ b/config/sounds.cfg @@ -1,3 +1,4 @@ +// game sounds registersound "player/jump" //S_JUMP registersound "player/step" 300 // S_SOFTLAND registersound "player/land" 200 // S_HARDLAND @@ -50,6 +51,8 @@ registersound "player/crouch" 100 1 // S_FOOTSTEPSCROUCH registersound "misc/menu_click1" // S_MENUSELECT registersound "misc/menu_click2" // S_MENUENTER + +// ingame voice chat registersound "voicecom/affirmative" registersound "voicecom/allrightsir" registersound "voicecom/comeonmove" @@ -76,13 +79,7 @@ registersound "voicecom/wedidit" registersound "voicecom/yes" registersound "voicecom/niceshot" -alias fade [ // 0=in, 1=out - alias stepsize 5 - alias numsteps (div $maxmusicvol $stepsize) - loop i (+ $numsteps 1) [ - alias curvol (* $i $stepsize) - if (= $arg1 1) [ alias curvol (- $maxmusicvol $curvol) ] - sleep (* $i 100) (concat musicvol $curvol) - ] -] - +// music +registermusic "pingpong/03-pp-kamikadze" // M_FLAGGRAB +registermusic "pingpong/08-pp-headshot" // M_LASTMINUTE1 +registermusic "ac" // M_LASTMINUTE2