Replace c12400099.lua

expansions/script/c12400099.lua

@@ -72,10 +72,11 @@ function s.neop(e,tp,eg,ep,ev,re,r,rp)
 				tc:RegisterEffect(e1)
 			end
 		end
-		if (re:GetHandler():IsType(TYPE_SPELL) or re:GetHandler():IsType(TYPE_TRAP) ) and tc:IsCanTurnSet() then
-			if Duel.SSet(tp,tc) ~= 0 then return end
-			Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEDOWN,true)
+		if (re:GetHandler():IsType(TYPE_SPELL) or re:GetHandler():IsType(TYPE_TRAP) ) then
 			
+			if Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true) then
+			local fid=e:GetHandler():GetFieldID()
+			tc:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1,fid)
 			
 			local e1=Effect.CreateEffect(e:GetHandler())
 			e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
@@ -88,6 +89,7 @@ function s.neop(e,tp,eg,ep,ev,re,r,rp)
 			e1:SetOperation(s.rmop)
 			e1:SetReset(RESET_PHASE+PHASE_END)
 			Duel.RegisterEffect(e1,tp)
+			end
 		end 
 	end
 end
@@ -102,10 +104,10 @@ end
 
 function s.discon(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) then return false end
-	return rp==1-tp and Duel.IsExistingMatchingCard(s.disfilter,tp,LOCATION_MZONE+LOCATION_GRAVE,0,1,nil,re)
+	return rp==1-tp and Duel.IsExistingMatchingCard(s.disfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,1,nil,re)
 end
 function s.disfilter(c,re)
-	return c:GetCode()==re:GetHandler():GetCode() and re:GetHandler():IsFaceup() and c:IsFaceup()
+	return c:GetCode()==re:GetHandler():GetCode() and c:IsFaceup()
 end
 function s.disop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.NegateEffect(ev)