Merge pull request #566 from sidschingis/patch-3

fix

script/c13629812.lua

@@ -61,8 +61,18 @@ function c13629812.disop(e,tp)
 	return bit.lshift(0x1,e:GetLabel())
 end
 function c13629812.retcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetFirstCardTarget()~=nil
+	local c=e:GetHandler()
+	local tc=c:GetFirstCardTarget()
+	if tc and tc:IsLocation(LOCATION_REMOVED) and tc:IsFaceup() and c:IsLocation(LOCATION_GRAVE) then
+		e:SetLabelObject(tc)
+		tc:CreateEffectRelation(e)
+		return true
+	else return false end
 end
 function c13629812.retop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.ReturnToField(e:GetHandler():GetFirstCardTarget())
+	local c=e:GetHandler()
+	local tc=e:GetLabelObject()
+	if tc:IsRelateToEffect(e) then
+		Duel.ReturnToField(tc)
+	end
 end

script/c21698716.lua

@@ -41,7 +41,7 @@ function c21698716.repoperation(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RaiseEvent(c,47408488,e,0,tp,0,0)
 end
 function c21698716.filter(c)
-	return c:IsSetCard(0x34) and c:IsAbleToDeck()
+	return c:IsSetCard(0x34) and c:IsAbleToDeck()  and c:IsFaceup()
 end
 function c21698716.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() and c21698716.filter(chkc) end

script/c30459350.lua

@@ -4,7 +4,7 @@ function c30459350.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetHintTiming(0,TIMING_DRAW_PHASE)
+	e1:SetHintTiming(0,TIMING_DRAW_PHASE+0x1e0)
 	c:RegisterEffect(e1)
 	--cannot remove
 	local e2=Effect.CreateEffect(c)