Add average attack speed to fsim reports.

1 files changed, 5 insertions, 3 deletions

diff --git a/crawl-ref/source/wiz-fsim.cc b/crawl-ref/source/wiz-fsim.cc
index aba20dbdf5..dfe93220ef 100644
--- a/crawl-ref/source/wiz-fsim.cc
+++ b/crawl-ref/source/wiz-fsim.cc
@@ -47,14 +47,15 @@ typedef map<skill_type, int8_t> skill_map;
 typedef map<skill_type, int8_t>::iterator skill_map_iterator;
 
 static const char* _title_line =
-    "AvHitDam | MaxDam | Accuracy | AvDam | AvTime | AvEffDam"; // 55 columns
+    "AvHitDam | MaxDam | Accuracy | AvDam | AvTime | AvSpeed | AvEffDam"; // 64 columns
 
 static const string _fight_string(fight_data fdata)
 {
     return make_stringf("   %5.1f |    %3d |     %3d%% |"
-                        " %5.1f |   %3d  |    %5.1f",
+                        " %5.1f |   %3d  | %5.2f |    %5.1f",
                         fdata.av_hit_dam, fdata.max_dam, fdata.accuracy,
-                        fdata.av_dam, fdata.av_time, fdata.av_eff_dam);
+                        fdata.av_dam, fdata.av_time, fdata.av_speed,
+                        fdata.av_eff_dam);
 }
 
 static skill_type _equipped_skill()
@@ -395,6 +396,7 @@ static fight_data _get_fight_data(monster &mon, int iter_limit, bool defend)
     fdata.accuracy = 100 * hits / iter_limit;
     fdata.av_dam = double(cumulative_damage) / iter_limit;
     fdata.av_time = double(time_taken) / iter_limit + 0.5; // round to nearest
+    fdata.av_speed = double(iter_limit) * 100 / time_taken;
     fdata.av_eff_dam = fdata.av_dam * 100 / fdata.av_time;
 
     return fdata;