fix

expansions/script/c13020010.lua

@@ -69,7 +69,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 			oc=QY_sk
 		end
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
-		local tcg=Duel.SelectMatchingCard(tp,Card.CheckEquipTarget,tp,oc,0,1,1,nil,tc):GetFirst()
+		local tcg=Duel.SelectMatchingCard(tp,cm.filter2,tp,oc,0,1,1,nil):GetFirst()
 		Duel.Equip(tp,tcg,tc,true)
 	end
 end
@@ -92,6 +92,7 @@ function cm.operation2(e,tp,eg,ep,ev,re,r,rp)
 	local g1 = Duel.GetMatchingGroup( cm.filter5, tp, LOCATION_GRAVE, 0, nil):GetFirst()
 	local g2 = Duel.GetMatchingGroup( cm.filter6, tp, LOCATION_GRAVE, 0, g1 ,e,tp)
 	local kx,zzx,sxx,zzjc,sxjc,zzl=it.sxbl()
+	
 	if num>=6 and g1~=nil and #g2>0 and zzx>0 and xg.ky(tp,m,1) then
 		Duel.Hint(HINT_SELECTMSG, tp, HINTMSG_TODECK)
 		local g = Duel.SelectMatchingCard(tp, cm.filter5, tp, LOCATION_GRAVE, 0, 1, 1, nil)
@@ -137,6 +138,7 @@ function cm.operation2(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SendtoDeck(g, nil, 2, REASON_EFFECT)
 		Duel.RegisterFlagEffect(tp, m, SD_js, 0, 1)
 	end
+
 end
 function cm.atkval(e,c)
 	return Duel.GetMatchingGroupCount(cm.atkfilter,e:GetHandlerPlayer(),LOCATION_GRAVE+LOCATION_REMOVED,0,nil)*500

expansions/script/c13020015.lua

@@ -134,6 +134,6 @@ function cm.desop(e,tp,eg,ep,ev,re,r,rp)
   local g2 = Duel.GetMatchingGroup( cm.filter5, tp, LOCATION_GRAVE+QY_cw, 0, nil,e,tp)
   local g1 = Duel.SelectMatchingCard(tp, cm.filter6, tp, LOCATION_GRAVE+QY_cw, 0, 1, 1, nil,e,tp,m,g2):GetFirst()
   Duel.SpecialSummon(g1,0,tp,tp,false,false,POS_FACEUP)
-  g2=g2:Filter(cm.filter4, nil,g1)
+  g2=g2:Filter(cm.filter4, nil,g1):GetFirst()
   Duel.Equip(tp,g2,g1,true)
 end
\ No newline at end of file

expansions/script/c21000702.lua

@@ -72,7 +72,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c)
 	Duel.RegisterEffect(e1,tp)
 end
 function s.sumlimit(e,c,sump,sumtype,sumpos,targetp,se)
-	return not c:IsSetCard(0x605)
+	return not c:IsRace(RACE_PSYCHO)
 end
 
 

expansions/script/c22348435.lua

@@ -66,7 +66,7 @@ function c22348435.eqop(e,tp,eg,ep,ev,re,r,rp)
 	local tg=ctg:SelectSubGroup(tp,c22348435.gcheck,false,1,ct,e,tp)
 	local ec=tg:GetFirst()
 	while ec do
-		if Duel.Equip(tp,ec,tc,true,true)~=0 then 
+		if Duel.Equip(tp,ec,tc)~=0 then 
 			local e1=Effect.CreateEffect(e:GetHandler())
 			e1:SetType(EFFECT_TYPE_SINGLE)
 			e1:SetCode(EFFECT_EQUIP_LIMIT)

expansions/script/c49811406.lua

@@ -81,9 +81,9 @@ function s.tdfilter(c)
 	return c:IsFaceupEx() and c:IsRace(RACE_FIEND) and c:IsLevel(3) and c:IsAbleToDeckAsCost()
 end
 function s.drcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(s.tdfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(s.tdfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,3,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
-	local g=Duel.SelectMatchingCard(tp,s.tdfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,3,nil)
+	local g=Duel.SelectMatchingCard(tp,s.tdfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,3,3,nil)
 	Duel.HintSelection(g)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_COST)
 end

expansions/script/c60010055.lua

@@ -13,7 +13,7 @@ function cm.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,2))
 	e1:SetCategory(CATEGORY_DRAW)
-	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCode(EVENT_CUSTOM+m)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetRange(LOCATION_SZONE)
@@ -27,12 +27,12 @@ if not cm.lblsz then
 	cm._tossdice=Duel.TossDice
 	Duel.TossDice=function (tp,a,b)
 		Duel.RaiseEvent(Duel.GetDecktopGroup(tp,1),EVENT_CUSTOM+m,nil,0,tp,tp,0)
-		if Duel.GetFlagEffect(tp,m+10000000)~=0 and Duel.SelectYesNo(tp,aux.Stringid(m,1)) and Duel.IsExistingMatchingCard(aux.TRUE,tp,0,LOCATION_ONFIELD,1,nil) then
+		if Duel.GetFlagEffect(tp,m+10000000)~=0 and Duel.IsExistingMatchingCard(aux.TRUE,tp,0,LOCATION_ONFIELD,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(m,1)) then
 			local rg=Duel.GetMatchingGroup(aux.TRUE,tp,0,LOCATION_ONFIELD,nil):Select(tp,1,2,nil)
 			Duel.Remove(rg,POS_FACEUP,REASON_EFFECT)
 			Duel.ResetFlagEffect(tp,m+10000000)
 		end
-		if Duel.GetFlagEffect(tp,m)==0 and Duel.SelectYesNo(tp,aux.Stringid(m,0)) and Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil,m) and Duel.GetMatchingGroup(Card.IsCode,tp,LOCATION_DECK+LOCATION_GRAVE,0,nil,m):RandomSelect(tp,1):GetFirst():IsAbleToHand(tp) then
+		if Duel.GetFlagEffect(tp,m)==0 and Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil,m) and Duel.GetMatchingGroup(Card.IsCode,tp,LOCATION_DECK+LOCATION_GRAVE,0,nil,m):RandomSelect(tp,1):IsAbleToHand(tp) and Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
 			Duel.RegisterFlagEffect(tp,m,0,0,1)
 			local ag=Duel.GetMatchingGroup(Card.IsCode,tp,LOCATION_DECK+LOCATION_GRAVE,0,nil,m):Select(tp,1,1,nil)
 			Duel.SendtoHand(ag,nil,REASON_EFFECT)

expansions/script/c60040053.lua

@@ -25,8 +25,8 @@ function cm.initial_effect(c)
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local num=Duel.GetFlagEffect(tp,m)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) or num>=5 end
-	if num<3 or not Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) or num>=3 end
+	if num<2 or not Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
 		Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST,nil)
 	end
 end

expansions/script/c60040054.lua

@@ -25,8 +25,8 @@ function cm.initial_effect(c)
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local num=Duel.GetFlagEffect(tp,m)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) or num>=5 end
-	if num<3 or not Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) or num>=3 end
+	if num<2 or not Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
 		Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST,nil)
 	end
 end

expansions/script/c60040055.lua

@@ -25,8 +25,8 @@ function cm.initial_effect(c)
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local num=Duel.GetFlagEffect(tp,m)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) or num>=5 end
-	if num<3 or not Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) or num>=3 end
+	if num<2 or not Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
 		Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST,nil)
 	end
 end

expansions/script/c60040056.lua

@@ -25,8 +25,8 @@ function cm.initial_effect(c)
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local num=Duel.GetFlagEffect(tp,m)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) or num>=5 end
-	if num<3 or not Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) or num>=3 end
+	if num<2 or not Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
 		Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST,nil)
 	end
 end

expansions/script/c60040057.lua

@@ -25,8 +25,8 @@ function cm.initial_effect(c)
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local num=Duel.GetFlagEffect(tp,m)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) or num>=5 end
-	if num<3 or not Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) or num>=3 end
+	if num<2 or not Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
 		Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST,nil)
 	end
 end

expansions/script/c60040058.lua

@@ -23,8 +23,8 @@ function cm.initial_effect(c)
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local num=Duel.GetFlagEffect(tp,m)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) or num>=5 end
-	if num<3 or not Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) or num>=3 end
+	if num<2 or not Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
 		Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST,nil)
 	end
 end

expansions/script/c60040060.lua

@@ -23,8 +23,8 @@ function cm.initial_effect(c)
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local num=Duel.GetFlagEffect(tp,m)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) or num>=5 end
-	if num<3 or not Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) or num>=3 end
+	if num<2 or not Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
 		Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST,nil)
 	end
 end

expansions/script/c61000026.lua

 --怪翎衣 玉鹤守子
 local s,id,o=GetID()
 function s.initial_effect(c)
-	aux.AddFusionProcFunRep(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x39c0),2,true)
+	aux.AddFusionProcFunRep(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x67c0),2,true)
 	c:EnableReviveLimit()
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))

expansions/script/c88881924.lua

@@ -39,7 +39,7 @@ function s.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE)
 	e3:SetCode(EFFECT_UPDATE_ATTACK)
 	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e3:SetValue(800)
+	e3:SetValue(1000)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCondition(s.actcon)
 	c:RegisterEffect(e3)

expansions/script/c98920755.lua

@@ -18,6 +18,7 @@ function c98920755.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_REMOVE)
 	e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
+	e2:SetCountLimit(1,98930755)
 	e2:SetTarget(c98920755.rtgtg)
 	e2:SetOperation(c98920755.rtgop)
 	c:RegisterEffect(e2)

expansions/script/c98921065.lua

@@ -65,13 +65,13 @@ function c98921065.xfilter(c)
 end
 function c98921065.tdop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local ssg=Duel.GetMatchingGroup(c98921065.xfilter,tp,LOCATION_GRAVE,0,nil)
 	if c:IsRelateToEffect(e) and Duel.SendtoDeck(c,nil,SEQ_DECKTOP,REASON_EFFECT)>0
 		and Duel.IsEnvironment(98921067) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 			and Duel.IsExistingMatchingCard(c98921065.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp)
-			and ssg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(98921065,0)) then
+			and Duel.GetMatchingGroup(c98921065.xfilter,tp,LOCATION_GRAVE,0,nil):GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(98921065,0)) then
 			Duel.BreakEffect()
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+			local ssg=Duel.GetMatchingGroup(c98921065.xfilter,tp,LOCATION_GRAVE,0,nil)
 			local sg=Duel.SelectMatchingCard(tp,c98921065.spfilter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp)
 			Duel.SpecialSummon(sg,0,tp,tp,false,false,POS_FACEUP)
 			local tc=sg:GetFirst()