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

fixes/cosmetic stuff

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6409 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Bukz
2011-05-05 21:00:51 +00:00
parent 67b6715854
commit 002727f3c3
3 changed files with 17 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/scripts.cfg
+4 -11
View File
@@ -93,11 +93,9 @@ gamemodedesc 13 [Hunt the Flag: Find the enemy flag, frag the flag bearer and co
gamemodedesc 14 [Team Keep the Flag: There is only one flag. Get the flag and keep it. You score one point every 15 seconds. If your teammate has the flag, protect him. If the flag bearer collects the enemy flag, they gain a 1 point bonus.]
gamemodedesc 15 [Keep the Flag: Get the flag and keep it. You score one point every 15 seconds. Everybody else will want to destroy you!]
// "resetbinds" command.
resetbinds = [ exec config/resetbinds.cfg; echo (c 3)All binds have been reset to default values! ]
// "changeteam" command.
resetbinds = [ run resetbinds; echo (c 3)All binds have been reset to default values! ]
changeteam = [ if (< (curteam) 4) [ team (at "RVSF CLA RVSF-SPECT CLA-SPECT" (curteam)) ] ]
// "spectate" command
spectate = [ suicide; sleep 500 [ team SPECTATOR ] ]
// Mode/map-setting aliases.
@@ -228,13 +226,10 @@ sbconnect = [
// For those players who use IRC too much...
join = [ connect $arg1 $arg2 $arg3 ]
add2alias = [
if (strcmp "" (getalias $arg1)) [
$arg1 = $arg2
] [
if (strcmp "" (getalias $arg1)) [ $arg1 = $arg2 ] [
$arg1 = (concat (concatword (getalias $arg1) ";") $arg2)
]
]
addOnLoadOnce = [ add2alias mapstartonce $arg1 ]
addOnLoadAlways = [ add2alias mapstartalways $arg1 ]
addOnQuit = [ add2alias onQuit $arg1 ]
@@ -413,9 +408,7 @@ _CAS_servername = "SERVER NAME"
customclaimadminscript = [
if (strcmp (curserver 1) $_CAS_serverip) [
if (! (currole)) [ setadmin 1 $_CAS_serverpass ] [ setadmin 0; echo you relinquished admin status ]
] [
echo (c 3)Error: (c 5)you're not connected to $_CAS_servername servers
]
] [ echo (c 3)Error: (c 5)you're not connected to $_CAS_servername servers ]
]
run on_quit
config/survival.cfg
+1 -1
View File
@@ -116,7 +116,7 @@ checkzone = [
startOBCount = [
startedOBCount = 1; startOBMillis = (millis); backInZone = 0; tmpSCtr = 5
echo (c 3)Get back into the arena! (c 5)You only have (c 3)5 (c 5)seconds to return.
loop soc 5 [ sleep (* $soc 1000) [ if (&& (! (isInZone)) (! $backInZone)) [ if $spamSurvMsgs [ hudecho (concatword (c 9) $tmpSCtr ...) ] [ echo (concatword (c 9) $tmpSCtr ...) ]; -= tmpSCtr 1 ] [ backInZone = 1 ] ] ]
loop soc 5 [ sleep (* $soc 1000) [ if (&& (! $survIsFinished) (&& (! (isInZone)) (! $backInZone))) [ if $spamSurvMsgs [ hudecho (concatword (c 9) $tmpSCtr ...) ] [ echo (concatword (c 9) $tmpSCtr ...) ]; -= tmpSCtr 1 ] [ backInZone = 1 ] ] ]
sleep 5000 [ if (&& (! (isInZone)) (&& (! $backInZone) (>= (- (millis) $startOBMillis) 5000))) [ endSurvival (concatword (c 3) "You took too long to return to the arena!") ] [ startedOBCount = 0 ] ]
]
config/tutorial.cfg
+12 -28
View File
@@ -3,47 +3,35 @@ tutstart = [
add2alias mapstartonce [ tut ]
// Disable most of the HUD
storesets "consize crosshairsize hidespecthud hideteam hidehudequipment spechudgun" tmp_tutsets
consize 0
crosshairsize 0
hidespecthud 1
hideteam 1
hidehudequipment 1
spechudgun 0
watchingtutorial = 1
consize 0; crosshairsize 0; hidespecthud 1; hideteam 1; hidehudequipment 1; spechudgun 0; watchingtutorial = 1
demo "tutorial_demo"
]
]
endtutorial = [
consize (at $tmp_tutsets 0)
crosshairsize (at $tmp_tutsets 1)
hidespecthud (at $tmp_tutsets 2)
hideteam (at $tmp_tutsets 3)
hidehudequipment (at $tmp_tutsets 4)
spechudgun (at $tmp_tutsets 5)
consize (at $tmp_tutsets 0); crosshairsize (at $tmp_tutsets 1); hidespecthud (at $tmp_tutsets 2)
hideteam (at $tmp_tutsets 3); hidehudequipment (at $tmp_tutsets 4); spechudgun (at $tmp_tutsets 5)
watchingtutorial = 0
]
tut = [
sleep 50 [ paused 1; showmenu "AC Tutorial - Welcome"; sleep 20 [ add2alias mapstartonce = [ endtutorial ] ] ]
consize 1; echo (c 2)Live tutorial information will appear here.
]
tut2 = [ sleep 9000 [ paused 1; showmenu "AC Tutorial - Basic Movement" ] ] // Need echoes timed with the movement before the paused 1
tut3 = [ sleep 8000 [ paused 1; showmenu "AC Tutorial - More Movement" ] ] // ibid
tut4 = [
consize 1; echo Here, the players are straferunning.
sleep 14200 [
consize 2; echo Now, they are jumping.
sleep 6000 [
consize 1; echo See them crouch up and down!
sleep 6000 [
echo Crouch jumping gives you that little bit of extra height needed sometimes! ] ] ]
consize 2; echo Now, they are jumping.
sleep 6000 [
consize 1; echo See them crouch up and down!
sleep 6000 [
echo Crouch jumping gives you that little bit of extra height needed sometimes!
]
]
]
sleep 42000 [ paused 1; showmenu "AC Tutorial - Weapons" ] // Main timing sequence to go to next menu, all above are subkeyframes
]
tut5 = [ sleep 10 [ paused 1; showmenu "AC Tutorial - Weapon Info" ] ]
tut6 = [
@@ -223,9 +211,5 @@ menuitem "Try it out!" -1
menuitem "" -1
menuitem " 0Finish - 7/7" "paused 0; endmenuitem"
endmenuitem = [
sleep 1000 [ showscores 1 ]
sleep 60000 [ endtutorial; tdm (at $defaultmaps (rnd (listlen $defaultmaps))) ]
]
endmenuitem = [ sleep 1000 [ showscores 1 ]; sleep 60000 [ endtutorial; tdm (at $defaultmaps (rnd (listlen $defaultmaps))) ] ]
watchingtutorial = 0