wadashimo

expansions/script/c33500050.lua

@@ -26,11 +26,12 @@ function c33500050.spfilter(c)
 	return c.setname=="Innocence" and c:IsAbleToGrave()
 end
 function c33500050.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) end
-	if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,0,1,nil)
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) --and chkc:IsControler(tp) 
+	end
+	if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil)
 		and Duel.IsExistingMatchingCard(c33500050.spfilter,tp,LOCATION_EXTRA,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
-	local g=Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,0,1,1,nil)
+	local g=Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
 end
 function c33500050.desop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -40,12 +41,14 @@ function c33500050.desop(e,tp,eg,ep,ev,re,r,rp)
 		local g=Duel.SelectMatchingCard(tp,c33500050.spfilter,tp,LOCATION_EXTRA,0,1,1,nil)
 		if g:GetCount()>0 then
 			if Duel.SendtoGrave(g,REASON_EFFECT)~=0 then
+				local reset_flag=RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END
 				local e1=Effect.CreateEffect(c)
 				e1:SetType(EFFECT_TYPE_SINGLE)
 				e1:SetCode(EFFECT_CHANGE_CODE)
 				e1:SetValue(g:GetFirst():GetOriginalCode())
 				e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,1)
 				tc:RegisterEffect(e1)
+				tc:CopyEffect(g:GetFirst():GetOriginalCode(), reset_flag, 1)
 			end
 		end
 	end