From 20640da913901a71f6e646b3a8f58bbc2c5fb155 Mon Sep 17 00:00:00 2001 From: blackhc Date: Thu, 17 Mar 2005 19:59:25 +0000 Subject: [PATCH] -Changed some item names to fit to the global name convention. -Split up data.menu into data.menu and a lot/few files in data/. -Started work on the map list. git-svn-id: svn://svn.icculus.org/nexuiz/trunk@322 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- scmenu/creategame.menu | 7 + scmenu/data.menu | 513 ++++----------------------- scmenu/data/color.menu | 130 +++++++ scmenu/data/effects.menu | 76 ++++ scmenu/data/input.menu | 31 ++ scmenu/data/key.menu | 90 +++++ scmenu/data/player.menu | 19 + scmenu/data/sound.menu | 34 ++ scmenu/data/video.menu | 37 ++ scmenu/options/effects.menu | 20 +- scmenu/options/server.menu | 26 +- scmenu/options/weapon.menu | 48 +-- scmenu/options/weapon2.menu | 60 ++-- scmenu/source/control/data/base.qc | 26 ++ scmenu/source/control/data/data.qh | 8 + scmenu/source/control/visual/list.qc | 1 - scmenu/source/custom/creategame.qm | 6 + 17 files changed, 605 insertions(+), 527 deletions(-) create mode 100644 scmenu/data/color.menu create mode 100644 scmenu/data/effects.menu create mode 100644 scmenu/data/input.menu create mode 100644 scmenu/data/key.menu create mode 100644 scmenu/data/player.menu create mode 100644 scmenu/data/sound.menu create mode 100644 scmenu/data/video.menu diff --git a/scmenu/creategame.menu b/scmenu/creategame.menu index 9356550c0..2524cfc3e 100644 --- a/scmenu/creategame.menu +++ b/scmenu/creategame.menu @@ -16,10 +16,16 @@ Item Layout CreateGame Derive TextButton BasicOptions { normal " Basic Options " + + init Nex_Action_JumpToPage + target "Panel::BasicOptions" } Derive TextButton MapList { normal " Map List " + + init Nex_Action_JumpToPage + target "Panel::MapList" } Derive TextButton Configurations { @@ -36,5 +42,6 @@ Item Layout CreateGame reinit Nex_Action_MakeFirstVisible #include "menu/creategame/basic.menu" + #include "menu/creategame/maplist.menu" } } diff --git a/scmenu/data.menu b/scmenu/data.menu index 4c42c277e..be2052cec 100644 --- a/scmenu/data.menu +++ b/scmenu/data.menu @@ -1,239 +1,15 @@ // Property of Alientrap // // Cvar Definitions -Item Container Data +Item DataContainer Data { #define DataLink_ZeroOneValue Derive "::DataLink_ZeroOneValue" Value {} #define DataLink_OnOffSwitch Derive "::DataLink_OnOffSwitch" Switch {} - // v_color prefix and other color controlling cvars - Item Container Color - { - // normal options - Item Data_Cvar Gamma - { - cvarName "v_gamma" - defValue 1.0 - Item DataLink_Value Value - { - minValue 0.0 - maxValue 4.0 - stepValue 0.05 - link "##up" - } - } - Item Data_Cvar Brightness - { - cvarName "v_brightness" - defValue 0.0 - Item DataLink_Value Value - { - minValue 0.0 - maxValue 3.0 - stepValue 0.05 - link "##up" - } - } - Item Data_Cvar Contrast - { - cvarName "v_contrast" - defValue 1.0 - Item DataLink_Value Value - { - minValue 0.0 - maxValue 3.0 - stepValue 0.05 - link "##up" - } - } - Item Data_Cvar HWGamma // read-only - { - cvarName "v_hwgamma" - defValue 1.0 - Derive DataLink_OnOffSwitch Switch - { - link "##up" - } - } - // extended options - Item Container Extended - { - Item Data_Cvar Active - { - cvarName "v_color_enable" - defValue 0.0 - Derive DataLink_OnOffSwitch Switch - { - link "##up" - } - } - Item Container Low - { - Item Data_Cvar Red - { - cvarName "v_color_black_r" - defValue 0.0 - [DataLink_ZeroOneValue] - } - Item Data_Cvar Green - { - cvarName "v_color_black_g" - defValue 0.0 - [DataLink_ZeroOneValue] - } - Item Data_Cvar Blue - { - cvarName "v_color_black_b" - defValue 0.0 - [DataLink_ZeroOneValue] - } - } - Item Container Mid - { - Item Data_Cvar Red - { - cvarName "v_color_grey_r" - defValue 0.5 - [DataLink_ZeroOneValue] - } - Item Data_Cvar Green - { - cvarName "v_color_grey_g" - defValue 0.5 - [DataLink_ZeroOneValue] - } - Item Data_Cvar Blue - { - cvarName "v_color_grey_b" - defValue 0.5 - [DataLink_ZeroOneValue] - } - } - Item Container High - { - Item Data_Cvar Red - { - cvarName "v_color_white_r" - defValue 1.0 - [DataLink_ZeroOneValue] - } - Item Data_Cvar Green - { - cvarName "v_color_white_g" - defValue 1.0 - [DataLink_ZeroOneValue] - } - Item Data_Cvar Blue - { - cvarName "v_color_white_b" - defValue 1.0 - [DataLink_ZeroOneValue] - } - } - } - } - Item Container Player - { - Item Data_Nex_Name Name - { - defValue "NexPlayer" - Item DataLink_Text Text - { - maxValue 32 - link "##up" - } - } - Item Data_Nex_Avatar Avatar - { - } - } - Item Container Key - { - Item Data_Nex_Key Forward - { - target "+forward" - } - Item Data_Nex_Key Backward - { - target "+back" - } - Item Data_Nex_Key StrafeLeft - { - target "+moveleft" - } - Item Data_Nex_Key StrafeRight - { - target "+moveright" - } - Item Data_Nex_Key Jump - { - target "+jump" - } - Item Data_Nex_Key Crouch - { - target "+shift" - } - - Item Data_Nex_Key FirePrimary - { - target "+attack" - } - Item Data_Nex_Key FireSecondary - { - target "+button3" - } - Item Data_Nex_Key PrevWeapon - { - target "impulse 12" - } - Item Data_Nex_Key NextWeapon - { - target "impulse 10" - } - Item Container Weapon - { - Item Data_Nex_Key Laser - { - target "impulse 1" - } - Item Data_Nex_Key Uzi - { - target "impulse 2" - } - Item Data_Nex_Key Shotgun - { - target "impulse 3" - } - Item Data_Nex_Key Grenade - { - target "impulse 4" - } - Item Data_Nex_Key Electro - { - target "impulse 5" - } - Item Data_Nex_Key CryLink - { - target "impulse 6" - } - Item Data_Nex_Key NexGun - { - target "impulse 7" - } - Item Data_Nex_Key Hagar - { - target "impulse 8" - } - Item Data_Nex_Key Rocket - { - target "impulse 9" - } - } + #include "menu/data/color.menu" + #include "menu/data/player.menu" + #include "menu/data/key.menu" + #include "menu/data/input.menu" - Item Data_Nex_Key ShowScores - { - target "+showscores" - } - } Item Container CreateGame { Item Data_Nex_Map Map @@ -390,171 +166,10 @@ Item Container Data } } } - Item Container Video - { - Item Data_Nex_Resolution Resolution - { - defValue "800 600" - - Item DataLink_TextSwitch Switch - { - valueList "'320 240' '640 480' '800 600' '1024 768' '1280 970' '1600 1200'" - descList "'320x240' '640x480' '800x600' '1024x768' '1280x970' '1600x1200'" - link "##up" - } - } - Item Data_Cvar BPP - { - cvarName "vid_bitsperpixel" - - Item DataLink_TextSwitch Switch - { - valueList "'16' '32'" - descList "'16-bit' '32-bit'" - link "##up" - } - } - Item Data_Cvar Fullscreen - { - cvarName "vid_fullscreen" - - Derive DataLink_OnOffSwitch Switch - { - link "##up" - } - } - } - Item Container Sound - { - Item Data_Cvar CDVolume - { - cvarName "bgmvolume" - defValue 0.5 - - [DataLink_ZeroOneValue] - } - Item Data_Cvar GameVolume - { - cvarName "volume" - defValue 1 - - [DataLink_ZeroOneValue] - } - Item Data_Cvar AmbientVolume - { - cvarName "snd_staticvolume" - defValue 0.5 - - [DataLink_ZeroOneValue] - } - Item Data_Cvar SwapStereo - { - cvarName "snd_swapstereo" - defValue 0 - - [DataLink_OnOffSwitch] - } - } - Item Container Effects - { - Item Data_Cvar Particles - { - cvarName "cl_particles" - defValue 1 - - [DataLink_OnOffSwitch] - } - Item Data_Cvar Particlequality - { - cvarName "cl_particles_quality" - defValue 1 - - [DataLink_ZeroOneValue] - } - Item Data_Cvar Decals - { - cvarName "cl_decals" - defValue 1 - - [DataLink_OnOffSwitch] - } - Item Data_Cvar Bloom - { - cvarName "r_bloom" - defValue 1 - - [DataLink_OnOffSwitch] - } - Item Data_Cvar Coronas - { - cvarName "r_coronas" - defValue 1 - - [DataLink_OnOffSwitch] - } - Item Data_Cvar Realtimelights - { - cvarName "r_shadow_realtime_world" - defValue 1 - - [DataLink_OnOffSwitch] - } - Item Data_Cvar Realtimedlights - { - cvarName "r_shadow_realtime_dlight" - defValue 1 - - [DataLink_OnOffSwitch] - } - Item Data_Cvar Realtimeshadows - { - cvarName "r_shadow_realtime_world_shadows" - defValue 1 - - [DataLink_OnOffSwitch] - } - Item Data_Cvar Offsetmaps - { - cvarName "r_shadow_glsl_offsetmapping" - defValue 1` - [DataLink_OnOffSwitch] - } - Item Data_Cvar Gloss - { - cvarName "r_shadow_gloss" - defValue 1 - - [DataLink_OnOffSwitch] - } - } - Item Container Input - { - Item Data_Cvar Sensitivity - { - cvarName "sensitivity" - defValue 6.0 - Item DataLink_Value Value - { - minValue 0.0 - maxValue 20.0 - stepValue 1 - link "##up" - } - } - Item Data_Cvar InvertMouse - { - cvarName "m_pitch" - defValue 'Off' - Item DataLink_ValueSwitch Switch - { - minValue -0.022 - maxValue 0.022 - descList "'On' 'Off'" - link "##up" - } - } + #include "menu/data/video.menu" + #include "menu/data/sound.menu" + #include "menu/data/effects.menu" - } Item Container Server { Item Data_Cvar Instagib @@ -564,7 +179,7 @@ Item Container Data [DataLink_OnOffSwitch] } - Item Data_Cvar Rocketarena + Item Data_Cvar RocketArena { cvarName "g_rocketarena" defValue 0 @@ -620,7 +235,7 @@ Item Container Data } } } - Item Data_Cvar Maxspeed + Item Data_Cvar MaxSpeed { cvarName "sv_maxspeed" defValue 400 @@ -641,7 +256,7 @@ Item Container Data } } } - Item Data_Cvar Gamespeed + Item Data_Cvar GameSpeed { cvarName "slowmo" defValue 1 @@ -662,7 +277,7 @@ Item Container Data } } } - Item Data_Cvar Maxairspeed + Item Data_Cvar MaxAirSpeed { cvarName "g_balance_maxairspeed" defValue 50 @@ -683,7 +298,7 @@ Item Container Data } } } - Item Data_Cvar Jumpheight + Item Data_Cvar JumpHeight { cvarName "g_balance_jumpheight" defValue 300 @@ -704,7 +319,7 @@ Item Container Data } } } - Item Data_Cvar Healthregen + Item Data_Cvar HealthRegeneration { cvarName "g_balance_healthregen" defValue 0.1 @@ -725,7 +340,7 @@ Item Container Data } } } - Item Data_Cvar Armorrott + Item Data_Cvar ArmorRott { cvarName "g_balance_armorrott" defValue 0.1 @@ -746,7 +361,7 @@ Item Container Data } } } - Item Data_Cvar Selfdamagepercent + Item Data_Cvar SelfDamagePercent { cvarName "g_balance_selfdamagepercent" defValue 0.6 @@ -767,7 +382,7 @@ Item Container Data } } } - Item Data_Cvar Weaponswitchdelay + Item Data_Cvar WeaponSwitchDelay { cvarName "g_balance_weaponswitchdelay" defValue 0.3 @@ -833,7 +448,7 @@ Item Container Data } Item Container Weapon { - Item Data_Cvar laserdamage + Item Data_Cvar LaserDamage { cvarName "g_balance_laser_damage" defValue 15 @@ -854,7 +469,7 @@ Item Container Data } } } - Item Data_Cvar laseredgedamage + Item Data_Cvar LaserEdgeDamage { cvarName "g_balance_laser_edgedamage" defValue 15 @@ -875,7 +490,7 @@ Item Container Data } } } - Item Data_Cvar laserforce + Item Data_Cvar LaserForce { cvarName "g_balance_laser_force" defValue 200 @@ -896,7 +511,7 @@ Item Container Data } } } - Item Data_Cvar laserradius + Item Data_Cvar LaserRadius { cvarName "g_balance_laser_radius" defValue 50 @@ -917,7 +532,7 @@ Item Container Data } } } - Item Data_Cvar laserspeed + Item Data_Cvar LaserSpeed { cvarName "g_balance_laser_speed" defValue 1000 @@ -938,7 +553,7 @@ Item Container Data } } } - Item Data_Cvar shotgundamage + Item Data_Cvar ShotgunDamage { cvarName "g_balance_shotgun_damage" defValue 3.5 @@ -959,7 +574,7 @@ Item Container Data } } } - Item Data_Cvar shotgunbullets + Item Data_Cvar ShotgunBullets { cvarName "g_balance_shotgun_bullets" defValue 10 @@ -980,7 +595,7 @@ Item Container Data } } } - Item Data_Cvar uzidamage + Item Data_Cvar UziDamage { cvarName "g_balance_uzi_damage" defValue 4 @@ -1001,7 +616,7 @@ Item Container Data } } } - Item Data_Cvar uzispread + Item Data_Cvar UziSpread { cvarName "g_balance_uzi_spread" defValue 0.1 @@ -1022,7 +637,7 @@ Item Container Data } } } - Item Data_Cvar uzispread2 + Item Data_Cvar UziSpread2 { cvarName "g_balance_uzi_spread2" defValue 0.01 @@ -1043,7 +658,7 @@ Item Container Data } } } - Item Data_Cvar uzirefire + Item Data_Cvar UziRefire { cvarName "g_balance_uzi_refire" defValue 0.05 @@ -1064,7 +679,7 @@ Item Container Data } } } - Item Data_Cvar grenadelauncherdamage + Item Data_Cvar GrenadeLauncherDamage { cvarName "g_balance_grenadelauncher_damage" defValue 65 @@ -1085,7 +700,7 @@ Item Container Data } } } - Item Data_Cvar grenadelauncheredgedamage + Item Data_Cvar GrenadeLauncherEdgeDamage { cvarName "g_balance_grenadelauncher_edgedamage" defValue 45 @@ -1106,7 +721,7 @@ Item Container Data } } } - Item Data_Cvar grenadelauncherforce + Item Data_Cvar GrenadeLauncherForce { cvarName "g_balance_grenadelauncher_force" defValue 400 @@ -1127,7 +742,7 @@ Item Container Data } } } - Item Data_Cvar grenadelauncherradius + Item Data_Cvar GrenadeLauncherRadius { cvarName "g_balance_grenadelauncher_radius" defValue 140 @@ -1148,7 +763,7 @@ Item Container Data } } } - Item Data_Cvar grenadelauncherspeed + Item Data_Cvar GrenadeLauncherSpeed { cvarName "g_balance_grenadelauncher_speed" defValue 2000 @@ -1169,7 +784,7 @@ Item Container Data } } } - Item Data_Cvar grenadelauncherspeedup + Item Data_Cvar GrenadeLauncherSpeedUp { cvarName "g_balance_grenadelauncher_speed_up" defValue 200 @@ -1190,7 +805,7 @@ Item Container Data } } } - Item Data_Cvar grenadelauncherspeed2 + Item Data_Cvar GrenadeLauncherSpeed2 { cvarName "g_balance_grenadelauncher_speed2" defValue 900 @@ -1211,7 +826,7 @@ Item Container Data } } } - Item Data_Cvar grenadelauncherspeed2up + Item Data_Cvar GrenadeLauncherSpeed2Up { cvarName "g_balance_grenadelauncher_speed2_up" defValue 200 @@ -1232,7 +847,7 @@ Item Container Data } } } - Item Data_Cvar electrodamage + Item Data_Cvar ElectroDamage { cvarName "g_balance_electro_damage" defValue 90 @@ -1253,7 +868,7 @@ Item Container Data } } } - Item Data_Cvar electroedgedamage + Item Data_Cvar ElectroEdgeDamage { cvarName "g_balance_electro_edgedamage" defValue 45 @@ -1274,7 +889,7 @@ Item Container Data } } } - Item Data_Cvar electroforce + Item Data_Cvar ElectroForce { cvarName "g_balance_electro_force" defValue 200 @@ -1295,7 +910,7 @@ Item Container Data } } } - Item Data_Cvar electroradius + Item Data_Cvar ElectroRadius { cvarName "g_balance_electro_radius" defValue 100 @@ -1316,7 +931,7 @@ Item Container Data } } } - Item Data_Cvar electrorefire + Item Data_Cvar ElectroRefire { cvarName "g_balance_electro_refire" defValue 1 @@ -1337,7 +952,7 @@ Item Container Data } } } - Item Data_Cvar electrospeed + Item Data_Cvar ElectroSpeed { cvarName "g_balance_electro_speed" defValue 2000 @@ -1358,7 +973,7 @@ Item Container Data } } } - Item Data_Cvar electroballspeed + Item Data_Cvar ElectroBallSpeed { cvarName "g_balance_electro_ballspeed" defValue 900 @@ -1379,7 +994,7 @@ Item Container Data } } } - Item Data_Cvar electroballspeedup + Item Data_Cvar ElectroBallSpeedUp { cvarName "g_balance_electro_ballspeed_up" defValue 200 @@ -1400,7 +1015,7 @@ Item Container Data } } } - Item Data_Cvar crylinkdamage + Item Data_Cvar CryLinkDamage { cvarName "g_balance_crylink_damage" defValue 20 @@ -1421,7 +1036,7 @@ Item Container Data } } } - Item Data_Cvar crylinkedgedamage + Item Data_Cvar CryLinkEdgeDamage { cvarName "g_balance_crylink_edgedamage" defValue 0 @@ -1442,7 +1057,7 @@ Item Container Data } } } - Item Data_Cvar crylinkforce + Item Data_Cvar CryLinkForce { cvarName "g_balance_crylink_force" defValue 55 @@ -1463,7 +1078,7 @@ Item Container Data } } } - Item Data_Cvar crylinkradius + Item Data_Cvar CryLinkRadius { cvarName "g_balance_crylink_radius" defValue 3 @@ -1484,7 +1099,7 @@ Item Container Data } } } - Item Data_Cvar crylinkspeed + Item Data_Cvar CryLinkSpeed { cvarName "g_balance_crylink_speed" defValue 1800 @@ -1505,7 +1120,7 @@ Item Container Data } } } - Item Data_Cvar crylinkspread + Item Data_Cvar CryLinkSpread { cvarName "g_balance_crylink_spread" defValue 0.15 @@ -1526,7 +1141,7 @@ Item Container Data } } } - Item Data_Cvar crylinkrefire + Item Data_Cvar CryLinkRefire { cvarName "g_balance_crylink_refire" defValue 0.4 @@ -1547,7 +1162,7 @@ Item Container Data } } } - Item Data_Cvar nexdamage + Item Data_Cvar NexDamage { cvarName "g_balance_nex_damage" defValue 200 @@ -1568,7 +1183,7 @@ Item Container Data } } } - Item Data_Cvar hagardamage + Item Data_Cvar HagarDamage { cvarName "g_balance_hagar_damage" defValue 40 @@ -1589,7 +1204,7 @@ Item Container Data } } } - Item Data_Cvar hagaredgedamage + Item Data_Cvar HagarEdgeDamage { cvarName "g_balance_hagar_edgedamage" defValue 15 @@ -1610,7 +1225,7 @@ Item Container Data } } } - Item Data_Cvar hagarforce + Item Data_Cvar HagarForce { cvarName "g_balance_hagar_force" defValue 100 @@ -1631,7 +1246,7 @@ Item Container Data } } } - Item Data_Cvar hagarradius + Item Data_Cvar HagarRadius { cvarName "g_balance_hagar_radius" defValue 70 @@ -1652,7 +1267,7 @@ Item Container Data } } } - Item Data_Cvar hagarspeed + Item Data_Cvar HagarSpeed { cvarName "g_balance_hagar_speed" defValue 3000 @@ -1673,7 +1288,7 @@ Item Container Data } } } - Item Data_Cvar hagarspeed2 + Item Data_Cvar HagarSpeed2 { cvarName "g_balance_hagar_speed2" defValue 1400 @@ -1694,7 +1309,7 @@ Item Container Data } } } - Item Data_Cvar hagarspeed2up + Item Data_Cvar HagarSpeed2Up { cvarName "g_balance_hagar_speed2_up" defValue 100 @@ -1715,7 +1330,7 @@ Item Container Data } } } - Item Data_Cvar rocketlauncherdamage + Item Data_Cvar RocketLauncherDamage { cvarName "g_balance_rocketlauncher_damage" defValue 130 @@ -1736,7 +1351,7 @@ Item Container Data } } } - Item Data_Cvar rocketlauncheredgedamage + Item Data_Cvar RocketLauncherEdgeDamage { cvarName "g_balance_rocketlauncher_edgedamage" defValue 50 @@ -1757,7 +1372,7 @@ Item Container Data } } } - Item Data_Cvar rocketlauncherforce + Item Data_Cvar RocketLauncherForce { cvarName "g_balance_rocketlauncher_force" defValue 600 @@ -1778,7 +1393,7 @@ Item Container Data } } } - Item Data_Cvar rocketlauncherradius + Item Data_Cvar RocketLauncherRadius { cvarName "g_balance_rocketlauncher_radius" defValue 170 @@ -1799,7 +1414,7 @@ Item Container Data } } } - Item Data_Cvar rocketlauncherspeed + Item Data_Cvar RocketLauncherSpeed { cvarName "g_balance_rocketlauncher_speed" defValue 850 diff --git a/scmenu/data/color.menu b/scmenu/data/color.menu new file mode 100644 index 000000000..30c13478b --- /dev/null +++ b/scmenu/data/color.menu @@ -0,0 +1,130 @@ +// Property of Alientrap +// +// data/color.menu + +// v_color prefix and other color controlling cvars +Item DataContainer Color +{ + // normal options + Item Data_Cvar Gamma + { + cvarName "v_gamma" + defValue 1.0 + Item DataLink_Value Value + { + minValue 0.0 + maxValue 4.0 + stepValue 0.05 + link "##up" + } + } + Item Data_Cvar Brightness + { + cvarName "v_brightness" + defValue 0.0 + Item DataLink_Value Value + { + minValue 0.0 + maxValue 3.0 + stepValue 0.05 + link "##up" + } + } + Item Data_Cvar Contrast + { + cvarName "v_contrast" + defValue 1.0 + Item DataLink_Value Value + { + minValue 0.0 + maxValue 3.0 + stepValue 0.05 + link "##up" + } + } + Item Data_Cvar HWGamma // read-only + { + cvarName "v_hwgamma" + defValue 1.0 + Derive DataLink_OnOffSwitch Switch + { + link "##up" + } + } + // extended options + Item DataContainer Extended + { + Item Data_Cvar Active + { + cvarName "v_color_enable" + defValue 0.0 + Derive DataLink_OnOffSwitch Switch + { + link "##up" + } + } + Item Container Low + { + Item Data_Cvar Red + { + cvarName "v_color_black_r" + defValue 0.0 + [DataLink_ZeroOneValue] + } + Item Data_Cvar Green + { + cvarName "v_color_black_g" + defValue 0.0 + [DataLink_ZeroOneValue] + } + Item Data_Cvar Blue + { + cvarName "v_color_black_b" + defValue 0.0 + [DataLink_ZeroOneValue] + } + } + Item Container Mid + { + Item Data_Cvar Red + { + cvarName "v_color_grey_r" + defValue 0.5 + [DataLink_ZeroOneValue] + } + Item Data_Cvar Green + { + cvarName "v_color_grey_g" + defValue 0.5 + [DataLink_ZeroOneValue] + } + Item Data_Cvar Blue + { + cvarName "v_color_grey_b" + defValue 0.5 + [DataLink_ZeroOneValue] + } + } + Item Container High + { + Item Data_Cvar Red + { + cvarName "v_color_white_r" + defValue 1.0 + [DataLink_ZeroOneValue] + } + Item Data_Cvar Green + { + cvarName "v_color_white_g" + defValue 1.0 + [DataLink_ZeroOneValue] + } + Item Data_Cvar Blue + { + cvarName "v_color_white_b" + defValue 1.0 + [DataLink_ZeroOneValue] + } + } + } +} diff --git a/scmenu/data/effects.menu b/scmenu/data/effects.menu new file mode 100644 index 000000000..a67cd2b24 --- /dev/null +++ b/scmenu/data/effects.menu @@ -0,0 +1,76 @@ +// Property of Alientrap/AK +// +// data/effects.menu + +Item DataContainer Effects +{ + Item Data_Cvar Particles + { + cvarName "cl_particles" + defValue 1 + + [DataLink_OnOffSwitch] + } + Item Data_Cvar ParticleQuality + { + cvarName "cl_particles_quality" + defValue 1 + + [DataLink_ZeroOneValue] + } + Item Data_Cvar Decals + { + cvarName "cl_decals" + defValue 1 + + [DataLink_OnOffSwitch] + } + Item Data_Cvar Bloom + { + cvarName "r_bloom" + defValue 1 + + [DataLink_OnOffSwitch] + } + Item Data_Cvar Coronas + { + cvarName "r_coronas" + defValue 1 + + [DataLink_OnOffSwitch] + } + Item Data_Cvar RealtimeLights + { + cvarName "r_shadow_realtime_world" + defValue 1 + + [DataLink_OnOffSwitch] + } + Item Data_Cvar RealtimeDLights + { + cvarName "r_shadow_realtime_dlight" + defValue 1 + + [DataLink_OnOffSwitch] + } + Item Data_Cvar RealtimeShadows + { + cvarName "r_shadow_realtime_world_shadows" + defValue 1 + + [DataLink_OnOffSwitch] + } + Item Data_Cvar OffsetMaps + { + cvarName "r_shadow_glsl_offsetmapping" + defValue 1` + [DataLink_OnOffSwitch] + } + Item Data_Cvar Gloss + { + cvarName "r_shadow_gloss" + defValue 1 + + [DataLink_OnOffSwitch] + } +} diff --git a/scmenu/data/input.menu b/scmenu/data/input.menu new file mode 100644 index 000000000..5cf25ecc5 --- /dev/null +++ b/scmenu/data/input.menu @@ -0,0 +1,31 @@ +// Property of Alientrap +// +// data/input.menu +Item DataContainer Input +{ + Item Data_Cvar Sensitivity + { + cvarName "sensitivity" + defValue 6.0 + Item DataLink_Value Value + { + minValue 0.0 + maxValue 20.0 + stepValue 1 + link "##up" + } + } + Item Data_Cvar InvertMouse + { + cvarName "m_pitch" + defValue 'Off' + Item DataLink_ValueSwitch Switch + { + minValue -0.022 + maxValue 0.022 + descList "'On' 'Off'" + link "##up" + } + } + +} diff --git a/scmenu/data/key.menu b/scmenu/data/key.menu new file mode 100644 index 000000000..f6d19a9b5 --- /dev/null +++ b/scmenu/data/key.menu @@ -0,0 +1,90 @@ +// Property of Alientrap +// +// data/key.menu + +Item DataContainer Key +{ + Item Data_Nex_Key Forward + { + target "+forward" + } + Item Data_Nex_Key Backward + { + target "+back" + } + Item Data_Nex_Key StrafeLeft + { + target "+moveleft" + } + Item Data_Nex_Key StrafeRight + { + target "+moveright" + } + Item Data_Nex_Key Jump + { + target "+jump" + } + Item Data_Nex_Key Crouch + { + target "+shift" + } + Item Data_Nex_Key FirePrimary + { + target "+attack" + } + Item Data_Nex_Key FireSecondary + { + target "+button3" + } + Item Data_Nex_Key PrevWeapon + { + target "impulse 12" + } + Item Data_Nex_Key NextWeapon + { + target "impulse 10" + } + Item DataContainer Weapon + { + Item Data_Nex_Key Laser + { + target "impulse 1" + } + Item Data_Nex_Key Uzi + { + target "impulse 2" + } + Item Data_Nex_Key Shotgun + { + target "impulse 3" + } + Item Data_Nex_Key Grenade + { + target "impulse 4" + } + Item Data_Nex_Key Electro + { + target "impulse 5" + } + Item Data_Nex_Key CryLink + { + target "impulse 6" + } + Item Data_Nex_Key NexGun + { + target "impulse 7" + } + Item Data_Nex_Key Hagar + { + target "impulse 8" + } + Item Data_Nex_Key Rocket + { + target "impulse 9" + } + } + Item Data_Nex_Key ShowScores + { + target "+showscores" + } +} diff --git a/scmenu/data/player.menu b/scmenu/data/player.menu new file mode 100644 index 000000000..af0c725cd --- /dev/null +++ b/scmenu/data/player.menu @@ -0,0 +1,19 @@ +// Property of Alientrap +// +// data/player.menu + +Item DataContainer Player +{ + Item Data_Nex_Name Name + { + defValue "NexPlayer" + Item DataLink_Text Text + { + maxValue 32 + link "##up" + } + } + Item Data_Nex_Avatar Avatar + { + } +} diff --git a/scmenu/data/sound.menu b/scmenu/data/sound.menu new file mode 100644 index 000000000..36af33848 --- /dev/null +++ b/scmenu/data/sound.menu @@ -0,0 +1,34 @@ +// Property of Alientrap +// +// data/sound.menu +Item DataContainer Sound +{ + Item Data_Cvar CDVolume + { + cvarName "bgmvolume" + defValue 0.5 + + [DataLink_ZeroOneValue] + } + Item Data_Cvar GameVolume + { + cvarName "volume" + defValue 1 + + [DataLink_ZeroOneValue] + } + Item Data_Cvar AmbientVolume + { + cvarName "snd_staticvolume" + defValue 0.5 + + [DataLink_ZeroOneValue] + } + Item Data_Cvar SwapStereo + { + cvarName "snd_swapstereo" + defValue 0 + + [DataLink_OnOffSwitch] + } +} diff --git a/scmenu/data/video.menu b/scmenu/data/video.menu new file mode 100644 index 000000000..32bc4e5c1 --- /dev/null +++ b/scmenu/data/video.menu @@ -0,0 +1,37 @@ +// Property of Alientrap +// +// data/video.menu +Item DataContainer Video +{ + Item Data_Nex_Resolution Resolution + { + defValue "800 600" + + Item DataLink_TextSwitch Switch + { + valueList "'320 240' '640 480' '800 600' '1024 768' '1280 970' '1600 1200'" + descList "'320x240' '640x480' '800x600' '1024x768' '1280x970' '1600x1200'" + link "##up" + } + } + Item Data_Cvar BPP + { + cvarName "vid_bitsperpixel" + + Item DataLink_TextSwitch Switch + { + valueList "'16' '32'" + descList "'16-bit' '32-bit'" + link "##up" + } + } + Item Data_Cvar Fullscreen + { + cvarName "vid_fullscreen" + + Derive DataLink_OnOffSwitch Switch + { + link "##up" + } + } +} diff --git a/scmenu/options/effects.menu b/scmenu/options/effects.menu index 3a8c3f152..23a057ef8 100644 --- a/scmenu/options/effects.menu +++ b/scmenu/options/effects.menu @@ -12,10 +12,10 @@ Item Layout Effects text "Particles" target "::Data::Effects::Particles::Switch" } - Derive Nex_Option_Slider Particlequality + Derive Nex_Option_Slider ParticleQuality { text "Particle Quality" - target "::Data::Effects::Particlequality::Value" + target "::Data::Effects::ParticleQuality::Value" } Derive Nex_Option_Switch Decals { @@ -32,25 +32,25 @@ Item Layout Effects text "Coronas" target "::Data::Effects::Coronas::Switch" } - Derive Nex_Option_Switch Realtimelights + Derive Nex_Option_Switch RealtimeLights { text "Realtime World Lights" - target "::Data::Effects::Realtimelights::Switch" + target "::Data::Effects::RealtimeLights::Switch" } - Derive Nex_Option_Switch Realtimedlights + Derive Nex_Option_Switch RealtimeDLights { text "Realtime Dynamic Lights" - target "::Data::Effects::Realtimedlights::Switch" + target "::Data::Effects::RealtimeDLights::Switch" } - Derive Nex_Option_Switch Realtimeshadows + Derive Nex_Option_Switch RealtimeShadows { text "Realtime Shadows" - target "::Data::Effects::Realtimeshadows::Switch" + target "::Data::Effects::RealtimeShadows::Switch" } - Derive Nex_Option_Switch Offsetmaps + Derive Nex_Option_Switch OffsetMaps { text "Offset maps" - target "::Data::Effects::Offsetmaps::Switch" + target "::Data::Effects::OffsetMaps::Switch" } Derive Nex_Option_Switch Gloss { diff --git a/scmenu/options/server.menu b/scmenu/options/server.menu index 4e01fcb80..292cef4f6 100644 --- a/scmenu/options/server.menu +++ b/scmenu/options/server.menu @@ -29,7 +29,7 @@ Item Layout Server Derive Nex_Option_Switch Rocketarena { text "Rocket Arena" - target "::Data::Server::Rocketarena::Switch" + target "::Data::Server::RocketArena::Switch" } Derive Nex_Option_Switch Casings { @@ -54,37 +54,37 @@ Item Layout Server Derive Nex_Option_EditBox Gamespeed { text "Game Speed" - target "Data::Server::Gamespeed::Text" + target "Data::Server::GameSpeed::Text" } Derive Nex_Option_EditBox Maxairspeed { text "Max Air Speed" - target "Data::Server::Maxairspeed::Text" + target "Data::Server::MaxAirSpeed::Text" } - Derive Nex_Option_EditBox Jumpheight + Derive Nex_Option_EditBox JumpHeight { text "Jump height" - target "Data::Server::Jumpheight::Text" + target "Data::Server::JumpHeight::Text" } - Derive Nex_Option_EditBox Healthregen + Derive Nex_Option_EditBox HealthRegeneration { text "Regeneration Speed" - target "Data::Server::Healthregen::Text" + target "Data::Server::HealthRegeneration::Text" } - Derive Nex_Option_EditBox Armorrott + Derive Nex_Option_EditBox ArmorRott { text "Armor Rott Speed" - target "Data::Server::Armorrott::Text" + target "Data::Server::ArmorRott::Text" } - Derive Nex_Option_EditBox Selfdamagepercent + Derive Nex_Option_EditBox SelfDamagePercent { text "Self Damage Percent" - target "Data::Server::Selfdamagepercent::Text" + target "Data::Server::SelfDamagePercent::Text" } - Derive Nex_Option_EditBox Weaponswitchdelay + Derive Nex_Option_EditBox WeaponSwitchDelay { text "Weapon Switch Delay" - target "Data::Server::Weaponswitchdelay::Text" + target "Data::Server::WeaponSwitchDelay::Text" } Derive Nex_Option_EditBox Friction { diff --git a/scmenu/options/weapon.menu b/scmenu/options/weapon.menu index 4bfc3fdbb..760022d71 100644 --- a/scmenu/options/weapon.menu +++ b/scmenu/options/weapon.menu @@ -24,121 +24,121 @@ Item Layout Weapon Derive Nex_Option_EditBox laserdamage { text "Laser Damage" - target "Data::Weapon::laserdamage::Text" + target "Data::Weapon::LaserDamage::Text" } Derive Nex_Option_EditBox laseredgedamage { text "Laser edge damage" - target "Data::Weapon::laseredgedamage::Text" + target "Data::Weapon::LaserEdgeDamage::Text" } Derive Nex_Option_EditBox laserforce { text "Laser Push Force" - target "Data::Weapon::laserforce::Text" + target "Data::Weapon::LaserForce::Text" } Derive Nex_Option_EditBox laserradius { text "Laser Radius" - target "Data::Weapon::laserradius::Text" + target "Data::Weapon::LaserRadius::Text" } Derive Nex_Option_EditBox laserspeed { text "Laser Speed" - target "Data::Weapon::laserspeed::Text" + target "Data::Weapon::LaserSpeed::Text" } Derive Nex_Option_EditBox shotgundamage { text "Shotgun Damage" - target "Data::Weapon::shotgundamage::Text" + target "Data::Weapon::ShotgunDamage::Text" } Derive Nex_Option_EditBox shotgunbullets { text "Shotgun Bullets" - target "Data::Weapon::shotgunbullets::Text" + target "Data::Weapon::ShotgunBullets::Text" } Derive Nex_Option_EditBox uzidamage { text "Uzi Damage" - target "Data::Weapon::uzidamage::Text" + target "Data::Weapon::UziDamage::Text" } Derive Nex_Option_EditBox uzispread { text "Uzi Spread" - target "Data::Weapon::uzispread::Text" + target "Data::Weapon::UziSpread::Text" } Derive Nex_Option_EditBox uzispread2 { text "Uzi Spread2" - target "Data::Weapon::uzispread2::Text" + target "Data::Weapon::UziSpread2::Text" } Derive Nex_Option_EditBox uzirefire { text "Uzi Refire" - target "Data::Weapon::uzirefire::Text" + target "Data::Weapon::UziRefire::Text" } Derive Nex_Option_EditBox grenadelauncherdamage { text "Grenade Launcher Damage" - target "Data::Weapon::grenadelauncherdamage::Text" + target "Data::Weapon::GrenadeLauncherDamage::Text" } Derive Nex_Option_EditBox grenadelauncheredgedamage { text "GL Edge Damage" - target "Data::Weapon::grenadelauncheredgedamage::Text" + target "Data::Weapon::GrenadeLauncherEdgeDamage::Text" } Derive Nex_Option_EditBox grenadelauncherforce { text "Grenade Launcher Force" - target "Data::Weapon::grenadelauncherforce::Text" + target "Data::Weapon::GrenadeLauncherForce::Text" } Derive Nex_Option_EditBox grenadelauncherradius { text "Grenade Launcher Radius" - target "Data::Weapon::grenadelauncherradius::Text" + target "Data::Weapon::GrenadeLauncherRadius::Text" } Derive Nex_Option_EditBox grenadelauncherspeed { text "Grenade Launcher Speed" - target "Data::Weapon::grenadelauncherspeed::Text" + target "Data::Weapon::GrenadeLauncherSpeed::Text" } Derive Nex_Option_EditBox grenadelauncherspeedup { text "Grenade Launcher Speedup" - target "Data::Weapon::grenadelauncherspeedup::Text" + target "Data::Weapon::GrenadeLauncherSpeedUp::Text" } Derive Nex_Option_EditBox grenadelauncherspeed2 { text "Grenade Launcher Speed2" - target "Data::Weapon::grenadelauncherspeed2::Text" + target "Data::Weapon::GrenadeLauncherSpeed2::Text" } Derive Nex_Option_EditBox grenadelauncherspeed2up { text "Grenade Launcher Speed2up" - target "Data::Weapon::grenadelauncherspeed2up::Text" + target "Data::Weapon::GrenadeLauncherSpeed2Up::Text" } Derive Nex_Option_EditBox electrodamage { text "Electro Damage" - target "Data::Weapon::electrodamage::Text" + target "Data::Weapon::ElectroDamage::Text" } Derive Nex_Option_EditBox electroedgedamage { text "Electro Edgedamage" - target "Data::Weapon::electroedgedamage::Text" + target "Data::Weapon::ElectroEdgeDamage::Text" } Derive Nex_Option_EditBox electroforce { text "Electro Force" - target "Data::Weapon::electroforce::Text" + target "Data::Weapon::ElectroForce::Text" } Derive Nex_Option_EditBox electroradius { text "Electro Radius" - target "Data::Weapon::electroradius::Text" + target "Data::Weapon::ElectroRadius::Text" } Derive Nex_Option_EditBox electrorefire { text "Electro Refire" - target "Data::Weapon::electrorefire::Text" + target "Data::Weapon::ElectroRefire::Text" } } diff --git a/scmenu/options/weapon2.menu b/scmenu/options/weapon2.menu index 0abeb173b..847fba046 100644 --- a/scmenu/options/weapon2.menu +++ b/scmenu/options/weapon2.menu @@ -24,116 +24,116 @@ Item Layout Weapon2 Derive Nex_Option_EditBox electrospeed { text "Electro Speed" - target "Data::Weapon::electrospeed::Text" + target "Data::Weapon::ElectroSpeed::Text" } Derive Nex_Option_EditBox electroballspeed { text "Electroball Speed" - target "Data::Weapon::electroballspeed::Text" + target "Data::Weapon::ElectroBallSpeed::Text" } Derive Nex_Option_EditBox electroballspeedup { text "Electroball Speed up" - target "Data::Weapon::electroballspeedup::Text" + target "Data::Weapon::ElectroBallSpeedUp::Text" } Derive Nex_Option_EditBox crylinkdamage { - text "Crylink Damage" - target "Data::Weapon::crylinkdamage::Text" + text "CryLink Damage" + target "Data::Weapon::CryLinkDamage::Text" } Derive Nex_Option_EditBox crylinkedgedamage { - text "Crylink Edgedamage" - target "Data::Weapon::crylinkedgedamage::Text" + text "CryLink Edgedamage" + target "Data::Weapon::CryLinkEdgeDamage::Text" } Derive Nex_Option_EditBox crylinkforce { - text "Crylink Force" - target "Data::Weapon::crylinkforce::Text" + text "CryLink Force" + target "Data::Weapon::CryLinkForce::Text" } Derive Nex_Option_EditBox crylinkradius { - text "Crylink Radius" - target "Data::Weapon::crylinkradius::Text" + text "CryLink Radius" + target "Data::Weapon::CryLinkRadius::Text" } Derive Nex_Option_EditBox crylinkspeed { - text "Crylink Speed" - target "Data::Weapon::crylinkspeed::Text" + text "CryLink Speed" + target "Data::Weapon::CryLinkSpeed::Text" } Derive Nex_Option_EditBox crylinkspread { - text "Crylink Spread" - target "Data::Weapon::crylinkspread::Text" + text "CryLink Spread" + target "Data::Weapon::CryLinkSpread::Text" } Derive Nex_Option_EditBox crylinkrefire { - text "Crylink Refire" - target "Data::Weapon::crylinkrefire::Text" + text "CryLink Refire" + target "Data::Weapon::CryLinkRefire::Text" } Derive Nex_Option_EditBox nexdamage { text "Nex Damage" - target "Data::Weapon::nexdamage::Text" + target "Data::Weapon::NexDamage::Text" } Derive Nex_Option_EditBox hagardamage { text "Hagar Damage" - target "Data::Weapon::hagardamage::Text" + target "Data::Weapon::HagarDamage::Text" } Derive Nex_Option_EditBox hagaredgedamage { text "Hagar Edge Damage" - target "Data::Weapon::hagaredgedamage::Text" + target "Data::Weapon::HagarEdgeDamage::Text" } Derive Nex_Option_EditBox hagarforce { text "Hagar Force" - target "Data::Weapon::hagarforce::Text" + target "Data::Weapon::HagarForce::Text" } Derive Nex_Option_EditBox hagarradius { text "Hagar Radius" - target "Data::Weapon::hagarradius::Text" + target "Data::Weapon::HagarRadius::Text" } Derive Nex_Option_EditBox hagarspeed { text "Hagar Speed" - target "Data::Weapon::hagarspeed::Text" + target "Data::Weapon::HagarSpeed::Text" } Derive Nex_Option_EditBox hagarspeed2 { text "Hagar Speed2" - target "Data::Weapon::hagarspeed2::Text" + target "Data::Weapon::HagarSpeed2::Text" } Derive Nex_Option_EditBox hagarspeed2up { text "Hagar Speed2 up" - target "Data::Weapon::hagarspeed2up::Text" + target "Data::Weapon::HagarSpeed2Up::Text" } Derive Nex_Option_EditBox rocketlauncherdamage { text "Rocket Launcher Damage" - target "Data::Weapon::rocketlauncherdamage::Text" + target "Data::Weapon::RocketLauncherDamage::Text" } Derive Nex_Option_EditBox rocketlauncheredgedamage { text "RL Edge Damage" - target "Data::Weapon::rocketlauncheredgedamage::Text" + target "Data::Weapon::RocketLauncherEdgeDamage::Text" } Derive Nex_Option_EditBox rocketlauncherforce { text "Rocket Launcher Force" - target "Data::Weapon::rocketlauncherforce::Text" + target "Data::Weapon::RocketLauncherForce::Text" } Derive Nex_Option_EditBox rocketlauncherradius { text "Rocket Launcher Radius" - target "Data::Weapon::rocketlauncherradius::Text" + target "Data::Weapon::RocketLauncherRadius::Text" } Derive Nex_Option_EditBox rocketlauncherspeed { text "Rocket Launcher Speed" - target "Data::Weapon::rocketlauncherspeed::Text" + target "Data::Weapon::RocketLauncherSpeed::Text" } } diff --git a/scmenu/source/control/data/base.qc b/scmenu/source/control/data/base.qc index d72ec8aad..78b2402b0 100644 --- a/scmenu/source/control/data/base.qc +++ b/scmenu/source/control/data/base.qc @@ -176,3 +176,29 @@ void() Item_DataUser_Init = self._destroy = Item_DataUser_Destroy; }; +/* +=================== +Item_DataContainer_DataEvent +=================== +*/ +void( float pEvent ) Item_DataContainer_DataEvent = +{ + // no support for embedded stuff yet (isnt needed imho anyway) + local entity lItem; + + for( lItem = self._child ; lItem != null_entity ; lItem = lItem._next ) { + Raise_DataEvent( lItem, pEvent ); + } +}; + +/* +=================== +Item_DataContainer_Spawn +=================== +*/ +void() Item_DataContainer_Spawn = +{ + Item_Container_Spawn(); + + self._dataEvent = Item_DataContainer_DataEvent; +}; diff --git a/scmenu/source/control/data/data.qh b/scmenu/source/control/data/data.qh index ea98a3f4e..dd69e159a 100644 --- a/scmenu/source/control/data/data.qh +++ b/scmenu/source/control/data/data.qh @@ -44,7 +44,15 @@ void() Item_DataLink_Init; void() Item_DataLink_Destroy; void() Item_DataLink_Update; +// Item_DataContainer [Item_Container] [implements the DATA events] +void( float pEvent ) Item_DataContainer_DataEvent; +void() Item_DataContainer_Spawn; + // Item_Data_Container [Item_Data] +void() Item_Data_Container_Reinit; +void( float pEvent ) Item_Data_Container_DataEvent; + +void() Item_Data_Container_Spawn; // Item_Data_Cvar [Item_Data] .string cvarName; diff --git a/scmenu/source/control/visual/list.qc b/scmenu/source/control/visual/list.qc index 06c92cd0d..b5295ff88 100644 --- a/scmenu/source/control/visual/list.qc +++ b/scmenu/source/control/visual/list.qc @@ -9,7 +9,6 @@ void() Item_List_Draw = local float lEnd; local vector lPos; - if( !self._target ) return; diff --git a/scmenu/source/custom/creategame.qm b/scmenu/source/custom/creategame.qm index 6b97e59ab..2556841c5 100644 --- a/scmenu/source/custom/creategame.qm +++ b/scmenu/source/custom/creategame.qm @@ -84,3 +84,9 @@ void() Nex_Action_Map_Start = // force the menu to hide m_hide(); }; + +// init the map list +void() Nex_Action_MapList_Init = +{ + Item_DataLink_Nex_MapList_InitWithMapList( self ); +}; -- 2.39.2