diff --git a/config/default_map_settings.cfg b/config/default_map_settings.cfg index 2e659af7..365f8ead 100644 --- a/config/default_map_settings.cfg +++ b/config/default_map_settings.cfg @@ -193,26 +193,29 @@ mapmodel 0 0 0 0 "toca/plasticbags/1" // 162 mapmodel 0 0 0 0 "toca/plasticbags/2" // 163 mapmodel 0 0 0 0 "toca/pickaxe/horz" // 164 mapmodel 0 0 0 0 "toca/pickaxe/vert" // 165 -mapmodel 0 0 0 0 "toca/newspaper/1" // 166 -mapmodel 0 0 0 0 "toca/newspaper/2" // 167 -mapmodel 1 3 0 0 "toca/cautionsign" // 168 -mapmodel 0 0 0 0 "toca/decals/broken/1" // 169 -mapmodel 0 0 0 0 "toca/decals/broken/2" // 170 -mapmodel 0 0 0 0 "toca/decals/broken/3" // 171 -mapmodel 0 0 0 0 "cleaner/hotel_sign" // 172 -mapmodel 0 0 0 0 "toca/plants/bush" // 173 -mapmodel 0 0 0 0 "toca/plants/smaltree" // 174 -mapmodel 0 0 0 0 "toca/plants/grass" // 175 -mapmodel 0 0 0 0 "cleaner/traffic_cones/up" // 176 -mapmodel 0 0 0 0 "cleaner/traffic_cones/down" // 177 -mapmodel 0 0 0 0 "cleaner/extinguisher" //178 -mapmodel 0 1 0 0 "toca/paintcan" //179 -mapmodel 0 0 0 0 "toca/droppedceiling/frame" //180 -mapmodel 0 0 0 0 "toca/droppedceiling/tiles" //181 -mapmodel 0 0 0 0 "toca/droppedceiling/single" //182 -mapmodel 0 0 0 0 "toca/droppedceiling/light1" //183 -mapmodel 0 0 0 0 "toca/droppedceiling/light2" //184 -mapmodel 0 0 0 0 "cleaner/extinguisher_box" //185 +mapmodel 0 0 0 0 "toca/newspaper/1" // 166 +mapmodel 0 0 0 0 "toca/newspaper/2" // 167 +mapmodel 1 3 0 0 "toca/cautionsign" // 168 +mapmodel 0 0 0 0 "toca/decals/broken/1" // 169 +mapmodel 0 0 0 0 "toca/decals/broken/2" // 170 +mapmodel 0 0 0 0 "toca/decals/broken/3" // 171 +mapmodel 0 0 0 0 "cleaner/hotel_sign" // 172 +mapmodel 0 0 0 0 "toca/plants/bush" // 173 +mapmodel 0 0 0 0 "toca/plants/smaltree" // 174 +mapmodel 0 0 0 0 "toca/plants/grass" // 175 +mapmodel 0 0 0 0 "cleaner/traffic_cones/up" // 176 +mapmodel 0 0 0 0 "cleaner/traffic_cones/down" // 177 +mapmodel 0 0 0 0 "cleaner/extinguisher" // 178 +mapmodel 0 1 0 0 "toca/paintcan" // 179 +mapmodel 0 0 0 0 "toca/droppedceiling/frame" // 180 +mapmodel 0 0 0 0 "toca/droppedceiling/tiles" // 181 +mapmodel 0 0 0 0 "toca/droppedceiling/single" // 182 +mapmodel 0 0 0 0 "toca/droppedceiling/light1" // 183 +mapmodel 0 0 0 0 "toca/droppedceiling/light2" // 184 +mapmodel 0 0 0 0 "cleaner/extinguisher_box" // 185 +mapmodel 0 0 0 0 "cleaner/monalisa" // 186 +mapmodel 0 0 0 0 "cleaner/weaponrack" // 187 +mapmodel 0 0 0 0 "cleaner/alarm_bell" // 188 // NOTE: There is a hard-limit maximum of 256 "mapmodel" commands. @@ -231,7 +234,7 @@ mapmodel 0 0 0 0 "cleaner/extinguisher_box" //185 // mapmodel 1 3 0 0 "makke/barrel_newsteel" // Steel makke/barrel mapmodel, specific to ac_rattrap. // mapmodel 1 2 0 0 "makke/barrel_newsteel_fallen" // Steel makke/barrel mapmodel, specific to ac_rattrap. // mapmodel 3 8 0 0 "makke/mine-shaft_elevator" // Mine lift, specific to ac_mines. -// mapmodel 1 2 0 0 "cleaner/minecart/down" // Cleaner's mines. +// mapmodel 1 2 0 0 "cleaner/minecart/down" // Cleaner's mines. // mapmodel 1 2 0 0 "cleaner/minecart/up" // Cleaner's mines. // mapmodel 0 0 0 0 "cleaner/rails/bent" // Cleaner's mines. // mapmodel 0 0 0 0 "cleaner/rails/straight" // Cleaner's mines. @@ -241,18 +244,18 @@ mapmodel 0 0 0 0 "cleaner/extinguisher_box" //185 // mapmodel 1 1 0 0 "misterfloppy/valve_hor" // Valve mapmodel, specific to ac_werk. // mapmodel 0 15 0 0 "makke/ladder_15x_offset" // Special ladder model for ac_desert. // mapmodel 0 0 0 0 "toca/stairs_aqueous/stairsacc/beam" - // Metal beam to support toca's stairs. This model can be difficult to place correctly. +// Metal beam to support toca's stairs. This model can be difficult to place correctly. // mapmodel 0 0 0 0 "toca/stairs_aqueous/stairsacc/handrail" - // Handrail for toca's metal platforms. This model requires careful clipping to be used. +// Handrail for toca's metal platforms. This model requires careful clipping to be used. // mapmodel 3 1 7 0 "toca/stairs_aqueous/stairs1" - // Special stairs platforms with handrails. This model requires careful clipping to be used. +// Special stairs platforms with handrails. This model requires careful clipping to be used. // mapmodel 3 1 7 0 "toca/stairs_aqueous/stairs2" - // Special stairs platforms with handrails. This model requires careful clipping to be used. +// Special stairs platforms with handrails. This model requires careful clipping to be used. // mapmodel 8 1 0 0 "cleaner/platform/16x16" // Requires setting a texture. // mapmodel 3 1 0 0 "toca/grid6x8" // A metal mesh, specifically designed for ac_aqueous. // mapmodel 4 1 0 0 "makke/platform_shine" // Platform for ac_shine, specifically textured for its surroundings. // mapmodel 4 1 0 0 "cleaner/platform/8x8" // Alternative platform that fits *most* textures better, - // requires setting a texture. +// requires setting a texture. // The skymap for this map. You can change this by commenting the one below, and then uncommenting one of your choosing // Alternatively, you can add your own into "packages/textures/skymaps" and use it as below. @@ -297,7 +300,7 @@ texturereset // Leave this command here, or else your map will look messed texture 0 "kurt/klite1.jpg" // Dummy texture - Also leave this here, or else your map will look messed up! - // Brickwall textures +// Brickwall textures texture 0 "toca/greybricks.jpg" // Texture #1 texture 0 "arcitool/archibrick01.jpg" texture 0 "arcitool/archibrick02.jpg" @@ -323,9 +326,9 @@ texture 0 "makke/01-CMU.jpg" texture 0 "makke/mauer1.jpg" texture 0 "makke/mauer2.jpg" texture 0 "makke/d_brick.jpg" -texture 0 "3dcafe/stone18.jpg" // Texture #26 +texture 0 "3dcafe/stone18.jpg" // Texture #26 - // Tile textures +// Tile textures texture 0 "noctua/tiles/16tile12.jpg" // Texture #27 texture 0 "noctua/tiles/16tile09.jpg" texture 0 "noctua/tiles/16tile10.jpg" @@ -341,7 +344,7 @@ texture 0 "arcitool/Cotta2-grau.jpg" texture 0 "arcitool/Cotta2-satt.jpg" texture 0 "makke/tiles.jpg" // Texture #40 - // Floor textures +// Floor textures texture 0 "noctua/ground/cobbles01.jpg" // Texture #41 texture 0 "arcitool/pflaster2.jpg" texture 0 "arcitool/gittersteine2.jpg" @@ -353,7 +356,7 @@ texture 0 "makke/pebbles_01.jpg" texture 0 "arcitool/sisal21.jpg" texture 0 "makke/platten.jpg" // Texture #51 - // Asphault/concrete textures +// Asphalt/concrete textures texture 0 "noctua/ground/asph01.jpg" // Texture #52 texture 0 "noctua/ground/asph02.jpg" texture 0 "noctua/ground/asph03.jpg" @@ -377,7 +380,7 @@ texture 0 "noctua/wall/conc02.jpg" texture 0 "noctua/wall/conc05.jpg" texture 0 "noctua/wall/wall02.jpg" // Texture #73 - // Walls/ceiling/plaster textures +// Walls/ceiling/plaster textures texture 0 "arcitool/sichtbeton1.jpg" // Texuture #74 texture 0 "arcitool/sichtbeton2.jpg" texture 0 "noctua/ground/snowy02.jpg" @@ -387,9 +390,9 @@ texture 0 "noctua/wall/plast01.jpg" texture 0 "noctua/wall/plast03.jpg" texture 0 "noctua/wall/plast04.jpg" texture 0 "golgotha/5sqtunnelroad.jpg" -texture 0 "lemog/027metal.jpg" // Texture #83 +texture 0 "lemog/027metal.jpg" // Texture #83 - // Metal textures +// Metal textures texture 0 "boeck/metal_019.jpg" // Texture #84 texture 0 "boeck/metal_019_b.jpg" texture 0 "lemog/036metal.jpg" @@ -415,9 +418,9 @@ texture 0 "noctua/metal/metbgr04.jpg" texture 0 "noctua/metal/verdig01.jpg" texture 0 "noctua/metal/brass01.jpg" texture 0 "lemog/006metal.jpg" -texture 0 "grsites/metal020.jpg" // Texture #109 +texture 0 "grsites/metal020.jpg" // Texture #109 - // Wood textures +// Wood textures texture 0 "boeck/wood_009.jpg" // Texture #110 texture 0 "boeck/wood_010.jpg" texture 0 "boeck/wood_017.jpg" @@ -440,9 +443,9 @@ texture 0 "noctua/wood/wood02.jpg" texture 0 "noctua/wood/wood03.jpg" texture 0 "noctua/wood/wood04.jpg" texture 0 "lemog/063bois.jpg" -texture 0 "lemog/063bois_b.jpg" // Texture #132 +texture 0 "lemog/063bois_b.jpg" // Texture #132 - // Mud/sand/grass textures +// Mud/sand/grass textures texture 0 "craig_fortune/terrain/grass_lush1.jpg" // Texture #133 texture 0 "craig_fortune/terrain/Grass_mossy.jpg" texture 0 "craig_fortune/terrain/Grass_parched.jpg" @@ -466,7 +469,7 @@ texture 0 "noctua/ground/pebble01.jpg" texture 0 "noctua/ground/ground02.jpg" texture 0 "noctua/ground/ground06.jpg" // Texture #154 - // Rock/stone textures +// Rock/stone textures texture 0 "arcitool/schotter1.jpg" // Texture #155 texture 0 "arcitool/schotter2.jpg" texture 0 "craig_fortune/terrain/Rock_cracked.jpg" @@ -494,7 +497,7 @@ texture 0 "noctua/wall/conc03.jpg" texture 0 "noctua/wall/conc04.jpg" texture 0 "noctua/wall/d_wall01.jpg" // Texture #180 - // Carpet textures +// Carpet textures texture 0 "noctua/textile/carpet04.jpg" // Texture #181 texture 0 "noctua/textile/carpet01.jpg" texture 0 "noctua/textile/carpet02.jpg" @@ -502,7 +505,7 @@ texture 0 "noctua/textile/carpet03.jpg" texture 0 "noctua/textile/burlap01.jpg" texture 0 "noctua/textile/carpet05.jpg" // Texture #186 - // Trim textures +// Trim textures texture 0 "arcitool/Wellblech1-1.jpg" // Texture #187 texture 0 "arcitool/Glasbausteine.jpg" texture 0 "boeck/gully.jpg" @@ -546,9 +549,9 @@ texture 0 "zastrow/sub_doors512B05.jpg" texture 0 "zastrow/sub_doors512A10.jpg" texture 0 "zastrow/sub_doors512A16.jpg" texture 0 "zastrow/sub_doors256nf_01.jpg" -texture 0 "3dcafe/objects08.jpg" // Texture #230 +texture 0 "3dcafe/objects08.jpg" // Texture #230 - // Crate/box textures +// Crate/box textures texture 0 "craig_fortune/crates/light_weathered.jpg" // Texture #231 texture 0 "craig_fortune/crates/light.jpg" texture 0 "zastrow/3wood_crate_03.jpg" @@ -568,7 +571,7 @@ texture 0 "makke/box_4.jpg" texture 0 "makke/box_3.jpg" texture 0 "golgotha/smallsteelbox.jpg" // Texture #248 - // Additional textures +// Additional textures texture 0 "drunkenM/rock_wall1.jpg" // Texture #249 texture 0 "makke/rb_window.jpg" @@ -710,7 +713,6 @@ texture 0 "makke/rb_window.jpg" // texture 0 "toca/ice1.jpg" // texture 0 "toca/oldwall.jpg" // texture 0 "toca/droppedceiling.jpg" -// texture 0 "snoosnoo/mona_lisa.jpg" // texture 0 "snoosnoo/map.jpg" // texture 0 "snoosnoo/map2.jpg" // texture 0 "jamz/new_bricks_3.jpg" diff --git a/packages/maps/ac_lainio.cgz b/packages/maps/ac_lainio.cgz deleted file mode 100644 index f25f25cf..00000000 Binary files a/packages/maps/ac_lainio.cgz and /dev/null differ diff --git a/packages/maps/new.cgz b/packages/maps/new.cgz deleted file mode 100644 index 7d23c6ef..00000000 Binary files a/packages/maps/new.cgz and /dev/null differ diff --git a/packages/maps/new.cfg b/packages/maps/new_content.cfg similarity index 100% rename from packages/maps/new.cfg rename to packages/maps/new_content.cfg diff --git a/packages/maps/new_content.cgz b/packages/maps/new_content.cgz new file mode 100644 index 00000000..9965b515 Binary files /dev/null and b/packages/maps/new_content.cgz differ diff --git a/packages/maps/official/ac_lainio.cfg b/packages/maps/official/ac_lainio.cfg index 30e06854..602bf8b2 100644 --- a/packages/maps/official/ac_lainio.cfg +++ b/packages/maps/official/ac_lainio.cfg @@ -370,7 +370,7 @@ texture 0 "makke/stairtrim.jpg" texture 0 "makke/metalstair1.jpg" texture 0 "makke/metalstair2.jpg" texture 0 "zastrow/metal_siding_kinksb.jpg" -texture 0 "snoosnoo/mona_lisa.jpg" +texture 0 "kurt/klite1.jpg.jpg" texture 0 "golgotha/windows.jpg" texture 0 "zastrow/sub_window31.jpg" texture 0 "zastrow/sub_window33.jpg" diff --git a/packages/maps/official/ac_lainio.cgz b/packages/maps/official/ac_lainio.cgz index f25f25cf..f2d8b4f6 100644 Binary files a/packages/maps/official/ac_lainio.cgz and b/packages/maps/official/ac_lainio.cgz differ diff --git a/packages/textures/snoosnoo/license.txt b/packages/textures/snoosnoo/license.txt index 1dbcbeb1..c6e70ab7 100644 --- a/packages/textures/snoosnoo/license.txt +++ b/packages/textures/snoosnoo/license.txt @@ -35,4 +35,3 @@ This is only a human-readable summary of the Legal Code (the full licence), whic The full legal code can be found at: http://creativecommons.org/licenses/by/3.0/legalcode ================================================================================ -Note: mona_lisa.jpg uses an existing Noctua graphic from ../noctua/wall/plast03.jpg diff --git a/packages/textures/snoosnoo/mona_lisa.jpg b/packages/textures/snoosnoo/mona_lisa.jpg deleted file mode 100644 index b7cc6b4a..00000000 Binary files a/packages/textures/snoosnoo/mona_lisa.jpg and /dev/null differ diff --git a/source/package_assaultcube.sh b/source/package_assaultcube.sh index 43525568..e6d05508 100644 --- a/source/package_assaultcube.sh +++ b/source/package_assaultcube.sh @@ -78,8 +78,8 @@ fi # Check that map previews are all available: MAPSPATH="$PATHTOACDIR/packages/maps/official" -MAPSCGZ=`cd $MAPSPATH && find ./*.cgz ! -name ac_depot_classic.cgz | xargs -i basename {} .cgz | sort -u | xargs` -MAPSJPG=`cd $MAPSPATH/preview && find ./*.jpg ! -name ac_depot_classic.jpg | xargs -i basename {} .jpg | sort -u | xargs` +MAPSCGZ=`cd $MAPSPATH && find ./*.cgz ! -name ac_depot_classic.cgz -name new_content.cgz | xargs -i basename {} .cgz | sort -u | xargs` +MAPSJPG=`cd $MAPSPATH/preview && find ./*.jpg ! -name ac_depot_classic.jpg -name new_content.cgz | xargs -i basename {} .jpg | sort -u | xargs` if [ "$MAPSCGZ" = "$MAPSJPG" ]; then echo "All map \"previews\" are available!" echo -e "Proceeding to the next step...\n" @@ -90,7 +90,7 @@ else fi # Check that bot waypoints are all available: -MAPSCGZ2=`cd $MAPSPATH && find ./*.cgz | xargs -i basename {} .cgz | sort -u | xargs` +MAPSCGZ2=`cd $MAPSPATH && find ./*.cgz ! -name new_content.cgz | xargs -i basename {} .cgz | sort -u | xargs` MAPSBOTS=`cd $PATHTOACDIR/bot/waypoints && find ./*.wpt | xargs -i basename {} .wpt | sort -u | xargs` if [ "$MAPSBOTS" = "$MAPSCGZ2" ]; then echo "All bot waypoints are available!" @@ -191,6 +191,8 @@ tar cjvf $SAVETARBALLPATH/AssaultCube_v$NEWACVERSION.tar.bz2 \ --exclude=*.bat --exclude=*bin_win32* \ --exclude=*xcode* \ --exclude=*vcpp* \ + --exclude=*new.cfg \ + --exclude=*new_content.cgz \ --exclude-vcs \ AssaultCube_v$NEWACVERSION/