54188

expansions/script/c52700607.lua

@@ -63,7 +63,7 @@ function s.specialsum(c)
 	e2:SetDescription(2)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e2:SetCode(EVENT_DETACH_MATERIAL)
+	e2:SetCode(EVENT_MOVE)
 	e2:SetRange(LOCATION_HAND)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
 	e2:SetCountLimit(1,id)
@@ -73,7 +73,8 @@ function s.specialsum(c)
 	c:RegisterEffect(e2)
 end
 function s.cfilter(c,tp)
-	return c:IsLocation(LOCATION_MZONE) and c:IsControler(tp) 
+	return c:IsPreviousLocation(LOCATION_OVERLAY) and c:IsPreviousControler(tp) 
+		and not c:IsReason(REASON_RULE)
 end
 function s.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(s.cfilter,1,nil,tp)

expansions/script/c52700610.lua

@@ -63,7 +63,7 @@ function s.specialsum(c)
 	e2:SetDescription(2)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e2:SetCode(EVENT_DETACH_MATERIAL)
+	e2:SetCode(EVENT_MOVE)
 	e2:SetRange(LOCATION_HAND)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
 	e2:SetCountLimit(1,id)
@@ -73,7 +73,8 @@ function s.specialsum(c)
 	c:RegisterEffect(e2)
 end
 function s.cfilter(c,tp)
-	return c:IsLocation(LOCATION_MZONE) and c:IsControler(tp) 
+	return c:IsPreviousLocation(LOCATION_OVERLAY) and c:IsPreviousControler(tp) 
+		and not c:IsReason(REASON_RULE)
 end
 function s.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(s.cfilter,1,nil,tp)

expansions/script/c52700616.lua

@@ -33,6 +33,7 @@ function s.tarfilter(c)
 	return c:IsType(TYPE_XYZ) and c:IsFaceup() and c:IsSetCard(0x5528)
 end
 function s.operation(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.thfilter),tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
 	if g:GetCount()>0 then