update (#973)

c1322368.lua

@@ -30,7 +30,7 @@ function c1322368.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFieldGroupCount(tp,0,LOCATION_DECK)>0
 		and Duel.IsExistingMatchingCard(c1322368.spfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil,e,tp,zone) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE)
-	e:SetLabel(Duel.SelectOption(tp,70,71,72))
+	e:SetLabel(Duel.AnnounceType(tp))
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
 end
 function c1322368.spop(e,tp,eg,ep,ev,re,r,rp)

c1409474.lua

@@ -22,7 +22,7 @@ end
 function c1409474.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanDiscardDeck(tp,1) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE)
-	Duel.SetTargetParam(Duel.SelectOption(tp,70,71,72))
+	Duel.SetTargetParam(Duel.AnnounceType(tp))
 end
 function c1409474.spfilter(c,e,tp)
 	return c:IsAttribute(ATTRIBUTE_FIRE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

c18486927.lua

@@ -24,7 +24,7 @@ end
 function c18486927.dectg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE)
-	e:SetLabel(Duel.SelectOption(tp,70,71,72))
+	e:SetLabel(Duel.AnnounceType(tp))
 end
 function c18486927.decop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

c20584712.lua

@@ -25,7 +25,7 @@ function c20584712.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingTarget(nil,tp,0,LOCATION_ONFIELD,1,nil)
 		and Duel.GetFieldGroupCount(tp,0,LOCATION_DECK)>0 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE)
-	e:SetLabel(Duel.SelectOption(tp,70,71,72))
+	e:SetLabel(Duel.AnnounceType(tp))
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
 	Duel.SelectTarget(tp,nil,tp,0,LOCATION_ONFIELD,1,1,nil)
 end

c21496848.lua

@@ -14,8 +14,8 @@ function c21496848.initial_effect(c)
 end
 function c21496848.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>0 and Duel.GetFieldGroupCount(tp,0,LOCATION_DECK)>0 end
-	Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(21496848,5))
-	local ac=Duel.SelectOption(tp,aux.Stringid(21496848,1),aux.Stringid(21496848,2),aux.Stringid(21496848,3))
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE)
+	local ac=Duel.AnnounceType(tp)
 	e:SetLabel(ac)
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,PLAYER_ALL,LOCATION_DECK)
 end

c39537362.lua

@@ -23,7 +23,7 @@ end
 function c39537362.target1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	if Duel.CheckEvent(EVENT_ATTACK_ANNOUNCE) and tp~=Duel.GetTurnPlayer()
-		and Duel.SelectYesNo(tp,aux.Stringid(39537362,1)) then 
+		and Duel.SelectYesNo(tp,aux.Stringid(39537362,1)) then
 		e:SetLabel(1)
 		Duel.SetTargetCard(Duel.GetAttacker())
 		e:GetHandler():RegisterFlagEffect(0,RESET_CHAIN,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(39537362,2))
@@ -41,8 +41,8 @@ function c39537362.activate(e,tp,eg,ep,ev,re,r,rp)
 		or not e:GetHandler():IsRelateToEffect(e) or not Duel.GetAttacker():IsRelateToEffect(e)	then return end
 	local g=Duel.GetFieldGroup(tp,LOCATION_HAND,0):RandomSelect(1-tp,1,nil)
 	local tc=g:GetFirst()
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE)
-	local op=Duel.SelectOption(1-tp,70,71,72)
+	Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_CARDTYPE)
+	local op=Duel.AnnounceType(1-tp)
 	Duel.ConfirmCards(1-tp,tc)
 	Duel.ShuffleHand(tp)
 	if (op~=0 and tc:IsType(TYPE_MONSTER)) or (op~=1 and tc:IsType(TYPE_SPELL)) or (op~=2 and tc:IsType(TYPE_TRAP)) then

c40607210.lua

@@ -49,8 +49,8 @@ function c40607210.operation(e,tp,eg,ep,ev,re,r,rp)
 end
 function c40607210.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPTION)
-	local op=Duel.SelectOption(tp,70,71,72)
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE)
+	local op=Duel.AnnounceType(tp)
 	e:SetLabel(op)
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,1-tp,LOCATION_DECK)
 end

c41091257.lua

@@ -28,7 +28,7 @@ function c41091257.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 		and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE)
-	e:SetLabel(Duel.SelectOption(tp,70,71,72))
+	e:SetLabel(Duel.AnnounceType(tp))
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 end
 function c41091257.spop(e,tp,eg,ep,ev,re,r,rp)

c53839837.lua

@@ -61,8 +61,8 @@ function c53839837.tgcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function c53839837.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
-	Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(53839837,5))
-	local op=Duel.SelectOption(tp,aux.Stringid(53839837,1),aux.Stringid(53839837,2),aux.Stringid(53839837,3))
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE)
+	local op=Duel.AnnounceType(tp)
 	e:SetLabel(op)
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,1-tp,LOCATION_DECK)
 end

c54719828.lua

@@ -21,8 +21,8 @@ function c54719828.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c54719828.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
-	Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(54719828,1))
-	e:SetLabel(Duel.SelectOption(tp,70,71,72))
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE)
+	e:SetLabel(Duel.AnnounceType(tp))
 end
 function c54719828.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

c56995655.lua

@@ -28,7 +28,7 @@ function c56995655.op(e,tp,eg,ep,ev,re,r,rp)
 	local tc=g:GetFirst()
 	if not tc then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE)
-	local op=Duel.SelectOption(tp,70,71,72)
+	local op=Duel.AnnounceType(tp)
 	Duel.ConfirmCards(tp,tc)
 	Duel.ShuffleHand(1-tp)
 	if (op==0 and tc:IsType(TYPE_MONSTER)) or (op==1 and tc:IsType(TYPE_SPELL)) or (op==2 and tc:IsType(TYPE_TRAP)) then

c58947797.lua

@@ -49,7 +49,7 @@ end
 function c58947797.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE)
-	local op=Duel.SelectOption(tp,70,71,72)
+	local op=Duel.AnnounceType(tp)
 	e:SetLabel(bit.lshift(1,op))
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,1-tp,LOCATION_DECK)
 end

c73820802.lua

@@ -38,7 +38,7 @@ function c73820802.operation(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetLabel()==0 then return end
 	if Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)==0 then return end
 	Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_CARDTYPE)
-	local op=Duel.SelectOption(1-tp,70,71,72)
+	local op=Duel.AnnounceType(1-tp)
 	Duel.ConfirmDecktop(tp,1)
 	local g=Duel.GetDecktopGroup(tp,1)
 	local tc=g:GetFirst()

c7582066.lua

@@ -23,7 +23,7 @@ function c7582066.atkop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetFieldGroup(tp,0,LOCATION_HAND):RandomSelect(tp,1,nil)
 	local tc=g:GetFirst()
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE)
-	local op=Duel.SelectOption(tp,70,71,72)
+	local op=Duel.AnnounceType(tp)
 	Duel.ConfirmCards(tp,tc)
 	Duel.ShuffleHand(1-tp)
 	if (op==0 and tc:IsType(TYPE_MONSTER)) or (op==1 and tc:IsType(TYPE_SPELL)) or (op==2 and tc:IsType(TYPE_TRAP)) then

c94096018.lua

@@ -31,7 +31,7 @@ function c94096018.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanDraw(tp,1)
 		and Duel.GetFieldGroupCount(tp,0,LOCATION_DECK)>0 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE)
-	e:SetLabel(Duel.SelectOption(tp,70,71,72))
+	e:SetLabel(Duel.AnnounceType(tp))
 	Duel.SetTargetPlayer(tp)
 	Duel.SetTargetParam(1)
 end