[DH] specify supported fight styles

ToppleTheNun · ToppleTheNun · commit a5e1a5eb1a7d · 2025-08-30T20:39:29.000-04:00
diff --git a/engine/class_modules/sc_demon_hunter.cpp b/engine/class_modules/sc_demon_hunter.cpp
@@ -9279,7 +9279,7 @@ bool demon_hunter_t::validate_fight_style( fight_style_e style ) const
 #ifdef NDEBUG
   if ( style == FIGHT_STYLE_DUNGEON_SLICE && !options.enable_dungeon_slice )
   {
-    sim->error( "Dungeon Slice is disabled for Demon Hunter. To force enable, use enable_dungeon_slice=1 option." );
+    sim->error( SEVERE, "Dungeon Slice is disabled for Demon Hunter. To force enable, use enable_dungeon_slice=1 option." );
     sim->cancel();
   }
 #endif
@@ -9288,16 +9288,12 @@ bool demon_hunter_t::validate_fight_style( fight_style_e style ) const
   switch ( specialization() )
   {
     case DEMON_HUNTER_HAVOC:
-      break;
+      return style == FIGHT_STYLE_PATCHWERK || style == FIGHT_STYLE_DUNGEON_ROUTE || style == FIGHT_STYLE_CASTING_PATCHWERK || style == FIGHT_STYLE_HECTIC_ADD_CLEAVE;
     case DEMON_HUNTER_VENGEANCE:
-      if ( style == FIGHT_STYLE_DUNGEON_ROUTE )
-        return false;
-      break;
+      return style == FIGHT_STYLE_PATCHWERK || style == FIGHT_STYLE_CASTING_PATCHWERK || style == FIGHT_STYLE_HECTIC_ADD_CLEAVE;
     default:
-      break;
+      return false;
   }
-
-  return true;
 }
 
 // demon_hunter_t::invalidate_cache =========================================

Original file line number	Diff line number	Diff line change
`@@ -9279,7 +9279,7 @@ bool demon_hunter_t::validate_fight_style( fight_style_e style ) const`
`9279`	`9279`	`#ifdef NDEBUG`
`9280`	`9280`	`if ( style == FIGHT_STYLE_DUNGEON_SLICE && !options.enable_dungeon_slice )`
`9281`	`9281`	`{`
`9282`		`- sim->error( "Dungeon Slice is disabled for Demon Hunter. To force enable, use enable_dungeon_slice=1 option." );`
	`9282`	`+ sim->error( SEVERE, "Dungeon Slice is disabled for Demon Hunter. To force enable, use enable_dungeon_slice=1 option." );`
`9283`	`9283`	`sim->cancel();`
`9284`	`9284`	`}`
`9285`	`9285`	`#endif`
`@@ -9288,16 +9288,12 @@ bool demon_hunter_t::validate_fight_style( fight_style_e style ) const`
`9288`	`9288`	`switch ( specialization() )`
`9289`	`9289`	`{`
`9290`	`9290`	`case DEMON_HUNTER_HAVOC:`
`9291`		`- break;`
	`9291`	`+ return style == FIGHT_STYLE_PATCHWERK \|\| style == FIGHT_STYLE_DUNGEON_ROUTE \|\| style == FIGHT_STYLE_CASTING_PATCHWERK \|\| style == FIGHT_STYLE_HECTIC_ADD_CLEAVE;`
`9292`	`9292`	`case DEMON_HUNTER_VENGEANCE:`
`9293`		`- if ( style == FIGHT_STYLE_DUNGEON_ROUTE )`
`9294`		`- return false;`
`9295`		`- break;`
	`9293`	`+ return style == FIGHT_STYLE_PATCHWERK \|\| style == FIGHT_STYLE_CASTING_PATCHWERK \|\| style == FIGHT_STYLE_HECTIC_ADD_CLEAVE;`
`9296`	`9294`	`default:`
`9297`		`- break;`
	`9295`	`+ return false;`
`9298`	`9296`	`}`
`9299`		`-`
`9300`		`- return true;`
`9301`	`9297`	`}`
`9302`	`9298`
`9303`	`9299`	`// demon_hunter_t::invalidate_cache =========================================`