equal
deleted
inserted
replaced
160 else if (CurrentHedgehog^.stats.Sacrificed = false) and ((CurrentHedgehog^.stats.StepDamageRecv > 0) or (CurrentHedgehog^.stats.StepPoisoned) or (CurrentHedgehog^.stats.StepDied)) then |
160 else if (CurrentHedgehog^.stats.Sacrificed = false) and ((CurrentHedgehog^.stats.StepDamageRecv > 0) or (CurrentHedgehog^.stats.StepPoisoned) or (CurrentHedgehog^.stats.StepDied)) then |
161 begin |
161 begin |
162 AddVoice(sndStupid, PreviousTeam^.voicepack); |
162 AddVoice(sndStupid, PreviousTeam^.voicepack); |
163 // Message for hurting itself only (not drowning) |
163 // Message for hurting itself only (not drowning) |
164 if (CurrentHedgehog^.stats.DamageGiven = CurrentHedgehog^.stats.StepDamageRecv) and (CurrentHedgehog^.stats.StepDamageRecv >= 1) then |
164 if (CurrentHedgehog^.stats.DamageGiven = CurrentHedgehog^.stats.StepDamageRecv) and (CurrentHedgehog^.stats.StepDamageRecv >= 1) then |
165 AddCaption(FormatA(GetEventString(eidHurtSelf), s), cWhiteColor, capgrpMessage); |
165 AddCaption(FormatA(GetEventString(eidHurtSelf), s), capcolDefault, capgrpMessage); |
166 end |
166 end |
167 |
167 |
168 // Hog hurts, poisons or kills own team/clan member. Sacrifice is taken into account |
168 // Hog hurts, poisons or kills own team/clan member. Sacrifice is taken into account |
169 else if (DamageClan <> 0) or (KillsClan > killsCheck) or (PoisonClan <> 0) then |
169 else if (DamageClan <> 0) or (KillsClan > killsCheck) or (PoisonClan <> 0) then |
170 if (DamageTurn > DamageClan) or (Kills > KillsClan) then |
170 if (DamageTurn > DamageClan) or (Kills > KillsClan) then |
203 |
203 |
204 // Turn skipped |
204 // Turn skipped |
205 else if isTurnSkipped and (not PlacingHogs) then |
205 else if isTurnSkipped and (not PlacingHogs) then |
206 begin |
206 begin |
207 AddVoice(sndCoward, PreviousTeam^.voicepack); |
207 AddVoice(sndCoward, PreviousTeam^.voicepack); |
208 AddCaption(FormatA(GetEventString(eidTurnSkipped), s), cWhiteColor, capgrpMessage); |
208 AddCaption(FormatA(GetEventString(eidTurnSkipped), s), capcolDefault, capgrpMessage); |
209 end |
209 end |
210 end; |
210 end; |
211 |
211 |
212 |
212 |
213 for t:= 0 to Pred(TeamsCount) do // send even on zero turn |
213 for t:= 0 to Pred(TeamsCount) do // send even on zero turn |