From 57f3bd49fe8ae4a595d1adf5777005ebd5728c4f Mon Sep 17 00:00:00 2001 From: esteel Date: Fri, 24 Feb 2006 19:12:14 +0000 Subject: [PATCH] corrected norecoil menu entry / changed cvars to say laserguided instead of homing as this was actualy wrong git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1125 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/default.cfg | 8 ++++---- data/menu/creategame/gamemodes/gamemisc.menu | 8 ++++---- data/menu/data/gamemodes/gamemisc.menu | 4 ++-- data/menu/data/weapon.menu | 6 +++--- data/qcsrc/server/gamec/cl_weaponsystem.c | 4 ++-- data/qcsrc/server/gamec/teamplay.c | 4 ++-- data/qcsrc/server/gamec/w_rocketlauncher.c | 14 +++++++------- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/data/default.cfg b/data/default.cfg index a73e4411a..39fa9f328 100644 --- a/data/default.cfg +++ b/data/default.cfg @@ -134,7 +134,7 @@ set g_minstagib_ammo_drop 5 // how much ammo you'll get for weapons or cells set g_minstagib_invis_alpha 0.1 // set -1 for complete invisibility set g_rocketarena 0 set g_vampire 0 -set g_homing_missile 0 +set g_laserguided_missile 0 set g_midair 0 set g_midair_shieldtime 0.3 set g_spawnshieldtime 0 @@ -419,9 +419,9 @@ set g_balance_rocketlauncher_lifetime 9 set g_balance_rocketlauncher_refire 1 set g_balance_rocketlauncher_animtime 0.3 set g_balance_rocketlauncher_ammo 3 -set g_balance_rocketlauncher_homing_speed 1000 //650 -set g_balance_rocketlauncher_homing_turnrate 0.75 //0.5 -set g_balance_rocketlauncher_homing_allow_steal 1 +set g_balance_rocketlauncher_laserguided_speed 1000 //650 +set g_balance_rocketlauncher_laserguided_turnrate 0.75 //0.5 +set g_balance_rocketlauncher_laserguided_allow_steal 1 set g_balance_falldamage_deadminspeed 150 set g_balance_falldamage_minspeed 1400 diff --git a/data/menu/creategame/gamemodes/gamemisc.menu b/data/menu/creategame/gamemodes/gamemisc.menu index b323f673c..282c96bc2 100644 --- a/data/menu/creategame/gamemodes/gamemisc.menu +++ b/data/menu/creategame/gamemodes/gamemisc.menu @@ -173,15 +173,15 @@ Item Layout Misc text "Vampire Mode" target "::Data::Game::Misc::Vampire::Switch" } - Derive Nex_Option_Switch HomingRocket + Derive Nex_Option_Switch LaserguidedRocket { - text "Laser-Guide Rockets" - target "::Data::Game::Misc::HomingRocket::Switch" + text "Laser-Guided Rockets" + target "::Data::Game::Misc::LaserguidedRockets::Switch" } Derive Nex_Option_Switch NoRecoil { text "No Recoil (no view kick when firing weapons)" - target "::Data::Game::Misc::HomingRocket::Switch" + target "::Data::Game::Misc::NoRecoil::Switch" } Derive Nex_Line SeperatorMidAir {} diff --git a/data/menu/data/gamemodes/gamemisc.menu b/data/menu/data/gamemodes/gamemisc.menu index 97ffeba33..942949580 100644 --- a/data/menu/data/gamemodes/gamemisc.menu +++ b/data/menu/data/gamemodes/gamemisc.menu @@ -186,9 +186,9 @@ Item DataContainer Misc [DataLink_OnOffSwitch] } - Item Data_Cvar HomingRocket + Item Data_Cvar LaserguidedRockets { - cvarName "g_homing_missile" + cvarName "g_laserguided_missile" defValue 0 [DataLink_OnOffSwitch] diff --git a/data/menu/data/weapon.menu b/data/menu/data/weapon.menu index cd08ebf49..4253dc16f 100644 --- a/data/menu/data/weapon.menu +++ b/data/menu/data/weapon.menu @@ -902,21 +902,21 @@ Item DataContainer Weapon } Item Data_Cvar RocketLauncherGuidedSpeed { - cvarName "g_balance_rocketlauncher_homing_speed" + cvarName "g_balance_rocketlauncher_laserguided_speed" defValue 650 [DataLink_Setting] } Item Data_Cvar RocketLauncherGuidedTurnRate { - cvarName "g_balance_rocketlauncher_homing_turnrate" + cvarName "g_balance_rocketlauncher_laserguided_turnrate" defValue 0.5 [DataLink_Setting] } Item Data_Cvar RocketLauncherGuidedAllowSteal { - cvarName "g_balance_rocketlauncher_homing_allow_steal" + cvarName "g_balance_rocketlauncher_laserguided_allow_steal" defValue 1 [DataLink_OnOffSwitch] diff --git a/data/qcsrc/server/gamec/cl_weaponsystem.c b/data/qcsrc/server/gamec/cl_weaponsystem.c index b4f632475..f9adfd454 100644 --- a/data/qcsrc/server/gamec/cl_weaponsystem.c +++ b/data/qcsrc/server/gamec/cl_weaponsystem.c @@ -35,10 +35,10 @@ void LaserTarget_Think() uselaser = 0; // list of weapons that will use the laser, and the options that enable it - if(self.owner.laser_on && self.owner.weapon == WEP_ROCKET_LAUNCHER && cvar("g_homing_missile")) + if(self.owner.laser_on && self.owner.weapon == WEP_ROCKET_LAUNCHER && cvar("g_laserguided_missile")) uselaser = 1; // example - //if(self.owner.weapon == WEP_ELECTRO && cvar("g_homing_electro")) + //if(self.owner.weapon == WEP_ELECTRO && cvar("g_laserguided_electro")) // uselaser = 1; diff --git a/data/qcsrc/server/gamec/teamplay.c b/data/qcsrc/server/gamec/teamplay.c index 99b48db88..b894aaa99 100644 --- a/data/qcsrc/server/gamec/teamplay.c +++ b/data/qcsrc/server/gamec/teamplay.c @@ -290,11 +290,11 @@ void PrintWelcomeMessage(entity pl) } modifications = strcat(modifications, "vampire"); } - if(cvar("g_homing_missile")) { + if(cvar("g_laserguided_missile")) { if (modifications) { modifications = strcat(modifications, ", "); } - modifications = strcat(modifications, "homing missiles"); + modifications = strcat(modifications, "laser-guided-missiles"); } local string versionmessage; diff --git a/data/qcsrc/server/gamec/w_rocketlauncher.c b/data/qcsrc/server/gamec/w_rocketlauncher.c index a36716118..55dc2aac1 100644 --- a/data/qcsrc/server/gamec/w_rocketlauncher.c +++ b/data/qcsrc/server/gamec/w_rocketlauncher.c @@ -17,7 +17,7 @@ void(float req) w_rlauncher = rlauncher_ready_01(); else if (req == WR_FIRE1) weapon_prepareattack(rlauncher_check, rlauncher_check, rlauncher_fire1_01, cvar("g_balance_rocketlauncher_refire")); - else if (req == WR_FIRE2 && cvar("g_homing_missile")) + else if (req == WR_FIRE2 && cvar("g_laserguided_missile")) { if(self.exteriorweaponentity.attack_finished < time) { @@ -57,7 +57,7 @@ void W_Rocket_Explode (void) self.owner.attack_finished = time; self.owner.switchweapon = w_getbestweapon(self.owner); } - if(cvar("g_homing_missile")) + if(cvar("g_laserguided_missile")) self.owner.attack_finished = time + cvar("g_balance_rocketlauncher_refire"); } remove (self); @@ -143,7 +143,7 @@ void W_Rocket_Think (void) } if (self.owner.weapon == WEP_ROCKET_LAUNCHER) { - if(cvar("g_homing_missile")) + if(cvar("g_laserguided_missile")) { if(!self.owner.button0) self.ltime = -1; // indicate that the player has let go of the button @@ -155,7 +155,7 @@ void W_Rocket_Think (void) return; } - if(cvar("g_balance_rocketlauncher_homing_allow_steal")) + if(cvar("g_balance_rocketlauncher_laserguided_allow_steal")) { if(self.owner.laser_on) { @@ -179,7 +179,7 @@ void W_Rocket_Think (void) if(!self.speed) self.speed = vlen(self.velocity); e = self.enemy;//self.owner.weaponentity.lasertarget; - turnrate = cvar("g_balance_rocketlauncher_homing_turnrate");//0.65; // how fast to turn + turnrate = cvar("g_balance_rocketlauncher_laserguided_turnrate");//0.65; // how fast to turn desireddir = normalize(e.origin - self.origin); // get direction from my position to the laser target olddir = normalize(self.velocity); // get my current direction newdir = normalize((olddir + desireddir * turnrate) * 0.5); // take the average of the 2 directions; not the best method but simple & easy @@ -253,8 +253,8 @@ void W_Rocket_Attack (void) setsize (missile, '0 0 0', '0 0 0'); setorigin (missile, org); - if(cvar("g_homing_missile") && self.laser_on) - missile.velocity = normalize(trueaim - org) * cvar("g_balance_rocketlauncher_homing_speed"); + if(cvar("g_laserguided_missile") && self.laser_on) + missile.velocity = normalize(trueaim - org) * cvar("g_balance_rocketlauncher_laserguided_speed"); else missile.velocity = normalize(trueaim - org) * cvar("g_balance_rocketlauncher_speed"); missile.angles = vectoangles (missile.velocity); -- 2.39.2