Replace c60000032.lua

expansions/script/c60000032.lua

@@ -16,16 +16,11 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e1:SetCode(EVENT_DAMAGE)
 	--e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_MAIN_END)
-	e1:SetRange(LOCATION_HAND)
-	e1:SetCountLimit(1,EFFECT_COUNT_CODE_CHAIN)
+	e1:SetRange(LOCATION_HAND+LOCATION_GRAVE)
 	e1:SetCondition(cm.spcon)
 	e1:SetTarget(cm.sptg)
 	e1:SetOperation(cm.spop)
 	c:RegisterEffect(e1)
-	local e2=e1:Clone()
-	e2:SetRange(LOCATION_GRAVE)
-	e2:SetCountLimit(1,m)
-	c:RegisterEffect(e2)
 	--to hand
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))
@@ -80,12 +75,14 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
-	if e:GetHandler():GetLocation()==LOCATION_HAND then i=1 else i=2 end
-	if not Duel.SelectYesNo(tp,aux.Stringid(m,i)) then return end
+	local c=e:GetHandler()
+	local i=e:GetHandler():GetLocation()==LOCATION_HAND and 1 or 2
+	if Duel.GetFlagEffect(tp,m+i)~=0 or not Duel.SelectYesNo(tp,aux.Stringid(m,i)) then return end
+	Duel.RegisterFlagEffect(tp,m+i,RESET_PHASE+PHASE_END,0,1)
 	local c=e:GetHandler()
 	if Duel.SpecialSummon(c,0,tp,tp,true,true,POS_FACEUP)~=0 then c:CompleteProcedure() end
-	local i=math.random(3,8)
-	Duel.Hint(24,0,aux.Stringid(60000032,i))
+	local desc=math.random(3,8)
+	Duel.Hint(24,0,aux.Stringid(60000032,desc))
 end
 function cm.thfilter(c)
 	return aux.IsCodeListed(c,60000032) and c:IsAbleToHand()