Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/development'
Browse files Browse the repository at this point in the history
  • Loading branch information
Sonaza committed Jul 25, 2016
2 parents 1ce132f + f0acc57 commit 95e4ea9
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 9 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 2.0.1
* Fixed reputation module glitchiness when not tracking any reputations.

## 2.0.0
* Legion update
* The addon has been practically rewritten and previously configured settings are unfortunately lost. You can reconfigure settings by right clicking the Experiencer bar.
Expand Down
2 changes: 1 addition & 1 deletion Experiencer.toc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
## Title: Experiencer
## Notes: Simple and Advanced Experience and Reputation Progress Bar
## Author: Sonaza
## Version: 2.0.0
## Version: 2.0.1
## OptionalDeps: Ace3
## SavedVariables: ExperiencerDB, ExperiencerDB_module_experience, ExperiencerDB_module_reputation, ExperiencerDB_module_artifact, ExperiencerDB_module_honor

Expand Down
1 change: 0 additions & 1 deletion modules/artifact.lua
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ end

function module:GetBarData()
local data = {};

data.level = 0;
data.min = 0;
data.max = 1;
Expand Down
21 changes: 14 additions & 7 deletions modules/reputation.lua
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,23 @@ function module:GetChatMessage()
end

function module:GetBarData()
local name, standing, minReputation, maxReputation, currentReputation, factionID = GetWatchedFactionInfo();

local data = {};
data.level = standing;
data.min = minReputation;
data.max = maxReputation;
data.current = currentReputation;
data.level = 0;
data.min = 0;
data.max = 1;
data.current = 0;
data.rested = nil;
data.visual = nil;

if(module:HasWatchedReputation()) then
local name, standing, minReputation, maxReputation, currentReputation, factionID = GetWatchedFactionInfo();

data.level = standing;
data.min = minReputation;
data.max = maxReputation;
data.current = currentReputation;
end

return data;
end

Expand Down Expand Up @@ -408,7 +415,7 @@ function module:UPDATE_FACTION(event, ...)
local name = GetWatchedFactionInfo();

local instant = false;
if(name ~= module.Tracked) then
if(name ~= module.Tracked or not name) then
instant = true;
end
module.Tracked = name;
Expand Down

0 comments on commit 95e4ea9

Please sign in to comment.