config updates

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6187 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2011-04-01 02:24:37 +00:00
parent 3d45e1915c
commit 798c79a3c6
13 changed files with 77 additions and 92 deletions
@@ -1,25 +1,24 @@
-alias kick [ callvote 0 $arg1 $arg2 ]
-alias ban [ callvote 1 $arg1  $arg2 ]
-alias removebans [ callvote 2 $arg1 ]
-alias mastermode [ callvote 3 $arg1 ]
-alias autoteam [ callvote 4 $arg1 ]
-alias forceteam [ callvote 5 $arg1 ]
-alias giveadmin [ callvote 6 $arg1 ]
-alias map [ callvote 7 $arg1 $arg2 ]
-alias recorddemo [ callvote 8 1 ]
-alias stopdemo [ callvote 9 ]
-alias cleardemo [ callvote 10 $arg1 ]
-alias cleardemos [ callvote 10 0 ]
-alias serverdesc [ callvote 11 $arg1 ]
-alias shuffleteams [ callvote 12 ]
-
-alias demo [
-    alias _demofile $arg1
-    if $connected [
-        addOnLoadOnce [mode -1; map $_demofile]
-        disconnect
-    ][
-        mode -1; map $_demofile
-    ]
-]
+kick         = [ callvote 0 $arg1 $arg2 ]
+ban          = [ callvote 1 $arg1  $arg2 ]
+removebans   = [ callvote 2 $arg1 ]
+mastermode   = [ callvote 3 $arg1 ]
+autoteam     = [ callvote 4 $arg1 ]
+forceteam    = [ callvote 5 $arg1 ]
+giveadmin    = [ callvote 6 $arg1 ]
+map          = [ callvote 7 $arg1 $arg2 ]
+recorddemo   = [ callvote 8 1 ]
+stopdemo     = [ callvote 9 ]
+cleardemo    = [ callvote 10 $arg1 ]
+cleardemos   = [ callvote 10 0 ]
+serverdesc   = [ callvote 11 $arg1 ]
+shuffleteams = [ callvote 12 ]

+demo = [
+  _demofile = $arg1
+  if $connected [
+    addOnLoadOnce [ mode -1; map $_demofile ]
+    disconnect
+  ] [
+    mode -1; map $_demofile
+  ]
+]
@@ -2,5 +2,3 @@

 // This is where you should put any scripts you may have created for AC.

-
-
@@ -1,32 +1,31 @@
 // These default settings get executed whenever "saved.cfg" is not available.
 // Do not modify anything below, instead change settings in game, or add to autoexec.cfg

-name "unarmed"				// Change your name!
-loadcrosshair default.png		// Choose another crosshair, see ./packages/crosshairs/
-loadcrosshair teammate.png teammate	// Teammate crosshair.
-loadcrosshair red_dot.png scope		// Scope crosshair.
-skin 0					// Change your look.
-autoreload 1				// Reload the guns automatically by default.
-setfont default                         // Choose your font
+name "unarmed"                      // Change your name!
+loadcrosshair default.png           // Choose another crosshair, see ./packages/crosshairs/
+loadcrosshair teammate.png teammate // Teammate crosshair.
+loadcrosshair red_dot.png scope     // Scope crosshair.
+skin 0                              // Change your look.
+autoreload 1                        // Reload the guns automatically by default.
+setfont default                     // Choose your font

-// alias scopesens [ *f $sensitivity $scopesensscale ] // scopesens is now hardcoded // Bukz
+// scopesens = [ *f $sensitivity $scopesensscale ] // scopesens is now hardcoded // Bukz

-//bind MOUSE2 [ zoom 1; onrelease [ zoom 0 ] ]
+// bind MOUSE2 [ zoom 1; onrelease [ zoom 0 ] ]

 // alternative zoom toggle
-//alias ztoggle 0
-//bind MOUSE2 [ alias ztoggle (= ztoggle 0); zoom $ztoggle ]
+// ztoggle = 0
+// bind MOUSE2 [ alias ztoggle (= ztoggle 0); zoom $ztoggle ]

 // alternative weapon switching (more economic), no more 1-2-3-4 /wheel cycling no finger ever leaving WASD
 // uncomment lines (remove the //) below to activate

-//alias delta_game_0 [ if (= $arg1 1) [ primary ] [ secondary ] ]
-//bind lshift "grenades"
-//bind lalt "melee"
-
-alias askquit 1
-alias gfxqualityalias 3		// Default GFX is medium.
-alias soundqualityalias 3	// Default sound is best.
-alias poniesmodeon 0		// Reduced violence mode.
-alias __gibsgore 1		// Default value for gibs slider.
+// delta_game_0 = [ if (= $arg1 1) [ primary ] [ secondary ] ]
+// bind lshift [ grenades ]
+// bind lalt [ melee ]

+askquit = 1
+gfxqualityalias = 3   // Default GFX is medium.
+soundqualityalias = 3 // Default sound is best.
+poniesmodeon = 0      // Reduced violence mode.
+__gibsgore = 1        // Default value for gibs slider.
@@ -42,8 +42,8 @@
 // pongflags is bit-coded: bit 0: passworded, bit 1: banned, bit 2: blacklisted, bit 6: mastermode

 // these two example scripts check, if the server plays a map from either the official list or the mappack list
-alias mpmap [(+ 1 (findlist $mappack_maps $arg1))]
-alias offmap [(+ 1 (findlist $defaultmaps $arg1))]
+mpmap = [ (+ 1 (findlist $mappack_maps $arg1)) ]
+offmap = [ (+ 1 (findlist $defaultmaps $arg1)) ]


 // basic categories
@@ -93,6 +93,4 @@ addfavcategory MODE
 sbfavourite_MODE_desc = "Favourite game modes"
 sbfavourite_MODE_alpha = 0
 sbfavourite_MODE_weight = 1
-sbfavourite_MODE_keys = "#42"           // automatically add servers playing towel mode
-
-
+sbfavourite_MODE_keys = "#42"           // automatically add servers playing towel mode
@@ -1,18 +1,16 @@
 // executed at first run, don't change

-alias delayed_firstrun [
-    music "pingpong/Ping_Pong_-_Kamikadze.ogg" 89000 " " // 90 secs, fade
-    
-    new_gfx_quality 3
-    echo "Welcome to AssaultCube"
-    echo "Developed by 'Rabid Viper Productions'"
-    echo ""
-    echo "Use the below menu to change some necessary settings..."
-    echo ""
-    echo "Further help & information can be found in your README, which is inside your AssaultCube directory."
-	showmenu "QUICK setup"
+delayed_firstrun = [
+  music "pingpong/Ping_Pong_-_Kamikadze.ogg" 89000 " " // 90 secs, fade
+
+  new_gfx_quality 3
+  echo "Welcome to AssaultCube"
+  echo "Developed by 'Rabid Viper Productions'"
+  echo ""
+  echo "Use the below menu to change some necessary settings..."
+  echo ""
+  echo "Further help & information can be found in your README, which is inside your AssaultCube directory."
+  showmenu "QUICK setup"
 ]

-sleep 1000 delayed_firstrun
-
-
+sleep 1000 [ delayed_firstrun ]
@@ -226,5 +226,4 @@ fontchar 96  64  32  64     //3 [x][x]
 fontchar 128 64  64  64     //4 [black]
 fontchar 192 64  64  64     //5 [green]
 fontchar 256 64  64  64     //6 [yellow]
-fontchar 320 64  64  64     //7 [red]
-
+fontchar 320 64  64  64     //7 [red]
@@ -21,9 +21,7 @@ necrop          // Ban names that mention some form of necrophilia.
 pedop
 penis
 pussy
-filho puta      // "whore" or "slut" in portugese. 
+filho puta      // "whore" or "slut" in portugese.
 redtube
 porntube
-youporn
-
-
+youporn
@@ -25,7 +25,7 @@ keymap 40 LEFTPAREN
 keymap 41 RIGHTPAREN
 keymap 42 ASTERISK
 keymap 43 PLUS
-keymap 44 COMMA 
+keymap 44 COMMA
 keymap 45 MINUS
 keymap 46 PERIOD
 keymap 47 SLASH
@@ -147,5 +147,4 @@ keymap 246 OE
 keymap 228 AE
 // :: added for de support

-exec config/resetbinds.cfg
-
+exec config/resetbinds.cfg
@@ -1,6 +1,6 @@
 // localization tools

 // retrieves the localized version of a string based on the current locale
-alias _ [
+_ = [
 	result (gettext $arg1)
 ]
@@ -2,7 +2,7 @@
 // arch of 2xN cubes, i.e. 3 vertices [0..2]
 // archvertex <cubespan> <vertex> <delta>
 // vertices not defined have a 0 delta
-alias av [
+av = [
  loop i $arg1 [
    archvertex (+ $arg1 1) (+ $i 1) (at $arg2 $i)
  ]
@@ -19,8 +19,8 @@ av  9 "7 11 13 14 14 14 13 11 7"
 av 10 "7 11 13 14 14 14 14 13 11 7"
 av 11 "8 13 16 18 19 19 19 18 16 13 8"
 av 12 "8 13 16 18 19 19 19 19 18 16 13 8"
-av 13 "8 13 16 18 19 19 19 19 19 18 16 13 8"    // these last few can be improved
+av 13 "8 13 16 18 19 19 19 19 19 18 16 13 8" // these last few can be improved
 av 14 "8 13 16 18 19 19 19 19 19 19 18 16 13 8"
 av 15 "8 13 16 18 19 19 19 19 19 19 19 18 16 13 8"

-// add wider arches here! :)
+// add wider arches here! :)
@@ -2,21 +2,19 @@
 // do NOT modify

 // supported contexts
-alias context_core 0    // hardcoded scripts
-alias context_cfg 1     // known scripts
-alias context_prompt 2  // command prompt
-alias context_mapcfg 3  // map configs, we don't trust them
+context_core   = 0 // hardcoded scripts
+context_cfg    = 1 // known scripts
+context_prompt = 2 // command prompt
+context_mapcfg = 3 // map configs, we don't trust them

 // set allowed commands for the map config context
-alias mapcfgidents [ loadnotexture loadsky mapmodelreset mapmodel texturereset texture fog fogcolour mapsoundreset mapsound watercolour shadowyaw ]
-loop i (listlen $mapcfgidents) [
-    scriptcontext $context_mapcfg (at $mapcfgidents $i)
-]
+mapcfgidents = [ loadnotexture loadsky mapmodelreset mapmodel texturereset texture fog fogcolour mapsoundreset mapsound watercolour shadowyaw ]
+loop i (listlen $mapcfgidents) [ scriptcontext $context_mapcfg (at $mapcfgidents $i) ]

 // isolate the map config context
 // this disables access from this context to identifiers located in other contexts
 // also it removes all aliases created in this context once the running context changes
-isolatecontext $context_mapcfg 
+isolatecontext $context_mapcfg

 // secure this configuration for the rest of the game
-sealcontexts 
+sealcontexts
@@ -250,14 +250,14 @@ ent_type = none
 get_ent_attrs = [
  if $editing [
    loop gea 4 [
-      alias (format "ent_attr_%1" $gea) (getentattr $gea)
+      (format "ent_attr_%1" $gea) = (getentattr $gea)
    ]
  ]
 ]

 copyent = [
  if $editing [
-    alias ent_type (getenttype)
+    ent_type = (getenttype)
    get_ent_attrs
  ]
 ]
@@ -28,5 +28,4 @@ securemap ac_stellar
 securemap ac_sunset
 securemap ac_toxic
 securemap ac_urban
-securemap ac_werk
-
+securemap ac_werk
				`@@ -2,5 +2,3 @@`

				`// This is where you should put any scripts you may have created for AC.`