fix

expansions/script/c11533716.lua

@@ -168,7 +168,7 @@ function c11533716.drtdtg(e,tp,eg,ep,ev,re,r,rp,chk)
 end 
 function c11533716.drtdop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectMatchingCard(tp,c32807846.filter,tp,LOCATION_DECK,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,c11533716.scfilter,tp,LOCATION_DECK,0,1,1,nil)
 	if g:GetCount()>0 and Duel.SendtoHand(g,nil,REASON_EFFECT)~=0 then
 		Duel.ConfirmCards(1-tp,g)
 		local dg=Duel.GetMatchingGroup(Card.IsAbleToDeck,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil,e)

expansions/script/c11533717.lua

@@ -40,7 +40,7 @@ function c11533717.initial_effect(c)
 	e12:SetCode(EVENT_FREE_CHAIN) 
 	e12:SetRange(LOCATION_HAND+LOCATION_MZONE)  
 	e12:SetCountLimit(1,11533717) 
-	e12:SetCost(c11533717.atkcost)
+	e12:SetCost(c11533717.sscost)
 	e12:SetTarget(c11533717.settg)
 	e12:SetOperation(c11533717.setop)
 	c:RegisterEffect(e12) 
@@ -51,7 +51,7 @@ function c11533717.initial_effect(c)
 	e11:SetCode(EVENT_FREE_CHAIN) 
 	e11:SetRange(LOCATION_HAND+LOCATION_MZONE)  
 	e11:SetCountLimit(1,11543717) 
-	e11:SetCost(c11533717.atkcost)
+	e11:SetCost(c11533717.sscost)
 	e11:SetTarget(c11533717.ssptg)
 	e11:SetOperation(c11533717.sspop)
 	c:RegisterEffect(e11) 
@@ -73,7 +73,6 @@ end
 function c11533717.settg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c11533717.setfilter,tp,LOCATION_DECK+LOCATION_HAND+LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil) end
 end
-aux.NecroValleyFilter(c79387392.setfilter)
 function c11533717.setop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
@@ -141,7 +140,7 @@ function c11533717.operation(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetReset(RESET_PHASE+Duel.GetCurrentPhase()) 
 	Duel.RegisterEffect(e1,tp) 
 end 
-function c11533717.atkcost(e,tp,eg,ep,ev,re,r,rp,chk)
+function c11533717.sscost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() end 
 	Duel.SendtoGrave(e:GetHandler(),REASON_COST)
 	--immune

expansions/script/c11561053.lua

@@ -108,6 +108,7 @@ function c11561053.tktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 end
 function c11561053.tkop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
+	local c=e:GetHandler()
 	if tc:IsRelateToEffect(e) then
 		Duel.SendtoGrave(tc,REASON_EFFECT+REASON_RETURN)
 	end

expansions/script/c11561075.lua

@@ -36,10 +36,10 @@ function cm.initial_effect(c)
 	
 end
 function c11561075.thfilter1(c)
-	return c:IsType(TYPE_MONSTER) and c:IsLevelAbove(0) and Duel.IsExistingTarget(c11561075.thfilter2,tp,0,LOCATION_GRAVE,1,nil,c)
+	return c:IsType(TYPE_MONSTER) and Duel.IsExistingMatchingCard(c11561075.thfilter2,tp,LOCATION_DECK,0,1,nil,c)
 end
 function c11561075.thfilter2(c,tc)
-	return c:IsAttribute(tc:GetAttribute()) and not c:IsRace(tc:Getrace()) and c:IsAbleToHand()
+	return c:IsAttribute(tc:GetAttribute()) and not c:IsRace(tc:GetRace()) and c:IsAbleToHand()
 end
 function c11561075.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(1-tp) and c11561075.thfilter1(chkc) end

expansions/script/c11561076.lua

@@ -32,10 +32,13 @@ function cm.initial_effect(c)
 end
 function c11561076.costfilter(c,tp,g)
 	return c:IsSetCard(0xe5)
-		and Duel.IsExistingMatchingCard(aux.NegateMonsterFilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,Group.FromCards(c))
+		and Duel.IsExistingMatchingCard(c11561076.NegateFilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,Group.FromCards(c))
+end
+function c11561076.NegateFilter(c)
+	return c:IsFaceup() and not c:IsDisabled() and ((c:IsType(TYPE_EFFECT) or c:GetOriginalType()&TYPE_EFFECT~=0) or c:IsType(0x6))
 end
 function c11561076.fselect(g,tp)
-	return Duel.IsExistingMatchingCard(aux.NegateMonsterFilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,g:GetCount(),g)
+	return Duel.IsExistingMatchingCard(c11561076.NegateFilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,g:GetCount(),g)
 		and Duel.CheckReleaseGroup(tp,aux.IsInGroup,#g,nil,g)
 end
 function c11561076.discost(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -52,14 +55,14 @@ function c11561076.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	local ct=e:GetLabel()
 	local g1=Duel.GetFieldGroup(tp,LOCATION_ONFIELD,LOCATION_ONFIELD)
-	local g=g1:Filter(aux.NegateMonsterFilter,nil)
+	local g=g1:Filter(c11561076.NegateFilter,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DISABLE,g,ct,0,0)
 end
 function c11561076.disop(e,tp,eg,ep,ev,re,r,rp)
 	local ct=e:GetLabel()
 	local c=e:GetHandler()
 	local g1=Duel.GetFieldGroup(tp,LOCATION_ONFIELD,LOCATION_ONFIELD)
-	local g=g1:Filter(aux.NegateMonsterFilter,nil)
+	local g=g1:Filter(c11561076.NegateFilter,nil)
 	if g:GetCount()>=ct then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SELECT)
 		local dg=g:Select(tp,ct,ct,nil)
@@ -119,7 +122,7 @@ end
 function c11561076.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
-	local tc=Duel.SelectMatchingCard(tp,aux.TRUE,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
+	local tc=Duel.SelectMatchingCard(tp,aux.TRUE,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil):GetFirst()
 	--battle indestructable
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c28335633.lua

@@ -171,7 +171,7 @@ function c28335633.tdcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function c28335633.tdcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToDeckAsCost() end
-	Duel.HintSelection(e:GetHandler())
+	Duel.HintSelection(Group.FromCards(e:GetHandler()))
 	Duel.SendtoDeck(e:GetHandler(),nil,SEQ_DECKSHUFFLE,REASON_COST)
 end
 function c28335633.tdfilter(c)

expansions/script/c7439201.lua

@@ -83,7 +83,7 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local b1=false
 	local b2=false
 	local b3=false
-	if re and re:GetHandler() then
+	--[[if re and re:GetHandler() then
 		b1=(re:GetHandler():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonCard() then
@@ -91,7 +91,7 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	end
 	if c:GetReasonEffect() and c:GetReasonEffect():GetHandler() then
 		b3=(c:GetReasonEffect():GetHandler():GetControler()==1-c:GetOwner())
-	end
+	end]]
 	return (c:GetReasonPlayer()==1-c:GetOwner() or b1 or b2 or b3) and (not (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE))
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c7439203.lua

@@ -91,15 +91,15 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local b1=false
 	local b2=false
 	local b3=false
-	if re and re:GetHandler() then
-		b1=(pl==1-c:GetOwner())
+	--[[if re and re:GetHandler() then
+		b1=(re:GetHandler():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonCard() then
 		b2=(c:GetReasonCard():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonEffect() and c:GetReasonEffect():GetHandler() then
-		b3=(c:GetReasonEffect():GetHandlerPlayer()==1-c:GetOwner())
-	end
+		b3=(c:GetReasonEffect():GetHandler():GetControler()==1-c:GetOwner())
+	end]]
 	return (c:GetReasonPlayer()==1-c:GetOwner() or b1 or b2 or b3) and (not (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE))
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c7439205.lua

@@ -71,15 +71,15 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local b1=false
 	local b2=false
 	local b3=false
-	if re and re:GetHandler() then
-		b1=(pl==1-c:GetOwner())
+	--[[if re and re:GetHandler() then
+		b1=(re:GetHandler():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonCard() then
 		b2=(c:GetReasonCard():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonEffect() and c:GetReasonEffect():GetHandler() then
-		b3=(c:GetReasonEffect():GetHandlerPlayer()==1-c:GetOwner())
-	end
+		b3=(c:GetReasonEffect():GetHandler():GetControler()==1-c:GetOwner())
+	end]]
 	return (c:GetReasonPlayer()==1-c:GetOwner() or b1 or b2 or b3) and (not (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE))
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c7439207.lua

@@ -66,15 +66,15 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local b1=false
 	local b2=false
 	local b3=false
-	if re and re:GetHandler() then
-		b1=(pl==1-c:GetOwner())
+	--[[if re and re:GetHandler() then
+		b1=(re:GetHandler():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonCard() then
 		b2=(c:GetReasonCard():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonEffect() and c:GetReasonEffect():GetHandler() then
-		b3=(c:GetReasonEffect():GetHandlerPlayer()==1-c:GetOwner())
-	end
+		b3=(c:GetReasonEffect():GetHandler():GetControler()==1-c:GetOwner())
+	end]]
 	return (c:GetReasonPlayer()==1-c:GetOwner() or b1 or b2 or b3) and (not (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE))
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c7439209.lua

@@ -109,15 +109,15 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local b1=false
 	local b2=false
 	local b3=false
-	if re and re:GetHandler() then
-		b1=(pl==1-c:GetOwner())
+	--[[if re and re:GetHandler() then
+		b1=(re:GetHandler():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonCard() then
 		b2=(c:GetReasonCard():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonEffect() and c:GetReasonEffect():GetHandler() then
-		b3=(c:GetReasonEffect():GetHandlerPlayer()==1-c:GetOwner())
-	end
+		b3=(c:GetReasonEffect():GetHandler():GetControler()==1-c:GetOwner())
+	end]]
 	return (c:GetReasonPlayer()==1-c:GetOwner() or b1 or b2 or b3) and (not (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE))
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c7439211.lua

@@ -87,15 +87,15 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local b1=false
 	local b2=false
 	local b3=false
-	if re and re:GetHandler() then
-		b1=(pl==1-c:GetOwner())
+	--[[if re and re:GetHandler() then
+		b1=(re:GetHandler():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonCard() then
 		b2=(c:GetReasonCard():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonEffect() and c:GetReasonEffect():GetHandler() then
-		b3=(c:GetReasonEffect():GetHandlerPlayer()==1-c:GetOwner())
-	end
+		b3=(c:GetReasonEffect():GetHandler():GetControler()==1-c:GetOwner())
+	end]]
 	return (c:GetReasonPlayer()==1-c:GetOwner() or b1 or b2 or b3) and (not (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE))
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c7439213.lua

@@ -98,15 +98,15 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local b1=false
 	local b2=false
 	local b3=false
-	if re and re:GetHandler() then
-		b1=(pl==1-c:GetOwner())
+	--[[if re and re:GetHandler() then
+		b1=(re:GetHandler():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonCard() then
 		b2=(c:GetReasonCard():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonEffect() and c:GetReasonEffect():GetHandler() then
-		b3=(c:GetReasonEffect():GetHandlerPlayer()==1-c:GetOwner())
-	end
+		b3=(c:GetReasonEffect():GetHandler():GetControler()==1-c:GetOwner())
+	end]]
 	return (c:GetReasonPlayer()==1-c:GetOwner() or b1 or b2 or b3) and (not (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE))
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c7439215.lua

@@ -85,15 +85,15 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local b1=false
 	local b2=false
 	local b3=false
-	if re and re:GetHandler() then
-		b1=(pl==1-c:GetOwner())
+	--[[if re and re:GetHandler() then
+		b1=(re:GetHandler():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonCard() then
 		b2=(c:GetReasonCard():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonEffect() and c:GetReasonEffect():GetHandler() then
-		b3=(c:GetReasonEffect():GetHandlerPlayer()==1-c:GetOwner())
-	end
+		b3=(c:GetReasonEffect():GetHandler():GetControler()==1-c:GetOwner())
+	end]]
 	return (c:GetReasonPlayer()==1-c:GetOwner() or b1 or b2 or b3) and (not (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE))
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c7439217.lua

@@ -27,7 +27,7 @@ function cm.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetCategory(CATEGORY_TOHAND)
 	e3:SetDescription(aux.Stringid(m,2))
-	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e3:SetCode(EVENT_PHASE+PHASE_END)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCountLimit(1)
@@ -96,15 +96,15 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local b1=false
 	local b2=false
 	local b3=false
-	if re and re:GetHandler() then
-		b1=(pl==1-c:GetOwner())
+	--[[if re and re:GetHandler() then
+		b1=(re:GetHandler():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonCard() then
 		b2=(c:GetReasonCard():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonEffect() and c:GetReasonEffect():GetHandler() then
-		b3=(c:GetReasonEffect():GetHandlerPlayer()==1-c:GetOwner())
-	end
+		b3=(c:GetReasonEffect():GetHandler():GetControler()==1-c:GetOwner())
+	end]]
 	return (c:GetReasonPlayer()==1-c:GetOwner() or b1 or b2 or b3) and (not (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE))
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c7439219.lua

@@ -196,15 +196,15 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local b1=false
 	local b2=false
 	local b3=false
-	if re and re:GetHandler() then
-		b1=(pl==1-c:GetOwner())
+	--[[if re and re:GetHandler() then
+		b1=(re:GetHandler():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonCard() then
 		b2=(c:GetReasonCard():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonEffect() and c:GetReasonEffect():GetHandler() then
-		b3=(c:GetReasonEffect():GetHandlerPlayer()==1-c:GetOwner())
-	end
+		b3=(c:GetReasonEffect():GetHandler():GetControler()==1-c:GetOwner())
+	end]]
 	return (c:GetReasonPlayer()==1-c:GetOwner() or b1 or b2 or b3) and (not (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE))
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c7439221.lua

@@ -84,15 +84,15 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local b1=false
 	local b2=false
 	local b3=false
-	if re and re:GetHandler() then
-		b1=(pl==1-c:GetOwner())
+	--[[if re and re:GetHandler() then
+		b1=(re:GetHandler():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonCard() then
 		b2=(c:GetReasonCard():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonEffect() and c:GetReasonEffect():GetHandler() then
-		b3=(c:GetReasonEffect():GetHandlerPlayer()==1-c:GetOwner())
-	end
+		b3=(c:GetReasonEffect():GetHandler():GetControler()==1-c:GetOwner())
+	end]]
 	return (c:GetReasonPlayer()==1-c:GetOwner() or b1 or b2 or b3) and (not (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE))
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c7439223.lua

@@ -119,15 +119,15 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local b1=false
 	local b2=false
 	local b3=false
-	if re and re:GetHandler() then
-		b1=(pl==1-c:GetOwner())
+	--[[if re and re:GetHandler() then
+		b1=(re:GetHandler():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonCard() then
 		b2=(c:GetReasonCard():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonEffect() and c:GetReasonEffect():GetHandler() then
-		b3=(c:GetReasonEffect():GetHandlerPlayer()==1-c:GetOwner())
-	end
+		b3=(c:GetReasonEffect():GetHandler():GetControler()==1-c:GetOwner())
+	end]]
 	return (c:GetReasonPlayer()==1-c:GetOwner() or b1 or b2 or b3) and (not (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE))
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c7439225.lua

@@ -70,15 +70,15 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local b1=false
 	local b2=false
 	local b3=false
-	if re and re:GetHandler() then
-		b1=(pl==1-c:GetOwner())
+	--[[if re and re:GetHandler() then
+		b1=(re:GetHandler():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonCard() then
 		b2=(c:GetReasonCard():GetControler()==1-c:GetOwner())
 	end
 	if c:GetReasonEffect() and c:GetReasonEffect():GetHandler() then
-		b3=(c:GetReasonEffect():GetHandlerPlayer()==1-c:GetOwner())
-	end
+		b3=(c:GetReasonEffect():GetHandler():GetControler()==1-c:GetOwner())
+	end]]
 	return (c:GetReasonPlayer()==1-c:GetOwner() or b1 or b2 or b3) and (not (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE))
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)