merge
authorkoda
Sun, 29 Aug 2010 16:55:58 +0200
changeset 3785 7056284fd97c
parent 3783 8e9daf967406 (current diff)
parent 3784 75aa91bea32b (diff)
child 3786 0907b0fd5714
child 3787 6e84339eefee
merge
--- a/hedgewars/uConsts.pas	Sun Aug 29 16:55:27 2010 +0200
+++ b/hedgewars/uConsts.pas	Sun Aug 29 16:55:58 2010 +0200
@@ -142,7 +142,8 @@
             capgrpMessage, capgrpAmmostate);
 
     TStatInfoType = (siGameResult, siMaxStepDamage, siMaxStepKills, siKilledHHs,
-            siClanHealth, siTeamStats);
+            siClanHealth, siTeamStats, siPlayerKills, siMaxTeamDamage,
+            siMaxTeamKills, siMaxTurnSkips );
 
     TWave = (waveRollup, waveSad, waveWave, waveHurrah, waveLemonade, waveShrug, waveJuggle);
 
--- a/hedgewars/uGears.pas	Sun Aug 29 16:55:27 2010 +0200
+++ b/hedgewars/uGears.pas	Sun Aug 29 16:55:58 2010 +0200
@@ -854,7 +854,8 @@
 if skipFlag then
     begin
     TurnTimeLeft:= 0;
-    skipFlag:= false
+    skipFlag:= false;
+    inc(CurrentHedgehog^.Team^.stats.TurnSkips);
     end;
 
 if ((GameTicks and $FFFF) = $FFFF) then
--- a/hedgewars/uMisc.pas	Sun Aug 29 16:55:27 2010 +0200
+++ b/hedgewars/uMisc.pas	Sun Aug 29 16:55:58 2010 +0200
@@ -376,7 +376,7 @@
 end;
 
 procedure SendStat(sit: TStatInfoType; s: shortstring);
-const stc: array [TStatInfoType] of char = 'rDkKHT';
+const stc: array [TStatInfoType] of char = 'rDkKHTPsSB';
 var buf: shortstring;
 begin
 buf:= 'i' + stc[sit] + s;
--- a/hedgewars/uStats.pas	Sun Aug 29 16:55:27 2010 +0200
+++ b/hedgewars/uStats.pas	Sun Aug 29 16:55:58 2010 +0200
@@ -32,11 +32,14 @@
                    MaxStepDamageGiven,
                    MaxStepKills: Longword;
                    FinishedTurns: Longword;
-                   AIKills : LongInt;
                    end;
 
 type TTeamStats = record
-    AIKills : LongInt;
+    Kills : Longword;
+    AIKills : Longword;
+    TeamKills : Longword;
+    TurnSkips : Longword;
+    TeamDamage : Longword;
 end;
 
 var TotalRounds: LongInt;
@@ -87,6 +90,12 @@
     inc(CurrentHedgehog^.stats.StepKills);
     inc(Kills);
     inc(KillsTotal);
+    inc(CurrentHedgehog^.Team^.stats.Kills);
+    if (CurrentHedgehog^.Team^.TeamName =
+            PHedgehog(Gear^.Hedgehog)^.Team^.TeamName) then begin
+        inc(CurrentHedgehog^.Team^.stats.TeamKills);
+        inc(CurrentHedgehog^.Team^.stats.TeamDamage, Gear^.Damage);
+    end;
     if CurrentHedgehog^.Team^.Clan = PHedgehog(Gear^.Hedgehog)^.Team^.Clan then inc(KillsClan);
     end;
 
@@ -190,18 +199,26 @@
 var i, t: LongInt;
     msd, msk: Longword; msdhh, mskhh: PHedgehog;
     mskcnt: Longword;
+    maxTeamKills : Longword;
+    maxTeamKillsName : shortstring;
+    maxTurnSkips : Longword;
+    maxTurnSkipsName : shortstring;
+    maxTeamDamage : Longword;
+    maxTeamDamageName : shortstring;
 begin
 msd:= 0; msdhh:= nil;
 msk:= 0; mskhh:= nil;
 mskcnt:= 0;
+maxTeamKills := 0;
+maxTurnSkips := 0;
+maxTeamDamage := 0;
 
 for t:= 0 to Pred(TeamsCount) do
     with TeamsArray[t]^ do
-        begin
+    begin
         if not ExtDriven then
             SendStat(siTeamStats, GetTeamStatString(TeamsArray[t]));
-        for i:= 0 to cMaxHHIndex do
-            begin
+        for i:= 0 to cMaxHHIndex do begin
             if Hedgehogs[i].stats.MaxStepDamageGiven > msd then
                 begin
                 msdhh:= @Hedgehogs[i];
@@ -216,13 +233,52 @@
                     mskhh:= @Hedgehogs[i];
                     msk:= Hedgehogs[i].stats.MaxStepKills
                     end;
-            end
+        end;
+
+        { send player stats for winner teams }
+        if Clan^.ClanHealth > 0 then begin
+            SendStat(siPlayerKills, inttostr(Clan^.Color) + ' ' +
+                inttostr(stats.Kills) + ' ' + TeamName);
+        end;
+
+        { determine maximum values of TeamKills, TurnSkips, TeamDamage }
+        if stats.TeamKills > maxTeamKills then begin
+            maxTeamKills := stats.TeamKills;
+            maxTeamKillsName := TeamName;
+        end;
+        if stats.TurnSkips > maxTurnSkips then begin
+            maxTurnSkips := stats.TurnSkips;
+            maxTurnSkipsName := TeamName;
         end;
+        if stats.TeamDamage > maxTeamDamage then begin
+            maxTeamDamage := stats.TeamDamage;
+            maxTeamDamageName := TeamName;
+        end;
+
+    end;
+
+{ now send player stats for loser teams }
+for t:= 0 to Pred(TeamsCount) do begin
+    with TeamsArray[t]^ do begin
+        if Clan^.ClanHealth = 0 then begin
+            SendStat(siPlayerKills, inttostr(Clan^.Color) + ' ' +
+                inttostr(stats.Kills) + ' ' + TeamName);
+        end;
+    end;
+end;
+
 if msdhh <> nil then
     SendStat(siMaxStepDamage, inttostr(msd) + ' ' + msdhh^.Name + ' (' + msdhh^.Team^.TeamName + ')');
 if mskcnt = 1 then
     SendStat(siMaxStepKills, inttostr(msk) + ' ' + mskhh^.Name + ' (' + mskhh^.Team^.TeamName + ')');
 
+if maxTeamKills > 1 then
+    SendStat(siMaxTeamKills, inttostr(maxTeamKills) + ' ' + maxTeamKillsName);
+if maxTurnSkips > 2 then
+    SendStat(siMaxTurnSkips, inttostr(maxTurnSkips) + ' ' + maxTurnSkipsName);
+if maxTeamDamage > 30 then
+    SendStat(siMaxTeamDamage, inttostr(maxTeamDamage) + ' ' + maxTeamDamageName);
+
 if KilledHHs > 0 then SendStat(siKilledHHs, inttostr(KilledHHs));
 end;