#define MAX_TIME_DIFF 5
float pickup_crosshair_time, pickup_crosshair_size;
- float hit_time, typehit_time;
- float nextsound_hit_time, nextsound_typehit_time;
- float hitindication_crosshair_time, hitindication_crosshair_size;
+ float hitsound_time_prev;
+ float spectatee_status_prev; // for preventing hitsound when switching spectatee
+ float damage_dealt_total, damage_dealt_total_prev;
+ float typehit_time, typehit_time_prev;
+ float hitindication_crosshair_size;
-float use_nex_chargepool;
+float use_vortex_chargepool;
float myhealth, myhealth_prev;
float myhealth_flash;
const float STAT_LEADLIMIT = 47;
const float STAT_WEAPON_CLIPLOAD = 48;
const float STAT_WEAPON_CLIPSIZE = 49;
-const float STAT_NEX_CHARGE = 50;
+const float STAT_VORTEX_CHARGE = 50;
const float STAT_LAST_PICKUP = 51;
const float STAT_HUD = 52;
-const float STAT_NEX_CHARGEPOOL = 53;
+const float STAT_VORTEX_CHARGEPOOL = 53;
- const float STAT_HIT_TIME = 54;
+ const float STAT_DAMAGE_DEALT_TOTAL = 54;
const float STAT_TYPEHIT_TIME = 55;
const float STAT_LAYED_MINES = 56;
const float STAT_HAGAR_LOAD = 57;
}
if(IS_PLAYER(frag_attacker))
- if(DEATH_ISWEAPON(frag_deathtype, WEP_MINSTANEX))
- if(frag_target.armorvalue)
+ if(DEATH_ISWEAPON(frag_deathtype, WEP_VAPORIZER))
{
- frag_target.armorvalue -= 1;
- Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_MINSTA_LIVES_REMAINING, frag_target.armorvalue);
- frag_damage = 0;
- frag_target.damage_dealt += 1;
- frag_attacker.damage_dealt += 1; // TODO change this to a future specific hitsound for armor hit
- }
-
- if(IS_PLAYER(frag_attacker))
- if (DEATH_ISWEAPON(frag_deathtype, WEP_LASER))
- {
- frag_damage = 0;
- frag_mirrordamage = 0;
- if (frag_target != frag_attacker)
+ if(frag_deathtype & HITTYPE_SECONDARY)
+ {
+ frag_damage = frag_mirrordamage = 0;
+
+ if(frag_target != frag_attacker)
+ {
+ if(frag_target.health > 0) { Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_MINSTA_SECONDARY); }
+ frag_force = '0 0 0';
+ }
+ }
+ else if(frag_target.armorvalue)
{
- if (frag_target.health >= 1)
- Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_MINSTA_SECONDARY);
- frag_force = '0 0 0';
- // keep mirrorfrag_force
- //frag_attacker = frag_target;
+ frag_target.armorvalue -= 1;
+ frag_damage = 0;
- frag_target.hitsound += 1;
- frag_attacker.hitsound += 1; // TODO: change this to a specific hitsound for armor hit
++ frag_target.damage_dealt += 1;
++ frag_attacker.damage_dealt += 1; // TODO: change this to a specific hitsound for armor hit
+ Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_MINSTA_LIVES_REMAINING, frag_target.armorvalue);
}
}
}