WoWInterface SVN OpenRDX

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /trunk/RDX/Raid
    from Rev 653 to Rev 658
    ↔ Reverse comparison
  •

Rev 653 → Rev 658

Bossmods/Encounters.lua
164,7 → 164,7
-----------------------------------------------
--- Synchronize the current encounter
function RDX.SyncEncounter()
local myunit = RDXDAL._ReallyFastProject("player");
local myunit = RDXDAL.GetMyUnit();
if myunit:IsLeader() then
RPC_Group:Flash("enc_set", RDX.GetActiveEncounter());
end
265,7 → 265,7
function RDX.StartEncounter(nosync)
local ename = RDX.GetActiveEncounter();
if encTimer:IsRunning() then return; end
local myunit = RDXDAL._ReallyFastProject("player");
local myunit = RDXDAL.GetMyUnit();
if (not nosync) and (myunit:IsLeader()) then
RPC_Group:Flash("enc_start", ename);
end
287,7 → 287,7
function RDX.StopEncounter(nosync)
local ename = RDX.GetActiveEncounter();
PlayBtn_SetPlay();
local myunit = RDXDAL._ReallyFastProject("player");
local myunit = RDXDAL.GetMyUnit();
-- Synchronize encounter stop
if (not nosync) and (myunit:IsLeader()) then
RPC_Group:Flash("enc_stop", ename);
Bossmods/Alerts.lua
395,7 → 395,7
function RDX.Alert.Spam(txt)
if not RDXU.spam then return; end
if GetNumRaidMembers() > 0 then
local myunit = RDXDAL._ReallyFastProject("player");
local myunit = RDXDAL.GetMyUnit();
if myunit:IsLeader() then
SendChatMessage(txt, "RAID_WARNING");
else
RaidLogger/TableViewer.lua
231,19 → 231,16
local rowType = data.y;
local str = nil;
-------------- TIME
--if (tbl.displayTime == "RELATIVE") then
if data.tm then
--str = string.format("%0.1f", (data.tm / 10));
--if(data.tm < 0) then str = "T" .. str; else str = "T+" .. str; end
str = date("%H:%M:%S", data.tm);
if (tbl.displayTime == "RELATIVE") then
str = string.format("%0.1f", (data.tm / 10));
if(data.tm < 0) then str = "T" .. str; else str = "T+" .. str; end
tm:SetText("|cFFAAAAAA" .. str .. "|r");
elseif (tbl.displayTime == "ABSOLUTE") then
local stWhole, stFrac = VFL.modf( (tbl.timeOffset + data.tm) / 10);
local str = date("%H:%M:%S", stWhole);
str = str .. string.format(".%1d", stFrac*10);
tm:SetText("|cFFAAAAAA" .. str .. "|r");
end
--elseif (tbl.displayTime == "ABSOLUTE") then
-- local stWhole, stFrac = VFL.modf( (tbl.timeOffset + data.tm) / 10);
-- local str = date("%H:%M:%S", stWhole);
-- str = str .. string.format(".%1d", stFrac*10);
-- tm:SetText("|cFFAAAAAA" .. str .. "|r");
--end
-------------- SOURCE/TARGET
--src:SetText(tbl:GetRowSource(data) or "");
--targ:SetText(tbl:GetRowTarget(data) or "");
RaidLogger/Remote.lua
53,7 → 53,7
if overrideName then
tbln = overrideName;
else
local myunit = RDXDAL._ReallyFastProject("player");
local myunit = RDXDAL.GetMyUnit();
tbln = (prefix or "") .. myunit.name .. " " .. date("%H:%M:%S", VFLT.GetServerTime());
end
local symtab, cdata = Omni.CompressData(tbl);
68,7 → 68,7
local function Omni_HistoryQuery(commInfo, name, secs)
-- If not from a leader, abort
if not RPC.IsGroupLeader(commInfo) then return; end
local myunit = RDXDAL._ReallyFastProject("player");
local myunit = RDXDAL.GetMyUnit();
-- If this query isn't directed at me, abort.
if string.lower(name) ~= myunit.name then return; end
secs = tonumber(secs); if (not secs) then return; end
81,7 → 81,7
local function Omni_TimeQuery(commInfo, name, serverTime, window)
-- If not from a leader, abort
if not RPC.IsGroupLeader(commInfo) then return; end
local myunit = RDXDAL._ReallyFastProject("player");
local myunit = RDXDAL.GetMyUnit();
-- If this query isn't directed at me, abort.
if string.lower(name) ~= myunit.name then return; end
serverTime, window = tonumber(serverTime), VFL.clamp(tonumber(window), 0, 3600);
RaidLogger/Transforms.lua
177,22 → 177,35
t = math.modf(t*10);
local now = VFLT.GetTimeTenths();
local targetTime = now - t;
local ret = Omni.TemporalExtractionTransform(Omni.localLog, "LAST", VFL.True, -1, function(tbl, row)
if row.t and row.t >= targetTime then return true; end
end);
if ret then ret:Timeshift(-now); end
return ret;
local session = Omni.GetSessionByName("Local");
if session then
local tbl = session:FindTable("WoWRDX:Logs_Me_tl");
if tbl then
local ret = Omni.TemporalExtractionTransform(tbl, "LAST", VFL.True, -1, function(tbl, row)
if row.tm and row.tm >= targetTime then return true; end
end);
if ret then ret:Timeshift(-now); end
return ret;
end
end
end
 
-- Starting from the given server time, extract a window of +/- w seconds.
function Omni.ExtractWindow(t, w)
t = math.modf(t*10); w = math.modf(w*10);
local t0, t1, dt = t-w, t+w, Omni.localLog.timeOffset;
local ret = Omni.TemporalExtractionTransform(Omni.localLog, "LAST", VFL.True, -1, function(tbl, row)
local rt = row.t; if not rt then return; end
rt = rt + dt;
if(rt < t0) or (rt > t1) then return nil; else return true; end
end);
if ret then ret:Timeshift(dt-t); end
return ret;
local t0, t1, dt = t-w, t+w;
local session = Omni.GetSessionByName("Local");
if session then
local tbl = session:FindTable("WoWRDX:Logs_Me_tl");
dt = tbl.timeOffset;
if tbl then
local ret = Omni.TemporalExtractionTransform(tbl, "LAST", VFL.True, -1, function(tbl, row)
local rt = row.tm; if not rt then return; end
rt = rt + dt;
if(rt < t0) or (rt > t1) then return nil; else return true; end
end);
if ret then ret:Timeshift(dt-t); end
return ret;
end
end
end
RaidLogger/Obj_TableLog.lua
90,6 → 90,7
if(n >= x.sizemax) then row = table.remove(x.data, 1); VFL.empty(row); else row = {}; end
row = VFL.copy(log);
row.sg = nil; row.tg = nil;
--VFL.print(row.tm);
table.insert(x.data, row);
OmniEvents:Dispatch("TABLE_DATA_CHANGED", x);
end
119,6 → 120,15
x.source = UnitName("player");
x.data = RDXGetTableLogs(path);
x.timeOffset = 0;
local sysEpoch = VFLT.GetSystemEpoch();
if sysEpoch then
x.timeOffset = math.modf(sysEpoch:GetKernelTimeCorrection() * 10);
else
VFLEvents:Bind("SYSTEM_EPOCH_ESTABLISHED", nil, function(syse)
x.timeOffset = math.modf(syse:GetKernelTimeCorrection() * 10);
VFLEvents:Unbind("omni_init");
end, "omni_init");
end
x.sizemax = md.data.size or 1000;
x.path = path;
if md.data.filter then
RaidLogger/Table.lua
340,7 → 340,7
function Omni.Table:Cleanse()
if not self.data then return; end
for _,row in ipairs(self.data) do
if row.t then row.t = tonumber(row.t); end
if row.tm then row.tm = tonumber(row.tm); end
if row.x then row.x = tonumber(row.x); end
if row.y then row.y = tonumber(row.y); end
if row.e then row.e = tonumber(row.e); end
372,14 → 372,14
function Omni.Table:Timeshift(dt)
if self:IsImmutable() then return nil; end
self.timeOffset = self.timeOffset - dt;
for _,row in ipairs(self.data) do row.t = row.t + dt; end
for _,row in ipairs(self.data) do row.tm = row.tm + dt; end
return true;
end
 
--- Get the true time from a row of this table.
function Omni.Table:GetRowTime(row)
if row.t then
return self.timeOffset + row.t;
if row.tm then
return self.timeOffset + row.tm;
else
return nil;
end
RaidUtility/CharacterSheet.lua
163,7 → 163,7
-- RPC:Debug(1, "Got Charsheet check from non-leader " .. sunit.name);
-- return;
--end
local myunit = RDXDAL._ReallyFastProject("player");
local myunit = RDXDAL.GetMyUnit();
if string.lower(who) == myunit.name then
return MakeCharSheet();
else
RaidUtility/MASync.lua
16,7 → 16,7
win_set:AddName(name);
local assist_set = RDXDB.GetObjectData("default:assists");
table.insert(assist_set.data, name);
local myunit = RDXDAL._ReallyFastProject("player");
local myunit = RDXDAL.GetMyUnit();
if myunit:IsLeader() then
RPC_Group:Flash("sync_assist", assist_set.data);
end
38,7 → 38,7
table.remove(assist_set.data, k);
end
end
local myunit = RDXDAL._ReallyFastProject("player");
local myunit = RDXDAL.GetMyUnit();
if myunit:IsLeader() then
RPC_Group:Flash("sync_assist", assist_set.data);
end
48,7 → 48,7
end
 
function Logistics.SyncAssists()
local myunit = RDXDAL._ReallyFastProject("player");
local myunit = RDXDAL.GetMyUnit();
if not myunit:IsLeader() then return; end
local assist_set = RDXDB.GetObjectData("default:assists");
if assist_set then
62,7 → 62,7
assist_set.data = {};
local win_set = RDXDB.GetObjectInstance("default:assists");
win_set:ClearNames();
local myunit = RDXDAL._ReallyFastProject("player");
local myunit = RDXDAL.GetMyUnit();
if myunit:IsLeader() then
RPC_Group:Flash("sync_assist", assist_set.data);
end