Skip to content

Commit f2909da

Browse files
millanzarretamillanzarreta
authored
[Warlock] Rename options to be whitelisted in the raidbots custom apl box. Deprecate old names. (#11320)
* [Warlock] Rename options to be whitelisted in the raidbots custom apl box * [Warlock] Rename options to be whitelisted in the raidbots custom apl box: modify .simc profiles * [Warlock] Rename options to be whitelisted in the raidbots custom apl box: set old options as deprecated
1 parent 51ab023 commit f2909da

9 files changed

Lines changed: 45 additions & 35 deletions

‎engine/class_modules/warlock/sc_warlock.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -476,29 +476,29 @@ std::string warlock_t::create_profile( save_e stype )
476476
if ( stype & SAVE_PLAYER )
477477
{
478478
if ( initial_soul_shards != 3 )
479-
profile_str += "soul_shards=" + util::to_string( initial_soul_shards ) + "\n";
479+
profile_str += "warlock.soul_shards=" + util::to_string( initial_soul_shards ) + "\n";
480480
if ( !default_pet.empty() )
481-
profile_str += "default_pet=" + default_pet + "\n";
481+
profile_str += "warlock.default_pet=" + default_pet + "\n";
482482
if ( disable_auto_felstorm )
483-
profile_str += "disable_felstorm=" + util::to_string( as<int>( disable_auto_felstorm ) ) + "\n";
483+
profile_str += "warlock.disable_felstorm=" + util::to_string( as<int>( disable_auto_felstorm ) ) + "\n";
484484
if ( normalize_destruction_mastery )
485485
profile_str +=
486-
"normalize_destruction_mastery=" + util::to_string( as<int>( normalize_destruction_mastery ) ) + "\n";
486+
"warlock.normalize_destruction_mastery=" + util::to_string( as<int>( normalize_destruction_mastery ) ) + "\n";
487487
if ( !eye_explosion_instanced_bug_cb )
488488
profile_str +=
489-
"eye_explosion_instanced_bug_cb=" + util::to_string( as<int>( eye_explosion_instanced_bug_cb ) ) + "\n";
489+
"warlock.eye_explosion_instanced_bug_cb=" + util::to_string( as<int>( eye_explosion_instanced_bug_cb ) ) + "\n";
490490
if ( !eye_explosion_instanced_bug_sb )
491491
profile_str +=
492-
"eye_explosion_instanced_bug_sb=" + util::to_string( as<int>( eye_explosion_instanced_bug_sb ) ) + "\n";
492+
"warlock.eye_explosion_instanced_bug_sb=" + util::to_string( as<int>( eye_explosion_instanced_bug_sb ) ) + "\n";
493493
if ( eye_explosion_instanced_bug_rof )
494494
profile_str +=
495-
"eye_explosion_instanced_bug_rof=" + util::to_string( as<int>( eye_explosion_instanced_bug_rof ) ) + "\n";
495+
"warlock.eye_explosion_instanced_bug_rof=" + util::to_string( as<int>( eye_explosion_instanced_bug_rof ) ) + "\n";
496496
if ( fel_armaments_extra_effect_bug )
497497
profile_str +=
498-
"fel_armaments_extra_effect_bug" + util::to_string( as<int>( fel_armaments_extra_effect_bug ) ) + "\n";
498+
"warlock.fel_armaments_extra_effect_bug" + util::to_string( as<int>( fel_armaments_extra_effect_bug ) ) + "\n";
499499
if ( tyrant_antoran_armaments_target_mul < 1.0 )
500500
profile_str +=
501-
"tyrant_antoran_armaments_target_mul=" + util::to_string( tyrant_antoran_armaments_target_mul ) + "\n";
501+
"warlock.tyrant_antoran_armaments_target_mul=" + util::to_string( tyrant_antoran_armaments_target_mul ) + "\n";
502502
rng_settings.for_each( [ &profile_str ]( auto& setting ) { profile_str += append_rng_option( setting ); } );
503503
}
504504

‎engine/class_modules/warlock/sc_warlock_init.cpp‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,22 +1590,32 @@ namespace warlock
15901590

15911591
void warlock_t::add_rng_option( warlock_t::rng_settings_t::rng_setting_t& setting )
15921592
{
1593-
add_option( opt_float( "rng_" + setting.option_name, setting.setting_value ) );
1593+
add_option( opt_float( "warlock.rng_" + setting.option_name, setting.setting_value ) );
1594+
add_option( opt_deprecated( "rng_" + setting.option_name, "warlock.rng_" + setting.option_name ) );
15941595
}
15951596

15961597
void warlock_t::create_options()
15971598
{
15981599
player_t::create_options();
15991600

1600-
add_option( opt_int( "soul_shards", initial_soul_shards ) );
1601-
add_option( opt_string( "default_pet", default_pet ) );
1602-
add_option( opt_bool( "disable_felstorm", disable_auto_felstorm ) );
1603-
add_option( opt_bool( "normalize_destruction_mastery", normalize_destruction_mastery ) );
1604-
add_option( opt_bool( "eye_explosion_instanced_bug_cb", eye_explosion_instanced_bug_cb ) );
1605-
add_option( opt_bool( "eye_explosion_instanced_bug_sb", eye_explosion_instanced_bug_sb ) );
1606-
add_option( opt_bool( "eye_explosion_instanced_bug_rof", eye_explosion_instanced_bug_rof ) );
1607-
add_option( opt_bool( "fel_armaments_extra_effect_bug", fel_armaments_extra_effect_bug ) );
1608-
add_option( opt_float( "tyrant_antoran_armaments_target_mul", tyrant_antoran_armaments_target_mul, 0.0, 1.0 ));
1601+
add_option( opt_int( "warlock.soul_shards", initial_soul_shards ) );
1602+
add_option( opt_deprecated( "soul_shards", "warlock.soul_shards" ) );
1603+
add_option( opt_string( "warlock.default_pet", default_pet ) );
1604+
add_option( opt_deprecated( "default_pet", "warlock.default_pet" ) );
1605+
add_option( opt_bool( "warlock.disable_felstorm", disable_auto_felstorm ) );
1606+
add_option( opt_deprecated( "disable_felstorm", "warlock.disable_felstorm" ) );
1607+
add_option( opt_bool( "warlock.normalize_destruction_mastery", normalize_destruction_mastery ) );
1608+
add_option( opt_deprecated( "normalize_destruction_mastery", "warlock.normalize_destruction_mastery" ) );
1609+
add_option( opt_bool( "warlock.eye_explosion_instanced_bug_cb", eye_explosion_instanced_bug_cb ) );
1610+
add_option( opt_deprecated( "eye_explosion_instanced_bug_cb", "warlock.eye_explosion_instanced_bug_cb" ) );
1611+
add_option( opt_bool( "warlock.eye_explosion_instanced_bug_sb", eye_explosion_instanced_bug_sb ) );
1612+
add_option( opt_deprecated( "eye_explosion_instanced_bug_sb", "warlock.eye_explosion_instanced_bug_sb" ) );
1613+
add_option( opt_bool( "warlock.eye_explosion_instanced_bug_rof", eye_explosion_instanced_bug_rof ) );
1614+
add_option( opt_deprecated( "eye_explosion_instanced_bug_rof", "warlock.eye_explosion_instanced_bug_rof" ) );
1615+
add_option( opt_bool( "warlock.fel_armaments_extra_effect_bug", fel_armaments_extra_effect_bug ) );
1616+
add_option( opt_deprecated( "fel_armaments_extra_effect_bug", "warlock.fel_armaments_extra_effect_bug" ) );
1617+
add_option( opt_float( "warlock.tyrant_antoran_armaments_target_mul", tyrant_antoran_armaments_target_mul, 0.0, 1.0 ));
1618+
add_option( opt_deprecated( "tyrant_antoran_armaments_target_mul", "warlock.tyrant_antoran_armaments_target_mul" ) );
16091619

16101620
rng_settings.for_each( [ this ]( auto& setting )
16111621
{

‎profiles/MID1/MID1_Warlock_Affliction.simc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,5 +170,5 @@ off_hand=grimoire_of_the_eternal_light,id=249276,ilevel=289
170170
# gear_armor=531
171171
# set_bonus=midnight_season_1_2pc=1
172172
# set_bonus=midnight_season_1_4pc=1
173-
soul_shards=0
174-
default_pet=sayaad
173+
warlock.soul_shards=0
174+
warlock.default_pet=sayaad

‎profiles/MID1/MID1_Warlock_Affliction_Hellcaller.simc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,5 +170,5 @@ off_hand=grimoire_of_the_eternal_light,id=249276,ilevel=289
170170
# gear_armor=531
171171
# set_bonus=midnight_season_1_2pc=1
172172
# set_bonus=midnight_season_1_4pc=1
173-
soul_shards=0
174-
default_pet=sayaad
173+
warlock.soul_shards=0
174+
warlock.default_pet=sayaad

‎profiles/MID1/MID1_Warlock_Demonology.simc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,5 +118,5 @@ main_hand=spire_of_the_furious_construct,id=110031,bonus_id=12806/13577,enchant_
118118
# gear_armor=531
119119
# set_bonus=midnight_season_1_2pc=1
120120
# set_bonus=midnight_season_1_4pc=1
121-
soul_shards=0
122-
default_pet=felguard
121+
warlock.soul_shards=0
122+
warlock.default_pet=felguard

‎profiles/MID1/MID1_Warlock_Destruction.simc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,5 +136,5 @@ main_hand=spire_of_the_furious_construct,id=110031,bonus_id=12806/13577,enchant_
136136
# gear_armor=531
137137
# set_bonus=midnight_season_1_2pc=1
138138
# set_bonus=midnight_season_1_4pc=1
139-
soul_shards=0
140-
default_pet=sayaad
139+
warlock.soul_shards=0
140+
warlock.default_pet=sayaad

‎profiles/MID1/MID1_Warlock_Destruction_Diabolist.simc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,5 +136,5 @@ main_hand=spire_of_the_furious_construct,id=110031,bonus_id=12806/13577,enchant_
136136
# gear_armor=531
137137
# set_bonus=midnight_season_1_2pc=1
138138
# set_bonus=midnight_season_1_4pc=1
139-
soul_shards=0
140-
default_pet=sayaad
139+
warlock.soul_shards=0
140+
warlock.default_pet=sayaad

‎profiles/generators/MID1/MID1_Generate_Warlock.simc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ race=pandaren
55
role=spell
66
position=ranged_back
77
talents=CkQAAAAAAAAAAAAAAAAAAAAAAwMzMzoZhhZmZmlBAAYmZxyMzsMzAAjllBGwEMDbBG2GAAAmBAAwMDzMjBGmZmZGzgZmZGAwMwA
8-
default_pet=sayaad
8+
warlock.default_pet=sayaad
99

1010
head=abyssal_immolators_smoldering_flames,id=250042,bonus_id=13575/1808,enchant_id=7961,gem_id=240983,ilevel=289
1111
neck=eternal_voidsong_chain,id=249368,bonus_id=12806/13577/13668,gem_id=240916
@@ -33,7 +33,7 @@ race=pandaren
3333
role=spell
3434
position=ranged_back
3535
talents=CkQAAAAAAAAAAAAAAAAAAAAAAwMzMzoZhhZmZmlBAAYmZZWmZmlxAAWgBmFjGzAysBWGAAAmBAAmZAzMjxwwMjZmZGMzMzAAmBG
36-
default_pet=sayaad
36+
warlock.default_pet=sayaad
3737

3838
head=abyssal_immolators_smoldering_flames,id=250042,bonus_id=13575/1808,enchant_id=7961,gem_id=240983,ilevel=289
3939
neck=eternal_voidsong_chain,id=249368,bonus_id=12806/13577/13668,gem_id=240916
@@ -114,7 +114,7 @@ level=90
114114
race=Dwarf
115115
role=spell
116116
position=ranged_back
117-
default_pet=sayaad
117+
warlock.default_pet=sayaad
118118
talents=CsQAAAAAAAAAAAAAAAAAAAAAAwMzMzoZjhZmZmlZjxMLGjFzAAgZmxMzsAGzYYhMw2wGNWYAAgxAjNAMzAYmxYAAAYmZmBAwMDD
119119

120120
head=abyssal_immolators_smoldering_flames,id=250042,bonus_id=13575/13575/13575/13575/1808/13575,enchant_id=7961,gem_id=240983,ilevel=289
@@ -142,7 +142,7 @@ level=90
142142
race=Dwarf
143143
role=spell
144144
position=ranged_back
145-
default_pet=sayaad
145+
warlock.default_pet=sayaad
146146
talents=CsQAAAAAAAAAAAAAAAAAAAAAAwMzMzoZjhZmZmlZjxMLGjFzAAgZmxMzsYBGYWMaMDgZL2YAAgxAjNAgZGYmxYAAAYmZmBAwMDD
147147

148148
head=abyssal_immolators_smoldering_flames,id=250042,bonus_id=13575/13575/13575/13575/1808/13575,enchant_id=7961,gem_id=240983,ilevel=289

‎profiles/generators/PreRaids/PR_Generate_Warlock.simc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# role=spell
66
# position=ranged_back
77
# talents=3302013
8-
# default_pet=sayaad
8+
# warlock.default_pet=sayaad
99

1010
# head=horns_of_the_demon_star,id=188889,bonus_id=1498/7187/6935,gem_id=173130
1111
# neck=worldkiller_iris,id=189859,bonus_id=1524/7187/6935,gem_id=173130
@@ -60,7 +60,7 @@
6060
# role=spell
6161
# position=ranged_back
6262
# talents=2103021
63-
# default_pet=sayaad
63+
# warlock.default_pet=sayaad
6464

6565
# head=grimveiled_hood,id=173245,bonus_id=6716/7039/6647/6649/1808/1588/6935,gem_id=173128
6666
# neck=worldkiller_iris,id=189859,bonus_id=1524/7187/6935,gem_id=173128

0 commit comments

Comments
 (0)