Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

missing enchants, engineering cogwheels, charInfo in separate file #3

Merged
merged 5 commits into from

2 participants

Postrov Pathal
Postrov

I added some enchants I found missing when importing various rogue profiles. I also moved charInfo to external file for more convenient configuration.

Pathal Pathal merged commit 5f62b27 into from
Pathal Pathal referenced this pull request from a commit
Pathal 5.2 PTR UPDATE - DON'T DOWNLOAD UNLESS YOU'RE LOOKING FOR PTR CALCS (#3)
Combat revision draft 1 - Need feedback.
a29a3f2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
1  scripts/char_info.py
View
@@ -0,0 +1 @@
+charInfo = {'region':'us', 'realm':'Doomhammer', 'name':'Pins', 'talents':None, 'stormlash':False, 'pvp':False, 'shiv':0}
32 scripts/import_character.py
View
@@ -88,6 +88,7 @@ class CharacterData:
enchants = {4441 : 'windsong',
4443 : 'elemental_force',
4444 : 'dancing_steel',
+ 4416 : [{'stat':'agi', 'value':170}], # Enchant Bracer - Greater Agility
4359 : [{'stat':'agi', 'value':180}], #Enchanting Perk
4411 : [{'stat':'mastery', 'value':170}],
4416 : [{'stat':'agi', 'value':170}],
@@ -96,12 +97,43 @@ class CharacterData:
4428 : [{'stat':'agi', 'value':140}], #Speed Boost
4430 : [{'stat':'haste', 'value':170}],
4431 : [{'stat':'exp', 'value':170}],
+ 4433 : [{'stat':'mastery', 'value':170}],
+ 4429 : [{'stat':'mastery', 'value':140}], # Pandaren's Step
4804 : [{'stat':'agi', 'value':200}, {'stat':'crit', 'value':100}],
4875 : [{'stat':'agi', 'value':500}], #Leatherworking Perk
4871 : [{'stat':'agi', 'value':170}, {'stat':'crit', 'value':100}],
4880 : [{'stat':'agi', 'value':285}, {'stat':'crit', 'value':165}],
+ 4822 : [{'stat':'agi', 'value':285}, {'stat':'crit', 'value':165}], # Shadowleather Leg Armor
+ 4411 : [{'stat':'mastery', 'value':170}],
+ 4871 : [{'stat':'agi', 'value':170}, {'stat':'crit', 'value':100}],
4427 : [{'stat':'hit', 'value':175}],
}
+
+ gemsMap = {76884: [{'stat':'agi', 'value':216}, 'chaotic_metagem'],
+ 83151: [{'stat':'agi', 'value':320}], #agi JC gem
+ 76626: [{'stat':'agi', 'value':160}],
+ 76680: [{'stat':'agi', 'value':80}, {'stat':'hit', 'value':160}],
+ 76614: [{'stat':'agi', 'value':80}, {'stat':'hit', 'value':160}],
+ 76666: [{'stat':'agi', 'value':80}, {'stat':'haste', 'value':160}],
+ 76600: [{'stat':'agi', 'value':80}, {'stat':'haste', 'value':160}],
+ 76604: [{'stat':'agi', 'value':80}, {'stat':'mastery', 'value':160}],
+ 76670: [{'stat':'agi', 'value':80}, {'stat':'mastery', 'value':160}],
+ 76636: [{'stat':'hit', 'value':320}],
+ 76576: [{'stat':'hit', 'value':160}, {'stat':'haste', 'value':160}],
+ 76643: [{'stat':'hit', 'value':160}, {'stat':'mastery', 'value':160}],
+ 76692: [{'stat':'agi', 'value':160}],
+ 76699: [{'stat':'haste', 'value':320}],
+ 76667: [{'stat':'exp', 'value':160}, {'stat':'haste', 'value':160}],
+ # engineering cogwheels
+ 77540: [{'stat':'dodge', 'value':600}],
+ 77541: [{'stat':'crit', 'value':600}],
+ 77542: [{'stat':'haste', 'value':600}],
+ 77543: [{'stat':'exp', 'value':600}],
+ 77544: [{'stat':'parry', 'value':600}],
+ 77545: [{'stat':'hit', 'value':600}],
+ 77546: [{'stat':'spirit', 'value':600}],
+ 77547: [{'stat':'mastery', 'value':600}],
+ }
trinkets = {87057 : 'heroic_bottle_of_infinite_stars',
86132 : 'bottle_of_infinite_stars',
8 scripts/mop_assassination_import.py
View
@@ -2,6 +2,9 @@
from os import path
import sys
from import_character import CharacterData
+from char_info import charInfo
+
+
#sys.path.append(path.abspath(path.join(path.dirname(__file__), '..')))
from shadowcraft.calcs.rogue.Aldriana import AldrianasRogueDamageCalculator
@@ -21,7 +24,7 @@
test_language = 'local'
i18n.set_language(test_language)
-charInfo = {'region':'us', 'realm':'Doomhammer', 'name':'Pins', 'talents':None, 'stormlash':False, 'pvp':False, 'shiv':0}
+
key = 1
while key < len(sys.argv):
terms = sys.argv[key].split(':')
@@ -94,7 +97,8 @@
stormlash=charInfo['stormlash'], shiv_interval=charInfo['shiv'])
# Build a DPS object.
-calculator = AldrianasRogueDamageCalculator(test_stats, test_talents, test_glyphs, test_buffs, test_race, test_settings, test_level, char_class=test_class)
+#calculator = AldrianasRogueDamageCalculator(test_stats, test_talents, test_glyphs, test_buffs, test_race, test_settings, test_level, char_class=test_class)
+calculator = AldrianasRogueDamageCalculator(test_stats, test_talents, test_glyphs, test_buffs, test_race, test_settings, test_level)
# Compute EP values.
ep_values = calculator.get_ep()
5 scripts/mop_combat_import.py
View
@@ -2,6 +2,7 @@
from os import path
import sys
from import_character import CharacterData
+from char_info import charInfo
#sys.path.append(path.abspath(path.join(path.dirname(__file__), '..')))
from shadowcraft.calcs.rogue.Aldriana import AldrianasRogueDamageCalculator
@@ -21,7 +22,7 @@
test_language = 'local'
i18n.set_language(test_language)
-charInfo = {'region':'us', 'realm':'Doomhammer', 'name':'Pins', 'talents':None, 'stormlash':False, 'pvp':False, 'shiv':0}
+
key = 1
while key < len(sys.argv):
terms = sys.argv[key].split(':')
@@ -139,4 +140,4 @@ def pretty_print(dict_list):
dps_breakdown
]
pretty_print(dicts_for_pretty_print)
-print ' ' * (max_length(dicts_for_pretty_print) + 1), total_dps, _("total damage per second.")
+print ' ' * (max_length(dicts_for_pretty_print) + 1), total_dps, _("total damage per second.")
2  scripts/mop_subtlety_import.py
View
@@ -2,6 +2,7 @@
from os import path
import sys
from import_character import CharacterData
+from char_info import charInfo
#sys.path.append(path.abspath(path.join(path.dirname(__file__), '..')))
from shadowcraft.calcs.rogue.Aldriana import AldrianasRogueDamageCalculator
@@ -21,7 +22,6 @@
test_language = 'local'
i18n.set_language(test_language)
-charInfo = {'region':'us', 'realm':'Doomhammer', 'name':'Pins', 'talents':None, 'stormlash':False, 'pvp':False, 'shiv':0}
key = 1
while key < len(sys.argv):
terms = sys.argv[key].split(':')
Something went wrong with that request. Please try again.