From 112b01bce5b75ae1da5cf7c416c599a0a429393a Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Thu, 23 Oct 2008 09:24:32 +0000 Subject: [PATCH] moved a bunch of script to defaults.cfg and made sure editent only works in editmode git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3203 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/defaults.cfg | 58 +++++++++++++++++++++++++++++++++++++++ config/menus.cfg | 33 ---------------------- config/menus_edit.cfg | 7 ----- config/menus_settings.cfg | 26 +----------------- config/resetbinds.cfg | 2 +- 5 files changed, 60 insertions(+), 66 deletions(-) diff --git a/config/defaults.cfg b/config/defaults.cfg index dccb8ea5..f91c59a2 100644 --- a/config/defaults.cfg +++ b/config/defaults.cfg @@ -123,3 +123,61 @@ alias toggleshowmap [ showmap 1; onrelease [ showmap 0 ] ] alias mapstartonce [ ] alias askquit 1 + +// Auto-completions +alias mapcomplete [complete $arg1 "packages/maps" cgz] + +mapcommands = "map tdm coop dm lms ts ctf pf lss osok tosok htf vip tktf ktf" +loop i (listlen $mapcommands) [ + mapcomplete (at $mapcommands $i) +] + +complete demo "demos" dmo + +alias entcomplete [listcomplete $arg1 "light playerstart clips ammobox grenades health armour akimbo mapmodel trigger ladder ctf-flag sound clip"] + +entcomplete newent + +// editent command +alias editent [ + alias enttype (getenttype) + if (! (strcmp enttype "")) [ + saycommand "/entset" $enttype (getentattr 0) (getentattr 1) (getentattr 2) (getentattr 3) + ] +] + +// Game mode descriptions... +gamemodedesc 0 [Team Deathmatch: Find the enemy team and destroy them!] +gamemodedesc 1 [Co-operative edit: Use this mode to edit maps with others online!] +gamemodedesc 2 [Deathmatch: Destroy anything that moves! Everyone for themselves!] +gamemodedesc 3 [Survivor: Everyone for themselves! Once you die, you must wait for the round to restart.] +gamemodedesc 4 [Team Survivor: Find the enemy team, destory them. Once everyone on the enemy team is gone... repeat!] +gamemodedesc 5 [Capture the Flag: Steal the enemy flag and bring it to your home base. Don't let your own flag get stolen.] +gamemodedesc 6 [Pistol Frenzy: Can you make your enemy eat lead with the most simple of weapons?] +gamemodedesc 7 [Bot Team Deathmatch: Find the enemy team and destroy them!] +gamemodedesc 8 [Bot Deathmatch: It's every man and A.I for themselves! Dismantle those bots! ] +gamemodedesc 9 [Last Swiss Standing: Knive and bomb the enemy!] +gamemodedesc 10 [One Shot, One Kill: You and your opponents start with 1hp, a sniper rifle, a knife and no pickups. Survive with your sniper, or humiliate with your swiss steel.] +gamemodedesc 11 [Team One Shot, One Kill: Your team starts with 1hp, a sniper rifle, a knife and no pickups. Survive with your sniper, or humiliate with your swiss steel.] +gamemodedesc 12 [Bot One-Shot, One Kill: You and the bots start with 1hp, a sniper rifle, a knife and no pickups. Survive with your sniper, or humiliate with your swiss steel.] +gamemodedesc 13 [Hunt the Flag: Find the enemy flag, frag the flag bearer and collect the flag to score. Protect your own team flag.] +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.] +gamemodedesc 15 [Keep the Flag: Get the flag and keep it. You score one point every 15 seconds. Everybody is will want to destroy you!] + +// Reduced game violence mode... +alias reducedviolencemode [ + if (= $arg1 1) [ + blood 0 + gibnum 0 + loop i (- 31 24) [ mutesound (+ (+ $i 24) 1) ] // Mute pain sounds + echo OMG!Ponies! mode enabled - Violent game content has now been reduced. + ] [ // Violent + blood 1 + gibnum 6 + unmuteallsounds + echo OMG!Ponies! mode disabled... + ] +] +alias getponiesmode [ + result (= $blood 0) +] diff --git a/config/menus.cfg b/config/menus.cfg index 82183d90..ed6f321d 100755 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -1,18 +1,3 @@ -// standard completions - -alias mapcomplete [complete $arg1 "packages/maps" cgz] - -mapcommands = "map tdm coop dm lms ts ctf pf lss osok tosok htf vip tktf ktf" -loop i (listlen $mapcommands) [ - mapcomplete (at $mapcommands $i) -] - -complete demo "demos" dmo - -alias entcomplete [listcomplete $arg1 "light playerstart clips ammobox grenades health armour akimbo mapmodel trigger ladder ctf-flag sound clip"] - -entcomplete newent - // standard menu definitions newmenu main @@ -192,24 +177,6 @@ alias savequit [ if (= $askquit 1) [ showmenu quit ] [ quit ] ] -// Game mode descriptions... -gamemodedesc 0 [Team Deathmatch: Find the enemy team and destroy them!] -gamemodedesc 1 [Co-operative edit: Use this mode to edit maps with others online!] -gamemodedesc 2 [Deathmatch: Destroy anything that moves! Everyone for themselves!] -gamemodedesc 3 [Survivor: Everyone for themselves! Once you die, you must wait for the round to restart.] -gamemodedesc 4 [Team Survivor: Find the enemy team, destory them. Once everyone on the enemy team is gone... repeat!] -gamemodedesc 5 [Capture the Flag: Steal the enemy flag and bring it to your home base. Don't let your own flag get stolen.] -gamemodedesc 6 [Pistol Frenzy: Can you make your enemy eat lead with the most simple of weapons?] -gamemodedesc 7 [Bot Team Deathmatch: Find the enemy team and destroy them!] -gamemodedesc 8 [Bot Deathmatch: It's every man and A.I for themselves! Dismantle those bots! ] -gamemodedesc 9 [Last Swiss Standing: Knive and bomb the enemy!] -gamemodedesc 10 [One Shot, One Kill: You and your opponents start with 1hp, a sniper rifle, a knife and no pickups. Survive with your sniper, or humiliate with your swiss steel.] -gamemodedesc 11 [Team One Shot, One Kill: Your team starts with 1hp, a sniper rifle, a knife and no pickups. Survive with your sniper, or humiliate with your swiss steel.] -gamemodedesc 12 [Bot One-Shot, One Kill: You and the bots start with 1hp, a sniper rifle, a knife and no pickups. Survive with your sniper, or humiliate with your swiss steel.] -gamemodedesc 13 [Hunt the Flag: Find the enemy flag, frag the flag bearer and collect the flag to score. Protect your own team flag.] -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.] -gamemodedesc 15 [Keep the Flag: Get the flag and keep it. You score one point every 15 seconds. Everybody is will want to destroy you!] - // Create additional menus... exec config/menus_bot.cfg diff --git a/config/menus_edit.cfg b/config/menus_edit.cfg index 0dad05b5..5f863c1a 100644 --- a/config/menus_edit.cfg +++ b/config/menus_edit.cfg @@ -1,10 +1,3 @@ -alias editent [ - alias enttype (getenttype) - if (! (strcmp enttype "")) [ - saycommand "/entset" $enttype (getentattr 0) (getentattr 1) (getentattr 2) (getentattr 3) - ] -] - newmenu editing menuitem "Mapmodels..." "showmenu Mapmodels" diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index b09db2b1..6d52b9ef 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -302,27 +302,6 @@ menuitemcheckbox "Footsteps: " "$footsteps" "footsteps $arg1" menuitemcheckbox "Bullet hit: " "$bulletbouncesound" "bulletbouncesound $arg1" menuitemcheckbox "Bullet near-miss: " "$bulletairsound" "bulletairsound $arg1" - -alias new_poniesmode [ - if (= $arg1 1) [ - blood 0 - gibnum 0 - loop i (- 31 24) [ mutesound (+ (+ $i 24) 1) ] // mute pain sounds - echo OMG!Ponies! mode enabled - Violent game content has now been reduced. - - ] [ // violent - blood 1 - gibnum 6 - unmuteallsounds - echo OMG!Ponies! mode disabled... - ] -] - -alias getponiesmode [ - result (= $blood 0) -] - - newmenu gameplay menuitemtextinput "Nickname: " "result $curname" "name $arg1" @@ -333,7 +312,7 @@ menuitem "Change player skin" [showmenu (at [CLA RVSF] (curteam))] menuitem "" -1 menuitemcheckbox "Auto map download: " "$autogetmap" "autogetmap $arg1" menuitemcheckbox "Auto weapon reload: " "$autoreload" "autoreload $arg1" -menuitemcheckbox "Reduced violence mode: " "(getponiesmode)" "new_poniesmode $arg1" +menuitemcheckbox "Reduced violence mode: " "(getponiesmode)" "reducedviolencemode $arg1" menuitemcheckbox "Show gamemodes as acronyms: " "$modeacronyms" "modeacronyms $arg1" menuitemcheckbox "Show quit dialog when quitting: " "$askquit" "askquit = $arg1" @@ -354,6 +333,3 @@ menuitemcheckbox " Crosshair team-sign " "$crosshairteamsign" "crosshairteamsi menuitem "" -1 menuitemslider "Crosshair size: " 0 50 "$crosshairsize" 5 "" "crosshairsize $arg1" menuitem "Change crosshair... " "showmenu Crosshairs" - - - diff --git a/config/resetbinds.cfg b/config/resetbinds.cfg index 1ded413b..aff13ec6 100644 --- a/config/resetbinds.cfg +++ b/config/resetbinds.cfg @@ -40,7 +40,7 @@ bind 7 "" bind 8 "vdelta -1" bind 9 "vdelta 1" bind COLON "" -bind SEMICOLON "editent" +bind SEMICOLON [ if $editing [ editent ] ] bind LESS "" bind EQUALS "" bind GREATER ""