Skip to content

Commit 23ae395

Browse files
authored
[Warlock] 11.1 Rain of Fire handling (simulationcraft#9933)
1 parent 85df174 commit 23ae395

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

engine/class_modules/warlock/sc_warlock.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ struct warlock_t : public player_t
371371

372372
player_talent_t backdraft;
373373
const spell_data_t* backdraft_buff;
374-
player_talent_t rain_of_fire; // TODO: 11.1 PTR - Choice node added to select targeting method. Make sure incoming talent strings are parsed correctly.
374+
player_talent_t rain_of_fire;
375375
const spell_data_t* rain_of_fire_tick;
376376

377377
player_talent_t roaring_blaze;

engine/class_modules/warlock/sc_warlock_init.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,9 @@ namespace warlock
347347
talents.backdraft = find_talent_spell( talent_tree::SPECIALIZATION, "Backdraft" ); // Should be ID 196406
348348
talents.backdraft_buff = find_spell( 117828 );
349349

350-
talents.rain_of_fire = find_talent_spell( talent_tree::SPECIALIZATION, "Rain of Fire" ); // Should be ID 5740
350+
talents.rain_of_fire = find_talent_spell( talent_tree::SPECIALIZATION, 5740 ); // Targeting reticle version
351+
if ( talents.rain_of_fire == spell_data_t::not_found() )
352+
talents.rain_of_fire = find_talent_spell( talent_tree::SPECIALIZATION, 1214467 ); // If targeting version not found, fall back to checking for on-target version
351353
talents.rain_of_fire_tick = find_spell( 42223 );
352354

353355
talents.roaring_blaze = find_talent_spell( talent_tree::SPECIALIZATION, "Roaring Blaze" ); // Should be ID 205184

0 commit comments

Comments
 (0)