{
if (!e.instagib_needammo)
return;
- Kill_Notification(NOTIF_ONE_ONLY, e, MSG_CENTER_CPID, CPID_MINSTA_FINDAMMO);
+ Kill_Notification(NOTIF_ONE_ONLY, e, MSG_CENTER_CPID, CPID_INSTAGIB_FINDAMMO);
e.instagib_needammo = FALSE;
}
void instagib_ammocheck()
{
- if (!IS_PLAYER(self))
- return; // not a player
- if (time < self.instagib_nextthink)
+ if(time < self.instagib_nextthink)
return;
+ if(!IS_PLAYER(self))
+ return; // not a player
- if (self.deadflag || gameover)
+ if(self.deadflag || gameover)
instagib_stop_countdown(self);
- else if (self.ammo_cells > 0 || (self.items & IT_UNLIMITED_WEAPON_AMMO))
+ else if (self.ammo_cells > 0 || (self.items & IT_UNLIMITED_WEAPON_AMMO) || (self.flags & FL_GODMODE))
instagib_stop_countdown(self);
else
{
self.instagib_needammo = TRUE;
- if (self.health == 5)
+ if (self.health <= 5)
{
Damage(self, self, self, 5, DEATH_NOAMMO, self.origin, '0 0 0');
Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_INSTAGIB_TERMINATED);
}
- else if (self.health == 10)
+ else if (self.health <= 10)
{
Damage(self, self, self, 5, DEATH_NOAMMO, self.origin, '0 0 0');
Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_1);
}
- else if (self.health == 20)
+ else if (self.health <= 20)
{
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_2);
}
- else if (self.health == 30)
+ else if (self.health <= 30)
{
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_3);
}
- else if (self.health == 40)
+ else if (self.health <= 40)
{
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_4);
}
- else if (self.health == 50)
+ else if (self.health <= 50)
{
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_5);
}
- else if (self.health == 60)
+ else if (self.health <= 60)
{
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_6);
}
- else if (self.health == 70)
+ else if (self.health <= 70)
{
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_7);
}
- else if (self.health == 80)
+ else if (self.health <= 80)
{
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_8);
}
- else if (self.health == 90)
+ else if (self.health <= 90)
{
- Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_MINSTA_FINDAMMO);
+ Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_INSTAGIB_FINDAMMO);
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_9);
}
- else if (self.health == 100)
+ else
{
- Send_Notification(NOTIF_ONE_ONLY, self, MSG_MULTI, MULTI_MINSTA_FINDAMMO);
+ Send_Notification(NOTIF_ONE_ONLY, self, MSG_MULTI, MULTI_INSTAGIB_FINDAMMO);
Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
}
}
if(IS_PLAYER(frag_attacker))
if(DEATH_ISWEAPON(frag_deathtype, WEP_VAPORIZER))
- if(frag_target.armorvalue)
{
- frag_target.armorvalue -= 1;
- Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_MINSTA_LIVES_REMAINING, frag_target.armorvalue);
- frag_damage = 0;
- frag_target.hitsound += 1;
- frag_attacker.hitsound += 1; // TODO change this to a future specific hitsound for armor hit
- }
-
- if(IS_PLAYER(frag_attacker))
- if(DEATH_ISWEAPON(frag_deathtype, WEP_BLASTER))
- {
- frag_damage = 0;
- frag_mirrordamage = 0;
- if (frag_target != frag_attacker)
+ if(frag_deathtype & HITTYPE_SECONDARY)
{
- 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_damage = frag_mirrordamage = 0;
+
+ if(frag_target != frag_attacker)
+ {
+ if(frag_target.health > 0) { Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_INSTAGIB_SECONDARY); }
+ frag_force = '0 0 0';
+ }
+ }
+ else if(frag_target.armorvalue)
+ {
+ frag_target.armorvalue -= 1;
+ frag_damage = 0;
+ 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_INSTAGIB_LIVES_REMAINING, frag_target.armorvalue);
}
}
}
if(frag_attacker.armorvalue > 0)
{
frag_attacker.armorvalue -= 1;
- Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_MINSTA_LIVES_REMAINING, frag_attacker.armorvalue);
- frag_attacker.hitsound += 1;
+ Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_INSTAGIB_LIVES_REMAINING, frag_attacker.armorvalue);
+ frag_attacker.damage_dealt += 1;
}
frag_mirrordamage = 0;
}
MUTATOR_HOOKFUNCTION(instagib_SetStartItems)
{
- start_ammo_cells = cvar("g_instagib_ammo_start");
+ start_health = warmup_start_health = 100;
+ start_armorvalue = warmup_start_armorvalue = 0;
+
+ start_ammo_shells = warmup_start_ammo_shells = 0;
+ start_ammo_nails = warmup_start_ammo_nails = 0;
+ start_ammo_cells = warmup_start_ammo_cells = cvar("g_instagib_ammo_start");
+ start_ammo_plasma = warmup_start_ammo_plasma = 0;
+ start_ammo_rockets = warmup_start_ammo_rockets = 0;
+ start_ammo_fuel = warmup_start_ammo_fuel = 0;
- start_health = 100;
- start_armorvalue = 0;
- start_weapons = WEPSET_VAPORIZER;
- warmup_start_weapons = WEPSET_VAPORIZER;
+ start_weapons = warmup_start_weapons = WEPSET_VAPORIZER;
start_items |= IT_UNLIMITED_SUPERWEAPONS;
return FALSE;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff