From bde8c4a5b408cecbf795076b52a91e7098e00f3b Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Sat, 14 Aug 2010 08:53:20 +0000 Subject: [PATCH] realign git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5615 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/default_map_settings.cfg | 96 ++++++++++++++++----------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/config/default_map_settings.cfg b/config/default_map_settings.cfg index 57006f88..04702140 100755 --- a/config/default_map_settings.cfg +++ b/config/default_map_settings.cfg @@ -1,31 +1,31 @@ // ** Important note for map editors ** -// When you first start a map, be sure to use the /newmap command, rather than editing an existing map. Issuing the +// When you first start a map, be sure to use the /newmap command, rather than editing an existing map. Issuing the // newmap command ensures that your map uses the default map settings, rather than using the existing configuration for // the map you were on. // If it did use the existing configuration, upon 2nd load, the map will become messed up. -// If you decide that you need a configuration file for your map, be sure to copy this file into "packages/maps" and -// rename it to be the same file name as your map (but keep the existing ".cfg" extension). DO THIS BEFORE YOU EDIT +// If you decide that you need a configuration file for your map, be sure to copy this file into "packages/maps" and +// rename it to be the same file name as your map (but keep the existing ".cfg" extension). DO THIS BEFORE YOU EDIT // ANYTHING, just to be safe! // If you wish to learn how to use configuration files for you map, read: "docs/mapediting5.html" // Possible commands that can be used in map configs are: // ====================================================== -// mapmodelreset, texturereset, mapmodel, texture, loadsky, fog, fogcolour, +// mapmodelreset, texturereset, mapmodel, texture, loadsky, fog, fogcolour, // mapsound, mapsoundreset, shadowyaw, loadnotexture, watercolour. // Mapmodels: -mapmodelreset // Leave this command here, or else your maps config file will become +mapmodelreset // Leave this command here, or else your maps config file will become // messed up! // Mapmodel number: // --------------- -mapmodel 2 2 0 0 "nothing" // 0 Use this for clipping off areas/things that players should +mapmodel 2 2 0 0 "nothing" // 0 Use this for clipping off areas/things that players should // colide against. See "docs/mapediting5.html" for more details. mapmodel 4 1 0 0 "comp_bridge" // 1 @@ -33,7 +33,7 @@ mapmodel 0 7 0 0 "ladder_7x" // 2 mapmodel 0 8 0 0 "ladder_8x" // 3 mapmodel 0 10 0 0 "ladder_10x" // 4 mapmodel 0 11 0 0 "ladder_11x" // 5 -mapmodel 0 15 0 0 "ladder_15x" // 6 +mapmodel 0 15 0 0 "ladder_15x" // 6 mapmodel 0 12 0 0 "streetlamp" // 7 mapmodel 0 12 0 0 "streetlamp" // 8 mapmodel 3 2 0 0 "bench" // 9 @@ -41,7 +41,7 @@ mapmodel 2 4 0 0 "dumpster" // 10 mapmodel 0 0 0 0 "roadblock01" // 11 Clip this with nothing mapmodels! mapmodel 0 0 0 0 "roadblock02" // 12 Clip this with nothing mapmodels! mapmodel 1 8 0 0 "fence" // 13 -mapmodel 1 8 0 0 "fencepost" // 14 +mapmodel 1 8 0 0 "fencepost" // 14 mapmodel 0 0 0 0 "fencegate_open" // 15 mapmodel 1 8 0 0 "fencegate_closed" // 16 mapmodel 0 0 0 0 "grass01" // 17 @@ -56,15 +56,15 @@ mapmodel 0 0 0 0 "plant01_s" // 25 mapmodel 0 0 0 0 "tree01" // 26 mapmodel 1 2 0 0 "chair1" // 27 mapmodel 0 0 0 0 "laptop1" // 28 -mapmodel 0 0 0 0 "picture1" // 29 If you wish to put a custom picture in the frame use // "skin_blanco.jpg" Please make a new folder, preferably called +mapmodel 0 0 0 0 "picture1" // 29 If you wish to put a custom picture in the frame use // "skin_blanco.jpg" Please make a new folder, preferably called // picture1_yourmapsname mapmodel 1 6 0 0 "locker" // 30 mapmodel 0 0 0 0 "strahler" // 31 -mapmodel 0 0 0 0 "light01" // 32 +mapmodel 0 0 0 0 "light01" // 32 mapmodel 0 0 0 0 "bulb" // 33 mapmodel 1 3 0 0 "barrel" // 34 mapmodel 1 2 0 0 "barrel2" // 35 -mapmodel 0 0 0 0 "elektro" // 36 +mapmodel 0 0 0 0 "elektro" // 36 mapmodel 3 1 0 0 "europalette" // 37 mapmodel 0 0 0 0 "gastank" // 38 Ensure you clip this mapmodel fully using the command // "newent clip 0 3 7 5" in the middle of the model. @@ -76,7 +76,7 @@ mapmodel 0 0 0 0 "signs/flammable" // 43 mapmodel 0 0 0 0 "signs/speed" // 44 mapmodel 0 0 0 0 "signs/maint" // 45 mapmodel 0 0 0 0 "signs/caution" // 46 -mapmodel 0 0 0 0 "signs/biohazard" // 47 +mapmodel 0 0 0 0 "signs/biohazard" // 47 mapmodel 0 0 0 0 "fag" // 48 mapmodel 0 0 0 0 "can" // 49 mapmodel 0 0 0 0 "can2" // 50 @@ -131,7 +131,7 @@ mapmodel 0 0 0 0 "toca/signs/nosmoking" // 97 mapmodel 0 0 0 0 "toca/signs/radioactive" // 98 mapmodel 0 0 0 0 "toca/signs/restricted" // 99 mapmodel 1 6 0 0 "toca/signs/target" // 100 -mapmodel 0 2 0 0 "toca/computer/pc" // 101 +mapmodel 0 2 0 0 "toca/computer/pc" // 101 mapmodel 1 8 0 0 "toca/corrugated/fence1" // 102 Use the beam with this (Model 66) mapmodel 1 8 0 0 "toca/corrugated/fence2" // 103 Use the beam with this (Model 66) mapmodel 0 0 0 0 "toca/securitycam/vertmount" // 104 Use the camera mapmodel with this (Model 77) @@ -145,7 +145,7 @@ mapmodel 0 0 0 0 "signs/arab" // 111 Note: This model was made before version mapmodel 1 1 0 0 "toca/milkcrate" // 112 mapmodel 0 0 0 0 "toca/ceilingfan" // 113 mapmodel 1 7 0 0 "toca/tree1" // 114 -mapmodel 0 17 0 0 "toca/palmtree1" // 115 +mapmodel 0 17 0 0 "toca/palmtree1" // 115 mapmodel 2 3 0 0 "toca/razorwire" // 116 mapmodel 0 14 0 0 "toca/tree2" // 117 mapmodel 0 18 0 0 "toca/pine" // 118 @@ -179,7 +179,7 @@ mapmodel 1 1 0 0 "rattrap/milkcrate2" // 135 // mapmodel 0 0 0 0 "wires/4x8" // Different sizes of power lines, specific to ac_power. // mapmodel 1 3 0 0 "barrel-toxic" // Toxic barrel, specific to ac_toxic. // mapmodel 0 0 0 0 "snowsail" // Camouflaged sail cloth, specific to ac_arctic. -// mapmodel 0 0 0 0 "icicle" // Icicle, specific to ac_arctic. +// mapmodel 0 0 0 0 "icicle" // Icicle, specific to ac_arctic. // mapmodel 4 1 0 0 "bridge_shine" // Platform for ac_shine, specifically textured for its surroundings. // mapmodel 0 15 0 0 "ladderx15_center3" // Special ladder model for ac_desert. // mapmodel 3 1 0 0 "toca/grid6x8" // A metal mesh, specifically designed for ac_aqueous. @@ -189,10 +189,10 @@ mapmodel 1 1 0 0 "rattrap/milkcrate2" // 135 // mapmodel 0 0 0 0 "toca/stairs_aqueous/stairsacc/handrail" // Handrail for toca's metal platforms. Specific to ac_aqueous. // mapmodel 3 1 7 0 "toca/stairs_aqueous/stairs1" - // Special stairs platforms with handrails. Specific to ac_aqueous. + // Special stairs platforms with handrails. Specific to ac_aqueous. // This model requires careful clipping to be used. // mapmodel 3 1 7 0 "toca/stairs_aqueous/stairs2" - // Special stairs platforms with handrails. Specific to ac_aqueous. + // Special stairs platforms with handrails. Specific to ac_aqueous. // This model requires careful clipping to be used. // mapmodel 0 0 0 0 "nocamp" // No-camping sign, specific to ac_douze. // mapmodel 1 2 0 0 "rattrap/rbbox" // Box mapmodel, specific to ac_rattrap. @@ -217,9 +217,9 @@ loadsky "textures/skymaps/steini/steini4" // Comment this if you want to use a d // loadsky "textures/skymaps/kothic/atsea" -// Alternative texture. See "docs/mapediting5.html" for more information. +// Alternative texture. See "docs/mapediting5.html" for more information. -loadnotexture // Reset to default alternative texture. Comment this if you want to use a +loadnotexture // Reset to default alternative texture. Comment this if you want to use a // different one. // loadnotexture "makke/black.jpg" // This is an example. Using this will make any missing textures end up black. // Uncomment it if you want to use this one. @@ -245,7 +245,7 @@ texture 0 "kurt/klite1.jpg" // Dummy texture - Also leave this here, or else you // Brickwall textures -texture 0 "toca/greybricks.jpg" // Texture #1 +texture 0 "toca/greybricks.jpg" // Texture #1 texture 0 "arcitool/archibrick01.jpg" texture 0 "arcitool/archibrick02.jpg" texture 0 "arcitool/archibrick03.jpg" @@ -270,7 +270,7 @@ texture 0 "makke/01-CMU.jpg" texture 0 "makke/mauer1.jpg" texture 0 "makke/mauer2.jpg" texture 0 "makke/d_brick.jpg" -texture 0 "mitaman/3dcafe/stone18.jpg" // Texture #26 +texture 0 "mitaman/3dcafe/stone18.jpg" // Texture #26 // Tile textures texture 0 "noctua/tiles/16tile12.jpg" // Texture #27 @@ -289,7 +289,7 @@ texture 0 "arcitool/Cotta2-satt.jpg" texture 0 "makke/tiles.jpg" // Texture #40 // Floor textures -texture 0 "noctua/ground/cobbles01.jpg" // Texture #41 +texture 0 "noctua/ground/cobbles01.jpg" // Texture #41 texture 0 "arcitool/pflaster2.jpg" texture 0 "arcitool/gittersteine2.jpg" texture 0 "makke/11-Brick.jpg" @@ -337,7 +337,7 @@ texture 0 "mitaman/various/5sqtunnelroad.jpg" texture 0 "mitaman/various/027metal.jpg" // Texture #83 // Metal textures -texture 0 "boeck/metal_019.jpg" // Texture #84 +texture 0 "boeck/metal_019.jpg" // Texture #84 texture 0 "boeck/metal_019_b.jpg" texture 0 "mitaman/various/036metal.jpg" texture 0 "boeck/rolltor.jpg" @@ -365,7 +365,7 @@ texture 0 "mitaman/various/006metal.jpg" texture 0 "mitaman/various/metal020.jpg" // Texture #109 // Wood textures -texture 0 "boeck/wood_009.jpg" // Texture #110 +texture 0 "boeck/wood_009.jpg" // Texture #110 texture 0 "boeck/wood_010.jpg" texture 0 "boeck/wood_017.jpg" texture 0 "makke/wood_01.jpg" @@ -411,7 +411,7 @@ texture 0 "makke/stuck1.jpg" texture 0 "noctua/ground/mud01.jpg" texture 0 "noctua/ground/pebble01.jpg" texture 0 "noctua/ground/ground02.jpg" -texture 0 "noctua/ground/ground06.jpg" // Texture #154 +texture 0 "noctua/ground/ground06.jpg" // Texture #154 // Rock/stone textures texture 0 "arcitool/schotter1.jpg" // Texture #155 @@ -442,12 +442,12 @@ texture 0 "noctua/wall/conc04.jpg" texture 0 "noctua/wall/d_wall01.jpg" // Texture #180 // Carpet textures -texture 0 "noctua/textile/carpet04.jpg" // Texture #181 +texture 0 "noctua/textile/carpet04.jpg" // Texture #181 texture 0 "noctua/textile/carpet01.jpg" texture 0 "noctua/textile/carpet02.jpg" texture 0 "noctua/textile/carpet03.jpg" texture 0 "noctua/textile/burlap01.jpg" -texture 0 "noctua/textile/carpet05.jpg" // Texture #186 +texture 0 "noctua/textile/carpet05.jpg" // Texture #186 // Trim textures texture 0 "arcitool/Wellblech1-1.jpg" // Texture #187 @@ -521,9 +521,9 @@ texture 0 "rattrap/rb_window.jpg" -// The below textures are in the AssaultCube package, but are not actually in the config file because their design is -// specific to the map they were made for or because there are only 256 texture slots available and we don't want to -// use them all up for you. If you want to use any of the below, simply uncomment the ones you want, but be sure to +// The below textures are in the AssaultCube package, but are not actually in the config file because their design is +// specific to the map they were made for or because there are only 256 texture slots available and we don't want to +// use them all up for you. If you want to use any of the below, simply uncomment the ones you want, but be sure to // stay aware of the 256 slot limit. // texture 0 "dog/texture08.jpg" @@ -647,23 +647,23 @@ texture 0 "rattrap/rb_window.jpg" 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/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_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_night_dog.ogg" -1 // 16 +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 @@ -674,22 +674,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_water_owl.ogg" -1 // 27 +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_waterdrip.ogg" -1 // 29 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 - For use with computer/keyboard mapmodels. -mapsound "ambience/t_factory01.ogg" -1 // 36 +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_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 mapsound "ambience/flies.ogg" -1 // 42 mapsound "ambience/deserthawk.ogg" -1 // 43 -mapsound "ambience/owl.ogg" -1 // 44 +mapsound "ambience/owl.ogg" -1 // 44 mapsound "ambience/citynoisebirds.ogg" -1 // 45