From: Jakob MG Date: Wed, 28 Jul 2010 13:26:07 +0000 (+0200) Subject: New raptor cockpit mode, add missing "spinner" model, add missing raptor config and... X-Git-Tag: xonotic-v0.1.0preview~383^2^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=62fe3a4a5fdf811bb7e59ce1c00bf4a750bd0ef7;p=xonotic%2Fxonotic-data.pk3dir.git New raptor cockpit mode, add missing "spinner" model, add missing raptor config and fix some code/cvar name mismatches. Fix a seriouse bug if vehicles shield handeling. --- diff --git a/models/vehicles/raptor_cockpit.dpm b/models/vehicles/raptor_cockpit.dpm index 332b2d7bf..fe933e4e4 100644 Binary files a/models/vehicles/raptor_cockpit.dpm and b/models/vehicles/raptor_cockpit.dpm differ diff --git a/models/vehicles/spinner.dpm b/models/vehicles/spinner.dpm new file mode 100644 index 000000000..d3d83b44b Binary files /dev/null and b/models/vehicles/spinner.dpm differ diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc index d7f4de67a..06392ec0d 100644 --- a/qcsrc/server/vehicles/raptor.qc +++ b/qcsrc/server/vehicles/raptor.qc @@ -84,13 +84,13 @@ void raptor_loadsettings() raptor_beam_leangth = CCVAR("_beam_length"); raptor_beam_refire = CCVAR("_beam_refire"); - raptor_shield_max = CCVAR("_shield_max"); + raptor_shield_max = CCVAR("_shield"); raptor_shield_regen = CCVAR("_shield_regen"); - raptor_health_max = CCVAR("_health_max"); + raptor_health_max = CCVAR("_health"); raptor_health_regen = CCVAR("_health_regen"); - raptor_energy_max = CCVAR("_energy_max"); + raptor_energy_max = CCVAR("_energy"); raptor_energy_regen = CCVAR("_energy_regen"); } @@ -234,7 +234,6 @@ void raptor_setanim(float start, float end, float length) } void raptor_beam (vector start, vector end, vector smin, vector smax, float bforce, float f_dmg, float deathtype) - { vector hitloc, force, endpoint, dir; entity ent; @@ -520,6 +519,7 @@ float raptor_pplug() setorigin(player,vhic.origin + '0 0 32'); // Aim the gunz + /* vector target_angle, move_angle, org1, org2, targ; makevectors(player.v_angle); @@ -549,7 +549,7 @@ float raptor_pplug() move_angle = shortangle_vxy(move_angle,(vhic.angles + vhic.gun2.angles)); vhic.gun2.angles_x = bound(-15,move_angle_x + vhic.gun2.angles_x,15); vhic.gun2.angles_y = bound(-20,move_angle_y + vhic.gun2.angles_y,20); - + */ if(player.BUTTON_ATCK) if(vhic.vehicle_energy > (raptor_beam_aps * sys_frametime)) { @@ -832,7 +832,7 @@ void raptor_dinit() raptor_spawn(); } -void spawnfunc_vehicle_raptor2() +void spawnfunc_vehicle_raptor() { self.cvar_basename = "g_vehicle_raptor"; raptor_loadsettings(); @@ -869,7 +869,7 @@ void spawnfunc_vehicle_raptor2() } -void spawnfunc_vehicle_raptor() +void spawnfunc_vehicle_raptor2() { entity iqm,dpm,md3; diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc index 5aac0f0f0..7cc2949f6 100644 --- a/qcsrc/server/vehicles/vehicles.qc +++ b/qcsrc/server/vehicles/vehicles.qc @@ -66,14 +66,15 @@ void vehicle_stdproc_damage(entity inflictor, entity attacker, float damage, flo if((self.vehicle_flags & VHF_HASSHIELD) && (self.vehicle_shield > 0)) { - if not (self.tur_head.enemy) + + if (wasfreed(self.tur_head.enemy) || self.tur_head.enemy == world) { self.tur_head.enemy = spawn(); self.tur_head.enemy.effects = EF_LOWPRECISION; } - setmodel(self.tur_head.enemy,"models/vhshield.md3"); - setattachment(self.tur_head.enemy,self,""); + setmodel(self.tur_head.enemy, "models/vhshield.md3"); + setattachment(self.tur_head.enemy, self, ""); self.tur_head.enemy.colormod = '1 1 1'; self.tur_head.enemy.alpha = 0.45; diff --git a/qcsrc/server/vehicles/vehicles.qh b/qcsrc/server/vehicles/vehicles.qh index 192d83f6d..8e452478e 100644 --- a/qcsrc/server/vehicles/vehicles.qh +++ b/qcsrc/server/vehicles/vehicles.qh @@ -22,6 +22,8 @@ float SVC_UPDATEENTITY = 128; // Net.Protocol 0x80 .entity gun1; .entity gun2; +.entity shield; + .float vehicle_health; .float vehicle_shield; .float vehicle_energy; diff --git a/vehicle_raptor.cfg b/vehicle_raptor.cfg new file mode 100644 index 000000000..bd2ff7c1a --- /dev/null +++ b/vehicle_raptor.cfg @@ -0,0 +1,37 @@ +set g_vehicle_raptor_reload 1 + +set g_vehicle_raptor_movestyle 1 +set g_vehicle_raptor_turnspeed 90 +set g_vehicle_raptor_turnroll 0.1 +set g_vehicle_raptor_pitchspeed 45 +set g_vehicle_raptor_speed_forward 1500 +set g_vehicle_raptor_speed_strafe 1500 +set g_vehicle_raptor_speed_up 1250 +set g_vehicle_raptor_speed_down 1400 + +set g_vehicle_raptor_bomblet_waves 2 +set g_vehicle_raptor_bomblet_wavefirst 0.5 +set g_vehicle_raptor_bomblet_wavenext 0.3 +set g_vehicle_raptor_bomblet_wawespread 0.3 +set g_vehicle_raptor_bomblets 3 +set g_vehicle_raptor_bomblet_damage 90 +set g_vehicle_raptor_bomblet_edgedamage 40 +set g_vehicle_raptor_bomblet_radius 250 +set g_vehicle_raptor_bomblet_force 300 +set g_vehicle_raptor_bombs_refire 1 + +set g_vehicle_raptor_beam_dps 200 +set g_vehicle_raptor_beam_fops 150 +set g_vehicle_raptor_beam_aps 100 +set g_vehicle_raptor_beam_size 8 +set g_vehicle_raptor_beam_leangth 1 +set g_vehicle_raptor_beam_refire 2 + +set g_vehicle_raptor_shield 250 +set g_vehicle_raptor_shield_regen 50 + +set g_vehicle_raptor_health 250 +set g_vehicle_raptor_health_regen 10 + +set g_vehicle_raptor_energy 300 +set g_vehicle_raptor_energy_regen 50 \ No newline at end of file