Patch 6.2 Updates

.editorconfig

@@ -0,0 +1,6 @@
+root = true
+charset = utf-8
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true

.gitignore

@@ -12,3 +12,11 @@ item_db.db
 
 /.project
 /.pydevproject
+*.sublime-workspace
+*.sublime-project
+/ShadowCraft-Engine.pyproj
+/ShadowCraft-Engine.pyproj.user
+/ShadowCraft-Engine.sln
+/.vs/ShadowCraft-Engine/v14/.suo
+/.vscode
+/TestResults

README.md

@@ -0,0 +1,59 @@
+ShadowCraft-Engine
+==================
+
+This repository contains the calculations engine behind the ShadowCraft
+theorycrafting webapp for the Rogue class in World of Warcraft. For the
+web application including the UI see
+[shadowcraft-ui](https://github.com/cheald/shadowcraft-ui).
+
+ShadowCraft-Engine is written in Python and supports both Python 2 and
+3. The calculation modules can be found in shadowcraft/calcs. Objects
+used for those calculations are defined in shadowcraft/objects.
+
+
+How To
+------
+
+In order to support both Python 2 and 3, ShadowCraft-Engine depends on
+the *future* library. You can install it by running:
+
+```
+pip install future
+```
+
+To run a simple calculation for the rogue spec of your choice you can
+look at the examples in the scripts folder. Feel free to play around
+and edit those files as you see fit, when testing. E.g. to run a DPS
+calculation for Subtlety, type:
+
+```
+python scripts/subtlety.py
+```
+
+
+Tests
+-----
+
+Although the tests currently do not provide good number testing for the
+different specialization models, they can be used to ensure that nothing
+major is broken. Run the tests using the following command:
+
+```
+python tests/runtests.py
+```
+
+Of course, we appreciate any help in extending the test coverage for the
+engine.
+
+
+Contributing
+------------
+
+The ShadowCraft team is always looking for help. If you would like to
+contribute to the engine, you can always contact the active developers
+or open a pull request on GitHub. There is also a #shadowcraft channel
+on the [Ravenholdt Discord Server](https://discord.gg/DdPahJ9) that can
+be used for discussion about the project.
+
+Before writing code and submitting for review, please have a look at the
+code style guidelines in style.md.

scripts/assassination.py

@@ -1,6 +1,10 @@
+from __future__ import division
+from __future__ import print_function
 # Simple test program to debug + play with assassination models.
+from builtins import str
 from os import path
 import sys
+from pprint import pprint
 sys.path.append(path.abspath(path.join(path.dirname(__file__), '..')))
 
 from shadowcraft.calcs.rogue.Aldriana import AldrianasRogueDamageCalculator
@@ -11,149 +15,148 @@
 from shadowcraft.objects import stats
 from shadowcraft.objects import procs
 from shadowcraft.objects import talents
-from shadowcraft.objects import glyphs
+from shadowcraft.objects import artifact
 
 from shadowcraft.core import i18n
 
-import time
-
 # Set up language. Use 'en_US', 'es_ES', 'fr' for specific languages.
 test_language = 'local'
 i18n.set_language(test_language)
 
-start = time.time()
-
 # Set up level/class/race
-test_level = 100
-test_race = race.Race('none')
+test_level = 110
+test_race = race.Race('blood_elf', 'rogue', 110)
 test_class = 'rogue'
+test_spec = 'assassination'
 
 # Set up buffs.
 test_buffs = buffs.Buffs(
-        #'short_term_haste_buff',
-        'stat_multiplier_buff',
-        'crit_chance_buff',
-        'mastery_buff',
-        'haste_buff',
-        'multistrike_buff',
-        'versatility_buff',
-        'attack_power_buff',
-        'physical_vulnerability_debuff',
-        'spell_damage_debuff',
-        'agi_flask_mop',
-        'food_mop_agi'
-    )
+    'short_term_haste_buff',
+    'flask_legion_agi',
+    'food_legion_mastery_375'
+)
 
 # Set up weapons.
-test_mh = stats.Weapon(812.0, 1.8, 'dagger', 'mark_of_the_shattered_hand')
-test_oh = stats.Weapon(812.0, 1.8, 'dagger', 'mark_of_the_frostwolf')
+test_mh = stats.Weapon(7063.0, 1.8, 'dagger', None)
+test_oh = stats.Weapon(7063.0, 1.8, 'dagger', None)
 
 # Set up procs.
-test_procs = procs.ProcsList(('scales_of_doom', 691), ('beating_heart_of_the_mountain', 701),
-                             'draenic_agi_pot', 'draenic_agi_prepot', 'archmages_greater_incandescence')
+#test_procs = procs.ProcsList(('scales_of_doom', 691), ('beating_heart_of_the_mountain', 701),
+#                             'draenic_agi_pot', 'draenic_agi_prepot', 'archmages_greater_incandescence')
+test_procs = procs.ProcsList('old_war_pot', 'old_war_prepot',
+    #'convergence_of_fates',
+    ('draught_of_souls', 910),
+    #('chaos_talisman', 890),
+    ('nightblooming_frond', 910),
+)
 
 # Set up gear buffs.
-test_gear_buffs = stats.GearBuffs('gear_specialization')
+test_gear_buffs = stats.GearBuffs('gear_specialization',
+#'the_dreadlords_deceit',
+'rogue_t19_2pc',
+'rogue_t19_4pc',
+'zoldyck_family_training_shackles',
+'mantle_of_the_master_assassin',
+#'duskwalkers_footpads',
+#'cinidaria_the_symbiote',
+)
 
 # Set up a calcs object..
 test_stats = stats.Stats(test_mh, test_oh, test_procs, test_gear_buffs,
-                         agi=3650,
-                         stam=2426,
-                         crit=1539,
-                         haste=0,
-                         mastery=1615,
-                         readiness=0,
-                         versatility=122,
-                         multistrike=1034,)
-
+                         agi=21964,
+                         stam=32801,
+                         crit=8749,
+                         haste=1935,
+                         mastery=9729,
+                         versatility=4382,)
 # Initialize talents..
-test_talents = talents.Talents('3322122', test_class, test_level)
-
-# Set up glyphs.
-glyph_list = ['disappearance', 'sprint', 'vendetta'] #just to have something
-test_glyphs = glyphs.Glyphs(test_class, *glyph_list)
+#test_talents = talents.Talents('2110031', test_spec, test_class, level=test_level)
+test_talents = talents.Talents('1230011', test_spec, test_class, level=test_level)
+
+#initialize artifact traits..
+test_traits = artifact.Artifact(test_spec, test_class, trait_dict={
+    'kingsbane':                 1,
+    'assassins_blades':          1,
+    'toxic_blades':              3,
+    'poison_knives':             3,
+    'urge_to_kill':              1,
+    'balanced_blades ':          3,
+    'surge_of_toxins':           1,
+    'shadow_walker':             3,
+    'master_assassin':           3+2,
+    'shadow_swiftness':          1,
+    'serrated_edge':             3,
+    'bag_of_tricks':             1,
+    'master_alchemist':          3,
+    'gushing_wounds':            3+1,
+    'fade_into_shadows':         3,
+    'from_the_shadows':          1,
+    'blood_of_the_assassinated': 1,
+    'slayers_precision':         1,
+    'silence_of_the_uncrowned':  1,
+    'strangler': 4,
+    'dense_concoction': 0,
+    'sinister_circulation': 0,
+    'concordance_of_the_legionfall': 0,
+})
 
 # Set up settings.
-test_cycle = settings.AssassinationCycle(min_envenom_size_non_execute=4, min_envenom_size_execute=5)
-test_settings = settings.Settings(test_cycle, response_time=.5, duration=360, dmg_poison='dp', utl_poison='lp', is_pvp=False,
-                                  use_opener='always', opener_name='mutilate')
+test_cycle = settings.AssassinationCycle()
+test_settings = settings.Settings(test_cycle, response_time=.5, duration=300,
+                                  finisher_threshold=4)
 
 # Build a DPS object.
-calculator = AldrianasRogueDamageCalculator(test_stats, test_talents, test_glyphs, test_buffs, test_race, test_settings, test_level)
+calculator = AldrianasRogueDamageCalculator(test_stats, test_talents, test_traits, test_buffs, test_race, test_spec, test_settings, test_level)
+
+print(str(calculator.stats.get_character_stats(calculator.race, test_traits)))
 
 # Compute DPS Breakdown.
 dps_breakdown = calculator.get_dps_breakdown()
-total_dps = sum(entry[1] for entry in dps_breakdown.items())
-calculator.init_assassination()
-non_execute_breakdown = calculator.assassination_dps_breakdown_non_execute()
-non_execute_total = sum(entry[1] for entry in non_execute_breakdown.items())
-calculator.init_assassination()
-execute_breakdown = calculator.assassination_dps_breakdown_execute()
-execute_total = sum(entry[1] for entry in execute_breakdown.items())
+total_dps = sum(entry[1] for entry in list(dps_breakdown.items()))
 
 # Compute EP values.
 ep_values = calculator.get_ep(baseline_dps=total_dps)
-#tier_ep_values = calculator.get_other_ep(['rogue_t14_4pc', 'rogue_t14_2pc', 'rogue_t15_4pc', 'rogue_t15_2pc', 'rogue_t16_2pc', 'rogue_t16_4pc'])
-#mh_enchants_and_dps_ep_values, oh_enchants_and_dps_ep_values = calculator.get_weapon_ep(dps=True, enchants=True)
-
-trinkets_list = [
-    #5.4
-    'assurance_of_consequence',
-    'haromms_talisman',
-    'sigil_of_rampage',
-    'ticking_ebon_detonator',
-    'thoks_tail_tip',
-    'discipline_of_xuen',
-    'fury_of_xuen',
-]
-# trinkets_ep_value = calculator.get_upgrades_ep_fast(trinkets_list)
+tier_ep_values = calculator.get_other_ep(['rogue_t19_4pc', 'rogue_t19_2pc',
+'duskwalkers_footpads', 'zoldyck_family_training_shackles', 'mantle_of_the_master_assassin'
+])
+
 
 #talent_ranks = calculator.get_talents_ranking()
+#trait_ranks = calculator.get_trait_ranking()
 
 def max_length(dict_list):
     max_len = 0
     for i in dict_list:
-        dict_values = i.items()
+        dict_values = list(i.items())
         if max_len < max(len(entry[0]) for entry in dict_values):
             max_len = max(len(entry[0]) for entry in dict_values)
 
     return max_len
 
-def pretty_print(dict_list, total_sum = 1., show_percent=False):
+def pretty_print(dict_list):
     max_len = max_length(dict_list)
 
     for i in dict_list:
-        dict_values = i.items()
+        dict_values = list(i.items())
         dict_values.sort(key=lambda entry: entry[1], reverse=True)
         for value in dict_values:
-            #print value[0] + ':' + ' ' * (max_len - len(value[0])), str(value[1])
-            if show_percent and ("{0:.2f}".format(float(value[1])/total_sum)) != '0.00':
-                print value[0] + ':' + ' ' * (max_len - len(value[0])), str(value[1]) + ' ('+str( "{0:.2f}".format(100*float(value[1])/total_sum) )+'%)'
+            if ("{0:.2f}".format(value[1] / total_dps)) != '0.00':
+                print(value[0] + ':' + ' ' * (max_len - len(value[0])), str(value[1]) + ' ('+str( "{0:.2f}".format(100*float(value[1])/total_dps) )+'%)')
             else:
-                print value[0] + ':' + ' ' * (max_len - len(value[0])), str(value[1])
-        print '-' * (max_len + 15)
+                print(value[0] + ':' + ' ' * (max_len - len(value[0])), str(value[1]))
+        print('-' * (max_len + 15))
 
 dicts_for_pretty_print = [
     ep_values,
-    #tier_ep_values,
-    #mh_enchants_and_dps_ep_values,
-    #oh_enchants_and_dps_ep_values,
-    #trinkets_ep_value,
-    #glyph_values,
+    tier_ep_values,
     #talent_ranks,
+    #trinkets_ep_value,
+    dps_breakdown,
+    #trait_ranks
 ]
 pretty_print(dicts_for_pretty_print)
 
-pretty_print([dps_breakdown], total_sum=total_dps, show_percent=True)
-print ' ' * (max_length([dps_breakdown]) + 1), total_dps, _("total damage per second.")
-print ''
-print "Request time: %s sec" % (time.time() - start)
-
-
-print 'non-execute breakdown: '
-pretty_print([non_execute_breakdown], total_sum=non_execute_total, show_percent=True)
-print ' ' * (max_length([non_execute_breakdown]) + 1), non_execute_total, _("total damage per second.")
+#pretty_print([dps_breakdown], total_sum=total_dps, show_percent=True)
+print(' ' * (max_length([dps_breakdown]) + 1), total_dps, ("total damage per second."))
 
-print 'execute breakdown: '
-pretty_print([execute_breakdown], total_sum=execute_total, show_percent=True)
-print ' ' * (max_length([execute_breakdown]) + 1), execute_total, _("total damage per second.")
+#pprint(talent_ranks)