fix

expansions/script/c12869075.lua

@@ -50,7 +50,7 @@ function s.linkcheck(c,g,tc)
 	return c:IsLinkSummonable(g,nil,g:GetCount(),g:GetCount()) and Duel.GetLocationCountFromEx(tp,tp,tc,c)>0
 end
 function s.syncheck(c,g)
-	return c:IsSynchroSummonable(nil,g,g:GetCount()-1,g:GetCount()-1) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
+	return c:IsSynchroSummonable(nil,g,g:GetCount()-1,g:GetCount()-1) and Duel.GetLocationCountFromEx(tp,tp,g,c)>0
 end
 function s.spcheck(g,tp,tc)
 	return Duel.GetMZoneCount(tp,tc,tp)>=g:GetCount() and Duel.IsExistingMatchingCard(s.linkcheck,tp,LOCATION_EXTRA,0,1,nil,g,tc)

expansions/script/c13700047.lua

 --绝对公正之蜻蜓队长
 local s, id = GetID()
--- 修改初始效果注册时使用的过滤器
 function s.initial_effect(c)
-    aux.AddXyzProcedure(c,nil,12,2,s.xyzfilter,aux.Stringid(id,0),2,s.altop)
-    if not s.global_check then
-        s.global_check=true
-        local ge1=Effect.CreateEffect(c)
-        ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-        ge1:SetCode(EVENT_SPSUMMON_SUCCESS)
-        ge1:SetOperation(s.chk)
-        Duel.RegisterEffect(ge1,0)
-    end
-    local e3=Effect.CreateEffect(c)
-    e3:SetType(EFFECT_TYPE_SINGLE)
-    e3:SetCode(EFFECT_CANNOT_DISABLE_SPSUMMON)
-    e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-    e3:SetCondition(s.spcon3)
-    c:RegisterEffect(e3)
-    --修改变量名
-    local e4=Effect.CreateEffect(c)
-    e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-    e4:SetCode(EVENT_SPSUMMON_SUCCESS)
-    e4:SetCondition(s.spcon3)
-    e4:SetOperation(s.spop3)
-    c:RegisterEffect(e4)
-    local e5=Effect.CreateEffect(c)
-    e5:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-    e5:SetCode(EVENT_SPSUMMON_SUCCESS)
-    e5:SetCondition(s.spcon3)
-    e5:SetOperation(s.spop3)
-    c:RegisterEffect(e5)
-	-- 修改e3的Value设置
+	aux.AddXyzProcedure(c,nil,12,2,s.xyzfilter,aux.Stringid(id,0),2,s.altop)
+	if not s.global_check then
+		s.global_check=true
+		local ge1=Effect.CreateEffect(c)
+		ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+		ge1:SetCode(EVENT_SPSUMMON_SUCCESS)
+		ge1:SetOperation(s.chk)
+		Duel.RegisterEffect(ge1,0)
+	end
 	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
-	e3:SetCode(EFFECT_CANNOT_INACTIVATE)
-	e3:SetReset(RESET_PHASE+PHASE_END)
-	e3:SetValue(s.chainfilter)
-	Duel.RegisterEffect(e3,tp)
+	e3:SetType(EFFECT_TYPE_SINGLE)
+	e3:SetCode(EFFECT_CANNOT_DISABLE_SPSUMMON)
+	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e3:SetCondition(s.spcon3)
+	c:RegisterEffect(e3)
+	local e4=Effect.CreateEffect(c)
+	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+	e4:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e4:SetCondition(s.spcon3)
+	e4:SetOperation(s.spop3)
+	c:RegisterEffect(e4)
+	local e6=Effect.CreateEffect(c)
+	e6:SetType(EFFECT_TYPE_FIELD)
+	e6:SetCode(EFFECT_CANNOT_INACTIVATE)
+	e6:SetRange(LOCATION_MZONE)
+	e6:SetValue(s.chainfilter)
+	e6:SetLabel(c:GetFieldID())
+	e6:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+	c:RegisterEffect(e6)
 end
 function s.xyzfilter(c,tp,mg)
-    local p=c:GetControler()
-    return Duel.GetFlagEffect(1-p,id)>4
-end
-function s.chainfilter(e,ct)
-    local te=Duel.GetChainInfo(ct,CHAININFO_TRIGGERING_EFFECT)
-    return te:GetHandler():GetFlagEffectLabel(id)~=e:GetLabel()
-end
-function s.spcon3(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ 
-end
-function s.spop3(e,tp,eg,ep,ev,re,r,rp,c)
-    local c=e:GetHandler()
-    if not c:IsSummonType(SUMMON_TYPE_XYZ) then return end
-    
-    --跳过战斗阶段
-    local e1=Effect.CreateEffect(c)
-    e1:SetType(EFFECT_TYPE_FIELD)
-    e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-    e1:SetCode(EFFECT_SKIP_BP)
-    e1:SetTargetRange(1,0)
-    e1:SetReset(RESET_PHASE+PHASE_END)
-    Duel.RegisterEffect(e1,tp)
-    
-    --无效化场上的卡的效果
-    local e2=Effect.CreateEffect(c)
-    e2:SetType(EFFECT_TYPE_FIELD)
-    e2:SetCode(EFFECT_DISABLE)
-    e2:SetTargetRange(LOCATION_ONFIELD,LOCATION_ONFIELD)
-    e2:SetTarget(s.disable)
-    e2:SetReset(RESET_PHASE+PHASE_END)
-    e2:SetLabel(c:GetFieldID())
-    Duel.RegisterEffect(e2,tp)
-    
-    --不会被无效化
-    local e3=Effect.CreateEffect(c)
-    e3:SetType(EFFECT_TYPE_FIELD)
-    e3:SetCode(EFFECT_CANNOT_INACTIVATE)
-    e3:SetReset(RESET_PHASE+PHASE_END)
-    e3:SetValue(s.efilter)
-    Duel.RegisterEffect(e3,tp)
-    local e4=e3:Clone()
-    e4:SetCode(EFFECT_CANNOT_DISEFFECT)
-    Duel.RegisterEffect(e4,tp)
-    
-    --不会被破坏，不能成为效果对象，不能除外
-    local e5=Effect.CreateEffect(c)
-    e5:SetType(EFFECT_TYPE_FIELD)
-    e5:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
-    e5:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
-    e5:SetTargetRange(LOCATION_ONFIELD,LOCATION_ONFIELD)
-    e5:SetValue(1)
-    e5:SetReset(RESET_PHASE+PHASE_END)
-    Duel.RegisterEffect(e5,tp)
-    local e6=e5:Clone()
-    e6:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
-    Duel.RegisterEffect(e6,tp)
-    local e7=e5:Clone()
-    e7:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
-    e7:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
-    Duel.RegisterEffect(e7,tp)
-    local e8=e5:Clone()
-    e8:SetCode(EFFECT_CANNOT_REMOVE)
-    Duel.RegisterEffect(e8,tp)
-    
-    --伤害变成0
-    local e9=Effect.CreateEffect(c)
-    e9:SetType(EFFECT_TYPE_FIELD)
-    e9:SetCode(EFFECT_CHANGE_DAMAGE)
-    e9:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-    e9:SetTargetRange(1,1)
-    e9:SetValue(0)
-    e9:SetReset(RESET_PHASE+PHASE_END)
-    Duel.RegisterEffect(e9,tp)
-    local e10=e9:Clone()
-    e10:SetCode(EFFECT_NO_EFFECT_DAMAGE)
-    Duel.RegisterEffect(e10,tp)
-    
-    c:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1,c:GetFieldID())
-end
-function s.disable(e,c)
-	return c:GetFlagEffectLabel(id)~=e:GetLabel() and (not c:IsType(TYPE_MONSTER) or (c:IsType(TYPE_EFFECT) or bit.band(c:GetOriginalType(),TYPE_EFFECT)==TYPE_EFFECT))
+	if not c:IsType(TYPE_MONSTER) then return false end
+	local p=c:GetControler()
+	return Duel.GetFlagEffect(1-p,id)>4
 end
-function s.discon(e,tp,eg,ep,ev,re,r,rp)
-	local rc=re:GetHandler()
-	local loc=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION)
-	return bit.band(loc,LOCATION_ONFIELD)~=0 and rc:GetFlagEffectLabel(id)~=e:GetLabel()
-end
-function s.disop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.NegateEffect(ev)
+function s.altop(e,tp,chk)
+	if chk==0 then return Duel.GetFlagEffect(1-tp,id)>4 end
+	return true
 end
 function s.chk(e,tp,eg,ep,ev,re,r,rp)
 	local tc=eg:GetFirst()
@@ -136,7 +47,96 @@ function s.chk(e,tp,eg,ep,ev,re,r,rp)
 		tc=eg:GetNext()
 	end
 end
-function s.altop(e,tp,chk)
-    if chk==0 then return Duel.GetFlagEffect(1-tp,id)>4 end
-    return true
+function s.chainfilter(e,ct)
+	local te=Duel.GetChainInfo(ct,CHAININFO_TRIGGERING_EFFECT)
+	if not te or not te:GetHandler() then return false end
+	local label=e:GetLabel()
+	if not label then return false end
+	return te:GetHandler():GetFlagEffectLabel(id)~=label
+end
+function s.spcon3(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ 
+end
+function s.spop3(e,tp,eg,ep,ev,re,r,rp,c)
+	local c=e:GetHandler()
+	if not c:IsSummonType(SUMMON_TYPE_XYZ) then return end
+	--跳过战斗阶段
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e1:SetCode(EFFECT_SKIP_BP)
+	e1:SetTargetRange(1,0)
+	e1:SetReset(RESET_PHASE+PHASE_END)
+	Duel.RegisterEffect(e1,tp)
+	--无效化场上的卡的效果
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_FIELD)
+	e2:SetCode(EFFECT_DISABLE)
+	e2:SetTargetRange(LOCATION_ONFIELD,LOCATION_ONFIELD)
+	e2:SetTarget(s.disable)
+	e2:SetReset(RESET_PHASE+PHASE_END)
+	e2:SetLabel(c:GetFieldID())
+	Duel.RegisterEffect(e2,tp)
+	--不会被无效化
+	local e3=Effect.CreateEffect(c)
+	e3:SetType(EFFECT_TYPE_FIELD)
+	e3:SetCode(EFFECT_CANNOT_INACTIVATE)
+	e3:SetReset(RESET_PHASE+PHASE_END)
+	e3:SetValue(s.efilter)
+	Duel.RegisterEffect(e3,tp)
+	local e4=e3:Clone()
+	e4:SetCode(EFFECT_CANNOT_DISEFFECT)
+	Duel.RegisterEffect(e4,tp)
+	--不会被破坏，不能成为效果对象，不能除外，不受其他效果影响
+	local e5=Effect.CreateEffect(c)
+	e5:SetType(EFFECT_TYPE_FIELD)
+	e5:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
+	e5:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
+	e5:SetTargetRange(LOCATION_ONFIELD,LOCATION_ONFIELD)
+	e5:SetTarget(aux.TargetBoolFunction(Card.IsControler,tp))
+	e5:SetValue(1)
+	e5:SetReset(RESET_PHASE+PHASE_END)
+	Duel.RegisterEffect(e5,tp)
+	
+	local e6=e5:Clone()
+	e6:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
+	Duel.RegisterEffect(e6,tp)
+	
+	local e7=e5:Clone()
+	e7:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e7:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
+	e7:SetValue(aux.tgoval)
+	Duel.RegisterEffect(e7,tp)
+	
+	local e8=e5:Clone()
+	e8:SetCode(EFFECT_CANNOT_REMOVE)
+	Duel.RegisterEffect(e8,tp)
+	
+	local e11=e5:Clone()
+	e11:SetCode(EFFECT_IMMUNE_EFFECT)
+	e11:SetValue(s.efilter2)
+	Duel.RegisterEffect(e11,tp)
+
+	--伤害变成0
+	local e9=Effect.CreateEffect(c)
+	e9:SetType(EFFECT_TYPE_FIELD)
+	e9:SetCode(EFFECT_CHANGE_DAMAGE)
+	e9:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e9:SetTargetRange(1,1)
+	e9:SetValue(0)
+	e9:SetReset(RESET_PHASE+PHASE_END)
+	Duel.RegisterEffect(e9,tp)
+	local e10=e9:Clone()
+	e10:SetCode(EFFECT_NO_EFFECT_DAMAGE)
+	Duel.RegisterEffect(e10,tp)
+	c:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1,c:GetFieldID())
+end
+function s.efilter(e,ct)
+	return true
+end
+function s.efilter2(e,re)
+	return e:GetOwnerPlayer()~=re:GetOwnerPlayer() and re:IsActivated()
+end
+function s.disable(e,c)
+	return c:GetFlagEffectLabel(id)~=e:GetLabel() and (not c:IsType(TYPE_MONSTER) or (c:IsType(TYPE_EFFECT) or bit.band(c:GetOriginalType(),TYPE_EFFECT)==TYPE_EFFECT))
 end
\ No newline at end of file

expansions/script/c17243381.lua

@@ -62,7 +62,7 @@ function cm.indcon(e)
 	return Duel.IsExistingMatchingCard(cm.indfilter,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,nil)
 end
 function cm.indtg(e,c)
-	return c:IsLocation(LOCATION_FZONE) or (c:IsFaceup() and c:IsType(TYPE_FIELD)) or (c:IsFaceup() and c:IsType(TYPE_CONTINUOUS))
+	return c:IsLocation(LOCATION_FZONE) or (c:IsFaceup() and c:IsType(TYPE_FIELD)) or (c:IsFaceup() and c:IsType(TYPE_CONTINUOUS) and c:IsType(TYPE_SPELL))
 end
 
 --------------------------------------------------------------------------

expansions/script/c18700544.lua

@@ -20,22 +20,17 @@ function cm.initial_effect(c)
 	e2:SetTarget(cm.target)
 	e2:SetOperation(cm.operation)
 	c:RegisterEffect(e2)
-	local e3=e2:Clone()
-	e3:SetCode(EVENT_TO_DECK)
-	c:RegisterEffect(e3)
-	
 	
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(m,2))
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e4:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e4:SetCode(EVENT_CHAINING)
 	e4:SetRange(LOCATION_FZONE)
-	e4:SetCountLimit(1,m+2)
 	e4:SetCondition(cm.tkcon)
 	e4:SetTarget(cm.thtg2)
 	e4:SetOperation(cm.thop2)
 	c:RegisterEffect(e4)
+	
 	if not cm.check then
 		cm.check=true
 		local e1=Effect.CreateEffect(c)
@@ -43,42 +38,52 @@ function cm.initial_effect(c)
 		e1:SetCode(EVENT_CHAIN_SOLVING)
 		e1:SetOperation(cm.chainop)
 		Duel.RegisterEffect(e1,0)
-		local _CheckFusionMaterial=Card.CheckFusionMaterial
-		local _SelectFusionMaterial=Duel.SelectFusionMaterial
+		local f1=Card.CheckFusionMaterial
 		function Card.CheckFusionMaterial(card,Group_fus,Card_g,int_chkf,not_mat)
-			local tp=card:GetControler()
-			local exg=Duel.GetMatchingGroup(cm.filter0,tp,0,LOCATION_MZONE+LOCATION_GRAVE,nil,card)
-			exg:Sub(Group_fus) 
-			if #exg>0 and Duel.GetFlagEffect(tp,18700544)>0 then
-				local hg=Group.__add(Group_fus,exg)
-				return _CheckFusionMaterial(card,hg,Card_g,int_chkf,not_mat)
+			local exg=Group.CreateGroup()
+			exg=Duel.GetMatchingGroup(cm.filter0,int_chkf,0,LOCATION_MZONE+LOCATION_GRAVE,nil,card)
+			exg=Group.__bxor(exg,Group_fus):Filter(Card.IsLocation,nil,LOCATION_MZONE+LOCATION_GRAVE)
+			if exg:GetCount()>0 then
+				if Duel.GetFlagEffect(0,m)~=0 and Duel.GetFlagEffect(0,m+50)==0 then
+					Duel.RegisterFlagEffect(0,m+50,RESET_CHAIN,0,1)
+					local e1=Effect.CreateEffect(card)
+					e1:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
+					e1:SetCode(EVENT_CHAIN_SOLVED)
+					e1:SetOperation(cm.resetop)
+					e1:SetReset(RESET_EVENT+RESET_CHAIN)
+					Duel.RegisterEffect(e1,0)
+					local e2=e1:Clone()
+					e2:SetCode(EVENT_CHAIN_NEGATED)
+					Duel.RegisterEffect(e2,0)
+				end
+				local hg=Group.__add(exg,Group_fus)
+				return f1(card,hg,Card_g,int_chkf,not_mat)
 			end
-			return _CheckFusionMaterial(card,Group_fus,Card_g,int_chkf,not_mat)
+			return f1(card,Group_fus,Card_g,int_chkf,not_mat)
 		end
+		local f2=Duel.SelectFusionMaterial
 		function Duel.SelectFusionMaterial(tp,card,mg,gc_nil,chkf)
-		  
-			if Duel.GetFlagEffect(tp,18700544)>0 then
-				local exg=Duel.GetMatchingGroup(cm.filter0,tp,0,LOCATION_MZONE+LOCATION_GRAVE,nil,card)
-				mg:Merge(exg)
+			if Duel.GetFlagEffect(0,m+50)~=0 then
+				exg=Duel.GetMatchingGroup(cm.filter0,int_chkf,LOCATION_MZONE+LOCATION_GRAVE,0,nil,card)
+				if exg:GetCount()>0 then
+					mg:Merge(exg)
+				end
 			end
-			return _SelectFusionMaterial(tp,card,mg,gc_nil,chkf)
+			Duel.ResetFlagEffect(0,m+50)
+			return f2(tp,card,mg,gc_nil,chkf)
 		end
 	end
 end
-
 function cm.chainop(e,tp,eg,ep,ev,re,r,rp)
-	if re:GetHandlerPlayer()==tp then
-		Duel.RegisterFlagEffect(tp,m,RESET_CHAIN,0,1) 
-	end
+	Duel.RegisterFlagEffect(0,m,RESET_CHAIN,0,1)
+end
+function cm.resetop(e,tp,eg,ep,ev,re,r,rp)
+	Duel.ResetFlagEffect(0,m+50)
+	e:Reset()
 end
-
 function cm.filter0(c,fc)
-	return c:IsCanBeFusionMaterial(fc) 
-		and c:GetFlagEffect(18700544)>0	   
-		and c:IsLocation(LOCATION_MZONE+LOCATION_GRAVE) 
+	return c:GetFlagEffect(m)>0 and c:IsCanBeFusionMaterial(fc)
 end
-	
-	
 
 function cm.thfilter2(c)
 	return c:IsType(TYPE_MONSTER)
@@ -103,10 +108,10 @@ function cm.effcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(cm.effilter,1,nil,tp)
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_MZONE) end
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,0,LOCATION_MZONE,1,nil) end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
-	local g=Duel.SelectTarget(tp,cm.thfilter2,tp,0,LOCATION_MZONE,1,1,nil)
+	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsAbleToDeck() end
+	if chk==0 then return true end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
+	local g=Duel.SelectTarget(tp,cm.thfilter2,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
 end
 function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -122,10 +127,8 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 
-
 function cm.tkcon(e,tp,eg,ep,ev,re,r,rp)
-	local rc=re:GetHandler()
-	return re:GetHandler():IsSetCard(0x820) and rc:IsType(TYPE_MONSTER) and rp==tp
+	return re:GetHandler():IsSetCard(0x820) and Duel.GetFlagEffect(tp,m)==0
 end
 function cm.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.effilter,tp,0,LOCATION_MZONE+LOCATION_GRAVE,1,nil) end
@@ -136,6 +139,7 @@ function cm.thop2(e,tp,eg,ep,ev,re,r,rp)
 		local tc=Duel.SelectMatchingCard(tp,cm.effilter,tp,0,LOCATION_MZONE+LOCATION_GRAVE,1,1,nil):GetFirst()
 		Duel.HintSelection(Group.FromCards(tc))
 		tc:RegisterFlagEffect(m,RESET_PHASE+PHASE_END,0,1)
+		Duel.RegisterFlagEffect(tp,m,RESET_PHASE+PHASE_END,0,1)
 	end
 end
 	
\ No newline at end of file

expansions/script/c36700120.lua

@@ -40,7 +40,7 @@ function c36700120.checkop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c36700120.chkfilter(c)
-	return c:IsSetCard(0xc22) and c:GetSequence()<5
+	return c:IsSetCard(0xc22) and c:GetSequence()<5 and c:IsFaceup()
 end
 function c36700120.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c36700120.chkfilter,tp,LOCATION_MZONE,0,1,nil)

expansions/script/c5012632.lua

@@ -10,12 +10,12 @@ function s.initial_effect(c)
 	--Search
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(1153)
-	--e2:SetType(EFFECT_TYPE_QUICK_O)
-	e2:SetType(EFFECT_TYPE_IGNITION)
-	--e2:SetCode(EVENT_FREE_CHAIN)
+	e2:SetType(EFFECT_TYPE_QUICK_O)
+	--e2:SetType(EFFECT_TYPE_IGNITION)
+	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetCountLimit(1,id)
-	--e2:SetCountLimit(2)
+	--e2:SetCountLimit(1,id)
+	e2:SetCountLimit(2)
 	e2:SetCost(s.setcost)
 	e2:SetTarget(s.settg)
 	e2:SetOperation(s.setop)

expansions/script/c52300125.lua

@@ -21,7 +21,6 @@ function s.initial_effect(c)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e2:SetCountLimit(1)
 	e2:SetCondition(s.tgcon)
 	e2:SetTarget(s.tgtg)
 	e2:SetOperation(s.tgop)
@@ -59,19 +58,32 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.tgcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetCurrentPhase()==PHASE_MAIN1 and Duel.GetTurnPlayer~=tp
+	local ph=Duel.GetCurrentPhase()
+	return (ph==PHASE_MAIN1 or ph==PHASE_MAIN2) and Duel.GetTurnPlayer~=tp
 end
 function s.tgtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+	local ph=Duel.GetCurrentPhase()
 	if chkc then return chkc:IsLocation(LOCATION_ONFIELD) and chkc:IsControler(1-tp) end
-	if chk==0 then return Duel.IsExistingTarget(Card.IsAbleToGrave,tp,0,LOCATION_ONFIELD,1,nil) end
+	if chk==0 then return Duel.IsExistingTarget(nil,tp,0,LOCATION_ONFIELD,1,nil) and Duel.GetFlagEffect(tp,id)==0 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
-	local g=Duel.SelectTarget(tp,Card.IsAbleToGrave,tp,0,LOCATION_ONFIELD,1,1,nil)
+	local g=Duel.SelectTarget(tp,nil,tp,0,LOCATION_ONFIELD,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,g,1,0,0)
+	if ph==PHASE_MAIN1 then
+		Duel.RegisterFlagEffect(tp,id,RESET_PHASE+PHASE_MAIN1,0,1)
+	end
+	if ph==PHASE_MAIN2 then
+		Duel.RegisterFlagEffect(tp,id,RESET_PHASE+PHASE_MAIN2,0,1)
+	end
 end
 function s.tgop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	if not tc or not tc:IsRelateToEffect(e) then return end
-	local opt=Duel.SelectOption(1-tp,aux.Stringid(id,1),aux.Stringid(id,2))
+	local a=tc:IsRelateToEffect(e) and tc:IsAbleToGrave()
+	local opt=1
+	if a then
+		opt=Duel.SelectOption(1-tp,aux.Stringid(id,1),aux.Stringid(id,2))
+	else
+		opt=Duel.SelectOption(1-tp,aux.Stringid(id,2))+1
+	end
 	if opt==0 then
 		Duel.SendtoGrave(tc,REASON_EFFECT)
 	else

expansions/script/c81902068.lua

@@ -60,7 +60,7 @@ function cm.initial_effect(c)
 end
 --XyzSummon
 function cm.ovfilter(c)
-	return c:IsFaceup() and c:IsRankAbove(4) and c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsType(TYPE_XYZ)
+	return c:IsFaceup() and c:IsRank(4) and c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsType(TYPE_XYZ)
 end
 function cm.xyzop(e,tp,chk)
 	if chk==0 then return Duel.GetFlagEffect(tp,m)==0 end

expansions/strings.conf

@@ -442,7 +442,7 @@
 #祈予之心 385149215 174 0x4b0～0x4bf
 !setname 0x4b1 域控
 
-#圣灵兽骑 643865567 180 0x6e0-0x6ef
+#雪音克莉丝 643865567 180 0x6e0-0x6ef
 !setname 0x36e1 调音
 !setname 0x56e1 霸星
 !setname 0x66e1 财布
@@ -469,8 +469,8 @@
 !setname 0x6ed 守护骑士
 !setname 0x6ee 忆炼
 !setname 0x66e6 纯白骑士
-#!setname 0xa6e6 木桶饭
 !setname 0x66e8 玉馔
+!setname 0x6f0 煌剑
 #DefineSet(code,"LianXing") 恋星
 #setname="advency" 冒险遗产
 #setcard="Shinkansen" 新干线
@@ -1068,6 +1068,9 @@
 !setname 0x351a 星之国
 !counter 0x510 射手指示物
 
+#子安 523 0x4e0-0x4ef
+!setname 0x34e0 和平主义者
+
 #TILL 3069681055 527 0x520-0x52f
 !setname 0x3527 骷髅魔
 !setname 0x5527 百群骑士
@@ -1628,6 +1631,7 @@
 !setname 0xaf1 寄生兽
 !setname 0xaf2 镜世界
 !setname 0x3af2 镜世界魔神
+!setname 0xaf0 灵化
 
 #水镜 457663161 960 0xef0-0xeff
 !setname 0xef1 侍神