Sub Mastery, Bonzoe's UI changes

Aldriana · Sep 20, 2012 · 1389505 · 1389505
1 parent 82e37fb
commit 1389505
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/shadowcraft/calcs/rogue/Aldriana/__init__.py b/shadowcraft/calcs/rogue/Aldriana/__init__.py
@@ -1472,7 +1472,7 @@ def subtlety_attack_counts_backstab(self, current_stats):
 
         haste_multiplier = self.stats.get_haste_multiplier_from_rating(current_stats['haste'])
 
-        mastery_snd_speed = 1 + .4 * (1 + .02 * self.stats.get_mastery_from_rating(current_stats['mastery']))
+        mastery_snd_speed = 1 + .4 * (1 + .03 * self.stats.get_mastery_from_rating(current_stats['mastery']))
 
         attack_speed_multiplier = self.base_speed_multiplier * haste_multiplier * mastery_snd_speed / 1.4
 

diff --git a/test_ui/testing_ui.py b/test_ui/testing_ui.py
@@ -499,7 +499,7 @@ def create_buff_checkboxes(self):
 
         for buff in buffs.Buffs.allowed_buffs:
             chk_box = wx.CheckBox(self, -1, buff, name = buff)
-            chk_box.SetValue(True)
+            chk_box.SetValue(False)
             vbox.Add(chk_box, 2, wx.BOTTOM)
             chk_box.Bind(wx.EVT_CHECKBOX, lambda event, name = buff: self.on_check_changed(event, name))
 
@@ -668,9 +668,9 @@ def calculate(self):
         if not self.initializing:
             gear_stats = self.gear_page.get_stats()
             my_stats = stats.Stats(**gear_stats)
-            my_talents = talents.get_allowed_talents_for_level() #(*self.talents_page.get_talents() )
+            my_talents = talents.Talents(talent_string='311113') #(*self.talents_page.get_talents() )
             #my_talents = '311113'
-            my_glyphs = glyphs() #.RogueGlyphs(*self.talents_page.get_glyphs())
+            my_glyphs = glyphs.Glyphs('rogue', *self.talents_page.get_glyphs()) #.RogueGlyphs(*self.talents_page.get_glyphs())
             my_buffs = buffs.Buffs(*self.buffs_page.current_buffs)
             my_race = race.Race(self.settings_page.get_race())
             test_settings = settings.Settings(self.settings_page.get_cycle(), response_time = self.settings_page.get_response_time())