Display damage per second in the item info (CleverRaven#38600)

* Display damage per second in the item info So you can quickly eyeball the weapon effectiveness versus plain meatbags * Added DPS to tests (cherry picked from commit deac304)
tung · Jun 23, 2020 · c57b924 · c57b924
1 parent 02618ec
commit c57b924
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/item.cpp b/src/item.cpp
@@ -1362,6 +1362,10 @@ void item::basic_info( std::vector<iteminfo> &info, const iteminfo_query *parts,
         if( parts->test( iteminfo_parts::BASE_MOVES ) ) {
             info.push_back( iteminfo( "BASE", _( "Moves per attack: " ), "",
                                       iteminfo::lower_is_better, attack_time() ) );
+            double dps = ( dmg_bash + dmg_cut + dmg_stab ) * to_moves<int>( 1_seconds ) /
+                         static_cast<double>( attack_time() );
+            info.push_back( iteminfo( "BASE", _( "Damage per second: " ), "",
+                                      iteminfo::is_decimal, dps ) );
         }
     }
 

diff --git a/tests/iteminfo_test.cpp b/tests/iteminfo_test.cpp
@@ -50,7 +50,8 @@ TEST_CASE( "weapon attack ratings and moves", "[item][iteminfo]" )
         "Bash: <color_c_yellow>20</color>"
         "  Cut: <color_c_yellow>5</color>"
         "  To-hit bonus: <color_c_yellow>+2</color>\n"
-        "Moves per attack: <color_c_yellow>145</color>\n" );
+        "Moves per attack: <color_c_yellow>145</color>\n"
+        "Damage per second: <color_c_yellow>17.24</color>\n" );
 
 }