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

fixes/updates

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6283 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Bukz
2011-04-18 04:09:49 +00:00
parent 5592250d35
commit 006d873d44
4 changed files with 66 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/on_quit.cfg
+3
View File
@@ -5,6 +5,7 @@ addListOnQuit = [ alias_list = $arg1; loop al (listlen $alias_list) [ addOnQuit
// alias_list is last for a reason!
on_quit_aliases = [
_demofile
badargs
cmapp
cs_sets
@@ -33,7 +34,9 @@ on_quit_aliases = [
tmp_numbots
tmp_old_sets
tmp_svol
tmp_tutsets
tmp_wc
watchingtutorial
alias_list
]
config/resetbinds.cfg
+2 -2
View File
@@ -13,7 +13,7 @@ bind TAB [ showscores 1; onrelease [ showscores 0 ] ]
bind CLEAR ""
bind RETURN ""
bind PAUSE ""
bind ESCAPE [ if $connected [ ingamemenu ] [ if (watchingdemo) [ showmenu "Watching demo" ] [ showmenu main ] ] ]
bind ESCAPE [ if $connected [ ingamemenu ] [ if (watchingtutorial) [ showmenu "Tutorial Menu" ] [ if (watchingdemo) [ showmenu "Watching demo" ] [ showmenu main ] ] ] ]
bind SPACE "jump"
bind EXCLAIM ""
bind QUOTEDBL ""
@@ -113,7 +113,7 @@ bind F3 ""
bind F4 ""
bind F5 "if $editing [ toggleocull ]"
bind F6 "if $editing [ showmip ]"
bind F7 ""
bind F7 [ if $editing [ if $fullbright [ fullbright 0 ] [ fullbright 1 ] ] ]
bind F8 ""
bind F9 ""
bind F10 "getdemo"
config/scripts.cfg
+12
View File
@@ -143,6 +143,18 @@ vip = [ votemap 13 $arg1 ]
tktf = [ votemap 14 $arg1 ]
ktf = [ votemap 15 $arg1 ]
// Helper aliases for (c) - easy color insertion. (e.g. echo (red)Hello (blue)world! (white)My fov today is: (orange) $fov)
green = [ result (c 0) ]
blue = [ result (c 1) ]
yellow = [ result (c 2) ]
red = [ result (c 3) ]
gray = [ result (c 4) ]
white = [ result (c 5) ]
dbrown = [ result (c 6) ]
dred = [ result (c 7) ]
purple = [ result (c 8) ]
orange = [ result (c 9) ]
// Weapon switching/action utilities.
primary = [ weapon (currentprimary) ]
secondary = [ weapon 1 ]
config/tutorial.cfg
+49 -60
View File
@@ -1,92 +1,81 @@
bind ESCAPE [ if $connected [ ingamemenu ] [if (= (watchingtutorial) 1) [ showmenu "Tutorial Menu" ] [ if (watchingdemo) [ showmenu "Watching demo" ] [ showmenu main ] ] ] ]
tutstart = [
if (= $arg1 1) [
mapstartonce = [tut]
add2alias mapstartonce [ tut ]
// Disable most of the HUD
getconsize__ = $consize
getcrosshairsize__ = $crosshairsize
gethidespecthud__ = $hidespecthud
gethideteam__ = $hideteam
gethidehudequipment__ = $hidehudequipment
storesets "consize crosshairsize hidespecthud hideteam hidehudequipment" tmp_tutsets
consize 0
crosshairsize 0
hidespecthud 1
hideteam 1
hidehudequipment 1
watchingtutorial = [1]
watchingtutorial = 1
demo "tutorial_demo"
]
]
endtutorial = [
consize $getconsize__
crosshairsize $getcrosshairsize__
hidespecthud $gethidespecthud__
hideteam $gethideteam__
hidehudequipment $gethidehudequipment__
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)
watchingtutorial = 0
]
tut = [
sleep 50 [paused 1; showmenu "AC Tutorial - Welcome"; sleep 20 [mapstartonce = [endtutorial]]]
consize 1; echo " 2Live tutorial information will appear here."
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
]
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
]
tut3 = [ sleep 8000 [ paused 1; showmenu "AC Tutorial - More Movement" ] ] // ibid
tut4 = [
consize 1; echo "Here, the players are straferunning."
consize 1; echo Here, the players are straferunning.
sleep 14200 [
consize 2; echo "Now, they are jumping."
consize 2; echo Now, they are jumping.
sleep 6000 [
consize 1; echo "See them crouch up and down!"
consize 1; echo See them crouch up and down!
sleep 6000 [
echo "See them crouchjump up and down!" ] ] ]
sleep 42000 [paused 1; showmenu "AC Tutorial - Weapons"] //Main timing sequence to go to next menu, all above are subkeyframes
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"]
]
tut5 = [ sleep 10 [ paused 1; showmenu "AC Tutorial - Weapon Info" ] ]
tut6 = [
sleep 6000 [consize 2; echo "Someone is about to get splattered with the shotgun"]
sleep 18000 [consize 2; echo "BOOM HEADSHOT! The sniper was scoping."]
sleep 26000 [consize 2; echo "Slice and dice with the knife."]
sleep 41000 [consize 2; echo "Fire in the hole! Grenades, grenades, grenades."]
sleep 50000 [paused 1; showmenu "AC Tutorial - CTF"]
sleep 6000 [ consize 2; echo Someone is about to get splattered with the shotgun... ]
sleep 18000 [ consize 2; echo (c 3)BOOM HEADSHOT! (c 5)The sniper was scoping. ]
sleep 26000 [ consize 2; echo Slice and dice with the knife. ]
sleep 41000 [ consize 2; echo Fire in the hole! Grenades, grenades, grenades... ]
sleep 50000 [ paused 1; showmenu "AC Tutorial - CTF" ]
]
tut7 = [
sleep 9000 [consize 2; echo "Touch a flag to pick it up"]
sleep 17000 [echo "You will drop the flag if you get fragged."]
sleep 19000 [echo "Touch the flag to return it"]
sleep 26000 [echo "Touch your own flag to score!"]
sleep 41000 [paused 1; showmenu "AC Tutorial - Advanced"]
sleep 9000 [ consize 2; echo Touch a flag to pick it up... ]
sleep 17000 [ echo You will drop the flag if you get fragged. ]
sleep 19000 [ echo Touch the flag to return it... ]
sleep 26000 [ echo Touch your own flag to score! ]
sleep 41000 [ paused 1; showmenu "AC Tutorial - Advanced" ]
]
tut8 = [
sleep 50 [echo "They are now edge jumping. These are popular spots to edgejump."]
sleep 18500 [echo "To rifle sprint, face opposite to where you want to go, and jump backwards while shooting."]
sleep 32500 [echo "Similar to the rifle sprint, rifle jump by jumping, facing down, and shooting."]
sleep 49000 [echo "That was a bad attempt at grenade jumping. You are not supposed to suicide."]
sleep 50000 [echo "A good grenade jump will give you height and distance."]
sleep 65000 [echo "Time for the combat demonstration!"]
sleep 200000 [paused 1; showmenu "AC Tutorial - GG"]
sleep 50 [ echo They are now edge jumping. These are popular spots to edgejump. ]
sleep 18500 [ echo To rifle sprint, face opposite to where you want to go, and jump backwards while shooting. ]
sleep 32500 [ echo Similar to the rifle sprint, rifle jump by jumping, facing down, and shooting. ]
sleep 49000 [ echo That was a (c 3)bad (c 5)attempt at grenade jumping. You are not supposed to suicide. ]
sleep 50000 [ echo A good grenade jump will give you height and distance. ]
sleep 65000 [ echo (c 0)Time for the combat demonstration! ]
sleep 200000 [ paused 1; showmenu "AC Tutorial - GG" ]
]
newmenu "Tutorial Menu"
menuitem "Go back to tutorial" [closemenu "Watching Tutorial"; paused 0]
newmenu "Tutorial Menu"
menuitem "Go back to tutorial" [ closemenu "Watching Tutorial"; paused 0 ]
menuitem "Restart tutorial" "tutstart 1"
menuitem " 3Stop 5tutorial" "dm ac_complex; endtutorial"
menuitem " 3Stop 5tutorial" [ endtutorial; tdm (at $defaultmaps (rnd (listlen $defaultmaps))) ]
newmenu "AC Tutorial - Welcome"
newmenu "AC Tutorial - Welcome"
menuitem " 1Thank you for downloading and trying 2AssaultCube!" -1
menuitem "" -1
menuitem "This short tutorial will show you the basics so you" -1
@@ -95,7 +84,7 @@ menuitem "and watch. You will be able to experiment after." -1
menuitem "" -1
menuitem " 0Continue" "paused 0; tut2; consize 0"
newmenu "AC Tutorial - Basic Movement"
newmenu "AC Tutorial - Basic Movement"
menuitem "Basic movement is done with the WASD keys." -1
menuitem "For left-handed players that prefer to use" -1
menuitem "the arrow keys for movement, you can switch" -1
@@ -110,7 +99,7 @@ menuitem "D: Right" -1
menuitem "" -1
menuitem " 0Continue - 1/7" "paused 0; tut3"
newmenu "AC Tutorial - More Movement"
newmenu "AC Tutorial - More Movement"
menuitem "If you combine a directional key (W or S)" -1
menuitem "with a strafing key, you will straferun." -1
menuitem "This diagonal movement is faster. Use it" -1
@@ -135,7 +124,7 @@ menuitem "Crouch: shift" -1
menuitem "" -1
menuitem " 0Continue - 2/7" "paused 0; tut4"
newmenu "AC Tutorial - Weapons"
newmenu "AC Tutorial - Weapons"
menuitem "There is a variety of weapons in AssaultCube." -1
menuitem "Some are better for certain situations than" -1
menuitem "others. Choose your starting weapon with the B" -1
@@ -164,7 +153,7 @@ menuitem "Knife: middle mouse click"
menuitem "" -1
menuitem " 0Continue - 3/7" "paused 0; tut5"
newmenu "AC Tutorial - Weapon Info"
newmenu "AC Tutorial - Weapon Info"
menuitem "When you get close enough to your enemy, the" -1
menuitem "shotgun will splatter them into bits of gibs (gore)." -1
menuitem "" -1
@@ -179,7 +168,7 @@ menuitem "or gib teammates with these." -1
menuitem "" -1
menuitem " 0Continue - 4/7" "paused 0; tut6"
newmenu "AC Tutorial - CTF"
newmenu "AC Tutorial - CTF"
menuitem "Capture the Flag, or CTF for short, is one of the" -1
menuitem "most popular gamemodes in AssaultCube. The objective" -1
menuitem "here is to bring the enemy flag back to your own, All" -1
@@ -190,7 +179,7 @@ menuitem "base." -1
menuitem "" -1
menuitem " 0Continue - 5/7" "paused 0; tut7"
newmenu "AC Tutorial - Advanced"
newmenu "AC Tutorial - Advanced"
menuitem "There are several advanced tactics you can use while" -1
menuitem "playing AssaultCube." -1
menuitem "Edge jumping is a trick that lets you jump higher," -1
@@ -209,9 +198,9 @@ menuitem "of the grenade to propel yourself." -1
menuitem "" -1
menuitem "After this is done, you will watch demonstration of" -1
menuitem "real combat in AssaultCube."
menuitem " 0Continue - 6/7" "paused 0; tut8"
menuitem " 0Continue - 6/7" "paused 0; tut8"
newmenu "AC Tutorial - GG"
newmenu "AC Tutorial - GG"
menuitem "Thats it! The tutorial is over now. Take a minute" -1
menuitem "to look at the scoreboard. Your name along with" -1
menuitem "your frags and deaths will be displayed. When" -1
@@ -233,8 +222,8 @@ menuitem "" -1
menuitem " 0Finish - 7/7" "paused 0; endmenuitem"
endmenuitem = [
sleep 1000 [showscores 1]
sleep 60000 dm ac_complex; endtutorial
sleep 1000 [ showscores 1 ]
sleep 60000 [ endtutorial; tdm (at $defaultmaps (rnd (listlen $defaultmaps))) ]
]
watchingtutorial = 0