diff --git a/bot/waypoints/ac_depot_classic.wpt b/bot/waypoints/ac_depot_classic.wpt deleted file mode 100644 index a9766625..00000000 Binary files a/bot/waypoints/ac_depot_classic.wpt and /dev/null differ diff --git a/config/menus.cfg b/config/menus.cfg index 581ad4ad..d13eaa3d 100755 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -33,7 +33,6 @@ genmapitems = [ newmenu maps // Add maps to the below list to include them in the normal map menu (also for botmaps). -// Don't add ac_depot_classic to the maps list. defaultmaps = [ac_aqueous ac_arabian ac_arctic ac_arid ac_avenue ac_cavern ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_douze ac_edifice ac_elevation ac_gothic ac_iceroad ac_industrial ac_ingress ac_keller ac_lainio ac_mines ac_outpost ac_power ac_rattrap ac_scaffold ac_shine ac_snow ac_stellar ac_sunset ac_swamp ac_terros ac_toxic ac_urban ac_venison ac_werk] genmapitems $defaultmaps menuitem [] -1 diff --git a/config/securemaps.cfg b/config/securemaps.cfg index 5ba1f4ee..477743eb 100644 --- a/config/securemaps.cfg +++ b/config/securemaps.cfg @@ -7,7 +7,6 @@ securemap ac_avenue securemap ac_cavern securemap ac_complex securemap ac_depot -securemap ac_depot_classic securemap ac_desert securemap ac_desert2 securemap ac_desert3 diff --git a/packages/maps/official/ac_depot_classic.cfg b/packages/maps/official/ac_depot_classic.cfg deleted file mode 100644 index 46406d41..00000000 --- a/packages/maps/official/ac_depot_classic.cfg +++ /dev/null @@ -1,307 +0,0 @@ -// "The Storage Depot" for AssaultCUBE -// By Mike "MitaMAN" Poeschl (mitaman1@optonline.net) -// June 11, 2005 -// © Copyright 2005 - -fog 350 -fogcolour 0 -shadowyaw 105 -mapmodelreset -mapmodel 0 0 0 0 "makke/nothing_clip" -mapmodel 2 16 0 0 "makke/nothing_clip" -mapmodel 0 0 0 0 "makke/nothing_clip" -mapmodel 3 1 0 0 "makke/platform_bridge" -mapmodel 0 10 0 0 "makke/ladder_10x" -mapmodel 1 3 0 0 "makke/barrel" -mapmodel 1 2 0 0 "makke/barrel_fallen" -mapmodel 0 0 0 0 "makke/electric_meter" -mapmodel 0 11 0 0 "makke/street_light" -mapmodel 3 1 0 0 "makke/pallet" -mapmodel 3 2 0 0 "makke/bench_seat" -mapmodel 0 0 0 0 "makke/signs/flammable" -mapmodel 0 0 0 0 "makke/signs/speed" -mapmodel 0 0 0 0 "makke/signs/caution_maintainence" -mapmodel 0 0 0 0 "makke/signs/caution_voltage" -mapmodel 0 0 0 0 "makke/signs/biohazard" -mapmodel 1 2 0 0 "makke/office_chair" -mapmodel 0 0 0 0 "jcdpc/laptop" -mapmodel 0 0 0 0 "makke/fluorescent_lamp" -mapmodel 0 0 0 0 "makke/picture" -mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 4 0 0 "makke/dumpster" -mapmodel 0 12 0 0 "makke/street_light" -mapmodel 0 0 0 0 "makke/wall_spotlight" -mapmodel 0 0 0 0 "makke/coke_can" -mapmodel 0 0 0 0 "makke/coke_can_fallen" -mapmodel 1 6 0 0 "makke/locker" -mapmodel 1 8 0 0 "makke/fence_chainlink_post" -mapmodel 1 8 0 0 "makke/fence_chainlink" -mapmodel 0 2 0 0 "makke/roadblock" -mapmodel 0 2 0 0 "makke/roadblock_graffiti" -mapmodel 0 0 0 0 "makke/cigarette" -mapmodel 4 5 0 0 "makke/nothing_clip" -mapmodel 0 0 0 0 "makke/broken_wood" -mapmodel 0 0 0 0 "makke/hook" -mapmodel 0 0 0 0 "makke/grass_short" -mapmodel 0 0 0 0 "makke/grass_long" -mapmodel 0 0 0 0 "makke/flyer_environmental" -mapmodel 0 0 0 0 "makke/plant_leafy" -mapmodel 2 1 0 0 "makke/grate_hor" -mapmodel 1 2 0 0 "makke/grate_vert" -mapmodel 0 0 0 0 "makke/wrench" -mapmodel 0 0 0 0 "makke/bolt_nut" -mapmodel 0 0 0 0 "makke/lightbulb" -mapmodel 0 7 0 0 "makke/ladder_7x" -mapmodel 0 8 0 0 "makke/ladder_8x" -mapmodel 1 8 0 0 "makke/fence_chainlink_closed_gate" -mapmodel 1 8 0 0 "makke/fence_chainlink_no_gate" -loadsky "textures/skymaps/steini/steini4" -texturereset -texture 0 "./kurt/klite1.jpg" -texture 0 "./makke/black.jpg" -texture 0 "./boeck/rolltor.jpg" -texture 0 "./craig_fortune/terrain/Mud_thick.jpg" -texture 0 "./golgotha/tunnel_ceiling.jpg" -texture 0 "./craig_fortune/terrain/Rock_rubble.jpg" -texture 0 "./golgotha/hhroofgray.jpg" -texture 0 "./golgotha/metal_bumps2.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./craig_fortune/terrain/mud.jpg" -texture 0 "./craig_fortune/terrain/rubble.jpg" -texture 0 "./craig_fortune/terrain/Rock_cracked.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./craig_fortune/crates/light_weathered.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./craig_fortune/crates/light.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./arcitool/Cotta1-graubraun.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./arcitool/Zaun.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./arcitool/gittersteine2.jpg" -texture 0 "./arcitool/pflaster2.jpg" -texture 0 "./arcitool/Cotta1-hell.jpg" -texture 0 "./boeck/gully.jpg" -texture 0 "./boeck/rolltor.jpg" -texture 0 "./makke/bricks_3.jpg" -texture 0 "./3dcafe/stone18.jpg" -texture 0 "./makke/wood_01.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./arcitool/Cotta1-grau.jpg" -texture 0 "./arcitool/Cotta2-dunkel.jpg" -texture 0 "./makke/box_4.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./grsites/brick051.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./3dcafe/door12.jpg" -texture 0 "./arcitool/Cotta1-graubraunhell.jpg" -texture 0 "./boeck/rolltor.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./arcitool/Rundholz.jpg" -texture 0 "./arcitool/Cotta2-beige.jpg" -texture 0 "./arcitool/Cotta2-grau.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./arcitool/Cotta2-satt.jpg" -texture 0 "./arcitool/schotter1.jpg" -texture 0 "./arcitool/schotter2.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./arcitool/Blockbohlen-natur.jpg" -texture 0 "./arcitool/Glasbausteine.jpg" -texture 0 "./grsites/brick065.jpg" -texture 0 "./arcitool/rohbaubims.jpg" -texture 0 "./makke/black.jpg" -texture 0 "./arcitool/sichtbeton1.jpg" -texture 0 "./arcitool/sichtbeton2.jpg" -texture 0 "./arcitool/Wellblech1-1.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/brickwall.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./noctua/wall/conc01.jpg" -texture 0 "./noctua/wall/conc02.jpg" -texture 0 "./noctua/wall/conc03.jpg" -texture 0 "./noctua/wall/conc04.jpg" -texture 0 "./noctua/wall/conc05.jpg" -texture 0 "./noctua/wall/wall01.jpg" -texture 0 "./noctua/wall/wall02.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./boeck/rolltor.jpg" -texture 0 "./noctua/wall/brick02.jpg" -texture 0 "./noctua/wall/plast01.jpg" -texture 0 "./noctua/wall/plast02.jpg" -texture 0 "./noctua/wall/plast03.jpg" -texture 0 "./noctua/wall/plast04.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./noctua/wall/d_wall01.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./zastrow/sub_doors512A10.jpg" -texture 0 "./zastrow/sub_doors512A16.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./golgotha/elecpanelstwo.jpg" -texture 0 "./noctua/wood/planks01.jpg" -texture 0 "./noctua/wood/planks02.jpg" -texture 0 "./noctua/wood/planks02_hor.jpg" -texture 0 "./noctua/wood/planks02_trim.jpg" -texture 0 "./noctua/wood/bark01.jpg" -texture 0 "./zastrow/sub_doors512B05.jpg" -texture 0 "./makke/bricky.jpg" -texture 0 "./mayang/bricks_2.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./boeck/stone_022.jpg" -texture 0 "./makke/mauer1.jpg" -texture 0 "./makke/mauer2.jpg" -texture 0 "./zastrow/sub_window31.jpg" -texture 0 "./zastrow/sub_window33.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./noctua/metal/verdig01.jpg" -texture 0 "./noctua/metal/zinc01.jpg" -texture 0 "./noctua/metal/zinc02.jpg" -texture 0 "./noctua/metal/zinc03.jpg" -texture 0 "./boeck/metal_019.jpg" -texture 0 "./noctua/metal/iron01.jpg" -texture 0 "./noctua/metal/iron02.jpg" -texture 0 "./noctua/metal/iron03.jpg" -texture 0 "./noctua/metal/iron04.jpg" -texture 0 "./noctua/metal/iron05.jpg" -texture 0 "./noctua/metal/metbgr01.jpg" -texture 0 "./noctua/metal/metbgr02.jpg" -texture 0 "./noctua/metal/metbgr03.jpg" -texture 0 "./noctua/metal/metbgr04.jpg" -texture 0 "./noctua/metal/brass01.jpg" -texture 0 "./noctua/metal/copper01.jpg" -texture 0 "./noctua/metal/copper02.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./grsites/wood060.jpg" -texture 0 "./3dcafe/door15.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./boeck/rolltor.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./3dcafe/objects09_a.jpg" -texture 0 "./boeck/rolltor.jpg" -texture 0 "./boeck/rolltor.jpg" -texture 0 "./boeck/rolltor.jpg" -texture 0 "./boeck/rolltor.jpg" -texture 0 "./noctua/tiles/16tile10.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./noctua/stone/marmor01.jpg" -texture 0 "./boeck/stone_013.jpg" -texture 0 "./noctua/stone/stone02.jpg" -texture 0 "./noctua/stone/stone03.jpg" -texture 0 "./noctua/stone/stone04.jpg" -texture 0 "./noctua/stone/stone05.jpg" -texture 0 "./noctua/stone/stone06.jpg" -texture 0 "./noctua/stone/stone07.jpg" -texture 0 "./noctua/stone/stone08.jpg" -texture 0 "./noctua/stone/stone09.jpg" -texture 0 "./3dcafe/objects08.jpg" -texture 0 "./3dcafe/door10.jpg" -texture 0 "./noctua/stone/stone12.jpg" -texture 0 "./noctua/stone/stone13.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./noctua/stone/stone15.jpg" -texture 0 "./noctua/stone/stone16.jpg" -texture 0 "./3dcafe/door07.jpg" -texture 0 "./noctua/stone/stone18.jpg" -texture 0 "./noctua/stone/stone19.jpg" -texture 0 "./makke/black.jpg" -texture 0 "./makke/black.jpg" -texture 0 "./golgotha/window.jpg" -texture 0 "./golgotha/windows.jpg" -texture 0 "./makke/black.jpg" -texture 0 "./makke/black.jpg" -texture 0 "./makke/metalstair1.jpg" -texture 0 "./makke/metalstair2.jpg" -texture 0 "./makke/stairtrim.jpg" -texture 0 "./makke/stein.jpg" -texture 0 "./golgotha/door.jpg" -texture 0 "./boeck/rolltor.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./boeck/rolltor.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/klappe.jpg" -texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe3.jpg" -texture 0 "./makke/neuklappe.jpg" -texture 0 "./golgotha/panel.jpg" -texture 0 "./boeck/rolltor.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./zastrow/metal_overlaps.jpg" -texture 0 "./zastrow/metal_plate_fill.jpg" -texture 0 "./zastrow/metal_siding_kinks.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./noctua/ground/asph01.jpg" -texture 0 "./noctua/ground/asph02.jpg" -texture 0 "./noctua/ground/asph03.jpg" -texture 0 "./noctua/ground/pebble01.jpg" -texture 0 "./makke/11-Brick.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./noctua/ground/ground02.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./boeck/rolltor.jpg" -texture 0 "./makke/stuck1.jpg" -texture 0 "./noctua/ground/ground06.jpg" -texture 0 "./boeck/stone_014.jpg" -texture 0 "./noctua/ground/mud01.jpg" -texture 0 "./noctua/ground/snowy01.jpg" -texture 0 "./noctua/ground/snowy02.jpg" -texture 0 "./noctua/ground/snowy03.jpg" -texture 0 "./noctua/ground/snowy04.jpg" -texture 0 "./noctua/ground/snowy05.jpg" -texture 0 "./noctua/ground/cobbles01.jpg" -texture 0 "./makke/dirt_01.jpg" -texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./DigitalFlux/gray_bricks_02.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./DigitalFlux/reddish_brown_dirt_01.jpg" -texture 0 "./DigitalFlux/reddish_brown_dirt_02.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./DigitalFlux/dirty_asphalt_02.jpg" -texture 0 "./DigitalFlux/dirty_asphalt_03.jpg" -texture 0 "./DigitalFlux/light_brown_dirt_01.jpg" -texture 0 "./DigitalFlux/light_brown_dirt_02.jpg" -texture 0 "./DigitalFlux/dirt_pebbles_01.jpg" -texture 0 "./makke/01-CMU.jpg" -texture 0 "./makke/lampe.jpg" -texture 0 "./makke/lampe_tile.jpg" -texture 0 "./makke/lampe_tile2.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/aircon.jpg" -texture 0 "./makke/aircon_sm.jpg" -texture 0 "./boeck/aircon2.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./makke/concrete.jpg" -texture 0 "./makke/concrete_trim.jpg" -texture 0 "./makke/concrete_trim_small.jpg" -texture 0 "./makke/rock.jpg" -texture 0 "./zastrow/2wood_crate_12.jpg" -texture 0 "./zastrow/3wood_crate_12.jpg" -texture 0 "./zastrow/wood_crate_12.jpg" -texture 0 "./zastrow/2wood_crate_10.jpg" -texture 0 "./zastrow/3wood_crate_10.jpg" -texture 0 "./zastrow/wood_crate_10.jpg" -texture 0 "./golgotha/smallsteelbox.jpg" diff --git a/packages/maps/official/ac_depot_classic.cgz b/packages/maps/official/ac_depot_classic.cgz deleted file mode 100644 index 6383edf5..00000000 Binary files a/packages/maps/official/ac_depot_classic.cgz and /dev/null differ diff --git a/source/package_assaultcube.sh b/source/package_assaultcube.sh index e6d05508..9e31bd4c 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 -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` +MAPSCGZ=`cd $MAPSPATH && find ./*.cgz ! -name new_content.cgz | xargs -i basename {} .cgz | sort -u | xargs` +MAPSJPG=`cd $MAPSPATH/preview && find ./*.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"