hedgewars/uStats.pas
changeset 14041 bc61809bfb1e
parent 14036 544b32038664
child 14044 bbecf663d599
equal deleted inserted replaced
14040:1effb8b72b11 14041:bc61809bfb1e
   215     if ((DamageTotal > 0) or (KillsTotal > 0) or (PoisonTotal > 0)) and ((CurrentHedgehog^.stats.DamageGiven = DamageTotal) and (CurrentHedgehog^.stats.StepKills = KillsTotal) and (PoisonTotal = PoisonTurn + PoisonClan)) then
   215     if ((DamageTotal > 0) or (KillsTotal > 0) or (PoisonTotal > 0)) and ((CurrentHedgehog^.stats.DamageGiven = DamageTotal) and (CurrentHedgehog^.stats.StepKills = KillsTotal) and (PoisonTotal = PoisonTurn + PoisonClan)) then
   216         AddVoice(sndFirstBlood, CurrentTeam^.voicepack)
   216         AddVoice(sndFirstBlood, CurrentTeam^.voicepack)
   217 
   217 
   218     // Hog hurts, poisons or kills itself (except sacrifice)
   218     // Hog hurts, poisons or kills itself (except sacrifice)
   219     else if (CurrentHedgehog^.stats.Sacrificed = false) and ((CurrentHedgehog^.stats.StepDamageRecv > 0) or (CurrentHedgehog^.stats.StepPoisoned) or (CurrentHedgehog^.stats.StepDied)) then
   219     else if (CurrentHedgehog^.stats.Sacrificed = false) and ((CurrentHedgehog^.stats.StepDamageRecv > 0) or (CurrentHedgehog^.stats.StepPoisoned) or (CurrentHedgehog^.stats.StepDied)) then
   220         // Hurting itself only (not drowning)
   220         // Hurt itself only (without dying)
   221         if (CurrentHedgehog^.stats.StepDamageGiven = CurrentHedgehog^.stats.StepDamageRecv) and (CurrentHedgehog^.stats.StepDamageRecv >= 1) then
   221         if (CurrentHedgehog^.stats.StepDamageGiven = CurrentHedgehog^.stats.StepDamageRecv) and (CurrentHedgehog^.stats.StepDamageRecv >= 1) and (not CurrentHedgehog^.stats.StepDied) then
   222             begin
   222             begin
   223             // Announcer message + random taunt
   223             // Announcer message + random taunt
   224             AddCaption(FormatA(GetEventString(eidHurtSelf), s), capcolDefault, capgrpMessage);
   224             AddCaption(FormatA(GetEventString(eidHurtSelf), s), capcolDefault, capgrpMessage);
   225             if (CurrentHedgehog^.stats.StepDamageGiven <= CurrentHedgehog^.stats.StepDamageRecv) and (CurrentHedgehog^.stats.StepDamageRecv >= 1) then
   225             if (CurrentHedgehog^.stats.StepDamageGiven <= CurrentHedgehog^.stats.StepDamageRecv) and (CurrentHedgehog^.stats.StepDamageRecv >= 1) then
   226                 case random(3) of
   226                 case random(3) of
   227                 0: AddVoice(sndStupid, PreviousTeam^.voicepack);
   227                 0: AddVoice(sndStupid, PreviousTeam^.voicepack);
   228                 1: AddVoice(sndBugger, CurrentTeam^.voicepack);
   228                 1: AddVoice(sndBugger, CurrentTeam^.voicepack);
   229                 2: AddVoice(sndDrat, CurrentTeam^.voicepack);
   229                 2: AddVoice(sndDrat, CurrentTeam^.voicepack);
   230                 end;
   230                 end;
   231             end
   231             end
   232         // Hurt itself and others
   232         // Hurt itself and others, or died
   233         else
   233         else
   234             AddVoice(sndStupid, PreviousTeam^.voicepack)
   234             AddVoice(sndStupid, PreviousTeam^.voicepack)
   235 
   235 
   236     // Hog hurts, poisons or kills own team/clan member. Sacrifice is taken into account
   236     // Hog hurts, poisons or kills own team/clan member. Sacrifice is taken into account
   237     else if (DamageClan <> 0) or (KillsClan > killsCheck) or (PoisonClan <> 0) then
   237     else if (DamageClan <> 0) or (KillsClan > killsCheck) or (PoisonClan <> 0) then