From affa6bbab96f3a1f10213de28a502ae47148b42c Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Mon, 15 Nov 2010 20:59:47 +0000 Subject: [PATCH] updated scopefov command as per makkE's request git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5881 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/docs.cfg | 130 ++++++++++++++++++++++---------------- config/menus_settings.cfg | 2 +- docs/reference.xml | 2 +- 3 files changed, 78 insertions(+), 56 deletions(-) diff --git a/config/docs.cfg b/config/docs.cfg index a081d1ef..24fcb4fe 100644 --- a/config/docs.cfg +++ b/config/docs.cfg @@ -1,5 +1,26 @@ // auto generated script to make the doc reference readable for Cube games, see the 'docs/cuberef.txt' docsection [CubeScript] +docident [<] [Determines if a value is smaller than a second value.]; +docargument [A] [the first value] [] [0]; +docargument [B] [the second value] [] [0]; +docident [<=] [Determines if a values is less than or equal than a second value.]; +docargument [A] [the first value] [] [0]; +docargument [B] [the second value] [] [0]; +docident [=] [Determines if two values are equal.]; +docargument [A] [first value] [] [0]; +docargument [B] [second value] [] [0]; +docexample [echo there are only (concatword (= 1 1) (= 1 0)) types of people in the world] [Output: there are only 10 types of people in the world]; +docident [>] [Determines if a value is bigger than a second value.]; +docargument [A] [the first value] [] [0]; +docargument [B] [the second value] [] [0]; +docident [>=] [Determines if a values is greater than or equal than a second value.]; +docargument [A] [the first value] [] [0]; +docargument [B] [the second value] [] [0]; +docident [||] [logical OR.]; +docargument [A] [first value] [] [0]; +docargument [B] [second value] [] [0]; +docexample [echo (|| 1 0)] [output: 1]; +docexample [echo (|| 0 0)] [output: 0]; docident [-] [Performs a subtraction.]; docargument [A] [the minuend] [] [0]; docargument [B] [the subtrahend] [] [0]; @@ -8,63 +29,18 @@ docargument [A] [argument] [] [0]; docident [!=] [Determines if two values are not equal.]; docargument [A] [first value] [] [0]; docargument [B] [second value] [] [0]; -docident [!=f] [Determines if a floating-point value is not equal to a second floating-point value.]; -docargument [A] [the first value] [] [0]; -docargument [B] [the second value] [] [0]; +docident [*] [Performs a multiplication.]; +docargument [A] [the multiplicand] [] [0]; +docargument [B] [the multiplier] [] [0]; docident [&&] [logical AND.]; docargument [A] [first value] [] [0]; docargument [B] [second value] [] [0]; docexample [echo (&& 1 1)] [Output: 1]; docexample [echo (&& 1 0)] [Output: 0]; -docident [*] [Performs a multiplication.]; -docargument [A] [the multiplicand] [] [0]; -docargument [B] [the multiplier] [] [0]; -docident [*f] [Performs a floating point multiplication.]; -docargument [A] [the multiplicand] [] [0]; -docargument [B] [the multiplier] [] [0]; -docident [||] [logical OR.]; -docargument [A] [first value] [] [0]; -docargument [B] [second value] [] [0]; -docexample [echo (|| 1 0)] [output: 1]; -docexample [echo (|| 0 0)] [output: 0]; docident [+] [Performs an addition.]; docargument [A] [the first summand] [] [0]; docargument [B] [the second summand] [] [0]; docremark [Example: echo the sum of x and y is (+ $x $y)]; -docident [+f] [Adds up two floating-point numbers.]; -docargument [A] [the first summand] [float] [0]; -docargument [B] [the second summand] [float] [0]; -docident [<] [Determines if a value is smaller than a second value.]; -docargument [A] [the first value] [] [0]; -docargument [B] [the second value] [] [0]; -docident [<=] [Determines if a values is less than or equal than a second value.]; -docargument [A] [the first value] [] [0]; -docargument [B] [the second value] [] [0]; -docident [<=f] [Determines if a floating-point value is less than or equal to a second floating-point value.]; -docargument [A] [the first value] [] [0]; -docargument [B] [the second value] [] [0]; -docident [] [Determines if a value is bigger than a second value.]; -docargument [A] [the first value] [] [0]; -docargument [B] [the second value] [] [0]; -docident [>=] [Determines if a values is greater than or equal than a second value.]; -docargument [A] [the first value] [] [0]; -docargument [B] [the second value] [] [0]; -docident [>=f] [Determines if a floating-point value is greater than or equal to a second floating-point value.]; -docargument [A] [the first value] [] [0]; -docargument [B] [the second value] [] [0]; -docident [>f] [Determines if a floating-point value is greater than a second floating-point value.]; -docargument [A] [the first value] [] [0]; -docargument [B] [the second value] [] [0]; docident [at] [Grabs a word out of a string.]; docargument [S] [the string] [] [0]; docargument [N] [the index of the word] [] [0]; @@ -84,9 +60,33 @@ docargument [B] [the divisor] [] [0]; docident [divf] [Performs a division with floating-point precision.]; docargument [A] [] [the dividend] [0]; docargument [B] [] [the divisor] [0]; +docident [f] [Determines if a floating-point value is greater than a second floating-point value.]; +docargument [A] [the first value] [] [0]; +docargument [B] [the second value] [] [0]; +docident [>=f] [Determines if a floating-point value is greater than or equal to a second floating-point value.]; +docargument [A] [the first value] [] [0]; +docargument [B] [the second value] [] [0]; docident [-f] [Subtracts two floating-point numbers.]; docargument [A] [the minuend] [float] [0]; docargument [B] [the subtrahend] [float] [0]; +docident [!=f] [Determines if a floating-point value is not equal to a second floating-point value.]; +docargument [A] [the first value] [] [0]; +docargument [B] [the second value] [] [0]; +docident [*f] [Performs a floating point multiplication.]; +docargument [A] [the multiplicand] [] [0]; +docargument [B] [the multiplier] [] [0]; +docident [+f] [Adds up two floating-point numbers.]; +docargument [A] [the first summand] [float] [0]; +docargument [B] [the second summand] [float] [0]; docident [findlist] [Searches a list for a specified value.]; docargument [L] [the list] [] [0]; docargument [I] [the item to find] [] [0]; @@ -285,6 +285,8 @@ docident [version] [Gets an integer representing the game version. READ ONLY]; docremark [As example, version 1.0 is represented as value 1000.]; docident [writecfg] [writes current configuration to config/saved.cfg - automatic on quit]; docsection [Gameplay] +docident [add2alias] [This will append the passed 2nd argument to any existing content of the alias named in the 1st argument. Several popular aliases have predefined shortcuts using this scriptalias: addOnQuit, addOnLoadOnce, addOnLoadAlways. Check config/scripts.cfg for possible omissions in that list.]; +docexample [foo = "one" add2alias foo two echo foo] [Output: one two]; docident [addbot] [add a bot for a given team with a given skill calling him a given name.]; docargument [T] [team] [RVSF or CLA] [0]; docargument [S] [skill] [best, good, medium, worse OR bad] [0]; @@ -382,6 +384,9 @@ docargument [B] [enable footsteps] [1 (true), 0 (false) min 0/max 1/default 1]; docident [gamespeed] [Sets the gamespeed in percent.]; docargument [N] [the game speed] [min 10/max 1000/default 100]; docremark [This does not work in multiplayer. For entertainment purposes only :)]; +docident [gametimecurrent] [Returns the time (in milliseconds) of the currently played game. READ ONLY]; +docexample [showtime = [ if (> $lastgametimeupdate 0) [ gmr = (- $gametimemaximum (+ $gametimecurrent (- (millis) $lastgametimeupdate))) gsr = (div $gmr 1000) gts = (mod $gsr 60) if (< $gts 10) [ gts = (concatword 0 $gts) ] [ ] gtm = (div $gsr 60) if (< $gtm 10) [ gtm = (concatword 0 $gtm) ] [ ] echo (concatword $gtm : $gts) remaining ] [ echo gametime not updated yet ] ]] []; +docident [gametimemaximum] [Returns the maximum time (in milliseconds) of the currently played game. READ ONLY]; docident [getclientmode] [Returns the current game mode number.]; docident [getdemo] []; docargument [X] [number in list] [] [0]; @@ -406,6 +411,7 @@ docident [kickbot] [Kicks the bot with the given name out of the current game.]; docargument [N] [botname] [name of the bot to kick.] [0]; docexample [kickbot Robbie] [Will make the bot named "Robbie" dissapear from the current game.]; docident [lanconnect] []; +docident [lastgametimeupdate] [Returns the last time (in milliseconds) the gametime was updated. READ ONLY]; docident [listcomplete] []; docident [listdemos] [Get the game demos listing from the server we are currently connected.]; docident [listignored] [Print a list of all players that you are currently ignoring.]; @@ -429,6 +435,12 @@ docremark [A map given as "blah" refers to "packages/maps/blah.cgz", "mypackage/ docremark [When the map finishes it will load the next map when one is defined, otherwise it reloads the current map. You can define what map follows a particular map by making an alias like (in the map script): alias nextmap_blah1 blah2 (loads "blah2" after "blah1").]; docident [mapname] [returns the mapname]; docident [mapsize] [outputs the mapsize.]; +docident [mapstartalways] [If this alias exists it will be run every time the game starts a new map.]; +docexample [mapstartalways = [ echo "------------------------------" ]] [This will output the string and override any other actions that might've been defined.]; +docexample [addOnLoadAlways [ echo "------------------------------" ]] [This will output the string after any previously defined actions have run.]; +docident [mapstartonce] [If this alias exists it will be run when the game starts a new map, then it is deleted.]; +docexample [mapstartonce = [ echo "------------------------------" ]] [This will output the string and override any other actions that might've been defined.]; +docexample [addOnLoadOnce [ echo "------------------------------" ]] [This will output the string after any previously defined actions have run.]; docident [mdldyncache] []; docargument [V] [] [min 1/max 32/default 2]; docident [mdlstatcache] []; @@ -461,6 +473,12 @@ docexample [nickgreet = [ say (concat "Hello," (concatword $arg1 "!")) ]; nickco docident [paused] [Determines if the game should be paused.]; docargument [B] [pause game] [min 0/max 1/default 0]; docident [prevweapon] [Returns the weapon-index the local player was previously holding.]; +docident [pstat_score] [Returns the score statistics for the player with the given clientnumber.]; +docargument [C] [client] [0..N] [0]; +docexample [echo (pstat_score 0)] [Output: 0 5 3 43 1 unarmed]; +docident [pstat_weap] [Returns the shot statistics for the player with the given clientnumber.]; +docargument [C] [client] [0..N] [0]; +docexample [echo (pstat_weap 0)] [Output: 0 0 0 0 0 0 0 0 0 0 1 240 15 312 0 0 3 112 0 0]; docident [reload] [Reloads the weapon.]; docargument [A] [] [value] [0]; docident [say] [Outputs text to other players.]; @@ -499,6 +517,8 @@ docident [spectatemode] [Toggle into spectator mode - only possible when you're dockey [SPACE] [] [switch spectator mode]; dockey [MOUSE4] [] [next player]; dockey [MOUSE5] [] [previous player]; +docident [start_intermission] [If this alias exists it will be run when the game reaches intermission.]; +docexample [start_intermission = [ echo "INTERMISSION - STATISTICS TIME" loop p 255 [ pn = (findpn $p) if (strcmp $pn "") [ ] [ echo (concatword Player $p ":") (pstat_score $p) ":" (pstat_weap $p) ] ] echo "------------------------------" ]] [This will output the full statistics line for all players.]; docident [stopdemo] [Stops any demo recording or playback.]; docident [suicide] [Kills your player. You will lose 1 frag point and gain 1 death point when using this command.]; docident [team] [Sets the team for the local player.]; @@ -530,6 +550,8 @@ docident [addpath2way2] []; docident [addwp] []; docident [advancemaprevision] [Select the increment of the map revision number for the next 'savemap'.]; docargument [N] [increment] [min 1/max 100/default 1]; +docident [ambientsoundvol] [Deletes the entity closest to the player]; +docremark [hotkey x]; docident [applymapsoundchanges] [during map editing, drop all mapsounds so they can be re-added]; docident [arch] [Makes an arch out of the current selection.]; docargument [S] [side delta (optional)] [] [0]; @@ -832,6 +854,9 @@ docargument [V] [abovehead icon display time] [min 1/max 10000/default 2000]; docident [altconsize] [Sets the number of text lines on an alternate F11 history display.]; docargument [V] [] [min 0/max 100/default 0]; docident [clearminimap] [Recreates the minimap for the current map.]; +docident [clockdisplay] [Sets the display mode for the HUD clock.]; +docargument [D] [display mode] [min 0/max 2/default 0]; +docremark [The clock shows game-time, it is either off (0) or counts backward (1) or forward (2).]; docident [confade] [Sets how many seconds before the console text rolls up.]; docargument [V] [time before text rollout] [min 0/max 60/default 20]; docremark [It may also be viewed as the speed at wich the console text dissapears.]; @@ -1038,13 +1063,13 @@ docident [scorch] []; docargument [V] [] [min 0/max 1/default 1]; docident [scorchttl] []; docargument [V] [] [min 0/max 30000/default 10000]; +docident [screenres] [Changes the screen resolution, available only for LINUX]; +docargument [W] [width] [] [0]; +docargument [H] [height] [] [0]; docident [scr_h] [Sets the screen height.]; docargument [] [the screen height] [min 0/max 768/default 10000]; docident [scr_w] [Sets the screen width.]; docargument [] [the screen width] [min 0/max 1024/default 10000]; -docident [screenres] [Changes the screen resolution, available only for LINUX]; -docargument [W] [width] [] [0]; -docargument [H] [height] [] [0]; docident [setfont] [Changes the current font.]; docargument [N] [Font name] [name of the font] [0]; docident [shadowcasters] []; @@ -1464,8 +1489,6 @@ docargument [N] [TODO] [min 0/max 4/default 2]; docident [maploaditemlength] [change at what position to truncate the map title string]; docargument [N] [CHAR] [min 0/max 255/default 46]; docident [mapshot] [save an image of the entire radar-overview of the map.]; -docident [mapstats_hud] [use the showmapstats command every new map]; -docargument [N] [CHAR] [min 0/max 1/default 0]; docident [maxrollremote] [TODO]; docargument [N] [TODO] [min 0/max 1/default 1]; docident [mdldlist] [TODO]; @@ -1513,7 +1536,6 @@ docident [showmapbackdrop] [change wether to have a see-through map overview (0) docargument [B] [backdrop-style] [min 0/max 2/default 0]; docident [showmapbackdroptransparency] []; docargument [T] [transparency] [min 0/max 100/default 75]; -docident [showmapstats] [show the map quality stats]; docident [soundmuted] [TODO: Description]; docargument [A] [TODO] [] [0]; docident [testvel] [TODO]; diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index 7b47ef8f..9dbef5c1 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -311,7 +311,7 @@ menuitem " 2 [ Apply now! ]" resetgl newmenu "Advanced video settings" -menuitemslider "Scope FOV: " 5 50 "$scopefov" 5 "" "scopefov $arg1" +menuitemslider "Scope FOV: " 5 60 "$scopefov" 5 "" "scopefov $arg1" alias fsaa_valuemap "-1 2 4 8 16" menuitemslider "Antialiasing (FSAA): " 0 4 "(findlist $fsaa_valuemap $fsaa)" 1 "Off 2 4 8 16" "fsaa (at $fsaa_valuemap $arg1)" diff --git a/docs/reference.xml b/docs/reference.xml index 1151fcf7..64f042f2 100644 --- a/docs/reference.xml +++ b/docs/reference.xml @@ -2064,7 +2064,7 @@ Output: - +