Merge pull request #1291 from DailyShana/patch-3

fix

script/c30500113.lua

@@ -48,7 +48,7 @@ function c30500113.activate(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c30500113.cfilter2(c,tp)
-	return c:IsSetCard(0xba) and c:IsReason(REASON_EFFECT)
+	return c:IsSetCard(0xba) and c:IsReason(REASON_EFFECT) and c:IsPreviousLocation(LOCATION_MZONE)
 		and c:GetPreviousControler()==tp and c:IsPreviousPosition(POS_FACEUP)
 end
 function c30500113.thcon(e,tp,eg,ep,ev,re,r,rp)

script/c4081665.lua

@@ -41,8 +41,11 @@ function c4081665.spop(e,tp,eg,ep,ev,re,r,rp,c)
 	e2:SetCode(EFFECT_CANNOT_MSET)
 	Duel.RegisterEffect(e2,tp)
 end
+function c4081665.cfilter(c)
+	return c:IsSetCard(0xc6) and c:IsType(TYPE_MONSTER)
+end
 function c4081665.damcon(e,tp,eg,ep,ev,re,r,rp)
-	if not Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_GRAVE,0,1,e:GetHandler(),0xc6) then return false end
+	if not Duel.IsExistingMatchingCard(c4081665.cfilter,tp,LOCATION_GRAVE,0,1,e:GetHandler()) then return false end
 	local ex,cg,ct,cp,cv=Duel.GetOperationInfo(ev,CATEGORY_DAMAGE)
 	if ex and (cp==1-tp or cp==PLAYER_ALL) then return true end
 	ex,cg,ct,cp,cv=Duel.GetOperationInfo(ev,CATEGORY_RECOVER)

script/c5050644.lua

@@ -57,7 +57,7 @@ function c5050644.reop1(e,tp,eg,ep,ev,re,r,rp)
 end
 function c5050644.cfilter2(c,tp)
 	return c:IsSetCard(0xc9) and c:IsReason(REASON_DESTROY) and c:IsReason(REASON_BATTLE+REASON_EFFECT)
-		and c:GetPreviousControler()==tp and c:IsPreviousPosition(POS_FACEUP)
+		and c:GetPreviousControler()==tp and c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousPosition(POS_FACEUP)
 end
 function c5050644.recon2(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c5050644.cfilter2,1,nil,tp)

script/c58446973.lua

@@ -14,7 +14,7 @@ function c58446973.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c58446973.filter(c)
-	return c:IsSetCard(0xbb) and not c:IsCode(58446973) and c:IsAbleToGrave()
+	return c:IsSetCard(0xbb) and c:IsType(TYPE_MONSTER) and not c:IsCode(58446973) and c:IsAbleToGrave()
 end
 function c58446973.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c58446973.filter,tp,LOCATION_DECK,0,1,nil) end

script/c79531196.lua

@@ -21,7 +21,7 @@ function c79531196.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c79531196.filter(c)
-	return (c:IsSetCard(0x1047) or c:IsSetCard(0x9b)) and c:IsAbleToGrave()
+	return (c:IsSetCard(0x1047) or c:IsSetCard(0x9b)) and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
 end
 function c79531196.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c79531196.filter,tp,LOCATION_DECK+LOCATION_HAND,0,1,nil) end