From: terencehill Date: Sun, 30 Apr 2023 09:35:04 +0000 (+0200) Subject: Merge branch 'master' into Mario/electro_combo_over_time X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e19be1e6321de909c7d920871cb9bf73e948bebf;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Mario/electro_combo_over_time # Conflicts: # .gitlab-ci.yml --- e19be1e6321de909c7d920871cb9bf73e948bebf diff --cc qcsrc/common/weapons/weapon/electro.qc index 9e0e39d85,2c03871ce..3c6da1bfc --- a/qcsrc/common/weapons/weapon/electro.qc +++ b/qcsrc/common/weapons/weapon/electro.qc @@@ -75,31 -56,8 +75,31 @@@ void W_Electro_ExplodeCombo(entity this W_Electro_TriggerCombo(this.origin, WEP_CVAR(electro, combo_comboradius), this.realowner); this.event_damage = func_null; - this.velocity = this.movedir; // particle fx and decals need .velocity + this.velocity = this.movedir; // .velocity must be != '0 0 0' for particle fx and decal to work + if(WEP_CVAR(electro, combo_duration)) + { + this.projectiledeathtype = WEP_ELECTRO.m_id | HITTYPE_SPLASH; + this.event_damage = func_null; + settouch(this, func_null); + this.effects |= EF_NODRAW; + + setthink(this, W_Electro_ExplodeComboThink); + this.nextthink = time; + this.dmg = WEP_CVAR(electro, combo_damage); + this.dmg_edge = WEP_CVAR(electro, combo_edgedamage); + this.dmg_radius = WEP_CVAR(electro, combo_radius); + this.dmg_force = WEP_CVAR(electro, combo_force); + this.dmg_power = WEP_CVAR(electro, combo_power); + this.dmg_duration = WEP_CVAR(electro, combo_duration); + this.dmg_interval = WEP_CVAR(electro, combo_damage_interval); + this.dmg_linear = WEP_CVAR(electro, combo_damage_linear); + this.teleport_time = time; + this.dmg_last = 1; + set_movetype(this, MOVETYPE_NONE); + return; + } + RadiusDamage( this, this.realowner,