X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fturrets%2Fsv_turrets.qc;h=820221d434d6ad22ed31ae151e1e40ffe60101aa;hb=5bc5a27a227b1bac27a153847d04571f54703171;hp=cb69bf0ff12ba7f2ec9c312e0af33002af6b9393;hpb=fdbfb6f9364d8aeae67e108400a6bd1dd37dc0b7;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/turrets/sv_turrets.qc b/qcsrc/common/turrets/sv_turrets.qc index cb69bf0ff..820221d43 100644 --- a/qcsrc/common/turrets/sv_turrets.qc +++ b/qcsrc/common/turrets/sv_turrets.qc @@ -102,7 +102,7 @@ float turret_targetscore_generic(entity _turret, entity _target) d_score = min(ikr, tvt_dist) / max(ikr, tvt_dist); } - a_score = 1 - tvt_thadf / _turret.aim_maxrotate; + a_score = 1 - tvt_thadf / _turret.aim_maxrot; if ((_turret.target_select_missilebias > 0) && (_target.flags & FL_PROJECTILE)) m_score = 1; @@ -182,9 +182,10 @@ void turret_die(entity this) this.tur_head.solid = this.solid; this.event_damage = func_null; + this.event_heal = func_null; this.takedamage = DAMAGE_NO; - this.health = 0; + SetResourceExplicit(this, RES_HEALTH, 0); // Go boom //RadiusDamage (this,this, min(this.ammo,50),min(this.ammo,50) * 0.25,250,NULL,min(this.ammo,50)*5,DEATH_TURRET,NULL); @@ -212,7 +213,7 @@ void turret_die(entity this) } } -void turret_damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector vforce) +void turret_damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector vforce) { // Enough already! if(this.deadflag == DEAD_DEAD) @@ -230,7 +231,7 @@ void turret_damage(entity this, entity inflictor, entity attacker, float damage, return; } - this.health -= damage; + TakeResource(this, RES_HEALTH, damage); // thorw head slightly off aim when hit? if (this.damage_flags & TFL_DMG_HEADSHAKE) @@ -244,10 +245,12 @@ void turret_damage(entity this, entity inflictor, entity attacker, float damage, if (this.turret_flags & TUR_FLAG_MOVE) this.velocity = this.velocity + vforce; - if (this.health <= 0) + if (GetResource(this, RES_HEALTH) <= 0) { this.event_damage = func_null; this.tur_head.event_damage = func_null; + this.event_heal = func_null; + this.tur_head.event_heal = func_null; this.takedamage = DAMAGE_NO; this.nextthink = time; setthink(this, turret_die); @@ -256,6 +259,17 @@ void turret_damage(entity this, entity inflictor, entity attacker, float damage, this.SendFlags |= TNSF_STATUS; } +bool turret_heal(entity targ, entity inflictor, float amount, float limit) +{ + float true_limit = ((limit != RES_LIMIT_NONE) ? limit : targ.max_health); + if(GetResource(targ, RES_HEALTH) <= 0 || GetResource(targ, RES_HEALTH) >= true_limit) + return false; + + GiveResourceWithLimit(targ, RES_HEALTH, amount, true_limit); + targ.SendFlags |= TNSF_STATUS; + return true; +} + void turret_think(entity this); void turret_respawn(entity this) { @@ -268,10 +282,11 @@ void turret_respawn(entity this) this.solid = SOLID_BBOX; this.takedamage = DAMAGE_AIM; this.event_damage = turret_damage; + this.event_heal = turret_heal; this.avelocity = '0 0 0'; this.tur_head.avelocity = this.avelocity; this.tur_head.angles = this.idle_aim; - this.health = this.max_health; + SetResourceExplicit(this, RES_HEALTH, this.max_health); this.enemy = NULL; this.volly_counter = this.shot_volly; this.ammo = this.ammo_max; @@ -287,7 +302,6 @@ void turret_respawn(entity this) // Main functions -#define cvar_base "g_turrets_unit_" .float clientframe; void turrets_setframe(entity this, float _frame, float client_only) { @@ -313,9 +327,7 @@ bool turret_send(entity this, entity to, float sf) { WriteByte(MSG_ENTITY, this.m_id); - WriteCoord(MSG_ENTITY, this.origin_x); - WriteCoord(MSG_ENTITY, this.origin_y); - WriteCoord(MSG_ENTITY, this.origin_z); + WriteVector(MSG_ENTITY, this.origin); WriteAngle(MSG_ENTITY, this.angles_x); WriteAngle(MSG_ENTITY, this.angles_y); @@ -335,13 +347,9 @@ bool turret_send(entity this, entity to, float sf) if(sf & TNSF_MOVE) { - WriteShort(MSG_ENTITY, rint(this.origin_x)); - WriteShort(MSG_ENTITY, rint(this.origin_y)); - WriteShort(MSG_ENTITY, rint(this.origin_z)); + WriteVector(MSG_ENTITY, this.origin); - WriteShort(MSG_ENTITY, rint(this.velocity_x)); - WriteShort(MSG_ENTITY, rint(this.velocity_y)); - WriteShort(MSG_ENTITY, rint(this.velocity_z)); + WriteVector(MSG_ENTITY, this.velocity); WriteShort(MSG_ENTITY, rint(this.angles_y)); } @@ -356,10 +364,10 @@ bool turret_send(entity this, entity to, float sf) { WriteByte(MSG_ENTITY, this.team); - if(this.health <= 0) + if(GetResource(this, RES_HEALTH) <= 0) WriteByte(MSG_ENTITY, 0); else - WriteByte(MSG_ENTITY, ceil((this.health / this.max_health) * 255)); + WriteByte(MSG_ENTITY, ceil((GetResource(this, RES_HEALTH) / this.max_health) * 255)); } return true; @@ -367,9 +375,6 @@ bool turret_send(entity this, entity to, float sf) void load_unit_settings(entity ent, bool is_reload) { - string unitname = ent.netname; - string sbase; - if (ent == NULL) return; @@ -381,7 +386,6 @@ void load_unit_settings(entity ent, bool is_reload) if(!ent.turret_scale_health) ent.turret_scale_health = 1; if(!ent.turret_scale_respawn) ent.turret_scale_respawn = 1; - sbase = strcat(cvar_base,unitname); if (is_reload) { ent.enemy = NULL; @@ -390,41 +394,24 @@ void load_unit_settings(entity ent, bool is_reload) ent.tur_head.angles = '0 0 0'; } - ent.health = cvar(strcat(sbase,"_health")) * ent.turret_scale_health; - ent.respawntime = cvar(strcat(sbase,"_respawntime")) * ent.turret_scale_respawn; - - ent.shot_dmg = cvar(strcat(sbase,"_shot_dmg")) * ent.turret_scale_damage; - ent.shot_refire = cvar(strcat(sbase,"_shot_refire")) * ent.turret_scale_refire; - ent.shot_radius = cvar(strcat(sbase,"_shot_radius")) * ent.turret_scale_damage; - ent.shot_speed = cvar(strcat(sbase,"_shot_speed")); - ent.shot_spread = cvar(strcat(sbase,"_shot_spread")); - ent.shot_force = cvar(strcat(sbase,"_shot_force")) * ent.turret_scale_damage; - ent.shot_volly = cvar(strcat(sbase,"_shot_volly")); - ent.shot_volly_refire = cvar(strcat(sbase,"_shot_volly_refire")) * ent.turret_scale_refire; - - ent.target_range = cvar(strcat(sbase,"_target_range")) * ent.turret_scale_range; - ent.target_range_min = cvar(strcat(sbase,"_target_range_min")) * ent.turret_scale_range; - ent.target_range_optimal = cvar(strcat(sbase,"_target_range_optimal")) * ent.turret_scale_range; - //ent.target_range_fire = cvar(strcat(sbase,"_target_range_fire")) * ent.turret_scale_range; - - ent.target_select_rangebias = cvar(strcat(sbase,"_target_select_rangebias")); - ent.target_select_samebias = cvar(strcat(sbase,"_target_select_samebias")); - ent.target_select_anglebias = cvar(strcat(sbase,"_target_select_anglebias")); - ent.target_select_playerbias = cvar(strcat(sbase,"_target_select_playerbias")); - //ent.target_select_fov = cvar(cvar_gets(sbase,"_target_select_fov")); - - ent.ammo_max = cvar(strcat(sbase,"_ammo_max")) * ent.turret_scale_ammo; - ent.ammo_recharge = cvar(strcat(sbase,"_ammo_recharge")) * ent.turret_scale_ammo; - - ent.aim_firetolerance_dist = cvar(strcat(sbase,"_aim_firetolerance_dist")); - ent.aim_speed = cvar(strcat(sbase,"_aim_speed")) * ent.turret_scale_aim; - ent.aim_maxrotate = cvar(strcat(sbase,"_aim_maxrot")); - ent.aim_maxpitch = cvar(strcat(sbase,"_aim_maxpitch")); - - ent.track_type = cvar(strcat(sbase,"_track_type")); - ent.track_accel_pitch = cvar(strcat(sbase,"_track_accel_pitch")); - ent.track_accel_rotate = cvar(strcat(sbase,"_track_accel_rot")); - ent.track_blendrate = cvar(strcat(sbase,"_track_blendrate")); + string unitname = ent.netname; + #define X(class, prefix, fld, type) ent.fld = cvar(strcat("g_turrets_unit_", prefix, "_", #fld)); + TR_PROPS_COMMON(X, , unitname) + #undef X + + ent.ammo_max *= ent.turret_scale_ammo; + ent.ammo_recharge *= ent.turret_scale_ammo; + ent.aim_speed *= ent.turret_scale_aim; + ent.health *= ent.turret_scale_health; + ent.respawntime *= ent.turret_scale_respawn; + ent.shot_dmg *= ent.turret_scale_damage; + ent.shot_refire *= ent.turret_scale_refire; + ent.shot_radius *= ent.turret_scale_damage; + ent.shot_force *= ent.turret_scale_damage; + ent.shot_volly_refire *= ent.turret_scale_refire; + ent.target_range *= ent.turret_scale_range; + ent.target_range_min *= ent.turret_scale_range; + ent.target_range_optimal *= ent.turret_scale_range; if(is_reload) { Turret tur = get_turretinfo(ent.m_id); @@ -439,11 +426,11 @@ void turret_projectile_explode(entity this) this.event_damage = func_null; #ifdef TURRET_DEBUG float d; - d = RadiusDamage (this, this.owner, this.owner.shot_dmg, 0, this.owner.shot_radius, this, NULL, this.owner.shot_force, this.totalfrags, NULL); + d = RadiusDamage (this, this.owner, this.owner.shot_dmg, 0, this.owner.shot_radius, this, NULL, this.owner.shot_force, this.totalfrags, DMG_NOWEP, NULL); this.owner.tur_debug_dmg_t_h = this.owner.tur_debug_dmg_t_h + d; this.owner.tur_debug_dmg_t_f = this.owner.tur_debug_dmg_t_f + this.owner.shot_dmg; #else - RadiusDamage (this, this.realowner, this.owner.shot_dmg, 0, this.owner.shot_radius, this, NULL, this.owner.shot_force, this.totalfrags, NULL); + RadiusDamage (this, this.realowner, this.owner.shot_dmg, 0, this.owner.shot_radius, this, NULL, this.owner.shot_force, this.totalfrags, DMG_NOWEP, NULL); #endif delete(this); } @@ -454,18 +441,18 @@ void turret_projectile_touch(entity this, entity toucher) turret_projectile_explode(this); } -void turret_projectile_damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector vforce) +void turret_projectile_damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector vforce) { this.velocity += vforce; - this.health -= damage; + TakeResource(this, RES_HEALTH, damage); //this.realowner = attacker; // Dont change realowner, it does not make much sense for turrets - if(this.health <= 0) + if(GetResource(this, RES_HEALTH) <= 0) W_PrepareExplosionByDamage(this, this.owner, turret_projectile_explode); } entity turret_projectile(entity actor, Sound _snd, float _size, float _health, float _death, float _proj_type, float _cull, float _cli_anim) { - TC(Sound, _snd); + TC(Sound, _snd); entity proj; sound (actor, CH_WEAPON_A, _snd, VOL_BASE, ATTEN_NORM); @@ -489,7 +476,7 @@ entity turret_projectile(entity actor, Sound _snd, float _size, float _health, f PROJECTILE_MAKETRIGGER(proj); if(_health) { - proj.health = _health; + SetResourceExplicit(proj, RES_HEALTH, _health); proj.takedamage = DAMAGE_YES; proj.event_damage = turret_projectile_damage; } @@ -593,11 +580,11 @@ void turret_track(entity this) if (this.track_flags & TFL_TRACK_ROTATE) { this.tur_head.angles_y += bound(-f_tmp, move_angle_y, f_tmp); - if(this.tur_head.angles_y > this.aim_maxrotate) - this.tur_head.angles_y = this.aim_maxrotate; + if(this.tur_head.angles_y > this.aim_maxrot) + this.tur_head.angles_y = this.aim_maxrot; - if(this.tur_head.angles_y < -this.aim_maxrotate) - this.tur_head.angles_y = this.aim_maxrotate; + if(this.tur_head.angles_y < -this.aim_maxrot) + this.tur_head.angles_y = this.aim_maxrot; } // CSQC @@ -608,7 +595,7 @@ void turret_track(entity this) case TFL_TRACKTYPE_FLUIDINERTIA: f_tmp = this.aim_speed * this.ticrate; // dgr/sec -> dgr/tic move_angle_x = bound(-this.aim_speed, move_angle_x * this.track_accel_pitch * f_tmp, this.aim_speed); - move_angle_y = bound(-this.aim_speed, move_angle_y * this.track_accel_rotate * f_tmp, this.aim_speed); + move_angle_y = bound(-this.aim_speed, move_angle_y * this.track_accel_rot * f_tmp, this.aim_speed); move_angle = (this.tur_head.avelocity * this.track_blendrate) + (move_angle * (1 - this.track_blendrate)); break; @@ -646,18 +633,18 @@ void turret_track(entity this) { this.tur_head.avelocity_y = move_angle_y; - if((this.tur_head.angles_y + this.tur_head.avelocity_y * this.ticrate) > this.aim_maxrotate) + if((this.tur_head.angles_y + this.tur_head.avelocity_y * this.ticrate) > this.aim_maxrot) { this.tur_head.avelocity_y = 0; - this.tur_head.angles_y = this.aim_maxrotate; + this.tur_head.angles_y = this.aim_maxrot; this.SendFlags |= TNSF_ANG; } - if((this.tur_head.angles_y + this.tur_head.avelocity_y * this.ticrate) < -this.aim_maxrotate) + if((this.tur_head.angles_y + this.tur_head.avelocity_y * this.ticrate) < -this.aim_maxrot) { this.tur_head.avelocity_y = 0; - this.tur_head.angles_y = -this.aim_maxrotate; + this.tur_head.angles_y = -this.aim_maxrot; this.SendFlags |= TNSF_ANG; } @@ -679,6 +666,7 @@ void turret_track(entity this) + TFL_TARGETSELECT_LOS + TFL_TARGETSELECT_PLAYERS + TFL_TARGETSELECT_MISSILES + + TFL_TARGETSELECT_VEHICLES - TFL_TARGETSELECT_TRIGGERTARGET + TFL_TARGETSELECT_ANGLELIMITS + TFL_TARGETSELECT_RANGELIMITS @@ -707,7 +695,7 @@ float turret_validate_target(entity e_turret, entity e_target, float validate_fl if(!checkpvs(e_target.origin, e_turret)) return -1; - if(e_target.alpha <= 0.3) + if(e_target.alpha != 0 && e_target.alpha <= 0.3) return -1; if(MUTATOR_CALLHOOK(TurretValidateTarget, e_turret, e_target, validate_flags)) @@ -721,15 +709,17 @@ float turret_validate_target(entity e_turret, entity e_target, float validate_fl return -5; // Cant touch this + if (GetResource(e_target, RES_HEALTH) <= 0) + return -6; + else if (STAT(FROZEN, e_target)) + return -6; + + // vehicle if(IS_VEHICLE(e_target)) { - if (e_target.vehicle_health <= 0) - return -6; + if ((validate_flags & TFL_TARGETSELECT_VEHICLES) && !e_target.owner) + return -7; } - else if (e_target.health <= 0) - return -6; - else if(STAT(FROZEN, e_target) > 0) - return -6; // player if (IS_CLIENT(e_target)) @@ -807,7 +797,7 @@ float turret_validate_target(entity e_turret, entity e_target, float validate_fl if (fabs(tvt_tadv_x) > e_turret.aim_maxpitch) return -17; - if (fabs(tvt_tadv_y) > e_turret.aim_maxrotate) + if (fabs(tvt_tadv_y) > e_turret.aim_maxrot) return -18; } @@ -949,10 +939,11 @@ bool turret_firecheck(entity this) { // To close? if (this.tur_dist_aimpos < this.target_range_min) + { if(turret_validate_target(this, this.tur_impactent, this.target_validate_flags) > 0) return true; // Target of opertunity? - else - return false; + return false; + } } // Try to avoid FF? @@ -1231,7 +1222,7 @@ void turret_initparams(entity tur) tur.target_range = bound(0, (TRY(tur.target_range) : tur.shot_speed * 0.5 ), max_shot_distance); tur.target_range_min = bound(0, (TRY(tur.target_range_min) : tur.shot_radius * 2 ), max_shot_distance); tur.target_range_optimal = bound(0, (TRY(tur.target_range_optimal) : tur.target_range * 0.5 ), max_shot_distance); - tur.aim_maxrotate = bound(0, (TRY(tur.aim_maxrotate) : 90 ), 360); + tur.aim_maxrot = bound(0, (TRY(tur.aim_maxrot) : 90 ), 360); tur.aim_maxpitch = bound(0, (TRY(tur.aim_maxpitch) : 20 ), 90); tur.aim_speed = bound(0.1, (TRY(tur.aim_speed) : 36 ), 1000); tur.aim_firetolerance_dist = bound(0.1, (TRY(tur.aim_firetolerance_dist) : 5 + (tur.shot_radius * 2) ), max_shot_distance); @@ -1245,6 +1236,12 @@ void turret_initparams(entity tur) #undef TRY } +bool turret_closetotarget(entity this, vector targ) +{ + vector path_extra_size = '64 64 64'; + return boxesoverlap(targ - path_extra_size, targ + path_extra_size, this.absmin - path_extra_size, this.absmax + path_extra_size); +} + void turret_findtarget(entity this) { entity e = find(NULL, classname, "turret_manager"); @@ -1292,7 +1289,7 @@ bool turret_initialize(entity this, Turret tur) if(!this.team || !teamplay) { this.team = FLOAT_MAX; } if(!this.ticrate) { this.ticrate = ((this.turret_flags & TUR_FLAG_SUPPORT) ? 0.2 : 0.1); } - if(!this.health) { this.health = 1000; } + if(!GetResource(this, RES_HEALTH)) { SetResourceExplicit(this, RES_HEALTH, 1000); } if(!this.shot_refire) { this.shot_refire = 1; } if(!this.tur_shotorg) { this.tur_shotorg = '50 0 50'; } if(!this.turret_flags) { this.turret_flags = TUR_FLAG_SPLASH | TUR_FLAG_MEDPROJ | TUR_FLAG_PLAYER; } @@ -1313,7 +1310,7 @@ bool turret_initialize(entity this, Turret tur) this.aim_speed = bound(0.1, ((!this.aim_speed) ? 180 : this.aim_speed), 1000); if(!this.track_accel_pitch) { this.track_accel_pitch = 0.5; } - if(!this.track_accel_rotate) { this.track_accel_rotate = 0.5; } + if(!this.track_accel_rot) { this.track_accel_rot = 0.5; } if(!this.track_blendrate) { this.track_blendrate = 0.35; } } @@ -1349,7 +1346,7 @@ bool turret_initialize(entity this, Turret tur) this.effects = EF_NODRAW; this.netname = tur.turret_name; this.ticrate = bound(sys_frametime, this.ticrate, 60); - this.max_health = this.health; + this.max_health = GetResource(this, RES_HEALTH); this.target_validate_flags = this.target_select_flags; this.ammo = this.ammo_max; this.ammo_recharge *= this.ticrate; @@ -1360,6 +1357,7 @@ bool turret_initialize(entity this, Turret tur) this.idle_aim = '0 0 0'; this.turret_firecheckfunc = turret_firecheck; this.event_damage = turret_damage; + this.event_heal = turret_heal; this.use = turret_use; this.bot_attack = true; this.nextthink = time + 1;