equal
deleted
inserted
replaced
98 vpHurtEnemy:= Gear^.Hedgehog^.Team^.voicepack; |
98 vpHurtEnemy:= Gear^.Hedgehog^.Team^.voicepack; |
99 |
99 |
100 ////////////////////////// |
100 ////////////////////////// |
101 |
101 |
102 inc(Attacker^.stats.StepDamageGiven, Damage); |
102 inc(Attacker^.stats.StepDamageGiven, Damage); |
103 inc(Attacker^.stats.DamageGiven, Damage); |
|
104 inc(Gear^.Hedgehog^.stats.StepDamageRecv, Damage); |
103 inc(Gear^.Hedgehog^.stats.StepDamageRecv, Damage); |
105 |
104 |
106 if CurrentHedgehog^.Team^.Clan = Gear^.Hedgehog^.Team^.Clan then inc(DamageClan, Damage); |
105 if CurrentHedgehog^.Team^.Clan = Gear^.Hedgehog^.Team^.Clan then inc(DamageClan, Damage); |
107 |
106 |
108 if killed then |
107 if killed then |
219 // Hog hurts, poisons or kills itself (except sacrifice) |
218 // Hog hurts, poisons or kills itself (except sacrifice) |
220 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 |
221 begin |
220 begin |
222 AddVoice(sndStupid, PreviousTeam^.voicepack); |
221 AddVoice(sndStupid, PreviousTeam^.voicepack); |
223 // Message for hurting itself only (not drowning) |
222 // Message for hurting itself only (not drowning) |
224 if (CurrentHedgehog^.stats.DamageGiven = CurrentHedgehog^.stats.StepDamageRecv) and (CurrentHedgehog^.stats.StepDamageRecv >= 1) then |
223 if (CurrentHedgehog^.stats.StepDamageGiven = CurrentHedgehog^.stats.StepDamageRecv) and (CurrentHedgehog^.stats.StepDamageRecv >= 1) then |
225 AddCaption(FormatA(GetEventString(eidHurtSelf), s), capcolDefault, capgrpMessage); |
224 AddCaption(FormatA(GetEventString(eidHurtSelf), s), capcolDefault, capgrpMessage); |
226 end |
225 end |
227 |
226 |
228 // Hog hurts, poisons or kills own team/clan member. Sacrifice is taken into account |
227 // Hog hurts, poisons or kills own team/clan member. Sacrifice is taken into account |
229 else if (DamageClan <> 0) or (KillsClan > killsCheck) or (PoisonClan <> 0) then |
228 else if (DamageClan <> 0) or (KillsClan > killsCheck) or (PoisonClan <> 0) then |