kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'grom' of github.com:aurhat/AC into aurhat-grom

Browse Source
This commit is contained in:
aerkefiende
2014-03-25 21:30:51 +01:00
parent 1fb6d5a05b cf3d2692ad
commit 97e0f6863b
3 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/menus_bot.cfg
+10 -11
View File
@@ -17,12 +17,11 @@ tmp_botskill = good
tmp_numbots = 1
tmp_mode =
tmp_botmap =
const isbotteammode [ return (&& (curmodeattr bot) (curmodeattr team)) ]
tmp_isbotteammode = 0
// add bots
const startbotmatch [
if (isbotteammode) [ // team botmode
if ($tmp_isbotteammode) [ // team botmode
numrvsf = (div $tmp_numbots 2)
numcla = (div $tmp_numbots 2)
if (= (player1 team) 0) [ -- numcla ] [
@@ -75,19 +74,19 @@ const emptymap [
newmenu singleplayer
// teamplay not mature yet
menuitem (_ [Bot Team Deathmatch]) [ tmp_mode = 7; showmenu botskill ]
menuitem (_ [Bot Deathmatch]) [ tmp_mode = 8; showmenu botskill ]
menuitem (_ [Bot One Shot, One Kill]) [ tmp_mode = 12; showmenu botskill ]
menuitem (_ [Bot Pistol Frenzy]) [ tmp_mode = 18; showmenu botskill ]
menuitem (_ [Bot Last Swiss Standing]) [ tmp_mode = 19; showmenu botskill ]
menuitem (_ [Bot Team Survivor]) [ tmp_mode = 20; showmenu botskill ]
menuitem (_ [Bot Team One Shot, One Kill]) [ tmp_mode = 21; showmenu botskill ]
menuitem (_ [Bot Team Deathmatch]) [ tmp_mode = 7; tmp_isbotteammode = 1; showmenu botskill ]
menuitem (_ [Bot Deathmatch]) [ tmp_mode = 8; tmp_isbotteammode = 0; showmenu botskill ]
menuitem (_ [Bot One Shot, One Kill]) [ tmp_mode = 12; tmp_isbotteammode = 0; showmenu botskill ]
menuitem (_ [Bot Pistol Frenzy]) [ tmp_mode = 18; tmp_isbotteammode = 0; showmenu botskill ]
menuitem (_ [Bot Last Swiss Standing]) [ tmp_mode = 19; tmp_isbotteammode = 0; showmenu botskill ]
menuitem (_ [Bot Team Survivor]) [ tmp_mode = 20; tmp_isbotteammode = 1; showmenu botskill ]
menuitem (_ [Bot Team One Shot, One Kill]) [ tmp_mode = 21; tmp_isbotteammode = 1; showmenu botskill ]
menuitem (_ [Bot Survival]) [ showmenu [Survival Mode] ]
menuitem [] -1
menuitem (_ [Bot settings...]) [ showmenu [Bot settings] ]
menuitem (_ [Empty Map]) emptymap
const showmenu_enemies [ if (isbotteammode $tmp_mode) [ showmenu [team enemies] ] [ showmenu enemies ] ]
const showmenu_enemies [ if ($tmp_isbotteammode) [ showmenu [team enemies] ] [ showmenu enemies ] ]
newmenu botskill
config/scripts.cfg
+3 -3
View File
@@ -189,11 +189,11 @@ oldsens = $sensitivity
const zoom [
if (= $arg1 1) [
if (! (=f $sensitivity (scopesens))) [
if (! (=f $sensitivity $scopesens)) [
oldsens = $sensitivity
// avoid error if using 0.001 as sensitivity
newsens = (scopesens)
if (> (*f 1 1000) $newsens) [ if (< 1000 $newsens) [ sensitivity (scopesens) ] ]
newsens = $scopesens
if (> (*f 1 1000) $newsens) [ if (< 1000 $newsens) [ sensitivity $scopesens ] ]
setscope 1
]
] [ sensitivity $oldsens; setscope 0 ]
config/survival.cfg
+17 -9
View File
@@ -156,16 +156,24 @@ const isInZone [ result (&& (checkrange (player1 x) (at $zone 0) (at $zone 1)) (
forceinit [changingspeed changinggamma] 0
const changespeed [
changingspeed = 1; curspeed = $gamespeed; targetspeed = $arg1; increments = $arg2
if (!= $curspeed $targetspeed) [
if (> $curspeed $targetspeed) [
loops = (- $curspeed $targetspeed)
] [ loops = (- $targetspeed $curspeed) ]
loop CSL $loops [
sleep (* $CSL $increments) [ gamespeed ((at [+ -] (> $curspeed $targetspeed)) $gamespeed 1) ]
if (= $connected 0) [
if (&& (>= $arg1 10) (<= $arg1 1000)) [
changingspeed = 1; curspeed = $gamespeed; targetspeed = $arg1; increments = $arg2
if (!= $curspeed $targetspeed) [
if (> $curspeed $targetspeed) [
loops = (- $curspeed $targetspeed)
] [ loops = (- $targetspeed $curspeed) ]
loop CSL $loops [
sleep (* $CSL $increments) [ gamespeed ((at [+ -] (> $curspeed $targetspeed)) $gamespeed 1) ]
]
sleep (* $loops $increments) [ changingspeed = 0 ]
] [ changingspeed = 0 ]
] [
echo "valid range for gamespeed is 10..1000"
]
sleep (* $loops $increments) [ changingspeed = 0 ]
] [ changingspeed = 0 ]
] [
echo "operation not available in multiplayer"
]
]
const changegamma [