54188

expansions/script/c16364023.lua

@@ -23,17 +23,6 @@ function c16364023.initial_effect(c)
 	e2:SetTarget(c16364023.settg)
 	e2:SetOperation(c16364023.setop)
 	c:RegisterEffect(e2)
-	--discard deck
-	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(16364023,3))
-	e3:SetCategory(CATEGORY_TOHAND)
-	e3:SetType(EFFECT_TYPE_XMATERIAL+EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e3:SetRange(LOCATION_MZONE)
-	e3:SetCode(EVENT_PHASE+PHASE_END)
-	e3:SetCountLimit(1)
-	e3:SetTarget(c16364023.thtg)
-	e3:SetOperation(c16364023.thop)
-	c:RegisterEffect(e3)
 	--attack up
 	local e4=Effect.CreateEffect(c)
 	e4:SetCategory(CATEGORY_ATKCHANGE)
@@ -89,21 +78,6 @@ function c16364023.setop(e,tp,eg,ep,ev,re,r,rp)
 		end
 	end
 end
-function c16364023.thfilter(c)
-	return c:IsSetCard(0xdc3) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
-end
-function c16364023.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c16364023.thfilter,tp,LOCATION_GRAVE,0,1,nil) end
-	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_GRAVE)
-end
-function c16364023.thop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectMatchingCard(tp,c16364023.thfilter,tp,LOCATION_GRAVE,0,1,1,nil)
-	if #g>0 then
-		Duel.SendtoHand(g,nil,REASON_EFFECT)
-		Duel.ConfirmCards(1-tp,g)
-	end
-end
 function c16364023.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local a=Duel.GetAttacker()

expansions/script/c16364063.lua

@@ -93,7 +93,7 @@ function c16364063.disop(e,tp,eg,ep,ev,re,r,rp)
 		tc=g:GetNext()
 	end
 	local sg=Duel.GetMatchingGroup(Card.IsCanOverlay,tp,0,LOCATION_SZONE,nil)
-	if #sg>0 then
+	if #sg>0 and c:IsRelateToEffect(e) then
 		Duel.BreakEffect()
 		Duel.Overlay(c,sg)
 	end