diff --git a/config/maprot.cfg b/config/maprot.cfg index f9ae0a7d..86c6607a 100644 --- a/config/maprot.cfg +++ b/config/maprot.cfg @@ -32,6 +32,10 @@ ac_scaffold : 2: 8: 1: 0: 3: 1 // dm, 8 minutes, 0..3 players ac_scaffold : 0:10: 1: 4:11: 0 // tdm, 10 minutes, 4..11 players +ac_industrial :15: 6: 1: 2: 3: 2 // ktf, 6 minutes, 2..3 players +ac_industrial : 5:12: 1: 4:11: 1 // ctf, 12 minutes, 4..11 players +ac_industrial :13:10: 1:12:13: 0 // htf, 10 minutes, 12..13 players + ac_power : 5:12: 1: 4:12: 1 // ctf, 12 minutes, 4..12 players ac_power :13:12: 1:13: 0: 0 // htf, 12 minutes, 13.. players @@ -94,6 +98,10 @@ ac_aqueous :13:10: 1:12:13: 0 // htf, 10 minutes, 12..13 players ac_arid : 2: 8: 1: 2: 5: 1 // dm, 8 minutes, 2..5 players ac_arid : 0:10: 1: 6: 0: 0 // tdm, 10 minutes, 6.. players +ac_edifice :15: 6: 1: 2: 3: 2 // ktf, 6 minutes, 2..3 players +ac_edifice : 5:12: 1: 4:11: 1 // ctf, 12 minutes, 4..11 players +ac_edifice :13:10: 1:12:13: 0 // htf, 10 minutes, 12..13 players + ac_iceroad : 5:10: 1: 5: 0: 0 // ctf, 10 minutes, 5.. players ac_douze :10: 6: 1: 5: 5: 3 // osok, 6 minutes, 5 players diff --git a/config/menus.cfg b/config/menus.cfg index a5022047..8b95ea5f 100755 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -32,10 +32,10 @@ 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_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" +alias defaultmaps "ac_aqueous ac_arabian ac_arctic ac_arid 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_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. +// the following seems to be of the old-style thoughts of MP - flowtron: 2010may23 says: the different MPs should somehow list themselves though, yes. // possibly a not defined internal script-file or we just generate from the know listing, which is well defined, the CGZ files and show them by code. if (&& $mappack_version (listlen $mappack_maps)) [menuitem (concatword "Map-pack (version " $mappack_version ") maps...") [showmenu "mappack maps"]]; menuitem "Show all maps..." [ showmenu "all maps" ] @@ -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_ingress 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_edifice ac_elevation ac_gothic ac_iceroad ac_industrial 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 5971b6ac..971894d6 100644 --- a/config/securemaps.cfg +++ b/config/securemaps.cfg @@ -10,9 +10,11 @@ securemap ac_depot_classic securemap ac_desert securemap ac_desert2 securemap ac_desert3 +securemap ac_edifice securemap ac_elevation securemap ac_gothic securemap ac_iceroad +securemap ac_industrial securemap ac_ingress securemap ac_keller securemap ac_mines diff --git a/packages/maps/official/official_readme.txt b/packages/maps/official/official_readme.txt index 2b318156..196b392a 100644 --- a/packages/maps/official/official_readme.txt +++ b/packages/maps/official/official_readme.txt @@ -1,16 +1,25 @@ -To ensure you have no errors with AssaultCube. -Do not edit, rename or delete maps in this directory. -Do not add files to this directory. +TO ENSURE YOU HAVE NO ERRORS WITH ASSAULTCUBE: + * Don't edit, rename or delete ANY files in this directory. + * Don't add files to this directory. -Note for folder: -================ -Handy linux command for keeping *.cfg sizes small: - gawk '{sub(/\r$/,"")};1' INPUT_FILE | gawk -F'//' '{print $1}' | gawk '{sub(/[ \t]+$/, "")};1' | gawk NF > OUTPUT_FILE +Developers notes for this folder: +================================= +When adding an "official" map, follow this to-do list after fixing the map up. -* Converts all new-lines to UNIX format (instead of DOS format). -* Removes all comments in the file. -* Removes all trailing spaces/tabs. -* Removes all blank lines. + 1) Remove un-needed data from *.cfg files by running this command: + gawk '{sub(/\r$/,"")};1' INPUT_FILE.cfg | gawk -F'//' '{print $1}' | gawk '{sub(/[ \t]+$/, "")};1' | gawk NF > OUTPUT_FILE.cfg + - This will convert all new-lines to UNIX format (instead of DOS format). + - This will remove all comments, trailing spaces/tabs & blank lines in that file. + 2) Add licensing and author information as comments in *.cfg file. + 3) "Normalise" the maps map-message. + 4) Add map to the map menu, and the CTF map menu if applicable. + 5) Add to "securemaps.cfg". + 6) Add authors (plus texture/skymap/model/etc authors) to the readme. + Remember to do this in the menus.cfg "credits" too. + 7) Add new textures/models/skymaps/etc to default_map_settings.cfg as comments. + If you added a skymap, add it to the "test skymaps" menu also. + 8) Add new mapmodels to the editing menu. + 9) Update the maprot. + 10) Create bot waypoints. -Remember to replace the words INPUT_FILE and OUTPUT_FILE in this script with the file. \ No newline at end of file diff --git a/source/adding-maps.txt b/source/adding-maps.txt deleted file mode 100644 index 2270787e..00000000 --- a/source/adding-maps.txt +++ /dev/null @@ -1,20 +0,0 @@ -This is here as a reminder for myself (RandumKiwi) of everything that must be -done in a map when making it official, as I will often overlook one of them. - - -Some things to remember to do when adding maps to the official maps: -==================================================================== - -1) Fix-up mistakes in the map. -2) Remove all un-needed comments/spaces/breaks from cfg files. -3) Ensure mapmsg only contains "Map name by Map author" with no colourings. -4) Add to the map menu, and the CTF map menu if applicable. -5) Add to "securemaps.cfg". -6) Add authors (plus texture/skymap/model/etc authors) to the readme. - Remember to do this in the menus.cfg "credits" too. -7) Add new textures/models/skymaps/etc to default_map_settings.cfg as comments. - If you added a skymap, add it to the "test skymaps" menu also. -8) Add new mapmodels to the editing menu. -9) Update the maprot. -10) Create bot waypoints. -