Merge pull request #661 from salix5/patch

fix

script/c21785144.lua

@@ -50,6 +50,5 @@ function c21785144.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c21785144.disop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetControler()~=tp or not c:IsRelateToEffect(e) or c:IsFacedown() then return end
 	Duel.DiscardDeck(tp,3,REASON_EFFECT)
 end

script/c22624373.lua

@@ -62,6 +62,5 @@ function c22624373.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c22624373.disop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetControler()~=tp or not c:IsRelateToEffect(e) or c:IsFacedown() then return end
 	Duel.DiscardDeck(tp,3,REASON_EFFECT)
 end

script/c40164421.lua

@@ -78,6 +78,5 @@ function c40164421.distg2(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c40164421.disop2(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetControler()~=tp or not c:IsRelateToEffect(e) or c:IsFacedown() then return end
 	Duel.DiscardDeck(tp,2,REASON_EFFECT)
 end

script/c44178886.lua

@@ -42,6 +42,5 @@ function c44178886.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c44178886.disop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetControler()~=tp or not c:IsRelateToEffect(e) or c:IsFacedown() then return end
 	Duel.DiscardDeck(tp,3,REASON_EFFECT)
 end

script/c4779823.lua

@@ -82,6 +82,5 @@ function c4779823.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c4779823.disop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetControler()~=tp or not c:IsRelateToEffect(e) or c:IsFacedown() then return end
 	Duel.DiscardDeck(tp,3,REASON_EFFECT)
 end

script/c48739166.lua

@@ -40,7 +40,7 @@ end
 function c48739166.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
-	if c:IsRelateToEffect(e) and c:IsFaceup() and tc:IsRelateToEffect(e) and not tc:IsImmuneToEffect(e) then
+	if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and not tc:IsImmuneToEffect(e) then
 		local og=tc:GetOverlayGroup()
 		if og:GetCount()>0 then
 			Duel.SendtoGrave(og,REASON_RULE)

script/c57774843.lua

@@ -73,6 +73,5 @@ function c57774843.target2(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c57774843.operation2(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetControler()~=tp or not c:IsRelateToEffect(e) or c:IsFacedown() then return end
 	Duel.DiscardDeck(tp,4,REASON_EFFECT)
 end

script/c63746411.lua

@@ -37,7 +37,7 @@ end
 function c63746411.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
-	if c:IsFaceup() and c:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsRelateToEffect(e) then
+	if c:IsFaceup() and c:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsRelateToEffect(e) and tc:IsType(TYPE_EFFECT) then
 		c:SetCardTarget(tc)
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)

script/c7183277.lua

@@ -34,6 +34,5 @@ function c7183277.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c7183277.disop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetControler()~=tp or not c:IsRelateToEffect(e) or c:IsFacedown() then return end
 	Duel.DiscardDeck(tp,2,REASON_EFFECT)
 end

script/c77558536.lua

@@ -41,6 +41,7 @@ function c77558536.operation(e,tp,eg,ep,ev,re,r,rp)
 	if ct==0 then return end
 	local c=e:GetHandler()
 	if c:IsFaceup() and c:IsRelateToEffect(e) then
+		Duel.BreakEffect()
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_UPDATE_ATTACK)
@@ -58,6 +59,5 @@ function c77558536.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c77558536.disop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetControler()~=tp or not c:IsRelateToEffect(e) or c:IsFacedown() then return end
 	Duel.DiscardDeck(tp,2,REASON_EFFECT)
 end

script/c95503687.lua

@@ -55,6 +55,5 @@ function c95503687.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c95503687.disop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetControler()~=tp or not c:IsRelateToEffect(e) or c:IsFacedown() then return end
 	Duel.DiscardDeck(tp,3,REASON_EFFECT)
 end

script/c96235275.lua

@@ -34,6 +34,5 @@ function c96235275.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c96235275.disop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetControler()~=tp or not c:IsRelateToEffect(e) or c:IsFacedown() then return end
 	Duel.DiscardDeck(tp,2,REASON_EFFECT)
 end