diff --git a/Documentation/RevisionHistory.txt b/Documentation/RevisionHistory.txt index 0dfb1ba..2809c5e 100644 --- a/Documentation/RevisionHistory.txt +++ b/Documentation/RevisionHistory.txt @@ -1,3 +1,17 @@ +Version 1.2.0 + +* Fixed some outfit generation, can now calc by resistance + +* Fixed outfitter window position (thanks stefan0uh) + +* Fixed various errors + +Version 1.0.0 changes + +* Initial Commit + +--Resetting Versions for Classic + Version 5.20.3 changes * FIXED: Prevented more custom events from being registered with the system diff --git a/Libraries/MC2ItemStatsLib/MC2ItemStatsLib.lua b/Libraries/MC2ItemStatsLib/MC2ItemStatsLib.lua index 57866f2..f814b9f 100644 --- a/Libraries/MC2ItemStatsLib/MC2ItemStatsLib.lua +++ b/Libraries/MC2ItemStatsLib/MC2ItemStatsLib.lua @@ -35,8 +35,14 @@ Addon.ItemStatsLib.strings.CriticalStrike = "Critical Strike" Addon.ItemStatsLib.strings.Power = ATTACK_POWER Addon.ItemStatsLib.strings.Dodge = STAT_DODGE Addon.ItemStatsLib.strings.ItemLevel = "Item Level" -Addon.ItemStatsLib.strings.Frost_Res = "Frost Resistance" -Addon.ItemStatsLib.strings.NatureResistance = "Nature Resistance" --Miv +Addon.ItemStatsLib.strings.Hit = ITEM_MOD_HIT_RATING_SHORT +Addon.ItemStatsLib.strings.SpellHit = ITEM_MOD_HIT_SPELL_RATING_SHORT + +Addon.ItemStatsLib.strings.FrostResist = RESISTANCE4_NAME +Addon.ItemStatsLib.strings.NatureResist = RESISTANCE3_NAME --Miv +Addon.ItemStatsLib.strings.FireResist = RESISTANCE2_NAME +Addon.ItemStatsLib.strings.ShadowResist = RESISTANCE5_NAME --Miv +Addon.ItemStatsLib.strings.ArcaneResist = RESISTANCE6_NAME Addon.ItemStatsLib.statNormalization = {} Addon.ItemStatsLib.statNormalization[Addon.ItemStatsLib.strings.Stamina] = "STA" @@ -49,7 +55,14 @@ Addon.ItemStatsLib.statNormalization[Addon.ItemStatsLib.strings.Versatility] = " Addon.ItemStatsLib.statNormalization[Addon.ItemStatsLib.strings.Mastery] = "MAS" Addon.ItemStatsLib.statNormalization[Addon.ItemStatsLib.strings.CriticalStrike] = "CRI" Addon.ItemStatsLib.statNormalization[Addon.ItemStatsLib.strings.ItemLevel] = "ITEM_LEVEL" -Addon.ItemStatsLib.statNormalization[Addon.ItemStatsLib.strings.NatureResistance] = "Nature Resistance" +Addon.ItemStatsLib.statNormalization[Addon.ItemStatsLib.strings.FireResist] = RESISTANCE2_NAME +Addon.ItemStatsLib.statNormalization[Addon.ItemStatsLib.strings.NatureResist] = RESISTANCE3_NAME +Addon.ItemStatsLib.statNormalization[Addon.ItemStatsLib.strings.FrostResist] = RESISTANCE4_NAME +Addon.ItemStatsLib.statNormalization[Addon.ItemStatsLib.strings.ShadowResist] = RESISTANCE5_NAME +Addon.ItemStatsLib.statNormalization[Addon.ItemStatsLib.strings.ArcaneResist] = RESISTANCE6_NAME +Addon.ItemStatsLib.statNormalization[Addon.ItemStatsLib.strings.Hit] = ITEM_MOD_HIT_RATING_SHORT +Addon.ItemStatsLib.statNormalization[Addon.ItemStatsLib.strings.SpellHit] = ITEM_MOD_HIT_SPELL_RATING_SHORT + function Addon.ItemStatsLib:statsForBagItem(bag, slot) local stats = Addon:new(self._Stats) @@ -85,6 +98,10 @@ end function Addon.ItemStatsLib._Stats:setToLink(link) local stats = Addon.TooltipLib:StatsForLink(link) + --print(stats[0]) + --print(stats[1]) + --print(stats[2]) + --print(stats[3]) self:setTooltipStats(stats) self:setInfoFromLink(link) end @@ -92,7 +109,9 @@ end function Addon.ItemStatsLib._Stats:setTooltipStats(tooltipStats) self.values = {} for key, value in pairs(Addon.ItemStatsLib.statNormalization) do + --print("Key: " .. key .. " Value: " .. value) if tooltipStats[key] then + --print("Value: " .. value .. " " .. tooltipStats[key]) self.values[value] = tooltipStats[key] end end diff --git a/Outfitter.lua b/Outfitter.lua index 635259b..2479cac 100644 --- a/Outfitter.lua +++ b/Outfitter.lua @@ -1,6 +1,5 @@ ---------------------------------------- -- Outfitter Copyright 2006-2018 John Stephen --- All rights reserved, unauthorized redistribution is prohibited ---------------------------------------- Outfitter.Debug = diff --git a/Outfitter.toc b/Outfitter.toc index 7790f0e..1269feb 100644 --- a/Outfitter.toc +++ b/Outfitter.toc @@ -1,7 +1,7 @@ ## Interface: 11302 ## Author: John Stephen ## Title: Outfitter [Classic] -## Version: 5.22.1.classic +## Version: 1.2.0 ## Notes: Clothing and weapon management and automated equipment changes. Updated for classic by Miv(aka Restoshaman) of . ## OptionalDeps: ## RequiredDeps: diff --git a/OutfitterItemStats.lua b/OutfitterItemStats.lua index 23c94f0..4a244ba 100644 --- a/OutfitterItemStats.lua +++ b/OutfitterItemStats.lua @@ -218,48 +218,48 @@ Outfitter.SimpleStatCategories = {ID = "ITEM_LEVEL", Name = Outfitter.cItemLevelName}, }, }, --- { --- CategoryID = "Melee", --- Name = PLAYERSTAT_MELEE_COMBAT, --- Stats = --- { --- {ID = "MELEE_DMG"}, --- {ID = "MELEE_HASTE_RATING"}, --- {ID = "AP"}, --- {ID = "RANGED_AP"}, --- {ID = "MELEE_HIT_RATING"}, --- {ID = "MELEE_CRIT_RATING"}, --- {ID = "EXPERTISE_RATING"}, --- {ID = "ARMOR_PENETRATION_RATING"}, --- }, --- }, --- { --- CategoryID = "Ranged", --- Name = PLAYERSTAT_RANGED_COMBAT, --- Stats = --- { --- {ID = "RANGED_DMG"}, --- {ID = "RANGED_HASTE_RATING"}, --- {ID = "RANGED_AP"}, --- {ID = "RANGED_HIT_RATING"}, --- {ID = "RANGED_CRIT_RATING"}, --- }, --- }, --- { --- CategoryID = "Spell", --- Name = PLAYERSTAT_SPELL_COMBAT, --- Stats = --- { --- {ID = "SPELL_DMG"}, --- {ID = "HEAL"}, --- {ID = "SPELL_HIT_RATING"}, --- {ID = "SPELL_CRIT_RATING"}, --- {ID = "SPELL_HASTE_RATING"}, --- {ID = "SPELLPEN"}, --- {ID = "MANA"}, --- {ID = "MANA_REG"}, --- }, --- }, + { + CategoryID = "Melee", + Name = PLAYERSTAT_MELEE_COMBAT, + Stats = + { + --{ID = "MELEE_DMG"}, + --{ID = "MELEE_HASTE_RATING"}, + --{ID = "AP"}, + --{ID = "RANGED_AP"}, + {ID = ITEM_MOD_HIT_RATING_SHORT, Name = Outfitter.ItemStatsLib.strings.Hit}, + --{ID = "MELEE_CRIT_RATING"}, + --{ID = "EXPERTISE_RATING"}, + --{ID = "ARMOR_PENETRATION_RATING"}, + }, + }, + { + CategoryID = "Ranged", + Name = PLAYERSTAT_RANGED_COMBAT, + Stats = + { + --{ID = "RANGED_DMG"}, + --{ID = "RANGED_HASTE_RATING"}, + --{ID = "RANGED_AP"}, + --{ID = "RANGED_HIT_RATING"}, + --{ID = "RANGED_CRIT_RATING"}, + }, + }, + { + CategoryID = "Spell", + Name = PLAYERSTAT_SPELL_COMBAT, + Stats = + { + --{ID = "SPELL_DMG"}, + --{ID = "HEAL"}, + {ID = ITEM_MOD_HIT_SPELL_RATING_SHORT, Name = Outfitter.ItemStatsLib.strings.SpellHit}, + --{ID = "SPELL_CRIT_RATING"}, + --{ID = "SPELL_HASTE_RATING"}, + --{ID = "SPELLPEN"}, + --{ID = "MANA"}, + --{ID = "MANA_REG"}, + }, + }, -- { -- CategoryID = "Defense", -- Name = PLAYERSTAT_DEFENSES, @@ -280,11 +280,11 @@ Outfitter.SimpleStatCategories = Name = Outfitter.cResistCategory, Stats = { - {ID = "ARCANE_RES"}, - {ID = "FIRE_RES"}, - {ID = "FROST_RES", Name = Outfitter.ItemStatsLib.strings.FrostResistance}, - {ID = "NATURE_RES", Name = Outfitter.ItemStatsLib.strings.NatureResistance}, --Miv - {ID = "SHADOW_RES"}, + {ID = RESISTANCE6_NAME, Name = Outfitter.ItemStatsLib.strings.ArcaneResist}, + {ID = RESISTANCE2_NAME, Name = Outfitter.ItemStatsLib.strings.FireResist}, + {ID = RESISTANCE4_NAME, Name = Outfitter.ItemStatsLib.strings.FrostResist}, + {ID = ESISTANCE3_NAME, Name = Outfitter.ItemStatsLib.strings.NatureResist}, --Miv + {ID = RESISTANCE5_NAME, Name = Outfitter.ItemStatsLib.strings.ShadowResist}, }, }, -- { diff --git a/OutfitterOptimize.lua b/OutfitterOptimize.lua index e7c54f0..a0686b8 100644 --- a/OutfitterOptimize.lua +++ b/OutfitterOptimize.lua @@ -20,7 +20,7 @@ Outfitter.cStatIDItems = function Outfitter:GenerateSmartOutfit(pName, pStatConfig, pInventoryCache, pAllowEmptyOutfit, pCompletionFunc) pInventoryCache:ResetIgnoreItemFlags() - + --print(pStatConfig) if type(pStatConfig) == "string" then local vStatID = pStatConfig @@ -63,9 +63,10 @@ function Outfitter:GenerateSmartOutfit(pName, pStatConfig, pInventoryCache, pAll if not vStat then Outfitter:ErrorMessage("Unknown stat ID: %s", tostring(vConfig.StatID)) + --print("Unknown stat ID: %s", tostring(vConfig.StatID)) return end - + --print(vConfig.StatID) table.insert(vStatConfig, {Stat = vStat, StatID = vConfig.StatID, MinValue = vConfig.MinValue, MaxValue = vConfig.MaxValue}) end diff --git a/OutfitterScripting.lua b/OutfitterScripting.lua index 5a26c81..910f44c 100644 --- a/OutfitterScripting.lua +++ b/OutfitterScripting.lua @@ -250,7 +250,7 @@ end function Outfitter:GenerateSmartUnequipScript(pEventID, pDescription, pUnequipDelay, pIncludeSpecEnables) local vScript local vEventIDs - + pIncludeSpecEnables = false vEventIDs = pEventID.." NOT_"..pEventID if pIncludeSpecEnables then vEventIDs = vEventIDs.." ACTIVE_TALENT_GROUP_CHANGED" diff --git a/README.md b/README.md index af4cbf1..d9f9ed0 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ Initial Release of Classic Port +Forked from https://github.com/Mundocani/Outfitter by John Stephen ----------------------------------------------- - on Skeram PvP is recruiting. World First Horde Ragnaros and Fastest Horde MC in Phase One. If you're interested in pushing speed/faction first and server first kills then apply here: http://onslaught-wow.com/recruitment-application/ \ No newline at end of file