Exiles/coa-details
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

- More fixes for dungeon bosses recognition.

Browse Source 
- Fixes for few errors during combat parser.
- Broker is now 'data source' type instead of 'launcher'.
This commit is contained in:
tercio
2014-11-19 17:23:58 -02:00
parent 7135518eb7
commit fb389eab02
7 changed files with 136 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot.lua
+4 -8
View File
File diff suppressed because one or more lines are too long
core/network.lua
+9
View File
@@ -487,6 +487,15 @@
["Darnassus"] = true,
["Ironforge"] = true,
["TheExodar"] = true,
["garrisonffhorde_tier1"] = true,
["garrisonffhorde_tier2"] = true,
["garrisonffhorde_tier3"] = true,
["garrisonsmvalliance_tier1"] = true,
["garrisonsmvalliance_tier2"] = true,
["garrisonsmvalliance_tier3"] = true,
["garrisonsmvalliance_tier4"] = true,
}
local sub_zones = {
core/parser.lua
+9 -2
View File
@@ -165,10 +165,17 @@
--if (npcId == 76933) then
-- return
--end
--using pattern, calling API is too slow here
if (alvo_serial:match ("^Creature:0:%d+:%d+:%d+:76933:%w+$")) then
if (alvo_serial:match ("^Creature%-0%-%d+%-%d+%-%d+%-76933%-%w+$")) then
return
end
--> Second try with :find
-- it's 20% faster when comparing Npcs serials, but very slow when comparing other things.
--if (alvo_serial:find ("-76933-")) then
-- return
--end
------------------------------------------------------------------------------------------------
--> check if need start an combat
@@ -1488,7 +1495,7 @@
end
if (jogador_alvo.powertype ~= este_jogador.powertype) then
print ("error: different power types: who -> ", este_jogador.powertype, " target -> ", jogador_alvo.powertype)
--print ("error: different power types: who -> ", este_jogador.powertype, " target -> ", jogador_alvo.powertype)
return
end
core/windows.lua
+1 -1
View File
@@ -2042,7 +2042,7 @@
if LDB then
local databroker = LDB:NewDataObject ("Details!", {
type = "launcher",
type = "data source",
icon = [[Interface\AddOns\Details\images\minimap]],
text = "0",
functions/slash.lua
+2 -2
View File
@@ -668,8 +668,8 @@ function SlashCmdList.DETAILS (msg, editbox)
if (pass_guid == "-") then
local guid = UnitGUID ("target")
if (guid) then
print (guid.. " -> " .. tonumber (guid:sub(6, 10), 16))
_detalhes.id_frame.texto:SetText (""..tonumber (guid:sub(6, 10), 16))
local g = _detalhes:GetNpcIdFromGuid (guid)
_detalhes.id_frame.texto:SetText ("" .. g)
_detalhes.id_frame.texto:HighlightText()
end
plugins/Details_DungeonInfo-Warlords/Details_DungeonInfo-Warlords.lua
+20 -11
View File
@@ -2,11 +2,12 @@
--Bloodmail Slag Mines
--The Everbloom
--GrimrailDepot
--IronDocks
--IronDocks
--ShadowmoonBurialGrounds
--Skyreach
--UpperBlackrockSpire
--82682 3 everbloom
local Auchindoun = {
id = 1182, --mapid
@@ -51,11 +52,11 @@ local Auchindoun = {
_detalhes:InstallEncounter (Auchindoun)
local BloodmailSlagMines = {
id = 0, --mapid
local BloodmaulSlagMines = {
id = 1175, --mapid
ej_id = 385, --encounter journal id
name = "Bloodmail Slag Mines",
name = "Bloodmaul Slag Mines",
boss_names = {
"Slave Watcher Crushto",
@@ -92,10 +93,10 @@ local BloodmailSlagMines = {
}
_detalhes:InstallEncounter (BloodmailSlagMines)
_detalhes:InstallEncounter (BloodmaulSlagMines)
local TheEverbloom = {
id = 0, --mapid
id = 1279, --mapid
ej_id = 556, --encounter journal id
name = "The Everbloom",
@@ -110,9 +111,11 @@ local TheEverbloom = {
boss_ids = {
[83894] = 1, --Ancient Protectors
[86244] = 1, --Ancient Protectors
[86246] = 2, --Archmage Sol
[86247] = 3, --Xeri'tac
[86242] = 4, --Witherbark
[82682] = 4, --Witherbark
[86248] = 5, --Yalnu
},
@@ -157,9 +160,10 @@ local GrimrailDepot = {
boss_ids = {
[86228] = 1, --Skylord Tovra
[86225] = 2, --Rocketspark and Borka
[86226] = 2, --Rocketspark and Borka
[86227] = 3, --Nitrogg Thundertower
},
encounters = {
[1] = {
boss = "Skylord Tovra",
@@ -179,7 +183,7 @@ local GrimrailDepot = {
_detalhes:InstallEncounter (GrimrailDepot)
local IronDocks = {
id = 0, --mapid
id = 1195, --mapid
ej_id = 558, --encounter journal id
name = "Iron Docks",
@@ -194,10 +198,12 @@ local IronDocks = {
boss_ids = {
[87451] = 1, --Fleshrender Nok'gar
[87452] = 2, --Ahri'ok Dugru
[86231] = 2, --Makogg Emberblade
[80808] = 2, --Neesa Nox
[86232] = 3, --Oshir
[86233] = 4, --Skulloc
},
encounters = {
[1] = {
boss = "Fleshrender Nok'gar",
@@ -221,7 +227,7 @@ local IronDocks = {
_detalhes:InstallEncounter (IronDocks)
local ShadowmoonBurialGrounds = {
id = 0, --mapid
id = 1176, --mapid
ej_id = 537, --encounter journal id
name = "Shadowmoon Burial Grounds",
@@ -321,13 +327,16 @@ local UpperBlackrockSpire = {
boss_ids = {
[86249] = 1, --Orebender Gor'ashan
[76413] = 1, --Orebender Gor'ashan
[86250] = 2, --Kyrak
[76021] = 2, --Kyrak
[86251] = 3, --Commander Tharbek
[79912] = 3, --Commander Tharbek
[76585] = 4, --Ragewing the Untamed
[77120] = 5, --Warlord Zaela
[77081] = 6, --The Lanticore
},
encounters = {
[1] = {
boss = "Orebender Gor'ashan",
startup.lua
+91
View File
@@ -489,5 +489,96 @@ function _G._detalhes:Start()
end)
--]]
--[[ start world map zoom
WorldMapScrollFrame:HookScript ("OnMouseWheel", function()
local HScroll = WorldMapScrollFrame:GetHorizontalScroll()
local VScroll = WorldMapScrollFrame:GetVerticalScroll()
if (MantainWorldMapZoomH ~= HScroll or MantainWorldMapZoomV ~= VScroll) then
MantainWorldMapZoomMouseX, MantainWorldMapZoomMouseY = GetCursorPosition()
end
MantainWorldMapZoomH = HScroll
MantainWorldMapZoomV = VScroll
MantainWorldMapZoomScale = WorldMapDetailFrame:GetScale();
end)
local MAX_ZOOM = 1.495;
hooksecurefunc ("ToggleWorldMap", function()
if (WorldMapFrame:IsShown()) then
if ((MantainWorldMapZoomV and MantainWorldMapZoomH) and (MantainWorldMapZoomH ~= 0 or MantainWorldMapZoomV ~= 0)) then
local last_opened = MantainWorldMapZoomLastOpened or time()
MantainWorldMapZoomLastOpened = time()
if (last_opened+60 < time()) then
WorldMapScrollFrame_ResetZoom()
MantainWorldMapZoomMouseX, MantainWorldMapZoomMouseY = nil, nil
MantainWorldMapZoomH = nil
MantainWorldMapZoomV = nil
MantainWorldMapZoomScale = nil
return
end
local scrollFrame = WorldMapScrollFrame;
local oldScrollH = MantainWorldMapZoomH
local oldScrollV = MantainWorldMapZoomV
-- get the mouse position on the frame, with 0,0 at top left
local cursorX, cursorY = MantainWorldMapZoomMouseX, MantainWorldMapZoomMouseY
local relativeFrame;
if ( WorldMapFrame_InWindowedMode() ) then
relativeFrame = UIParent;
else
relativeFrame = WorldMapFrame;
end
local frameX = cursorX / relativeFrame:GetScale() - scrollFrame:GetLeft();
local frameY = scrollFrame:GetTop() - cursorY / relativeFrame:GetScale();
local oldScale = WorldMapDetailFrame:GetScale();
--local newScale = oldScale + delta * 0.3;
local newScale = MantainWorldMapZoomScale
newScale = max(WORLDMAP_SETTINGS.size, newScale);
newScale = min(MAX_ZOOM, newScale);
WorldMapDetailFrame:SetScale(newScale);
QUEST_POI_FRAME_WIDTH = WorldMapDetailFrame:GetWidth() * newScale;
QUEST_POI_FRAME_HEIGHT = WorldMapDetailFrame:GetHeight() * newScale;
scrollFrame.maxX = QUEST_POI_FRAME_WIDTH - 1002 * WORLDMAP_SETTINGS.size;
scrollFrame.maxY = QUEST_POI_FRAME_HEIGHT - 668 * WORLDMAP_SETTINGS.size;
scrollFrame.zoomedIn = abs(WorldMapDetailFrame:GetScale() - WORLDMAP_SETTINGS.size) > 0.05;
scrollFrame.continent = GetCurrentMapContinent();
scrollFrame.mapID = GetCurrentMapAreaID();
-- figure out new scroll values
local scaleChange = newScale / oldScale;
local newScrollH = scaleChange * ( frameX + oldScrollH ) - frameX;
local newScrollV = scaleChange * ( frameY + oldScrollV ) - frameY;
-- clamp scroll values
newScrollH = min(newScrollH, scrollFrame.maxX);
newScrollH = max(0, newScrollH);
newScrollV = min(newScrollV, scrollFrame.maxY);
newScrollV = max(0, newScrollV);
-- set scroll values
scrollFrame:SetHorizontalScroll(oldScrollH);
scrollFrame:SetVerticalScroll(oldScrollV);
WorldMapFrame_Update();
WorldMapScrollFrame_ReanchorQuestPOIs();
WorldMapBlobFrame_ResetHitTranslations();
WorldMapBlobFrame_DelayedUpdateBlobs();
end
else
MantainWorldMapZoomLastOpened = time()
end
end)
--]]
end