update card that declare a level (#962)

c16725505.lua

@@ -21,16 +21,9 @@ function c16725505.tg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingTarget(c16725505.filter,tp,LOCATION_MZONE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
 	local g=Duel.SelectTarget(tp,c16725505.filter,tp,LOCATION_MZONE,0,1,1,nil)
-	local t={}
-	local i=1
-	local p=1
 	local lv=g:GetFirst():GetLevel()
-	for i=1,6 do
-		if lv~=i then t[p]=i p=p+1 end
-	end
-	t[p]=nil
 	Duel.Hint(HINT_SELECTMSG,tp,HINGMSG_LVRANK)
-	e:SetLabel(Duel.AnnounceNumber(tp,table.unpack(t)))
+	e:SetLabel(Duel.AnnounceLevel(tp,1,6,lv))
 end
 function c16725505.op(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()

c19808608.lua

@@ -18,16 +18,9 @@ function c19808608.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingTarget(c19808608.filter,tp,LOCATION_MZONE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
 	local g=Duel.SelectTarget(tp,c19808608.filter,tp,LOCATION_MZONE,0,1,1,nil)
-	local t={}
-	local i=1
-	local p=1
 	local lv=g:GetFirst():GetLevel()
-	for i=1,8 do
-		if lv~=i then t[p]=i p=p+1 end
-	end
-	t[p]=nil
 	Duel.Hint(HINT_SELECTMSG,tp,HINGMSG_LVRANK)
-	e:SetLabel(Duel.AnnounceNumber(tp,table.unpack(t)))
+	e:SetLabel(Duel.AnnounceLevel(tp,1,8,lv))
 end
 function c19808608.lvop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()

c20579538.lua

@@ -56,11 +56,8 @@ end
 function c20579538.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
-	local t={}
-	local i=1
-	for i=1,8 do t[i]=i end
 	Duel.Hint(HINT_SELECTMSG,tp,HINGMSG_LVRANK)
-	local lv=Duel.AnnounceNumber(tp,table.unpack(t))
+	local lv=Duel.AnnounceLevel(tp,1,8)
 	e:SetLabel(lv)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 end

c22657402.lua

@@ -41,17 +41,12 @@ function c22657402.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingTarget(c22657402.filter,tp,LOCATION_MZONE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
 	local g=Duel.SelectTarget(tp,c22657402.filter,tp,LOCATION_MZONE,0,1,2,nil)
-	local t={}
-	local p=1
 	local lv1=g:GetFirst():GetLevel()
 	local lv2=0
 	local tc2=g:GetNext()
 	if tc2 then lv2=tc2:GetLevel() end
-	for i=5,8 do
-		if lv1~=i and lv2~=i then t[p]=i p=p+1 end
-	end
 	Duel.Hint(HINT_SELECTMSG,tp,HINGMSG_LVRANK)
-	local lv=Duel.AnnounceNumber(tp,table.unpack(t))
+	local lv=Duel.AnnounceLevel(tp,5,8,lv1,lv2)
 	e:SetLabel(lv)
 end
 function c22657402.lvfilter(c,e)

c26082117.lua

@@ -20,16 +20,9 @@ function c26082117.initial_effect(c)
 end
 function c26082117.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
-	local t={}
-	local i=1
-	local p=1
 	local lv=e:GetHandler():GetLevel()
-	for i=1,8 do 
-		if lv~=i then t[p]=i p=p+1 end
-	end
-	t[p]=nil
 	Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(26082117,1))
-	e:SetLabel(Duel.AnnounceNumber(tp,table.unpack(t)))
+	e:SetLabel(Duel.AnnounceLevel(tp,1,8,lv))
 end
 function c26082117.op(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

c26099457.lua

@@ -11,15 +11,15 @@ function c26099457.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c26099457.filter(c)
-	return c:IsFaceup() and not c:IsType(TYPE_XYZ)
+	return c:IsFaceup() and c:IsLevelAbove(0)
 end
 function c26099457.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c26099457.filter(chkc) end
 	if chk==0 then return Duel.IsExistingTarget(c26099457.filter,tp,LOCATION_MZONE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
-	Duel.SelectTarget(tp,c26099457.filter,tp,LOCATION_MZONE,0,1,1,nil)
+	local g=Duel.SelectTarget(tp,c26099457.filter,tp,LOCATION_MZONE,0,1,1,nil)
 	Duel.Hint(HINT_SELECTMSG,tp,HINGMSG_LVRANK)
-	local lv=Duel.AnnounceNumber(tp,1,2,3)
+	local lv=Duel.AnnounceLevel(tp,1,3,g:GetFirst():GetLevel())
 	e:SetLabel(lv)
 end
 function c26099457.activate(e,tp,eg,ep,ev,re,r,rp)

c3752422.lua

@@ -49,14 +49,10 @@ function c3752422.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc~=c and chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c3752422.filter(chkc) end
 	if chk==0 then return c:GetLevel()>1
 		and Duel.IsExistingTarget(c3752422.filter,tp,LOCATION_MZONE,0,1,c) end
-	local t={}
 	local p=c:GetLevel()-1
 	p=math.min(p,5)
-	for i=1,p do
-		t[i]=i
-	end
 	Duel.Hint(HINT_SELECTMSG,tp,HINGMSG_LVRANK)
-	e:SetLabel(Duel.AnnounceNumber(tp,table.unpack(t)))
+	e:SetLabel(Duel.AnnounceLevel(tp,1,p))
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
 	Duel.SelectTarget(tp,c3752422.filter,tp,LOCATION_MZONE,0,1,1,c)
 end

c50074392.lua

@@ -38,7 +38,7 @@ end
 function c50074392.lvtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c50074392.filter,tp,LOCATION_MZONE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINGMSG_LVRANK)
-	local lv=Duel.AnnounceNumber(tp,3,4,5)
+	local lv=Duel.AnnounceLevel(tp,3,5)
 	e:SetLabel(lv)
 end
 function c50074392.lvop(e,tp,eg,ep,ev,re,r,rp)

c58577036.lua

@@ -16,7 +16,7 @@ end
 function c58577036.operation(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.IsPlayerCanSpecialSummon(tp) or not Duel.IsPlayerCanDiscardDeck(tp,1) then return end
 	Duel.Hint(HINT_SELECTMSG,1-tp,HINGMSG_LVRANK)
-	local lv=Duel.AnnounceNumber(1-tp,1,2,3,4,5,6,7,8,9,10,11,12)
+	local lv=Duel.AnnounceLevel(1-tp)
 	local g=Duel.GetMatchingGroup(Card.IsSummonableCard,tp,LOCATION_DECK,0,nil)
 	local dcount=Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)
 	local seq=-1

c63881033.lua

@@ -52,7 +52,7 @@ function c63881033.lvtg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if Duel.IsExistingMatchingCard(c63881033.filter,tp,LOCATION_MZONE,0,1,nil)
 		and Duel.SelectYesNo(tp,94) then
 		Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(63881033,1))
-		local lv=Duel.AnnounceNumber(tp,5,6,7,8,9)
+		local lv=Duel.AnnounceLevel(tp,5,9)
 		e:SetLabel(lv)
 		e:GetHandler():RegisterFlagEffect(63881033,RESET_PHASE+PHASE_END,0,1)
 	else
@@ -69,7 +69,7 @@ function c63881033.lvtg2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():GetFlagEffect(63881033)==0
 		and Duel.IsExistingMatchingCard(c63881033.filter,tp,LOCATION_MZONE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(63881033,1))
-	local lv=Duel.AnnounceNumber(tp,5,6,7,8,9)
+	local lv=Duel.AnnounceLevel(tp,5,9)
 	e:SetLabel(lv)
 	e:GetHandler():RegisterFlagEffect(63881033,RESET_PHASE+PHASE_END,0,1)
 end

c67556500.lua

@@ -21,7 +21,7 @@ end
 function c67556500.lvtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.Hint(HINT_SELECTMSG,tp,HINGMSG_LVRANK)
-	local lv=Duel.AnnounceNumber(tp,1,2,3)
+	local lv=Duel.AnnounceLevel(tp,1,3)
 	e:SetLabel(lv)
 end
 function c67556500.lvop(e,tp,eg,ep,ev,re,r,rp)

c70456282.lua

@@ -49,16 +49,9 @@ function c70456282.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingTarget(c70456282.filter,tp,LOCATION_MZONE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
 	local g=Duel.SelectTarget(tp,c70456282.filter,tp,LOCATION_MZONE,0,1,1,nil)
-	local t={}
-	local i=1
-	local p=1
 	local lv=g:GetFirst():GetLevel()
-	for i=1,8 do
-		if lv~=i then t[p]=i p=p+1 end
-	end
-	t[p]=nil
 	Duel.Hint(HINT_SELECTMSG,tp,HINGMSG_LVRANK)
-	e:SetLabel(Duel.AnnounceNumber(tp,table.unpack(t)))
+	e:SetLabel(Duel.AnnounceLevel(tp,1,8,lv))
 end
 function c70456282.lvop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()

c7405310.lua

@@ -12,7 +12,7 @@ function c7405310.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_HAND,0)~=0
 		and Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,0,LOCATION_EXTRA,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINGMSG_LVRANK)
-	local lv=Duel.AnnounceNumber(tp,1,2,3,4,5,6,7,8,9,10,11,12)
+	local lv=Duel.AnnounceLevel(tp)
 	e:SetLabel(lv)
 end
 function c7405310.filter(c,lv)

c84677654.lua

@@ -14,7 +14,7 @@ end
 function c84677654.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c84677654.cfilter,tp,LOCATION_MZONE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINGMSG_LVRANK)
-	local lv=Duel.AnnounceNumber(tp,1,2,3,4,5,6,7,8,9,10,11,12)
+	local lv=Duel.AnnounceLevel(tp)
 	Duel.SetTargetParam(lv)
 	Duel.SetOperationInfo(0,CATEGORY_COIN,nil,0,PLAYER_ALL,2)
 end