fix

expansions/script/c16300080.lua

@@ -3,12 +3,11 @@ function c16300080.initial_effect(c)
 	c16300080.EnableUnionAttribute(c,c16300080.unfilter)
 	--equip
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(16300080,0))
 	e2:SetCategory(CATEGORY_EQUIP+CATEGORY_HANDES)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_SUMMON_SUCCESS)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
-	e2:SetCountLimit(1,16300005)
+	e2:SetCountLimit(1,16300080)
 	e2:SetTarget(c16300080.eqtg)
 	e2:SetOperation(c16300080.eqop)
 	c:RegisterEffect(e2)
@@ -17,13 +16,12 @@ function c16300080.initial_effect(c)
 	c:RegisterEffect(e22)
 	--draw
 	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(16300005,0))
 	e3:SetCategory(CATEGORY_DRAW)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e3:SetCode(EVENT_ATTACK_ANNOUNCE)
 	e3:SetRange(LOCATION_SZONE)
-	e3:SetCountLimit(1,16300005+1)
+	e3:SetCountLimit(1,16300080+1)
 	e3:SetCondition(c16300080.drcon)
 	e3:SetTarget(c16300080.drtg)
 	e3:SetOperation(c16300080.drop)

expansions/script/c16310035.lua

@@ -45,7 +45,7 @@ function c16310035.initial_effect(c)
 	c:RegisterEffect(e33)
 end
 function c16310035.ffilter(c,fc,sub,mg,sg)
-	return c:IsFusionSetCard(0x3dc6) and c:GetDefense()==0 and c:IsType(0x1)
+	return c:IsFusionSetCard(0x3dc6) and c:IsDefense(0) and c:IsType(0x1)
 		and (not sg or not sg:IsExists(Card.IsFusionCode,1,c,c:GetFusionCode()))
 end
 function c16310035.fsplimit(e,se,sp,st)

expansions/script/c16310040.lua

@@ -47,7 +47,7 @@ function c16310040.initial_effect(c)
 	c:RegisterEffect(e33)
 end
 function c16310040.ffilter(c,fc,sub,mg,sg)
-	return c:IsFusionSetCard(0x3dc6) and c:GetAttack()==0 and c:IsType(0x1)
+	return c:IsFusionSetCard(0x3dc6) and c:IsAttack(0) and c:IsType(0x1)
 		and (not sg or not sg:IsExists(Card.IsFusionCode,1,c,c:GetFusionCode()))
 end
 function c16310040.fsplimit(e,se,sp,st)

expansions/script/c16310045.lua

@@ -51,7 +51,7 @@ function c16310045.initial_effect(c)
 	c:RegisterEffect(e33)
 end
 function c16310045.ffilter(c,fc,sub,mg,sg)
-	return c:IsFusionSetCard(0x3dc6) and c:GetDefense()==0 and c:IsType(0x1)
+	return c:IsFusionSetCard(0x3dc6) and c:IsDefense(0) and c:IsType(0x1)
 		and (not sg or not sg:IsExists(Card.IsFusionCode,1,c,c:GetFusionCode()))
 end
 function c16310045.fsplimit(e,se,sp,st)

expansions/script/c16310050.lua

@@ -49,7 +49,7 @@ function c16310050.initial_effect(c)
 	c:RegisterEffect(e33)
 end
 function c16310050.ffilter(c,fc,sub,mg,sg)
-	return c:IsFusionSetCard(0x3dc6) and c:GetAttack()==0 and c:IsType(0x1)
+	return c:IsFusionSetCard(0x3dc6) and c:IsAttack(0) and c:IsType(0x1)
 		and (not sg or not sg:IsExists(Card.IsFusionCode,1,c,c:GetFusionCode()))
 end
 function c16310050.fsplimit(e,se,sp,st)

expansions/script/c33400908.lua

@@ -3,7 +3,7 @@ local m=33400908
 local cm=_G["c"..m]
 function cm.initial_effect(c)
 	  --link summon
-	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x341),2,99,s.lcheck)
+	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x341),2,99,cm.lcheck)
 	c:EnableReviveLimit()
 	--
 	local e1=Effect.CreateEffect(c)

expansions/script/c33400909.lua

@@ -3,7 +3,7 @@ local m=33400909
 local cm=_G["c"..m]
 function cm.initial_effect(c)
 	  --link summon
-	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x341),2,99,s.lcheck)
+	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x341),2,99,cm.lcheck)
 	c:EnableReviveLimit()
 	 --atk up
 	local e1=Effect.CreateEffect(c)

expansions/script/c37573002.lua

@@ -57,7 +57,6 @@ function s.xyzcon(e,c,og,min,max)
 		maxc=math.min(maxc,max)
 	end
 	if maxc<minc then return false end
-	if og then
 		return false
 	end
 	local mg=Duel.GetFieldGroup(tp,LOCATION_MZONE,0)

expansions/script/c5012619.lua

@@ -39,8 +39,9 @@ end
 --①：回到卡组并回复LP和特召
 function s.tdcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	if chk==0 then return not c:IsPublic() end
+	if chk==0 then return c:IsAbleToDeck()end
 	Duel.ConfirmCards(1-tp,c)
+	Duel.SendtoDeck(c,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 
 function s.spfilter(c,e,tp)
@@ -48,8 +49,7 @@ function s.spfilter(c,e,tp)
 end
 
 function s.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():IsAbleToDeck() and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
-	Duel.SetOperationInfo(0,CATEGORY_TODECK,e:GetHandler(),1,0,0)
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
 	Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,tp,800)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
 	local e3=Effect.CreateEffect(e:GetHandler())
@@ -66,19 +66,17 @@ end
 
 function s.tdop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) and Duel.SendtoDeck(c,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)>0 
-		and c:IsLocation(LOCATION_DECK+LOCATION_EXTRA) then
-		Duel.Recover(tp,800,REASON_EFFECT)
-		if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
-		if Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp)
-		and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
-			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-			local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
-			if #g>0 then
-				Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
-			end
+	Duel.Recover(tp,800,REASON_EFFECT)
+	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
+	if Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp)
+	and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+		local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
+		if #g>0 then
+			Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 		end
 	end
+
 end
 
 --②：确认对手卡并盖放陷阱

expansions/script/c52700744.lua

@@ -85,13 +85,12 @@ function s.negcon(e,tp,eg,ep,ev,re,r,rp)
 	return not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) and Duel.IsChainNegatable(ev) and rp~=tp
 end
 function s.costfilter(c)
-	return  c:IsSetCard(0x3529)
+	return  c:IsSetCard(0x3529) and (c:IsReleasableByEffect() or c:IsLocation(LOCATION_HAND) )  
 end
 function s.negcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	local rg=Duel.GetReleaseGroup(tp,true):Filter(s.costfilter,nil)
-	if chk==0 then return rg:GetCount()>0 end
+	if chk==0 then return Duel.IsExistingMatchingCard(s.costfilter,tp,LOCATION_ONFIELD+LOCATION_HAND,0,1,c) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RELEASE)
-	local g=Duel.SelectReleaseGroupEx(tp,s.costfilter,1,1,REASON_COST,TRUE,nil)
+	local g=Duel.SelectMatchingCard(tp,s.costfilter,tp,LOCATION_ONFIELD+LOCATION_HAND,0,1,1,c) 
 	local tc=g:GetFirst()
 	if tc:GetOwner()~=tp 
 	then 

expansions/script/c52700745.lua

@@ -110,10 +110,10 @@ function s.cfilter2(c)
 	return c:IsFaceup() and c:IsFusionType(TYPE_MONSTER) and c:IsSetCard(0x3529) and c:IsRace(RACE_WYRM) and c:IsType(TYPE_FUSION)
 end
 function s.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(s.cfilter1,tp,LOCATION_MZONE,0,1,nil) and not Duel.IsExistingMatchingCard(s.cfilter2,tp,LOCATION_MZONE,0,1,nil)
+	return Duel.IsExistingMatchingCard(s.cfilter1,tp,LOCATION_MZONE,0,1,nil,tp) and not Duel.IsExistingMatchingCard(s.cfilter2,tp,LOCATION_MZONE,0,1,nil)
 end
 function s.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(s.cfilter1,tp,LOCATION_MZONE,0,1,nil) and Duel.IsExistingMatchingCard(s.cfilter2,tp,LOCATION_MZONE,0,1,nil)
+	return Duel.IsExistingMatchingCard(s.cfilter1,tp,LOCATION_MZONE,0,1,nil,tp) and Duel.IsExistingMatchingCard(s.cfilter2,tp,LOCATION_MZONE,0,1,nil)
 end
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0