From ac4bdecf43901f0d0521ea41c05f231833eb8883 Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Thu, 30 Oct 2008 12:05:11 +0000 Subject: [PATCH] Ambient sounds menu git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3334 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/default_map_settings.cfg | 49 +++++++++++++-------------- config/menus_edit.cfg | 60 +++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 25 deletions(-) diff --git a/config/default_map_settings.cfg b/config/default_map_settings.cfg index 9133720f..c0570f33 100755 --- a/config/default_map_settings.cfg +++ b/config/default_map_settings.cfg @@ -14,7 +14,8 @@ // Possible commands that can be used in map configs are: // ====================================================== -// mapmodelreset, texturereset, mapmodel, texture, loadsky, fog, fogcolour, mapsound, loadnotexture, watercolour. +// mapmodelreset, texturereset, mapmodel, texture, loadsky, fog, fogcolour, +// mapsound, mapsoundreset, shadowyaw, loadnotexture, watercolour. @@ -550,52 +551,50 @@ texture 0 "./drunkenM/rock_wall1.jpg" // Texture #249 // texture 0 "./wotwot/urban/electric1.jpg" // texture 0 "./wotwot/urban/electric1_bla.jpg" // texture 0 "./openfootage/stonewall_4.jpg" +// texture 0 "./craig_fortune/crates/light_weathered_desert3.jpg" -// Ambient Sounds -mapsoundreset +mapsoundreset // Ambient sounds. Leave this command here, or else your sounds will mess up! -mapsound "./ambience/cavedrip.ogg" -1 // 0 -mapsound "./ambience/distant_cars.ogg" -1 // 1 -mapsound "./ambience/hum01.ogg" -1 // 2 -mapsound "./ambience/hum02.ogg" -1 // 3 -mapsound "./ambience/night_crickets.ogg" -1 // 4 -mapsound "./ambience/water.ogg" -1 // 5 -mapsound "./ambience/wind.ogg" -1 // 6 - -mapsound "./ambience/t_aircond.ogg" -1 // 7 -mapsound "./ambience/t_compressor.ogg" -1 // 8 -mapsound "./ambience/t_crow.ogg" -1 // 9 -mapsound "./ambience/t_dogs01.ogg" -1 //10 +mapsound "./ambience/cavedrip.ogg" -1 //0 +mapsound "./ambience/distant_cars.ogg" -1 //1 +mapsound "./ambience/hum01.ogg" -1 //2 +mapsound "./ambience/hum02.ogg" -1 //3 +mapsound "./ambience/night_crickets.ogg" -1 //4 +mapsound "./ambience/water.ogg" -1 //5 +mapsound "./ambience/wind.ogg" -1 //6 +mapsound "./ambience/t_aircond.ogg" -1 //7 +mapsound "./ambience/t_compressor.ogg" -1 //8 +mapsound "./ambience/t_crow.ogg" -1 //9 +mapsound "./ambience/t_dogs01.ogg" -1 //10 mapsound "./ambience/t_helicopter.ogg" -1 //11 -mapsound "./ambience/t_hum01.ogg" -1 //12 -mapsound "./ambience/t_hum02.ogg" -1 //13 -mapsound "./ambience/t_hum03.ogg" -1 //14 -mapsound "./ambience/t_hum04.ogg" -1 //15 +mapsound "./ambience/t_hum01.ogg" -1 //12 +mapsound "./ambience/t_hum02.ogg" -1 //13 +mapsound "./ambience/t_hum03.ogg" -1 //14 +mapsound "./ambience/t_hum04.ogg" -1 //15 mapsound "./ambience/t_night_dog.ogg" -1 //16 mapsound "./ambience/t_night01.ogg" -1 //17 mapsound "./ambience/t_night02.ogg" -1 //18 mapsound "./ambience/t_radio_comms.ogg" -1 //19 mapsound "./ambience/t_radio_static.ogg" -1 //20 mapsound "./ambience/t_satcoms.ogg" -1 //21 -mapsound "./ambience/t_sludge.ogg" -1 //22 +mapsound "./ambience/t_sludge.ogg" -1 //22 mapsound "./ambience/t_static01.ogg" -1 //23 mapsound "./ambience/t_static02.ogg" -1 //24 -mapsound "./ambience/t_vent01.ogg" -1 //25 -mapsound "./ambience/t_vent02.ogg" -1 //26 +mapsound "./ambience/t_vent01.ogg" -1 //25 +mapsound "./ambience/t_vent02.ogg" -1 //26 mapsound "./ambience/t_water_owl.ogg" -1 //27 mapsound "./ambience/t_water01.ogg" -1 //28 mapsound "./ambience/t_waterdrip.ogg" -1 //29 -mapsound "./ambience/t_wind.ogg" -1 //30 +mapsound "./ambience/t_wind.ogg" -1 //30 mapsound "./ambience/t_waterpipe01.ogg" -1 //31 mapsound "./ambience/t_waterpipe02.ogg" -1 //32 mapsound "./ambience/warningalarm01.ogg" -1 //33 mapsound "./ambience/t_gastank.ogg" -1 //34 -mapsound "./ambience/t_keyboard.ogg" 1 //35 play only once when user gets near a keyboard +mapsound "./ambience/t_keyboard.ogg" 1 //35 - For use with computer/keyboard mapmodels. mapsound "./ambience/t_factory01.ogg" -1 //36 mapsound "./ambience/t_vents.ogg" -1 //37 mapsound "./ambience/t_waterfront.ogg" -1 //38 mapsound "./ambience/t_generator.ogg" -1 //39 mapsound "./ambience/t_electricbuzz.ogg" -1 //40 mapsound "./ambience/t_alarm01.ogg" -1 //41 - diff --git a/config/menus_edit.cfg b/config/menus_edit.cfg index 8a4e1733..a3a58a1a 100644 --- a/config/menus_edit.cfg +++ b/config/menus_edit.cfg @@ -4,6 +4,7 @@ menuitem "Mapmodels..." "showmenu Mapmodels" menuitem "Lighting..." "showmenu Lighting" menuitem "Entities..." "showmenu Entities" menuitem "Pickups..." "showmenu Pickups" +menuitem "Ambient sounds..." [ showmenu "Ambient sounds" ] menuitem "Arches and slopes..." "showmenu Arches" menuitem "Map operations..." [ showmenu "Map operations" ] menuitem "Bots..." [ showmenu "Creating bot waypoints" ] @@ -291,3 +292,62 @@ menuitem "Coffee" "newent mapmodel 53" menuitem "Flyer" "newent mapmodel 54" menuitem "Tree Flyer" "newent mapmodel 26" menuitem "Potato box" "newent mapmodel 56" + + +newmenu "Ambient sounds" + +menuinit [ alias ambientsoundmenu "" ] +menuitem "Cave drip" [ alias ambientsoundmenu 0; showmenu "Ambient sound settings" ] +menuitem "Cars driving in the distance" [ alias ambientsoundmenu 1; showmenu "Ambient sound settings" ] +menuitem "Humm (01)" [ alias ambientsoundmenu 2; showmenu "Ambient sound settings" ] +menuitem "Humm (02)" [ alias ambientsoundmenu 3; showmenu "Ambient sound settings" ] +menuitem "Crickets at night" [ alias ambientsoundmenu 4; showmenu "Ambient sound settings" ] +menuitem "Water (01)" [ alias ambientsoundmenu 5; showmenu "Ambient sound settings" ] +menuitem "Wind" [ alias ambientsoundmenu 6; showmenu "Ambient sound settings" ] +menuitem "Air conditioner" [ alias ambientsoundmenu 7; showmenu "Ambient sound settings" ] +menuitem "Compressor" [ alias ambientsoundmenu 8; showmenu "Ambient sound settings" ] +menuitem "Crow" [ alias ambientsoundmenu 9; showmenu "Ambient sound settings" ] +menuitem "Dogs (01)" [ alias ambientsoundmenu 10; showmenu "Ambient sound settings" ] +menuitem "Helicopter" [ alias ambientsoundmenu 11; showmenu "Ambient sound settings" ] +menuitem "Humm (03)" [ alias ambientsoundmenu 12; showmenu "Ambient sound settings" ] +menuitem "Humm (04)" [ alias ambientsoundmenu 13; showmenu "Ambient sound settings" ] +menuitem "Humm (05)" [ alias ambientsoundmenu 14; showmenu "Ambient sound settings" ] +menuitem "Humm (06)" [ alias ambientsoundmenu 15; showmenu "Ambient sound settings" ] +menuitem "Dogs (02)" [ alias ambientsoundmenu 16; showmenu "Ambient sound settings" ] +menuitem "Night (01)" [ alias ambientsoundmenu 17; showmenu "Ambient sound settings" ] +menuitem "Night (02)" [ alias ambientsoundmenu 18; showmenu "Ambient sound settings" ] +menuitem "Radio comms" [ alias ambientsoundmenu 19; showmenu "Ambient sound settings" ] +menuitem "Radio static" [ alias ambientsoundmenu 20; showmenu "Ambient sound settings" ] +menuitem "Sat-coms" [ alias ambientsoundmenu 21; showmenu "Ambient sound settings" ] +menuitem "Sludge" [ alias ambientsoundmenu 22; showmenu "Ambient sound settings" ] +menuitem "Static (01)" [ alias ambientsoundmenu 23; showmenu "Ambient sound settings" ] +menuitem "Static (02)" [ alias ambientsoundmenu 24; showmenu "Ambient sound settings" ] +menuitem "Vent (01)" [ alias ambientsoundmenu 25; showmenu "Ambient sound settings" ] +menuitem "Vent (02)" [ alias ambientsoundmenu 26; showmenu "Ambient sound settings" ] +menuitem "Water owl" [ alias ambientsoundmenu 27; showmenu "Ambient sound settings" ] +menuitem "Water (02)" [ alias ambientsoundmenu 28; showmenu "Ambient sound settings" ] +menuitem "Water drip" [ alias ambientsoundmenu 29; showmenu "Ambient sound settings" ] +menuitem "Wind (02)" [ alias ambientsoundmenu 30; showmenu "Ambient sound settings" ] +menuitem "Waterpipes (01)" [ alias ambientsoundmenu 31; showmenu "Ambient sound settings" ] +menuitem "Waterpipes (02)" [ alias ambientsoundmenu 32; showmenu "Ambient sound settings" ] +menuitem "Warning alarm" [ alias ambientsoundmenu 33; showmenu "Ambient sound settings" ] +menuitem "Gastank" [ alias ambientsoundmenu 34; showmenu "Ambient sound settings" ] +menuitem "Keyboard" [ alias ambientsoundmenu 35; showmenu "Ambient sound settings" ] +menuitem "Factory" [ alias ambientsoundmenu 36; showmenu "Ambient sound settings" ] +menuitem "Vent (03)" [ alias ambientsoundmenu 37; showmenu "Ambient sound settings" ] +menuitem "Waterfront" [ alias ambientsoundmenu 38; showmenu "Ambient sound settings" ] +menuitem "Generator" [ alias ambientsoundmenu 39; showmenu "Ambient sound settings" ] +menuitem "Electric buzz" [ alias ambientsoundmenu 40; showmenu "Ambient sound settings" ] +menuitem "Alarm" [ alias ambientsoundmenu 41; showmenu "Ambient sound settings" ] + + +alias soundrad 1 +alias soundsize 0 +alias ambientsoundvol 255 + +newmenu "Ambient sound settings" +menuinit [ alias soundrad 1; alias soundsize 0; alias ambientsoundvol 255 ] +menuitemslider "Sound radius: " 1 25 "$soundrad" 1 "" "alias soundrad $arg1" +menuitemslider "Sound size: " 0 25 "$soundsize" 1 "" "alias soundsize $arg1" +menuitemslider "Sound volume: " 1 255 "$ambientsoundvol" 5 "" "alias ambientsoundvol $arg1" +menuitem " 2 [ OK ]" "newent sound $ambientsoundmenu $soundrad $soundsize $ambientsoundvol"