Merge branch 'master' into patch

script/c31181711.lua

@@ -61,10 +61,11 @@ function c31181711.btcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function c31181711.btcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() end
+	e:SetLabelObject(e:GetHandler():GetEquipTarget())
 	Duel.SendtoGrave(e:GetHandler(),REASON_COST)
 end
 function c31181711.btop(e,tp,eg,ep,ev,re,r,rp)
-	local ec=e:GetHandler():GetEquipTarget()
+	local ec=e:GetLabelObject()
 	if Duel.NegateAttack() and ec:IsFaceup() then
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_SINGLE)

script/c47198668.lua

@@ -92,7 +92,7 @@ function c47198668.atkop2(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c47198668.efilter(e,re,rp)
-	if not re:IsActiveType(TYPE_SPELL+TYPE_TRAP) or not re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) then return false end
+	if not re:IsActiveType(TYPE_SPELL+TYPE_TRAP) then return false end
 	local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
-	return not g:IsContains(e:GetHandler())
+	return g and not g:IsContains(e:GetHandler())
 end