テキスト比較

2 つのテキストファイルの違いを見つける

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

ツール

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Details_Covenants/Skada.lua

Created 3 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

66 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

103 lines

local _, dc = ...

local oribos = _G.Oribos

local detalhes = _G._detalhes

function dc:replaceSkadaImplmentation()

if _G.Skada then

_G.Skada.get_player = function(self, set, playerid, playername)

local covenantPrefix = ""

local covenantSuffix = ""

if DCovenant["iconAlign"] == "right" then

covenantSuffix = " "..oribos:getCovenantIconForPlayer(playername)

else

covenantPrefix = oribos:getCovenantIconForPlayer(playername).." "

end

-- Add player to set if it does not exist.

local player = Skada:find_player(set, playerid)

if not player then

-- If we do not supply a playername (often the case in submodes), we can not create an entry.

if not playername then

return

end

local _, playerClass = UnitClass(playername)

local playerRole = UnitGroupRolesAssigned(playername)

player = {id = playerid, class = playerClass, role = playerRole, name = playername, first = time(), ["time"] = 0}

-- Tell each mode to apply its needed attributes.

for i, mode in ipairs(_G.Skada:GetModes(nil)) do

if mode.AddPlayerAttributes ~= nil then

mode:AddPlayerAttributes(player, set)

end

-- Strip realm name

-- This is done after module processing due to cross-realm names messing with modules (death log for example, which needs to do UnitHealthMax on the playername).

local player_name, realm = string.split("-", playername, 2)

-- code from Details.lua in this folder

if _G.NickTag and detalhes then

local _table = NickTag:GetNicknameTable(playername)

if (not _table) then

player_name = playername:gsub(("%-.*"), "")

end

if _table and _table[1] then

if TemniUgolok_SetEmojiToDetails then

player_name = TemniUgolok_SetEmojiToDetails(_table[1])

else

player_name = _table[1]

end

else

local player_name, realm = string.split("-", playername, 2)

end

player.name = covenantPrefix..(player_name or playername)..covenantSuffix

tinsert(set.players, player)

end

if player.name == UNKNOWN and playername ~= UNKNOWN then -- fixup players created before we had their info

local player_name, realm = string.split("-", playername, 2)

if _G.NickTag and detalhes then

local _table = NickTag:GetNicknameTable(playername)

if (not _table) then

player_name = playername:gsub(("%-.*"), "")

end

if _table and _table[1] then

if TemniUgolok_SetEmojiToDetails then

player_name = TemniUgolok_SetEmojiToDetails(_table[1])

else

player_name = _table[1]

end

else

local player_name, realm = string.split("-", playername, 2)

end

player.name = covenantPrefix..(player_name or playername)..covenantSuffix

local _, playerClass = UnitClass(playername)

local playerRole = UnitGroupRolesAssigned(playername)

player.class = playerClass

player.role = playerRole

end

-- The total set clears out first and last timestamps.

if not player.first then

player.first = time()

end

-- Mark now as the last time player did something worthwhile.

player.last = time()

changed = true

return player

end

保存された差分

原文

ファイルを開く

local _, dc = ...
local oribos = _G.Oribos

function dc:replaceSkadaImplmentation()
    if _G.Skada then
        _G.Skada.get_player = function(self, set, playerid, playername)
            local covenantPrefix = ""
            local covenantSuffix = ""

if DCovenant["iconAlign"] == "right" then
                covenantSuffix = " "..oribos:getCovenantIconForPlayer(playername)
            else 
                covenantPrefix = oribos:getCovenantIconForPlayer(playername).." "
            end 
            
            -- Add player to set if it does not exist.
            local player = Skada:find_player(set, playerid)

if not player then
                -- If we do not supply a playername (often the case in submodes), we can not create an entry.
                if not playername then
                    return
                end

local _, playerClass = UnitClass(playername)
                local playerRole = UnitGroupRolesAssigned(playername)
                player = {id = playerid, class = playerClass, role = playerRole, name = playername, first = time(), ["time"] = 0}

-- Tell each mode to apply its needed attributes.
                for i, mode in ipairs(_G.Skada:GetModes(nil)) do
                    if mode.AddPlayerAttributes ~= nil then
                        mode:AddPlayerAttributes(player, set)
                    end
                end

-- Strip realm name
                -- This is done after module processing due to cross-realm names messing with modules (death log for example, which needs to do UnitHealthMax on the playername).
                local player_name, realm = string.split("-", playername, 2)
                player.name = covenantPrefix..(player_name or playername)..covenantSuffix

tinsert(set.players, player)
            end

if player.name == UNKNOWN and playername ~= UNKNOWN then -- fixup players created before we had their info
                local player_name, realm = string.split("-", playername, 2)
                player.name = covenantPrefix..(player_name or playername)..covenantSuffix
                local _, playerClass = UnitClass(playername)
                local playerRole = UnitGroupRolesAssigned(playername)
                player.class = playerClass
                player.role = playerRole
            end

-- The total set clears out first and last timestamps.
            if not player.first then
                player.first = time()
            end

-- Mark now as the last time player did something worthwhile.
            player.last = time()
            changed = true
            return player
        end
    end  
end

変更されたテキスト

ファイルを開く

local _, dc = ...
local oribos = _G.Oribos
local detalhes = _G._detalhes

-- Strip realm name
                -- This is done after module processing due to cross-realm names messing with modules (death log for example, which needs to do UnitHealthMax on the playername).
                -- code from Details.lua in this folder
                if _G.NickTag and detalhes then
                    local _table = NickTag:GetNicknameTable(playername)

if (not _table) then
                        player_name = playername:gsub(("%-.*"), "")
                    end

if _table and _table[1] then
                        if TemniUgolok_SetEmojiToDetails then
                            player_name = TemniUgolok_SetEmojiToDetails(_table[1])
                        else
                            player_name = _table[1]
                        end
                    end

else
                    local player_name, realm = string.split("-", playername, 2)
                end

player.name = covenantPrefix..(player_name or playername)..covenantSuffix
                tinsert(set.players, player)
            end

if player.name == UNKNOWN and playername ~= UNKNOWN then -- fixup players created before we had their info
                if _G.NickTag and detalhes then
                    local _table = NickTag:GetNicknameTable(playername)

if (not _table) then
                        player_name = playername:gsub(("%-.*"), "")
                    end

else
                    local player_name, realm = string.split("-", playername, 2)
                end

player.name = covenantPrefix..(player_name or playername)..covenantSuffix
                local _, playerClass = UnitClass(playername)
                local playerRole = UnitGroupRolesAssigned(playername)
                player.class = playerClass
                player.role = playerRole
            end

-- The total set clears out first and last timestamps.
            if not player.first then
                player.first = time()
            end

-- Mark now as the last time player did something worthwhile.
            player.last = time()
            changed = true
            return player
        end
    end  
end