rar

expansions/script/c12008030.lua

@@ -25,6 +25,10 @@ function c12008030.initial_effect(c)
 	e2:SetTarget(c12008030.sptg1)
 	e2:SetOperation(c12008030.spop1)
 	c:RegisterEffect(e2)
+	local e22=e2:Clone()
+	e22:SetProperty(EFFECT_FLAG_CARD_TARGET,EFFECT_FLAG2_COF)
+	e22:SetCondition(c12008030.spcon1)
+	c:RegisterEffect(e22)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(12008030,1))
@@ -39,6 +43,9 @@ function c12008030.initial_effect(c)
 	e1:SetOperation(c12008030.operation)
 	c:RegisterEffect(e1)
 end
+function c12008030.spcon1(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():GetFlagEffect(12008030)>0 and e:GetHandler():IsPublic()
+end
 function c12008030.tdcon2(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetFlagEffect(tp,12008030)>0
 end
@@ -55,7 +62,7 @@ function c12008030.regop(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetCode(EFFECT_PUBLIC)
 		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END,2)
 		c:RegisterEffect(e1)
-	 Duel.RegisterFlagEffect(tp,12008030,RESET_PHASE+PHASE_END,0,2)
+	 c:RegisterFlagEffect(12008030,RESET_PHASE+PHASE_END,0,2)
 end
 function c12008030.spfilter1(c,e,tp)
 	return c:IsFaceup() and c:IsSetCard(0x1fb3) and c:IsLevelAbove(1)

expansions/script/c12063060.lua

@@ -40,11 +40,12 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_DECK,0,1,1,nil)
 	if g:GetCount()>0 then
 		local tc=g:GetFirst()
-		if tc:IsAbleToHand() and e:GetLabel() and e:GetLabel()~=2 and (not tc:IsCanBeSpecialSummoned(e,0,tp,false,false) or ft<=0 or Duel.SelectOption(tp,1190,1152)==0) then
+		local ft=Duel.GetMZoneCount(tp)
+		if tc:IsAbleToHand() and e:GetLabel() and e:GetLabel()==2 and tc:IsCanBeSpecialSummoned(e,0,tp,false,false) and ft>0 and Duel.SelectOption(tp,1190,1152)==1 then
+			Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
+		else
 			Duel.SendtoHand(tc,nil,REASON_EFFECT)
 			Duel.ConfirmCards(1-tp,tc)
-		else
-			Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
 		end
 	end
 end