From: Jakob MG Date: Wed, 4 May 2011 16:29:03 +0000 (+0200) Subject: No csqc vehicles enabled for now, make raptor aim-lock a bit better when strafing... X-Git-Tag: xonotic-v0.5.0~199^2~11^2~54 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8952f4c63ed5480c61515b302871b22da9042a92;p=xonotic%2Fxonotic-data.pk3dir.git No csqc vehicles enabled for now, make raptor aim-lock a bit better when strafing, update default settings --- diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index db9d38121..d79888b0f 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -420,6 +420,7 @@ void CSQC_UpdateView(float w, float h) // Render the Scene if(!intermission || !view_set) { + #ifdef VEHICLES_CSQC if(hud) { view_origin = vehicle_hudmodel.origin; //pmove_org + vo + randomvec() * 20; @@ -433,6 +434,7 @@ void CSQC_UpdateView(float w, float h) } else { + #endif view_origin = pmove_org + vo; view_angles = input_angles; makevectors(view_angles); @@ -440,8 +442,9 @@ void CSQC_UpdateView(float w, float h) view_right = v_right; view_up = v_up; view_set = 1; - dprint("Bong!\n"); + #ifdef VEHICLES_CSQC } + #endif } #ifdef BLURTEST diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc index 8113e6abb..8ea2ca7bc 100644 --- a/qcsrc/server/vehicles/racer.qc +++ b/qcsrc/server/vehicles/racer.qc @@ -510,8 +510,10 @@ void racer_enter() self.movetype = MOVETYPE_BOUNCE; self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_racer_health); self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_racer_shield); +#ifdef VEHICLES_CSQC if(self.SendEntity) self.SendFlags |= VSF_SETUP; +#endif } void racer_exit(float eject) diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc index b24de9216..de5c7dfcd 100644 --- a/qcsrc/server/vehicles/raptor.qc +++ b/qcsrc/server/vehicles/raptor.qc @@ -202,6 +202,9 @@ void raptor_enter() self.velocity_z = 1; // Nudge upwards to takeoff sequense can work. self.tur_head.exteriormodeltoclient = self.owner; + self.delay = time + autocvar_g_vehicle_raptor_bombs_refire; + self.lip = time; + #ifdef RAPTOR_RETARDCAMERA setorigin(self.vehicle_viewport, self.origin); #endif @@ -279,6 +282,24 @@ float raptor_takeoff() else player.PlayerPhysplug = raptor_frame; + if(self.vehicle_flags & VHF_SHIELDREGEN) + vehicles_regen(dmg_time, vehicle_shield, autocvar_g_vehicle_raptor_shield, autocvar_g_vehicle_raptor_shield_regen_pause, autocvar_g_vehicle_raptor_shield_regen, frametime); + + if(self.vehicle_flags & VHF_HEALTHREGEN) + vehicles_regen(dmg_time, vehicle_health, autocvar_g_vehicle_raptor_health, autocvar_g_vehicle_raptor_health_regen_pause, autocvar_g_vehicle_raptor_health_regen, frametime); + + if(self.vehicle_flags & VHF_ENERGYREGEN) + vehicles_regen(cnt, vehicle_energy, autocvar_g_vehicle_raptor_energy, autocvar_g_vehicle_raptor_energy_regen_pause, autocvar_g_vehicle_raptor_energy_regen, frametime); + + + raptor.bomb1.alpha = raptor.bomb2.alpha = (time - raptor.lip) / (raptor.delay - raptor.lip); + player.vehicle_reload2 = bound(0, raptor.bomb1.alpha * 100, 100); + + VEHICLE_UPDATE_PLAYER(health, raptor); + VEHICLE_UPDATE_PLAYER(energy, raptor); + if(self.vehicle_flags & VHF_HASSHIELD) + VEHICLE_UPDATE_PLAYER(shield, raptor); + player.BUTTON_ATCK = player.BUTTON_ATCK2 = player.BUTTON_CROUCH = 0; self = player; return 1; @@ -288,7 +309,7 @@ float raptor_frame() { entity player, raptor; float ftmp, ftmp2; - vector df; + vector df, ra; player = self; raptor = self.vehicle; @@ -413,8 +434,9 @@ float raptor_frame() df += v_up * autocvar_g_vehicle_raptor_speed_up; raptor.velocity += df * frametime; - player.velocity = player.movement = raptor.velocity; - setorigin(player,raptor.origin + '0 0 32'); + //player.velocity = player.movement = raptor.velocity; + player.velocity = raptor.velocity; + //setorigin(player,raptor.origin + '0 0 32'); vector vf, ad; // Target lock & predict @@ -454,6 +476,8 @@ float raptor_frame() } } + ra = raptor.angles; + ra_z = 0; // Aim the gunz ftmp2 = autocvar_g_vehicle_raptor_cannon_turnspeed * frametime; ftmp = -ftmp2; @@ -463,7 +487,7 @@ float raptor_frame() //ad = df; //vf = v_forward; df = vectoangles(normalize(trace_endpos - df)); // Find the direction & angle - df = shortangle_vxy(df - (raptor.angles + raptor.gun1.angles), raptor.angles + raptor.gun1.angles); // Find aim offset + df = shortangle_vxy(df - (ra + raptor.gun1.angles), ra + raptor.gun1.angles); // Find aim offset // Bind to aimspeed df_x = bound(ftmp, df_x, ftmp2); df_y = bound(ftmp, df_y, ftmp2); @@ -478,7 +502,7 @@ float raptor_frame() //ad += df; //vf += v_forward; df = vectoangles(normalize(trace_endpos - df)); // Find the direction & angle - df = shortangle_vxy(df - (raptor.angles + raptor.gun2.angles), raptor.angles + raptor.gun2.angles); // Find aim offset + df = shortangle_vxy(df - (ra + raptor.gun2.angles), ra + raptor.gun2.angles); // Find aim offset // Bind to aimspeed df_x = bound(ftmp, df_x, ftmp2); df_y = bound(ftmp, df_y, ftmp2); @@ -539,8 +563,6 @@ float raptor_frame() if(self.vehicle_flags & VHF_HASSHIELD) VEHICLE_UPDATE_PLAYER(shield, raptor); - - player.BUTTON_ATCK = player.BUTTON_ATCK2 = player.BUTTON_CROUCH = 0; return 1; } diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc index 93d9ef3ac..cef72363d 100644 --- a/qcsrc/server/vehicles/vehicles.qc +++ b/qcsrc/server/vehicles/vehicles.qc @@ -404,8 +404,9 @@ void vehicles_enter() // .viewmodelforclient works better. //self.vehicle_hudmodel.drawonlytoclient = self.owner; - if not (self.SendEntity) +#ifndef VEHICLES_CSQC self.vehicle_hudmodel.viewmodelforclient = self.owner; +#endif self.event_damage = vehicles_damage; self.nextthink = 0; @@ -439,10 +440,8 @@ void vehicles_enter() self.team = self.owner.team; self.flags -= FL_NOTARGET; -#if 0 - other.clientcamera = self.vehicle_viewport; -#else - /*msg_entity = other; +#ifndef VEHICLES_CSQC + msg_entity = other; WriteByte (MSG_ONE, SVC_SETVIEWPORT); WriteEntity(MSG_ONE, self.vehicle_viewport); @@ -459,7 +458,8 @@ void vehicles_enter() WriteAngle(MSG_ONE, self.angles_x * -1); // tilt WriteAngle(MSG_ONE, self.angles_y); // yaw WriteAngle(MSG_ONE, 0); // roll - }*/ + } +#endif #endif vehicles_clearrturn(); diff --git a/qcsrc/server/vehicles/vehicles_def.qh b/qcsrc/server/vehicles/vehicles_def.qh index 736bb1873..3ecdd8b63 100644 --- a/qcsrc/server/vehicles/vehicles_def.qh +++ b/qcsrc/server/vehicles/vehicles_def.qh @@ -1,4 +1,4 @@ -#define VEHICLES_CSQC +//#define VEHICLES_CSQC // #define VEHICLES_USE_ODE #define VEHICLES_ENABLED #ifdef VEHICLES_ENABLED diff --git a/vehicle_racer.cfg b/vehicle_racer.cfg index 3e32696e2..9d6fec3d4 100644 --- a/vehicle_racer.cfg +++ b/vehicle_racer.cfg @@ -1,16 +1,15 @@ set g_vehicle_racer_respawntime 30 -set g_vehicle_racer_health 300 +set g_vehicle_racer_health 190 set g_vehicle_racer_health_regen 0 set g_vehicle_racer_health_regen_pause 0 -set g_vehicle_racer_shield 80 +set g_vehicle_racer_shield 75 set g_vehicle_racer_shield_regen 25 set g_vehicle_racer_shield_regen_pause 1 -set g_vehicle_racer_energy 150 -set g_vehicle_racer_energy_regen 50 -set g_vehicle_racer_energy_regen 50 +set g_vehicle_racer_energy 125 +set g_vehicle_racer_energy_regen 40 set g_vehicle_racer_energy_regen_pause 1 set g_vehicle_racer_speed_stop 2000 @@ -43,19 +42,19 @@ set g_vehicle_racer_cannon_spread 0.0125 set g_vehicle_racer_cannon_force 50 set g_vehicle_racer_rocket_speed 1000 -set g_vehicle_racer_rocket_accel 1300 -set g_vehicle_racer_rocket_turnrate 0.14 -set g_vehicle_racer_rocket_damage 150 +set g_vehicle_racer_rocket_accel 1400 +set g_vehicle_racer_rocket_turnrate 0.15 +set g_vehicle_racer_rocket_damage 175 set g_vehicle_racer_rocket_force 350 -set g_vehicle_racer_rocket_radius 100 -set g_vehicle_racer_rocket_refire 5 +set g_vehicle_racer_rocket_radius 125 +set g_vehicle_racer_rocket_refire 6 set g_vehicle_racer_rocket_cost 0 set g_vehicle_racer_rocket_locktarget 1 set g_vehicle_racer_rocket_locking_time 0.45 -set g_vehicle_racer_rocket_locking_releasetime 1.2 -set g_vehicle_racer_rocket_locked_time 3.5 -set g_vehicle_racer_rocket_locked_maxangle 1.42 +set g_vehicle_racer_rocket_locking_releasetime 1.5 +set g_vehicle_racer_rocket_locked_time 5 +set g_vehicle_racer_rocket_locked_maxangle 1.44 set g_vehicle_racer_blowup_radius 250 set g_vehicle_racer_blowup_coredamage 250 diff --git a/vehicle_raptor.cfg b/vehicle_raptor.cfg index 164f2bbef..07e511c56 100644 --- a/vehicle_raptor.cfg +++ b/vehicle_raptor.cfg @@ -33,9 +33,9 @@ set g_vehicle_raptor_cannon_pitchlimit_up 12 set g_vehicle_raptor_cannon_pitchlimit_down 32 set g_vehicle_raptor_cannon_locktarget 1 -set g_vehicle_raptor_cannon_locking_time 0.6 +set g_vehicle_raptor_cannon_locking_time 0.5 set g_vehicle_raptor_cannon_locking_releasetime 1.5 -set g_vehicle_raptor_cannon_locked_time 3.5 +set g_vehicle_raptor_cannon_locked_time 5 set g_vehicle_raptor_cannon_predicttarget 1 set g_vehicle_raptor_cannon_cost 1 @@ -46,16 +46,16 @@ set g_vehicle_raptor_cannon_speed 12000 set g_vehicle_raptor_cannon_spread 0.01 set g_vehicle_raptor_cannon_force 50 -set g_vehicle_raptor_energy 20 -set g_vehicle_raptor_energy_regen 10 -set g_vehicle_raptor_energy_regen_pause 0.75 +set g_vehicle_raptor_energy 30 +set g_vehicle_raptor_energy_regen 15 +set g_vehicle_raptor_energy_regen_pause 0.8 -set g_vehicle_raptor_health 200 +set g_vehicle_raptor_health 150 set g_vehicle_raptor_health_regen 0 set g_vehicle_raptor_health_regen_pause 0 -set g_vehicle_raptor_shield 150 +set g_vehicle_raptor_shield 100 set g_vehicle_raptor_shield_regen 25 -set g_vehicle_raptor_shield_regen_pause 2 +set g_vehicle_raptor_shield_regen_pause 1.5 set g_vehicle_raptor_mass 2200 diff --git a/vehicle_spiderbot.cfg b/vehicle_spiderbot.cfg index a7f4d59bf..09d9fe964 100644 --- a/vehicle_spiderbot.cfg +++ b/vehicle_spiderbot.cfg @@ -30,8 +30,8 @@ set g_vehicle_spiderbot_minigun_spread 0.015 set g_vehicle_spiderbot_minigun_speed 50000 set g_vehicle_spiderbot_minigun_refire 0.05 set g_vehicle_spiderbot_minigun_ammo_cost 1 -set g_vehicle_spiderbot_minigun_ammo_max 100 -set g_vehicle_spiderbot_minigun_ammo_regen 10 +set g_vehicle_spiderbot_minigun_ammo_max 200 +set g_vehicle_spiderbot_minigun_ammo_regen 15 set g_vehicle_spiderbot_minigun_ammo_regen_pause 1 set g_vehicle_spiderbot_springlength 150