diff --git a/config/defaults.cfg b/config/defaults.cfg index 3caf3d94..62e562fd 100644 --- a/config/defaults.cfg +++ b/config/defaults.cfg @@ -62,22 +62,22 @@ alias zoom [ alias votemap [ mode $arg1; map $arg2 ] -alias tdm [ votemap 0 $arg1 ] -alias ts [ votemap 4 $arg1 ] -alias ctf [ votemap 5 $arg1 ] -alias dm [ votemap 2 $arg1 ] -alias ffa [ votemap 2 $arg1 ] -alias lms [ votemap 3 $arg1 ] -alias pf [ votemap 6 $arg1 ] -alias lss [ votemap 9 $arg1 ] -alias insta [ votemap 10 $arg1 ] +alias tdm [ votemap 0 $arg1 ] - +alias coop [ votemap 1 $arg1 ] - +alias dm [ votemap 2 $arg1 ] - +alias lms [ votemap 3 $arg1 ] - +alias ts [ votemap 4 $arg1 ] - +alias ctf [ votemap 5 $arg1 ] - +alias pf [ votemap 6 $arg1 ] - +alias lss [ votemap 9 $arg1 ] - alias osok [ votemap 10 $arg1 ] alias tosok [ votemap 11 $arg1 ] + //--------------------- editing ------------------------------- -// below is a fun new way of editing, with all using the mousewheel -// try it out :) +// The below is for editing using your mouse wheel. See the page 1 of the +// map editing guide for details on what's used for what. alias modifier 0 alias domodifier [ alias modifier $arg1; onrelease [ alias modifier 0 ] ] @@ -94,18 +94,22 @@ alias delta_edit_1 [ if $flrceil [ vdelta $arg1 ] [ vdelta (- 0 $arg1) ] ] alias delta_edit_2 [ edittex $flrceil $arg1 ] alias delta_edit_3 [ edittex (+ $flrceil 1) $arg1 ] alias delta_edit_4 [ equalize $flrceil ] -alias delta_edit_5 [ entproperty 0 $arg1 ] // and the others +alias delta_edit_5 [ entproperty 0 $arg1 ] +// End of using your mouse to edit +// ------------------------------ + alias delta_game_0 [ if (= $arg1 1) [ shiftweapon 1 ] [ shiftweapon -1 ] ] alias delta_spect_0 [ followplayer $arg1 ] // alternative weapon switching, no more 1-2-3-4 /wheel cycling no finger ever leaving WASD -//uncomment lines (remove the //) below to activate +// uncomment lines (remove the //) below to activate //alias delta_game_0 [ if (= $arg1 1) [ primary ] [ secondary ] ] //bind lshift "grenades" //bind lalt "melee" -alias timeremain [ echo time remaining: ($minutesremaining) ] +alias timeremain [ echo 3Minutes remaining: 5 ($minutesremaining) ] +alias timeremaining [ echo 3Minutes remaining: 5 ($minutesremaining) ] alias toggleshowmap [ showmap 1; onrelease [ showmap 0 ] ] alias mapstartonce [ ] diff --git a/docs/mapediting4.xml b/docs/mapediting4.xml index 438b5ffb..fbaa70d6 100644 --- a/docs/mapediting4.xml +++ b/docs/mapediting4.xml @@ -93,7 +93,8 @@

To start co-operative map editing, when in a server, type: /mode 1 and then type: /map and then your mapnames name and press ENTER. - You will have to of made a "newmap" previous to entering the server to be able to co-op edit it. + You will have to of made a "newmap" previous to entering the server to be able to co-op edit it. Alternatively, you can type: /coop MAP + (replace MAP with your maps name).

You will then need to send the map. You can do this by typing: /sendmap and then your mapnames name and press ENTER. Note: Custom diff --git a/docs/reference.xml b/docs/reference.xml index a6bbdc36..648b6df4 100644 --- a/docs/reference.xml +++ b/docs/reference.xml @@ -759,7 +759,10 @@ - + Tells you how many minutes are remaining in the current game. + + + Tells you how many minutes are remaining in the current game. @@ -804,6 +807,153 @@ + + + Starts a map with the mode "Capture the Flag" + + + + + + + ctf ac_mines + + + + + + + Starts a map with the mode "Team Deathmatch" + + + + + + + tdm ac_complex + + + + + + + + Starts a map with the mode "Deathmatch" + + + + + + + dm ac_complex + + + + + + + Starts a map with the mode "Co-op edit" + + + See the co-op edit section in page 4 of the map editing guide for more information. + + + + + + + + + coop ac_newmap + + + + + + + Starts a map with the mode "Last man standing" + + + + + + + lms ac_complex + + + + + + + Starts a map with the mode "Team survivor" + + + + + + + ts ac_complex + + + + + + + Starts a map with the mode "Pistol frenzy" + + + + + + + pf ac_complex + + + + + + + Starts a map with the mode "Last swiss standing" + + + + + + + lss ac_complex + + + + + + + + Starts a map with the mode "One shot, One kill" + + + + + + + osok ac_complex + + + + + + + Starts a map with the mode "Team one shot, One kill" + + + + + + + tosok ac_complex + + + + @@ -997,7 +1147,7 @@ - Kill yourself. + Kills your player. You will lose 1 frag point and gain 1 death point when using this command.