fix

expansions/script/c13020005.lua

@@ -36,7 +36,8 @@ function cm.filter66(c)
 end
 
 function cm.ffilter(c, fc, sub, mg, sg)
-	return c:IsAbleToGraveAsCost() and (c:GetOriginalType() & TYPE_UNION ~= 0 or c:GetOriginalType() & TYPE_EQUIP ~= 0)
+	return c:IsAbleToGraveAsCost() and
+		(c:GetOriginalType() & TYPE_UNION ~= 0 or c:IsType(TYPE_EQUIP)) --(c:GetOriginalType() & TYPE_UNION ~= 0 or c:GetOriginalType() & TYPE_EQUIP ~= 0)
 end
 
 function cm.filter(c, c2)

expansions/script/c33201802.lua

@@ -110,6 +110,7 @@ function s.thop(e, tp, eg, ep, ev, re, r, rp)
 	
 	if #g > 0 then
 		Duel.SendtoDeck(g, nil, SEQ_DECKSHUFFLE, REASON_EFFECT)
+		Duel.ShuffleDeck(tp)
 	end
 end
 

expansions/script/c33201803.lua

@@ -18,8 +18,8 @@ function s.initial_effect(c)
 	e2:SetDescription(aux.Stringid(id, 0))
 	e2:SetCategory(CATEGORY_TOHAND + CATEGORY_SEARCH)
 	e2:SetType(EFFECT_TYPE_IGNITION) -- 启动效果
-	e2:SetRange(LOCATION_SZONE)	  -- 在魔陷区发动（无论是装备状态还是永续魔法状态）
-	e2:SetCountLimit(1, id+10000)		  -- 卡名硬限制
+	e2:SetRange(LOCATION_SZONE)   -- 在魔陷区发动（无论是装备状态还是永续魔法状态）
+	e2:SetCountLimit(1, id+10000)		 -- 卡名硬限制
 	e2:SetCondition(s.thcon1)
 	e2:SetTarget(s.thtg1)
 	e2:SetOperation(s.thop1)
@@ -106,6 +106,7 @@ function s.thop(e, tp, eg, ep, ev, re, r, rp)
 	
 	if #g > 0 then
 		Duel.SendtoDeck(g, nil, SEQ_DECKSHUFFLE, REASON_EFFECT)
+		Duel.ShuffleDeck(tp)
 	end
 end
 

expansions/script/c33201804.lua

@@ -22,7 +22,7 @@ function s.initial_effect(c)
 	e2:SetCode(EVENT_SUMMON_SUCCESS)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_ACTIVATE_CONDITION)
-	e2:SetCountLimit(1)	   
+	e2:SetCountLimit(1)	
 	e2:SetCondition(s.descon)
 	e2:SetTarget(s.destg)
 	e2:SetOperation(s.desop)
@@ -115,6 +115,7 @@ function s.thop(e, tp, eg, ep, ev, re, r, rp)
 	
 	if #g > 0 then
 		Duel.SendtoDeck(g, nil, SEQ_DECKSHUFFLE, REASON_EFFECT)
+		Duel.ShuffleDeck(tp)
 	end
 end
 

expansions/script/c33201805.lua

@@ -19,7 +19,7 @@ function s.initial_effect(c)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON + CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_IGNITION) -- 启动效果
 	e2:SetRange(LOCATION_SZONE)   -- 在魔陷区发动
-	e2:SetCountLimit(1, id +10000)		-- 【安全起见】添加了卡名硬限制
+	e2:SetCountLimit(1, id +10000)	  -- 【安全起见】添加了卡名硬限制
 	e2:SetCondition(s.spcon)
 	e2:SetTarget(s.sptg)
 	e2:SetOperation(s.spop)
@@ -110,6 +110,7 @@ function s.thop(e, tp, eg, ep, ev, re, r, rp)
 	
 	if #g > 0 then
 		Duel.SendtoDeck(g, nil, SEQ_DECKSHUFFLE, REASON_EFFECT)
+		Duel.ShuffleDeck(tp)
 	end
 end
 

expansions/script/c33201806.lua

@@ -67,7 +67,11 @@ function s.matop(e, tp, eg, ep, ev, re, r, rp)
 			local mat = g:GetFirst()
 			-- 变成超量素材
 			-- 如果是对方的卡，Duel.Overlay 会处理移动逻辑
-			Duel.Overlay(tc, mat)
+				local og=mat:GetOverlayGroup()
+				if og:GetCount()>0 then
+					Duel.SendtoGrave(og,REASON_RULE)
+				end
+				Duel.Overlay(tc,mat)
 		end
 	end
 end

expansions/script/c33201808.lua

@@ -104,7 +104,7 @@ function s.disop(e, tp, eg, ep, ev, re, r, rp)
 			
 			-- 步骤3：那之后，可以塞素材
 			-- 只有成功无效了，才能处理“那之后”
-			if target:IsRelateToEffect(e) and not target:IsImmuneToEffect(e) and tc:IsCanOverlay() then 
+			if target:IsRelateToEffect(e) and not target:IsImmuneToEffect(e) and target:IsCanOverlay() then 
 				Duel.BreakEffect()
 				local og=target:GetOverlayGroup()
 				if og:GetCount()>0 then

expansions/script/c6100002.lua

+local s,id,o=GetID()
+function s.initial_effect(c)
+	local e1=Effect.CreateEffect(c)
+	e1:SetCategory(CATEGORY_DISABLE)
+	e1:SetType(EFFECT_TYPE_ACTIVATE)
+	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetHintTiming(TIMING_DRAW_PHASE+TIMING_END_PHASE)
+	e1:SetCountLimit(1,id+EFFECT_COUNT_CODE_OATH)
+	e1:SetOperation(s.activate)
+	c:RegisterEffect(e1)
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_SINGLE)
+	e2:SetCode(EFFECT_TRAP_ACT_IN_HAND)
+	e2:SetCondition(s.handcon)
+	c:RegisterEffect(e2)
+	if s.counter==nil then
+		s.counter=true
+		s[0]=0
+		s[1]=0
+		local e3=Effect.CreateEffect(c)
+		e3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
+		e3:SetCode(EVENT_PHASE_START+PHASE_DRAW)
+		e3:SetOperation(s.resetcount)
+		Duel.RegisterEffect(e3,0)
+		local e4=Effect.CreateEffect(c)
+		e4:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
+		e4:SetCode(EVENT_CHAIN_SOLVING)
+		e4:SetOperation(s.checkop)
+		Duel.RegisterEffect(e4,0)
+	end
+end
+function s.resetcount(e,tp,eg,ep,ev,re,r,rp)
+	s[0]=0
+	s[1]=0
+end
+function s.checkop(e,tp,eg,ep,ev,re,r,rp)
+	s[rp]=s[rp]+1
+end
+function s.activate(e,tp,eg,ep,ev,re,r,rp)
+	local e1=Effect.CreateEffect(e:GetHandler())
+	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e1:SetCode(EVENT_PHASE+PHASE_END)
+	e1:SetReset(RESET_PHASE+PHASE_END)
+	e1:SetCountLimit(1)
+	e1:SetOperation(s.operation)
+	Duel.RegisterEffect(e1,tp)
+end
+function s.operation(e,tp,eg,ep,ev,re,r,rp)
+	Duel.Hint(HINT_CARD,0,m)
+	local c=e:GetHandler()
+	local g=Duel.GetMatchingGroup(aux.disfilter1,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
+	local ct=math.floor(s[1-tp]/5)
+	if #g==0 or ct<1 then return end
+	if ct>#g then ct=#g end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISABLE)
+	local dg=g:Select(tp,1,ct,nil)
+	Duel.HintSelection(dg)
+	for tc in aux.Next(dg) do
+		Duel.NegateRelatedChain(tc,RESET_TURN_SET)
+		local e1=Effect.CreateEffect(c)
+		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetCode(EFFECT_DISABLE)
+		e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,2)
+		tc:RegisterEffect(e1)
+		local e2=Effect.CreateEffect(c)
+		e2:SetType(EFFECT_TYPE_SINGLE)
+		e2:SetCode(EFFECT_DISABLE_EFFECT)
+		e2:SetValue(RESET_TURN_SET)
+		e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,2)
+		tc:RegisterEffect(e2)
+	end
+end
+function s.handcon(e)
+	return Duel.GetFieldGroupCount(e:GetHandlerPlayer(),LOCATION_ONFIELD,0)==0
+end

expansions/script/c6100228.lua

@@ -28,7 +28,7 @@ end
 
 --字段：朦雨
 function s.costfilter(c)
-	return c:IsSetCard(0x613) and c:IsAbleToGraveAsCost()
+	return c:IsSetCard(0x613) and c:IsAbleToGrave()
 end
 
 function s.spfilter(c)
@@ -37,7 +37,7 @@ end
 
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	if chk==0 then return Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_EXTRA,0,1,nil) and c:IsAbleToGraveAsCost() 
+	if chk==0 then return Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_EXTRA,0,1,nil) and c:IsAbleToGrave() 
 			and Duel.IsExistingMatchingCard(s.costfilter,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,c) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end

expansions/script/c71500204.lua

@@ -19,6 +19,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)<7 then return end
 	Duel.ConfirmDecktop(tp,7)
+	local ag=Group.CreateGroup()
 	local g=Duel.GetDecktopGroup(tp,7)
 	if #g>0 then
 		local codes={}

expansions/script/c7476866.lua

@@ -63,14 +63,14 @@ function s.limop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e6,tp)
 end
 function s.scount(e,tp,eg,ep,ev,re,r,rp)
-	if ep~=tp or not re:IsActiveType(TYPE_MONSTER) or (re:GetHandler() and not re:GetHandler():IsSetCard(0xc9)) then return end
+	if ep~=tp or not re:IsActiveType(TYPE_MONSTER) or (re:GetHandler() and re:GetHandler():IsSetCard(0xc9)) then return end
 	Duel.RegisterFlagEffect(tp,id,RESET_PHASE+PHASE_END,0,1)
 end
 function s.econ1(e)
 	return Duel.GetFlagEffect(tp,id)>2
 end
 function s.ocount(e,tp,eg,ep,ev,re,r,rp)
-	if ep==tp or not re:IsActiveType(TYPE_MONSTER) or (re:GetHandler() and not re:GetHandler():IsSetCard(0xc9)) then return end
+	if ep==tp or not re:IsActiveType(TYPE_MONSTER) or (re:GetHandler() and re:GetHandler():IsSetCard(0xc9)) then return end
 	Duel.RegisterFlagEffect(tp,id+o,RESET_PHASE+PHASE_END,0,1)
 end
 function s.econ2(e)