fix

expansions/script/c33701403.lua

@@ -3,7 +3,7 @@ local m=33701403
 local cm=_G["c"..m]
 function cm.initial_effect(c)
 	--xyz summon
-	aux.AddXyzProcedure(c,nil,5,2,cm.ovfilter,aux.Stringid(m,0),2)
+	aux.AddXyzProcedure(c,nil,5,2,cm.ovfilter,aux.Stringid(m,0))
 	c:EnableReviveLimit()
 	--atk
 	local e1=Effect.CreateEffect(c)
@@ -25,7 +25,9 @@ function cm.initial_effect(c)
 	e3:SetCondition(cm.indcon)
 	e3:SetValue(1)
 	c:RegisterEffect(e3)
-	
+end
+function cm.ovfilter(c)
+	return c:IsFaceup() and c:IsType(TYPE_XYZ) and c:GetOverlayCount()==0
 end
 function cm.atkval(e,c)
 	return c:GetOverlayCount()*500

expansions/script/c72411050.lua

@@ -31,27 +31,27 @@ function c72411050.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return c:IsDiscardable() end
 	Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
 end
-function c72411050.filtera(c)
-	return c:IsSetCard(0x5729) and c:GetType()==TYPE_SPELL and c:IsAbleToHand()
+function c72411050.filtera(c,tp)
+	return (c:IsSetCard(0x5729) or Duel.IsPlayerAffectedByEffect(tp,72413440)) and c:GetType()==TYPE_SPELL and c:IsAbleToHand()
 end
 function c72411050.target1(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chk==0 then return Duel.IsExistingMatchingCard(c72411050.filtera,tp,LOCATION_DECK,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(c72411050.filtera,tp,LOCATION_DECK,0,1,nil,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 end
 function c72411050.operation1(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectMatchingCard(tp,c72411050.filtera,tp,LOCATION_DECK,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,c72411050.filtera,tp,LOCATION_DECK,0,1,1,nil,tp)
 	if g:GetCount()>0 then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)
 	end
 end
-function c72411050.filterb(c,e)
-	return c:IsSetCard(0x5729) and c:IsType(TYPE_SPELL) and c:IsAbleToDeck() and c:IsCanBeEffectTarget(e)
+function c72411050.filterb(c,e,tp)
+	return ((c:IsSetCard(0x5729) and c:IsType(TYPE_SPELL)) or (c:IsSetCard(0x5729) or Duel.IsPlayerAffectedByEffect(tp,72413440))) and c:IsAbleToDeck() and c:IsCanBeEffectTarget(e)
 end
 function c72411050.target2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end
-	local g=Duel.GetMatchingGroup(c72411050.filterb,tp,LOCATION_GRAVE,0,e:GetHandler(),e)
+	local g=Duel.GetMatchingGroup(c72411050.filterb,tp,LOCATION_GRAVE,0,e:GetHandler(),e,tp)
 	if chk==0 then return Duel.IsPlayerCanDraw(tp,1)
 		and g:GetClassCount(Card.GetCode)>2 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)

expansions/script/c72411110.lua

@@ -18,18 +18,18 @@ end
 function c72411110.filterb(c)
 	return c:IsCode(72411030) and c:IsAbleToHand()
 end
-function c72411110.filterc(c)
-	return c:IsSetCard(0x5729) and c:IsAbleToDeck()
+function c72411110.filterc(c,tp)
+	return (c:IsSetCard(0x5729) or (Duel.IsPlayerAffectedByEffect(tp,72413440) and c:GetType()==TYPE_SPELL)) and c:IsAbleToDeck()
 end
 function c72411110.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c72411110.filtera,tp,LOCATION_DECK,0,1,nil) and Duel.IsExistingMatchingCard(c72411110.filterb,tp,LOCATION_DECK,0,1,nil) and Duel.IsExistingMatchingCard(c72411110.filterc,tp,LOCATION_HAND,0,1,e:GetHandler()) end
+	if chk==0 then return Duel.IsExistingMatchingCard(c72411110.filtera,tp,LOCATION_DECK,0,1,nil) and Duel.IsExistingMatchingCard(c72411110.filterb,tp,LOCATION_DECK,0,1,nil) and Duel.IsExistingMatchingCard(c72411110.filterc,tp,LOCATION_HAND,0,1,e:GetHandler(),tp) end
 	Duel.SetTargetPlayer(tp)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,tp,LOCATION_HAND)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,2,tp,LOCATION_DECK)
 end
 function c72411110.activate(e,tp,eg,ep,ev,re,r,rp)
 	local p=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER)
-	local g=Duel.GetMatchingGroup(c72411110.filterc,p,LOCATION_HAND,0,nil)
+	local g=Duel.GetMatchingGroup(c72411110.filterc,p,LOCATION_HAND,0,nil,tp)
 	if g:GetCount()>=1 then
 		Duel.Hint(HINT_SELECTMSG,p,HINTMSG_TODECK)
 		local sg=g:Select(p,1,1,nil)

expansions/script/c72411140.lua

@@ -47,12 +47,12 @@ function c72411140.operation1(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 --e2
-function c72411140.costfilter(c)
-	return c:IsType(TYPE_SPELL) and c:IsSetCard(0x5729) and c:IsDiscardable(REASON_COST)
+function c72411140.costfilter(c,tp)
+	return (c:IsSetCard(0x5729) and c:IsType(TYPE_SPELL)) or (c:IsSetCard(0x5729) or Duel.IsPlayerAffectedByEffect(tp,72413440)) and c:IsDiscardable(REASON_COST)
 end
 function c72411140.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c72411140.costfilter,tp,LOCATION_HAND,0,1,nil)  end
-	Duel.DiscardHand(tp,c72411140.costfilter,1,1,REASON_COST+REASON_DISCARD)
+	if chk==0 then return Duel.IsExistingMatchingCard(c72411140.costfilter,tp,LOCATION_HAND,0,1,nil,tp)  end
+	Duel.DiscardHand(tp,c72411140.costfilter,1,1,REASON_COST+REASON_DISCARD,nil,tp)
 end
 function c72411140.target2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local c=e:GetHandler()

expansions/script/c72411150.lua

@@ -43,7 +43,8 @@ function c72411150.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return b1 or b2 end
 end
 function c72411150.tokentarget(e,c)
-	return c:IsSetCard(0x5729)
+	local tp=e:GetHandler():GetControler()
+	return c:IsSetCard(0x5729) or (c:GetType()==TYPE_SPELL and Duel.IsPlayerAffectedByEffect(tp,72413440))
 end
 function c72411150.tokenfilter(e,re)
 	return re:GetOwnerPlayer()~=e:GetHandlerPlayer()

expansions/script/c72411160.lua

@@ -30,12 +30,12 @@ end
 function c72411160.matfilter1(c)
 	return c:IsSynchroType(TYPE_TUNER) or c:IsSynchroType(TYPE_NORMAL)
 end
-function c72411160.costfilter(c)
-	return c:IsType(TYPE_SPELL) and c:IsSetCard(0x5729) and c:IsDiscardable(REASON_COST)
+function c72411160.costfilter(c,tp)
+	return (c:IsSetCard(0x5729) and c:IsType(TYPE_SPELL)) or (c:IsSetCard(0x5729) or Duel.IsPlayerAffectedByEffect(tp,72413440)) and c:IsDiscardable(REASON_COST)
 end
 function c72411160.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c72411160.costfilter,tp,LOCATION_HAND,0,1,nil)  end
-	Duel.DiscardHand(tp,c72411160.costfilter,1,1,REASON_COST+REASON_DISCARD)
+	if chk==0 then return Duel.IsExistingMatchingCard(c72411160.costfilter,tp,LOCATION_HAND,0,1,nil,tp)  end
+	Duel.DiscardHand(tp,c72411160.costfilter,1,1,REASON_COST+REASON_DISCARD,nil,tp)
 end
 function c72411160.target2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local c=e:GetHandler()

expansions/script/c72411580.lua

@@ -14,16 +14,16 @@ function c72411580.initial_effect(c)
 	e1:SetOperation(c72411580.thop)
 	c:RegisterEffect(e1)
 end
-function c72411580.thfilter(c)
-	return c:IsSetCard(0x5729) 
+function c72411580.thfilter(c,tp)
+	return ( c:IsSetCard(0x5729) or (Duel.IsPlayerAffectedByEffect(tp,72413440) and c:GetType()==TYPE_SPELL))
 end
 function c72411580.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c72411580.thfilter,tp,LOCATION_REMOVED,0,3,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(c72411580.thfilter,tp,LOCATION_REMOVED,0,3,nil,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_REMOVED)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,2,tp,LOCATION_REMOVED)
 end
 function c72411580.thop(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.SelectMatchingCard(tp,c72411580.thfilter,tp,LOCATION_REMOVED,0,3,3,nil)
+	local g=Duel.SelectMatchingCard(tp,c72411580.thfilter,tp,LOCATION_REMOVED,0,3,3,nil,tp)
 	if g:GetCount()==3 then
 		Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND)
 		local tg=g:RandomSelect(1-tp,1)