diff --git a/config/menus.cfg b/config/menus.cfg index c6e20862..d9c6157d 100755 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -32,7 +32,7 @@ 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. -alias defaultmaps "ac_aqueous ac_arabian ac_arctic ac_arid ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_douze ac_elevation ac_gothic ac_iceroad ac_keller ac_mines ac_outpost ac_power ac_rattrap ac_scaffold ac_shine ac_snow ac_sunset ac_toxic ac_urban ac_werk" +alias defaultmaps "ac_aqueous ac_arabian ac_arctic ac_arid ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_douze ac_elevation ac_gothic ac_iceroad ac_ingress ac_keller ac_mines ac_outpost ac_power ac_rattrap ac_scaffold ac_shine ac_snow ac_sunset ac_toxic ac_urban ac_werk" genmapitems $defaultmaps menuitem "" -1 // the following seems to be of the old-style thoughts of MP - flowtron: 2010may23 says: the different MPs should somehow list themselves thouh, yes. @@ -46,7 +46,7 @@ menudirlist "packages/maps" "cgz" "map $arg1" newmenu maps_flags // Add maps to the below list to include them in the CTF, KTF & TKTF map menu. Maps should contain flags here. -alias ctfmaps "ac_aqueous ac_arabian ac_arid ac_depot ac_desert3 ac_douze ac_elevation ac_gothic ac_iceroad ac_keller ac_mines ac_outpost ac_power ac_shine ac_sunset ac_urban ac_werk" +alias ctfmaps "ac_aqueous ac_arabian ac_arid ac_depot ac_desert3 ac_douze ac_elevation ac_gothic ac_iceroad ac_ingress ac_keller ac_mines ac_outpost ac_power ac_shine ac_sunset ac_urban ac_werk" genmapitems $ctfmaps menuitem "" -1 if (&& $mappack_version (listlen $mappack_flagmaps)) [menuitem (concatword "Map-pack (version " $mappack_version ") maps...") [showmenu "mappack flag maps"]]; diff --git a/config/securemaps.cfg b/config/securemaps.cfg index feb2b2db..5971b6ac 100644 --- a/config/securemaps.cfg +++ b/config/securemaps.cfg @@ -13,6 +13,7 @@ securemap ac_desert3 securemap ac_elevation securemap ac_gothic securemap ac_iceroad +securemap ac_ingress securemap ac_keller securemap ac_mines securemap ac_outpost diff --git a/packages/maps/official/ac_ingress.cfg b/packages/maps/official/ac_ingress.cfg index c029ca6d..f85ce03e 100644 --- a/packages/maps/official/ac_ingress.cfg +++ b/packages/maps/official/ac_ingress.cfg @@ -19,6 +19,7 @@ // Exceptions to this license may be made if written permission is given by ourselves. mapmodelreset +shadowyaw 305 mapmodel 2 2 0 0 "nothing" mapmodel 4 1 0 0 "comp_bridge" mapmodel 0 7 0 0 "ladder_7x" @@ -32,7 +33,7 @@ mapmodel 3 2 0 0 "bench" mapmodel 2 4 0 0 "dumpster" mapmodel 0 0 0 0 "roadblock01" mapmodel 0 0 0 0 "roadblock02" -mapmodel 1 8 0 0 "fence" +mapmodel 0 0 0 0 "fence" mapmodel 1 8 0 0 "fencepost" mapmodel 0 0 0 0 "fencegate_open" mapmodel 1 8 0 0 "fencegate_closed" @@ -152,6 +153,10 @@ mapmodel 4 1 15 0 "toca/guardtower" mapmodel 1 2 0 0 "toca/treetrunk1" mapmodel 0 0 0 0 "toca/stairs_aqueous/stairsacc/handrail" mapmodel 0 0 0 0 "toca/stairs_aqueous/stairsacc/beam" +mapmodel 0 0 0 0 "wires/3x8" +mapmodel 0 0 0 0 "wires/2x8" +mapmodel 0 0 0 0 "wires/4x8a" +mapmodel 0 0 0 0 "wires/4x8" fog 800 loadsky "textures/skymaps/socksky/grave" loadnotexture diff --git a/packages/maps/official/ac_ingress.cgz b/packages/maps/official/ac_ingress.cgz index 3c2ebab1..00b36cab 100644 Binary files a/packages/maps/official/ac_ingress.cgz and b/packages/maps/official/ac_ingress.cgz differ