テキスト比較

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

表示

レイアウト

ライブエディター空白の変更を非表示未変更行を折りたたむ折り返しなし

比較精度

構文

処理

Diffchecker Desktop Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手：あなたの差分はコンピューターから出ることはありません！Desktopを入手

Untitled diff

作成日 10 年前差分は期限切れになりません

40 削除

行
合計
削除

文字
合計
削除

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

351 行

42 追加

行
合計
追加

文字
合計
追加

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

351 行

--[[

#1 Cast_Interrupt reset

# Nostalrius Bug

--> "ITEM_LOCK CHANGED" van a "SPELLCAST_STOP" helyett

--> reportolva van már nostalrius bugtrackeren, ha fixelik cseréljem le "SPELLCAST_STOP"-ra

--> https://report.nostalrius.org/plugins/tracker/?aid=310

]]

local AddOn = "rais_AutoShot"

local _G = getfenv(0)

local Textures = {

Bar = "Interface\\AddOns\\"..AddOn.."\\Textures\\Bar.tga",

}

local Table = {

["posX"] = 0;

["posY"] = -235;

["Width"] = 100;

["Height"] = 15;

}

local AimedCastBar = true; -- true / false

local AimedCastBar = false; -- true / false

local castStart = false;

local swingStart = false;

local aimedStart = false;

local shooting = false; -- player adott pillantban lő-e

local posX, posY -- player position when starts Casting

local interruptTime -- Concussive shot miatt

local castTime = 0.65

local swingTime

local berserkValue = false

local function AutoShotBar_Create()

local function Bar_Create()

Table["posX"] = Table["posX"] *GetScreenWidth() /1000;

Table["posY"] = Table["posY"] *GetScreenHeight() /1000;

Table["Width"] = Table["Width"] *GetScreenWidth() /1000;

Table["Height"] = Table["Height"] *GetScreenHeight() /1000;

_G[AddOn.."_Frame_Timer"] = CreateFrame("Frame",nil,UIParent);

local Frame = _G[AddOn.."_Frame_Timer"];

Frame:SetFrameStrata("HIGH");

Frame:SetWidth(Table["Width"]);

Frame:SetHeight(Table["Height"]);

Frame:SetPoint("CENTER",UIParent,"CENTER",Table["posX"],Table["posY"]);

Frame:SetAlpha(0);

_G[AddOn.."_Texture_Timer"] = Frame:CreateTexture(nil,"OVERLAY");

local Bar = _G[AddOn.."_Texture_Timer"];

Bar:SetHeight(Table["Height"]);

Bar:SetTexture(Textures.Bar);

Bar:SetPoint("CENTER",Frame,"CENTER");

local Background = Frame:CreateTexture(nil,"ARTWORK");

Background:SetTexture(15/100, 15/100, 15/100, 1);

Background:SetAllPoints(Frame);

local Border = Frame:CreateTexture(nil,"BORDER");

Border:SetPoint("CENTER",Frame,"CENTER");

Border:SetWidth(Table["Width"] +3);

Border:SetHeight(Table["Height"] +3);

Border:SetTexture(0,0,0);

local Border = Frame:CreateTexture(nil,"BACKGROUND");

Border:SetPoint("CENTER",Frame,"CENTER");

Border:SetWidth(Table["Width"] +6);

Border:SetHeight(Table["Height"] +6);

Border:SetTexture(1,1,1);

end

local sST,sSCD = 0,0

local sSTold

local function GlobalCD_Check()

local _,_,offset,numSpells = GetSpellTabInfo(GetNumSpellTabs())

local numAllSpell = offset + numSpells;

for i=1,numAllSpell do

local name = GetSpellName(i,"BOOKTYPE_SPELL");

if ( name == "Serpent Sting" ) then

sST,sSCD = GetSpellCooldown(i,"BOOKTYPE_SPELL")

end

local function Cast_Start()

_G[AddOn.."_Texture_Timer"]:SetVertexColor(1,0,0);

posX, posY = GetPlayerMapPosition("player");

castStart = GetTime();

end

local function Cast_Update()

保存された差分

原文

ファイルを開く

--[[ 
	#1 Cast_Interrupt reset

# Nostalrius Bug
		--> "ITEM_LOCK CHANGED" van a "SPELLCAST_STOP" helyett 
		--> reportolva van már nostalrius bugtrackeren, ha fixelik cseréljem le "SPELLCAST_STOP"-ra 
		--> https://report.nostalrius.org/plugins/tracker/?aid=310
]]
local AddOn = "rais_AutoShot"
local _G = getfenv(0)

local Textures = {
	Bar = "Interface\\AddOns\\"..AddOn.."\\Textures\\Bar.tga",
}
local Table = {
	["posX"] = 0;
	["posY"] = -235;
	["Width"] = 100;
	["Height"] = 15;
}

local AimedCastBar = true; -- true / false

local castStart = false;
local swingStart = false;
local aimedStart = false;
local shooting = false; -- player adott pillantban lő-e
local posX, posY -- player position when starts Casting
local interruptTime -- Concussive shot miatt
local castTime = 0.65
local swingTime
local berserkValue = false

local function AutoShotBar_Create()
	Table["posX"] = Table["posX"] *GetScreenWidth() /1000;
	Table["posY"] = Table["posY"] *GetScreenHeight() /1000;
	Table["Width"] = Table["Width"] *GetScreenWidth() /1000;
	Table["Height"] = Table["Height"] *GetScreenHeight() /1000;

_G[AddOn.."_Frame_Timer"] = CreateFrame("Frame",nil,UIParent);
	local Frame = _G[AddOn.."_Frame_Timer"];
	Frame:SetFrameStrata("HIGH");
	Frame:SetWidth(Table["Width"]);
	Frame:SetHeight(Table["Height"]);
	Frame:SetPoint("CENTER",UIParent,"CENTER",Table["posX"],Table["posY"]);
	Frame:SetAlpha(0);

_G[AddOn.."_Texture_Timer"] = Frame:CreateTexture(nil,"OVERLAY");
	local Bar = _G[AddOn.."_Texture_Timer"];
	Bar:SetHeight(Table["Height"]);
	Bar:SetTexture(Textures.Bar);
	Bar:SetPoint("CENTER",Frame,"CENTER");

local Background = Frame:CreateTexture(nil,"ARTWORK");
	Background:SetTexture(15/100, 15/100, 15/100, 1);
	Background:SetAllPoints(Frame);
	
	local Border = Frame:CreateTexture(nil,"BORDER");
	Border:SetPoint("CENTER",Frame,"CENTER");
	Border:SetWidth(Table["Width"] +3);
	Border:SetHeight(Table["Height"] +3);
	Border:SetTexture(0,0,0);
	
	local Border = Frame:CreateTexture(nil,"BACKGROUND");
	Border:SetPoint("CENTER",Frame,"CENTER");
	Border:SetWidth(Table["Width"] +6);
	Border:SetHeight(Table["Height"] +6);
	Border:SetTexture(1,1,1);
end

local sST,sSCD = 0,0
local sSTold
local function GlobalCD_Check()
	local _,_,offset,numSpells = GetSpellTabInfo(GetNumSpellTabs())
	local numAllSpell = offset + numSpells;
	for i=1,numAllSpell do
		local name = GetSpellName(i,"BOOKTYPE_SPELL");
		if ( name == "Serpent Sting" ) then
			sST,sSCD = GetSpellCooldown(i,"BOOKTYPE_SPELL")
		end
	end
end

local function Cast_Start()
	_G[AddOn.."_Texture_Timer"]:SetVertexColor(1,0,0);
	posX, posY = GetPlayerMapPosition("player");
	castStart = GetTime();
end
local function Cast_Update()
	_G[AddOn.."_Frame_Timer"]:SetAlpha(1);
	local relative = GetTime() - castStart
	if ( relative > castTime ) then
		castStart = false;
	elseif ( swingStart == false ) then
		_G[AddOn.."_Texture_Timer"]:SetWidth(Table["Width"] * relative/castTime);
	end
end
local function Cast_Interrupted()
	_G[AddOn.."_Frame_Timer"]:SetAlpha(0);
	swingStart = false;
	Cast_Start()
end

local function Shot_Start()
	Cast_Start();
	shooting = true;
end
local function Shot_End()
	if ( swingStart == false ) then
		_G[AddOn.."_Frame_Timer"]:SetAlpha(0);
	end
	castStart = false
	shooting = false
end

local function Swing_Start()
	swingTime = UnitRangedDamage("player") - castTime;
	_G[AddOn.."_Texture_Timer"]:SetVertexColor(1,1,1);
	castStart = false
	swingStart = GetTime();
end

local AimedTooltip = CreateFrame("GameTooltip","AimedTooltip",UIParent,"GameTooltipTemplate");
AimedTooltip:SetOwner(UIParent,"ANCHOR_NONE");

local AimedID
local function AimedID_Get()
	local _,_,offset,numSpells = GetSpellTabInfo(GetNumSpellTabs())
	local numAllSpell = offset + numSpells;
	for spellID=1,numAllSpell do
		local name = GetSpellName(spellID,"BOOKTYPE_SPELL");
		if ( name == "Aimed Shot" ) then
			AimedID = spellID
		end
	end
end

local function Aimed_Start()
	aimedStart = GetTime()

if ( swingStart == false ) then
		_G[AddOn.."_Frame_Timer"]:SetAlpha(0);
	end
	castStart = false

--[[
	AimedTooltip:ClearLines();
	AimedTooltip:SetInventoryItem("player", 18)
	local speed_base = string.gsub(AimedTooltipTextRight3:GetText(),"Speed ","")
	local speed_haste = UnitRangedDamage("player");
	local castTime_Aimed = 3 * speed_haste / speed_base -- rapid 1.4 / quick 1.3 / berserking / spider 1.2
	]]

-- azt kéne, hogy alapból megnézi mennyi az auto-shot casttime (speed_haste) belogoláskor pl. (a lényeg, hogy modosító buff ne legyen), majd utána ahhoz viszonítja az épp jelenlévőt. De lehet ez se jó, mert hátha van olyan amit auto-shotét csökkenti, aimedét nem (mint pl. quiver)

local castTime_Aimed = 3
	for i=1,32 do
		if UnitBuff("player",i) == "Interface\\Icons\\Ability_Warrior_InnerRage" then
			castTime_Aimed = castTime_Aimed/1.3
		end
		if UnitBuff("player",i) == "Interface\\Icons\\Ability_Hunter_RunningShot" then
			castTime_Aimed = castTime_Aimed/1.4
		end
		if UnitBuff("player",i) == "Interface\\Icons\\Racial_Troll_Berserk" then
			castTime_Aimed = castTime_Aimed/ (1 + berserkValue)
		end
		if UnitBuff("player",i) == "Interface\\Icons\\Inv_Trinket_Naxxramas04" then
			castTime_Aimed = castTime_Aimed/1.2
		end
	end
	--[[local _,_,latency = GetNetStats();
	latency = latency/1000;
	castTime_Aimed = castTime_Aimed - latency;]]
	
	if ( AimedCastBar == true ) then
		CastingBarFrameStatusBar:SetStatusBarColor(1.0, 0.7, 0.0);
		CastingBarSpark:Show();
		CastingBarFrame.startTime = GetTime();
		CastingBarFrame.maxValue = CastingBarFrame.startTime + castTime_Aimed;
		CastingBarFrameStatusBar:SetMinMaxValues(CastingBarFrame.startTime, CastingBarFrame.maxValue);
		CastingBarFrameStatusBar:SetValue(CastingBarFrame.startTime);
		CastingBarText:SetText("Aimed Shot   "..string.format("%.2f",castTime_Aimed));
		-- CastingBarText:SetText(castTime_Aimed);
		CastingBarFrame:SetAlpha(1.0);
		CastingBarFrame.holdTime = 0;
		CastingBarFrame.casting = 1;
		CastingBarFrame.fadeOut = nil;
		CastingBarFrame:Show();
		CastingBarFrame.mode = "casting";
	end
end

UseAction_Real = UseAction;
function UseAction( slot, checkFlags, checkSelf )
	AimedTooltip:ClearLines();
	AimedTooltip:SetAction(slot);
	local spellName = AimedTooltipTextLeft1:GetText();
	if ( spellName == "Aimed Shot" ) then
		Aimed_Start()
	end
	UseAction_Real( slot, checkFlags, checkSelf );
end

CastSpell_Real = CastSpell;
function CastSpell(spellID, spellTab)
	AimedID_Get();
	if ( spellID == AimedID and spellTab == "BOOKTYPE_SPELL" ) then
		Aimed_Start()
	end
	CastSpell_Real(spellID,spellTab);
end

CastSpellByName_Real = CastSpellByName;
function CastSpellByName(spellName)
	if ( spellName == "Aimed Shot" ) then
		Aimed_Start()
	end
	CastSpellByName_Real(spellName)
end

local Frame = CreateFrame("Frame");
Frame:RegisterAllEvents()
Frame:RegisterEvent("PLAYER_LOGIN")
Frame:RegisterEvent("SPELLCAST_STOP")
Frame:RegisterEvent("CURRENT_SPELL_CAST_CHANGED")
Frame:RegisterEvent("START_AUTOREPEAT_SPELL")
Frame:RegisterEvent("STOP_AUTOREPEAT_SPELL")
Frame:RegisterEvent("ITEM_LOCK_CHANGED")
Frame:SetScript("OnEvent",function()
	if ( event == "PLAYER_LOGIN" ) then
		AutoShotBar_Create();
		DEFAULT_CHAT_FRAME:AddMessage("|cff00ccff"..AddOn.."|cffffffff Loaded");
	end
	if ( event == "START_AUTOREPEAT_SPELL" ) then
		Shot_Start();
	end
	if ( event == "STOP_AUTOREPEAT_SPELL" ) then
		Shot_End();
	end

if ( event == "SPELLCAST_STOP" ) then
		if ( aimedStart ~= false ) then
			aimedStart = false
		end
		GlobalCD_Check();
		if ( sSCD == 1.5 ) then
			sSTold = sST
		end
	end
	if ( event == "CURRENT_SPELL_CAST_CHANGED" ) then
		if ( swingStart == false and aimedStart == false ) then
			interruptTime = GetTime()
			Cast_Interrupted();
		end
	end
	if ( event == "ITEM_LOCK_CHANGED" ) then
		if ( shooting == true ) then 
			GlobalCD_Check();

--[[local _,_,offset,numSpells = GetSpellTabInfo(GetNumSpellTabs())
			local numAllSpell = offset + numSpells;
			for i=1,numAllSpell do
				local name = GetSpellName(i,"BOOKTYPE_SPELL");
				if ( name == "Aimed Shot" ) then
					aST,aSCD = GetSpellCooldown(i,"BOOKTYPE_SPELL")
				end
			end]]

if ( aimedStart ~= false ) then
				_G[AddOn.."_Frame_Timer"]:SetAlpha(1);
				Cast_Start();
			elseif ( sSCD ~= 1.5 ) then
				Swing_Start();
			elseif ( sSTold == sST ) then
				Swing_Start();
			else
				sSTold = sST;
			end

--			if ( GetTime()-interruptTime > 0.3 ) then -- ha Concussive Shot castolás megy Auto-Shot castolás közben, ne induljon el a swingtimer
--			end
		end
	end
	--[[if ( UnitName("target") ) then
		if ( event ~= "CHAT_MSG_CHANNEL" and event ~= "TABARD_CANSAVE_CHANGED" and event ~= "SPELL_UPDATE_COOLDOWN" and event ~= "CHAT_MSG_SPELL_FAILED_LOCALPLAYER"  and event ~= "CURSOR_UPDATE" and event ~= "CHAT_MSG_COMBAT_SELF_HITS" and event ~= "SPELL_UPDATE_USABLE" and event ~= "UPDATE_MOUSEOVER_UNIT" and event ~= "UNIT_HAPPINESS" and event ~= "PLAYER_TARGET_CHANGED" and event ~= "UNIT_MANA" and event ~= "UNIT_HEALTH" ) then
			if ( event ~= "ACTIONBAR_UPDATE_STATE" and event ~= "CURRENT_SPELL_CAST_CHANGED" ) then
				if ( event ~= "UNIT_COMBAT" and event ~= "UI_ERROR_MESSAGE"and event ~= "SPELLCAST_INTERRUPTED" ) then
					DEFAULT_CHAT_FRAME:AddMessage(event);
				end
			end
		end
	end]]
	if ( event == "UNIT_AURA" ) then
		for i=1,16 do
			if ( UnitBuff("player",i) == "Interface\\Icons\\Racial_Troll_Berserk" ) then
				if ( berserkValue == false ) then
					if((UnitHealth("player")/UnitHealthMax("player")) >= 0.40) then
						berserkValue = (1.30 - (UnitHealth("player")/UnitHealthMax("player")))/3
					else
						berserkValue = 0.30
					end
				end
			else
				berserkValue = false
			end
		end
	end
end)
Frame:SetScript("OnUpdate",function()
	if ( shooting == true ) then
		if ( castStart ~= false ) then
			local cposX, cposY = GetPlayerMapPosition("player") -- player position atm
			if ( posX == cposX and posY == cposY ) then
				Cast_Update();
			else
				Cast_Interrupted();
			end
		end
	end
	if ( swingStart ~= false ) then
		local relative = GetTime() - swingStart
		_G[AddOn.."_Texture_Timer"]:SetWidth(Table["Width"] - (Table["Width"]*relative/swingTime));
		if ( relative > swingTime ) then
			if ( shooting == true and aimedStart == false ) then
				Cast_Start()
			else
				_G[AddOn.."_Texture_Timer"]:SetWidth(0);
				_G[AddOn.."_Frame_Timer"]:SetAlpha(0);
			end
			swingStart = false;
		end
	end
end)

変更されたテキスト

ファイルを開く

--[[ 
	#1 Cast_Interrupt reset

local Textures = {
	Bar = "Interface\\AddOns\\"..AddOn.."\\Textures\\Bar.tga",
}
local Table = {
	["posX"] = 0;
	["posY"] = -235;
	["Width"] = 100;
	["Height"] = 15;
}

local AimedCastBar = false; -- true / false

local function Bar_Create()
	Table["posX"] = Table["posX"] *GetScreenWidth() /1000;
	Table["posY"] = Table["posY"] *GetScreenHeight() /1000;
	Table["Width"] = Table["Width"] *GetScreenWidth() /1000;
	Table["Height"] = Table["Height"] *GetScreenHeight() /1000;

local function Swing_Start()
	swingTime = UnitRangedDamage("player") - castTime;
	_G[AddOn.."_Texture_Timer"]:SetVertexColor(1,1,1);
	castStart = false
	swingStart = GetTime();
end

local AimedTooltip = CreateFrame("GameTooltip","AimedTooltip",UIParent,"GameTooltipTemplate");
AimedTooltip:SetOwner(UIParent,"ANCHOR_NONE");

local function Aimed_Start()
	aimedStart = GetTime()

if ( swingStart == false ) then
		_G[AddOn.."_Frame_Timer"]:SetAlpha(0);
	end
	castStart = false

if ( AimedCastBar == true ) then
		CastingBarFrameStatusBar:SetStatusBarColor(1.0, 0.7, 0.0);
		CastingBarSpark:Show();
		CastingBarFrame.startTime = GetTime();
		CastingBarFrame.maxValue = CastingBarFrame.startTime + castTime_Aimed;
		CastingBarFrameStatusBar:SetMinMaxValues(CastingBarFrame.startTime, CastingBarFrame.maxValue);
		CastingBarFrameStatusBar:SetValue(CastingBarFrame.startTime);
		CastingBarText:SetText("Aimed Shot");
		--CastingBarText:SetText(castTime_Aimed);
		CastingBarFrame:SetAlpha(1.0);
		CastingBarFrame.holdTime = 0;
		CastingBarFrame.casting = 1;
		CastingBarFrame.fadeOut = nil;
		CastingBarFrame:Show();
		CastingBarFrame.mode = "casting";
	end
end

CastSpellByName_Real = CastSpellByName;
function CastSpellByName(spellName,target)
	if ( spellName == "Aimed Shot" ) then
		Aimed_Start()
	end
	CastSpellByName_Real(spellName,target)
end

local Frame = CreateFrame("Frame");
--Frame:RegisterAllEvents()
Frame:RegisterEvent("PLAYER_LOGIN")
Frame:RegisterEvent("SPELLCAST_STOP")
Frame:RegisterEvent("CURRENT_SPELL_CAST_CHANGED")
Frame:RegisterEvent("START_AUTOREPEAT_SPELL")
Frame:RegisterEvent("STOP_AUTOREPEAT_SPELL")
Frame:RegisterEvent("ITEM_LOCK_CHANGED")
Frame:SetScript("OnEvent",function()
	if ( event == "PLAYER_LOGIN" ) then
		Bar_Create();
		DEFAULT_CHAT_FRAME:AddMessage("|cff00ccff"..AddOn.."|cffffffff Loaded");
	end
	if ( event == "START_AUTOREPEAT_SPELL" ) then
		Shot_Start();
	end
	if ( event == "STOP_AUTOREPEAT_SPELL" ) then
		Shot_End();
	end

--			if ( GetTime()-interruptTime > 0.3 ) then -- ha Concussive Shot castolás megy Auto-Shot castolás közben, ne induljon el a swingtimer
--			end
		end
	end
	--[[if ( UnitName("target") ) then
		if ( event ~= "CHAT_MSG_CHANNEL" and event ~= "TABARD_CANSAVE_CHANGED" and event ~= "SPELL_UPDATE_COOLDOWN" and event ~= "CHAT_MSG_SPELL_FAILED_LOCALPLAYER"  and event ~= "CURSOR_UPDATE" and event ~= "CHAT_MSG_COMBAT_SELF_HITS" and event ~= "SPELL_UPDATE_USABLE" and event ~= "UPDATE_MOUSEOVER_UNIT" and event ~= "UNIT_HAPPINESS" and event ~= "PLAYER_TARGET_CHANGED" and event ~= "UNIT_MANA" and event ~= "UNIT_HEALTH" ) then
			if ( event ~= "ACTIONBAR_UPDATE_STATE" and event ~= "CURRENT_SPELL_CAST_CHANGED" ) then
				if ( event ~= "UNIT_COMBAT" and event ~= "UI_ERROR_MESSAGE"and event ~= "SPELLCAST_INTERRUPTED" ) then
					DEFAULT_CHAT_FRAME:AddMessage(event);
				end
			end
		end
	end]]
								 
			   
																																			
									 
																																					 
																																														
		 
						 
		
	   
	   
						
	  
	 
	
end)
Frame:SetScript("OnUpdate",function()
	if ( shooting == true ) then
		if ( castStart ~= false ) then
			local cposX, cposY = GetPlayerMapPosition("player") -- player position atm
			if ( posX == cposX and posY == cposY ) then
				Cast_Update();
			else
				Cast_Interrupted();
			end
		end
	end
	if ( swingStart ~= false ) then
		local relative = GetTime() - swingStart
		_G[AddOn.."_Texture_Timer"]:SetWidth(Table["Width"] - (Table["Width"]*relative/swingTime));
		if ( relative > swingTime ) then
			if ( shooting == true and aimedStart == false ) then
				Cast_Start()
			else
				_G[AddOn.."_Texture_Timer"]:SetWidth(0);
				_G[AddOn.."_Frame_Timer"]:SetAlpha(0);
			end
			swingStart = false;
		end
	end
end)