X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fclient.qc;h=24a0e0e1aab630da7ba311515a7aeb5a778482d1;hp=22287db9b278150aa41ab42e3036bb3c0e4046e8;hb=86c4f57358c37c4165945b1c99840aa447b50000;hpb=274359abdba7e814a0b404e9bc2e230869e7ffe8 diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index 22287db9b..24a0e0e1a 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -229,7 +229,7 @@ void PutObserverInServer(entity this) if (IS_PLAYER(this)) { - if(this.health >= 1) + if(GetResourceAmount(this, RESOURCE_HEALTH) >= 1) { // despawn effect Send_Effect(EFFECT_SPAWN_NEUTRAL, this.origin, '0 0 0', 1); @@ -324,15 +324,14 @@ void PutObserverInServer(entity this) if(this.damagedbycontents) IL_REMOVE(g_damagedbycontents, this); this.damagedbycontents = false; - this.health = FRAGS_SPECTATOR; + SetResourceAmountExplicit(this, RESOURCE_HEALTH, FRAGS_SPECTATOR); SetSpectatee_status(this, etof(this)); this.takedamage = DAMAGE_NO; this.solid = SOLID_NOT; set_movetype(this, MOVETYPE_FLY_WORLDONLY); // user preference is controlled by playerprethink this.flags = FL_CLIENT | FL_NOTARGET; - this.armorvalue = 666; this.effects = 0; - this.armorvalue = autocvar_g_balance_armor_start; + SetResourceAmountExplicit(this, RESOURCE_ARMOR, autocvar_g_balance_armor_start); // was 666?! this.pauserotarmor_finished = 0; this.pauserothealth_finished = 0; this.pauseregen_finished = 0; @@ -560,8 +559,8 @@ void PutPlayerInServer(entity this) SetResourceAmount(this, RESOURCE_CELLS, warmup_start_ammo_cells); SetResourceAmount(this, RESOURCE_PLASMA, warmup_start_ammo_plasma); SetResourceAmount(this, RESOURCE_FUEL, warmup_start_ammo_fuel); - this.health = warmup_start_health; - this.armorvalue = warmup_start_armorvalue; + SetResourceAmount(this, RESOURCE_HEALTH, warmup_start_health); + SetResourceAmount(this, RESOURCE_ARMOR, warmup_start_armorvalue); STAT(WEAPONS, this) = WARMUP_START_WEAPONS; } else { SetResourceAmount(this, RESOURCE_SHELLS, start_ammo_shells); @@ -570,8 +569,8 @@ void PutPlayerInServer(entity this) SetResourceAmount(this, RESOURCE_CELLS, start_ammo_cells); SetResourceAmount(this, RESOURCE_PLASMA, start_ammo_plasma); SetResourceAmount(this, RESOURCE_FUEL, start_ammo_fuel); - this.health = start_health; - this.armorvalue = start_armorvalue; + SetResourceAmount(this, RESOURCE_HEALTH, start_health); + SetResourceAmount(this, RESOURCE_ARMOR, start_armorvalue); STAT(WEAPONS, this) = start_weapons; if (MUTATOR_CALLHOOK(ForbidRandomStartWeapons, this) == false) { @@ -968,7 +967,7 @@ void KillIndicator_Think(entity this) ClientKill_Now(this.owner); return; } - else if(this.health == 1) // health == 1 means that it's silent + else if(this.count == 1) // count == 1 means that it's silent { this.nextthink = time + 1; this.cnt -= 1; @@ -1724,13 +1723,17 @@ void player_regen(entity this) limith = limith * limit_mod; limita = limita * limit_mod; - this.armorvalue = CalcRotRegen(this.armorvalue, mina, autocvar_g_balance_armor_regen, autocvar_g_balance_armor_regenlinear, regen_mod * frametime * (time > this.pauseregen_finished), maxa, autocvar_g_balance_armor_rot, autocvar_g_balance_armor_rotlinear, rot_mod * frametime * (time > this.pauserotarmor_finished), limita); - this.health = CalcRotRegen(this.health, regen_health_stable, regen_health, regen_health_linear, regen_mod * frametime * (time > this.pauseregen_finished), regen_health_rotstable, regen_health_rot, regen_health_rotlinear, rot_mod * frametime * (time > this.pauserothealth_finished), limith); + SetResourceAmountExplicit(this, RESOURCE_ARMOR, CalcRotRegen(GetResourceAmount(this, RESOURCE_ARMOR), mina, autocvar_g_balance_armor_regen, autocvar_g_balance_armor_regenlinear, + regen_mod * frametime * (time > this.pauseregen_finished), maxa, autocvar_g_balance_armor_rot, autocvar_g_balance_armor_rotlinear, + rot_mod * frametime * (time > this.pauserotarmor_finished), limita)); + SetResourceAmountExplicit(this, RESOURCE_HEALTH, CalcRotRegen(GetResourceAmount(this, RESOURCE_HEALTH), regen_health_stable, regen_health, regen_health_linear, + regen_mod * frametime * (time > this.pauseregen_finished), regen_health_rotstable, regen_health_rot, regen_health_rotlinear, + rot_mod * frametime * (time > this.pauserothealth_finished), limith)); } // if player rotted to death... die! // check this outside above checks, as player may still be able to rot to death - if(this.health < 1) + if(GetResourceAmount(this, RESOURCE_HEALTH) < 1) { if(this.vehicle) vehicles_exit(this.vehicle, VHEF_RELEASE); @@ -1806,7 +1809,7 @@ void SpectateCopy(entity this, entity spectatee) MUTATOR_CALLHOOK(SpectateCopy, spectatee, this); PS(this) = PS(spectatee); this.armortype = spectatee.armortype; - this.armorvalue = spectatee.armorvalue; + SetResourceAmountExplicit(this, RESOURCE_ARMOR, GetResourceAmount(spectatee, RESOURCE_ARMOR)); SetResourceAmountExplicit(this, RESOURCE_CELLS, GetResourceAmount(spectatee, RESOURCE_CELLS)); SetResourceAmountExplicit(this, RESOURCE_PLASMA, GetResourceAmount(spectatee, RESOURCE_PLASMA)); SetResourceAmountExplicit(this, RESOURCE_SHELLS, GetResourceAmount(spectatee, RESOURCE_SHELLS)); @@ -1814,7 +1817,7 @@ void SpectateCopy(entity this, entity spectatee) SetResourceAmountExplicit(this, RESOURCE_ROCKETS, GetResourceAmount(spectatee, RESOURCE_ROCKETS)); SetResourceAmountExplicit(this, RESOURCE_FUEL, GetResourceAmount(spectatee, RESOURCE_FUEL)); this.effects = spectatee.effects & EFMASK_CHEAP; // eat performance - this.health = spectatee.health; + SetResourceAmountExplicit(this, RESOURCE_HEALTH, GetResourceAmount(spectatee, RESOURCE_HEALTH)); CS(this).impulse = 0; this.items = spectatee.items; STAT(LAST_PICKUP, this) = STAT(LAST_PICKUP, spectatee); @@ -2567,7 +2570,7 @@ void PlayerPreThink (entity this) if (STAT(FROZEN, this) == 2) { STAT(REVIVE_PROGRESS, this) = bound(0, STAT(REVIVE_PROGRESS, this) + frametime * this.revive_speed, 1); - this.health = max(1, STAT(REVIVE_PROGRESS, this) * start_health); + SetResourceAmountExplicit(this, RESOURCE_HEALTH, max(1, STAT(REVIVE_PROGRESS, this) * start_health)); this.iceblock.alpha = bound(0.2, 1 - STAT(REVIVE_PROGRESS, this), 1); if (STAT(REVIVE_PROGRESS, this) >= 1) @@ -2576,9 +2579,9 @@ void PlayerPreThink (entity this) else if (STAT(FROZEN, this) == 3) { STAT(REVIVE_PROGRESS, this) = bound(0, STAT(REVIVE_PROGRESS, this) - frametime * this.revive_speed, 1); - this.health = max(0, autocvar_g_nades_ice_health + (start_health-autocvar_g_nades_ice_health) * STAT(REVIVE_PROGRESS, this) ); + SetResourceAmountExplicit(this, RESOURCE_HEALTH, max(0, autocvar_g_nades_ice_health + (start_health-autocvar_g_nades_ice_health) * STAT(REVIVE_PROGRESS, this))); - if (this.health < 1) + if (GetResourceAmount(this, RESOURCE_HEALTH) < 1) { if (this.vehicle) vehicles_exit(this.vehicle, VHEF_RELEASE); @@ -2820,7 +2823,7 @@ void PlayerPostThink (entity this) } if (this.waypointsprite_attachedforcarrier) { - vector v = healtharmor_maxdamage(this.health, this.armorvalue, autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id); + vector v = healtharmor_maxdamage(GetResourceAmount(this, RESOURCE_HEALTH), GetResourceAmount(this, RESOURCE_ARMOR), autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id); WaypointSprite_UpdateHealth(this.waypointsprite_attachedforcarrier, '1 0 0' * v); }