wadashimo

expansions/script/c1111005.lua

@@ -7,7 +7,7 @@ cm.named_with_Butterfly=true
 function c1111005.initial_effect(c)
 --
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_REMOVE)
+	e1:SetCategory(CATEGORY_SEARCH+CATEGORY_TOHAND+CATEGORY_DRAW+CATEGORY_TODECK+CATEGORY_REMOVE)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetTarget(c1111005.tg1)
@@ -44,8 +44,12 @@ function c1111005.op1(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	local tg=Duel.SelectMatchingCard(tp,c1111005.tfilter1,tp,LOCATION_GRAVE,0,1,1,nil)
 	if tg:GetCount()<1 then return end
-	local tc=tg:GetFirst()
-	if Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)<1 then return end
+	if Duel.Remove(tg:GetFirst(),POS_FACEUP,REASON_EFFECT)<1 then return end
+--
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
+	local sg=Duel.SelectMatchingCard(tp,Card.IsAbleToHand,tp,0,LOCATION_ONFIELD,1,1,nil)
+	if sg:GetCount()<0 then return end
+	if Duel.SendtoHand(sg:GetFirst(),nil,REASON_EFFECT)<1 then return end
 --
 	local b1=tc:IsType(TYPE_PENDULUM) and Duel.IsPlayerCanDraw(tp,1)
 	local b2=tc:IsType(TYPE_RITUAL) and Duel.IsExistingMatchingCard(c1111005.ofilter1_2,tp,LOCATION_DECK,0,1,nil)
@@ -64,7 +68,7 @@ function c1111005.op1(e,tp,eg,ep,ev,re,r,rp)
 	end
 	if b3 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
-		local rg=Duel.SelectMatchingCard(tp,Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,63,nil)
+		local rg=Duel.SelectMatchingCard(tp,Card.IsAbleToDeck,tp,LOCATION_GRAVE,0,1,63,nil)
 		if rg:GetCount()<1 then return end
 		Duel.SendtoDeck(rg,nil,2,REASON_EFFECT)
 	end

expansions/script/c12030020.lua

@@ -61,6 +61,7 @@ function c12030020.activate(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetCategory(CATEGORY_RECOVER)
 		e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 		e2:SetCode(EVENT_DAMAGE)
+		e2:SetReset(RESET_PHASE+PHASE_END)
 		e2:SetCondition(c12030020.con1)
 		e2:SetOperation(c12030020.op1)
 		Duel.RegisterEffect(e2,tp)
@@ -120,15 +121,8 @@ function c12030020.spop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) and Duel.IsPlayerCanSpecialSummonMonster(tp,12030020,nil,0x1011,700,0,1,RACE_SPELLCASTER,ATTRIBUTE_LIGHT) then
+		c:AddMonsterAttribute(TYPE_NORMAL+TYPE_TUNER)
 		Duel.SpecialSummonStep(c,0,tp,tp,true,false,POS_FACEUP)
-		local e2=Effect.CreateEffect(c)
-		e2:SetType(EFFECT_TYPE_SINGLE)
-		e2:SetCode(EFFECT_CHANGE_TYPE)
-		e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CANNOT_DISABLE)
-		e2:SetRange(LOCATION_MZONE)
-		e2:SetValue(TYPE_MONSTER)
-		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
-		c:RegisterEffect(e2,true)
 		--redirect
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)