catchup changes

expansions/script/c1111401.lua

@@ -141,7 +141,7 @@ function c1111401.tg5_1(e,tp,eg,ep,ev,re,r,rp,chk)
 	else
 	end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
-	local ac=Duel.AnnounceCardFilter(tp,table.unpack(c1111401.announce_filter))
+	local ac=Duel.AnnounceCard(tp,table.unpack(c1111401.announce_filter))
 	Duel.SetTargetParam(ac)
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,ANNOUNCE_CARD)
 end

expansions/script/c1161025.lua

@@ -24,7 +24,7 @@ end
 function c1161025.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.Hint(HINT_SELECTMSG,tp,564)
-	local ac=Duel.AnnounceCard(tp,TYPE_SPELL)
+	local ac=Duel.AnnounceCard(tp,TYPE_SPELL,OPCODE_ISTYPE)
 	Duel.SetTargetParam(ac)
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,ANNOUNCE_CARD)
 end
@@ -156,4 +156,4 @@ function c1161025.op2_2(e,tp,eg,ep,ev,re,r,rp)
 	local lp=e:GetLabel()
 	Duel.SetLP(tp,lp)
 end
---
\ No newline at end of file
+--

expansions/script/c14010106.lua

@@ -68,7 +68,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
 	cm.announce_filter={TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK,OPCODE_ISTYPE,OPCODE_NOT}
-	local ac=Duel.AnnounceCardFilter(tp,table.unpack(cm.announce_filter))
+	local ac=Duel.AnnounceCard(tp,table.unpack(cm.announce_filter))
 	Duel.SetTargetParam(ac)
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,ANNOUNCE_CARD_FILTER)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
@@ -105,4 +105,4 @@ function cm.epop(e,tp,eg,ep,ev,re,r,rp)
 			Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 		end
 	end
-end
\ No newline at end of file
+end

expansions/script/c17029601.lua

@@ -177,7 +177,7 @@ end
 function c17029601.revop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
 	c17029611.announce_filter={TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK,OPCODE_ISTYPE,OPCODE_NOT}
-	local ac=Duel.AnnounceCardFilter(tp,table.unpack(c17029611.announce_filter))
+	local ac=Duel.AnnounceCard(tp,table.unpack(c17029611.announce_filter))
 	Duel.SetTargetParam(ac)
 	local ac=Duel.GetChainInfo(0,CHAININFO_TARGET_PARAM)
 	local g=Duel.GetMatchingGroup(Card.IsCode,tp,0,LOCATION_HAND,nil,ac)
@@ -193,4 +193,4 @@ function c17029601.revop(e,tp,eg,ep,ev,re,r,rp)
 			c:RegisterEffect(e1,true)
 		end
 	end
-end
\ No newline at end of file
+end

expansions/script/c17029604.lua

@@ -151,7 +151,7 @@ end
 function c17029604.tgop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
 	c17029604.announce_filter={TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK,OPCODE_ISTYPE,OPCODE_NOT}
-	local ac=Duel.AnnounceCardFilter(tp,table.unpack(c17029604.announce_filter))
+	local ac=Duel.AnnounceCard(tp,table.unpack(c17029604.announce_filter))
 	Duel.SetTargetParam(ac)
 	local ac=Duel.GetChainInfo(0,CHAININFO_TARGET_PARAM)
 	local g=Duel.GetMatchingGroup(Card.IsCode,tp,0,LOCATION_HAND,nil,ac)

expansions/script/c17029605.lua

@@ -145,7 +145,7 @@ end
 function c17029605.atkop1(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
 	c17029605.announce_filter={TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK,OPCODE_ISTYPE,OPCODE_NOT}
-	local ac=Duel.AnnounceCardFilter(tp,table.unpack(c17029605.announce_filter))
+	local ac=Duel.AnnounceCard(tp,table.unpack(c17029605.announce_filter))
 	Duel.SetTargetParam(ac)
 	local ac=Duel.GetChainInfo(0,CHAININFO_TARGET_PARAM)
 	local g=Duel.GetMatchingGroup(Card.IsCode,tp,0,LOCATION_HAND,nil,ac)

expansions/script/c17029609.lua

@@ -21,7 +21,7 @@ end
 function c17029609.revop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
 	c17029611.announce_filter={TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK,OPCODE_ISTYPE,OPCODE_NOT}
-	local ac=Duel.AnnounceCardFilter(tp,table.unpack(c17029611.announce_filter))
+	local ac=Duel.AnnounceCard(tp,table.unpack(c17029611.announce_filter))
 	Duel.SetTargetParam(ac)
 	local ac=Duel.GetChainInfo(0,CHAININFO_TARGET_PARAM)
 	local g=Duel.GetMatchingGroup(Card.IsCode,tp,0,LOCATION_HAND,nil,ac)

expansions/script/c17029611.lua

@@ -76,11 +76,11 @@ end
 function c17029611.tdop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
 	c17029611.announce_filter={TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK,OPCODE_ISTYPE,OPCODE_NOT}
-	local ac=Duel.AnnounceCardFilter(tp,table.unpack(c17029611.announce_filter))
+	local ac=Duel.AnnounceCard(tp,table.unpack(c17029611.announce_filter))
 	Duel.SetTargetParam(ac)
 	local ac=Duel.GetChainInfo(0,CHAININFO_TARGET_PARAM)
 	local g=Duel.GetMatchingGroup(Card.IsCode,tp,0,LOCATION_HAND,nil,ac)
 	if g:GetCount()>0 then
 		Duel.SendtoDeck(g,nil,0,REASON_EFFECT)
 	end
-end
\ No newline at end of file
+end

expansions/script/c22000270.lua

@@ -67,7 +67,7 @@ function c22000270.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
 		and Duel.IsExistingMatchingCard(nil,tp,LOCATION_HAND,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
 	c22000270.announce_filter={TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK,OPCODE_ISTYPE,OPCODE_NOT}
-	local ac=Duel.AnnounceCardFilter(tp,table.unpack(c22000270.announce_filter))
+	local ac=Duel.AnnounceCard(tp,table.unpack(c22000270.announce_filter))
 	Duel.SetTargetParam(ac)
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,ANNOUNCE_CARD_FILTER)
 end

expansions/script/c22600106.lua

@@ -52,7 +52,7 @@ function c22600106.dhtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
     if chk==0 then return g1:GetCount()>0 and Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)>0 end
     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
     c22600106.announce_filter={TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK,OPCODE_ISTYPE,OPCODE_NOT}
-    local ac=Duel.AnnounceCardFilter(tp,table.unpack(c22600106.announce_filter))
+    local ac=Duel.AnnounceCard(tp,table.unpack(c22600106.announce_filter))
     Duel.SetTargetParam(ac)
     Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,ANNOUNCE_CARD_FILTER)
     Duel.SetOperationInfo(0,CATEGORY_HANDES,g1,1,0,0)
@@ -102,4 +102,4 @@ function c22600106.sop(e,tp,eg,ep,ev,re,r,rp)
     if g:GetCount()>0 then
         Duel.SendtoGrave(g,REASON_EFFECT)
     end
-end
\ No newline at end of file
+end

expansions/script/c33700352.lua

@@ -47,7 +47,7 @@ function cm.initial_effect(c)
 		if chk==0 then return Duel.IsExistingMatchingCard(v_filter,tp,0,LOCATION_HAND+LOCATION_ONFIELD,1,nil) end
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
 		cm.announce_filter={TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK,OPCODE_ISTYPE,OPCODE_NOT}
-		local ac=Duel.AnnounceCardFilter(tp,table.unpack(cm.announce_filter))
+		local ac=Duel.AnnounceCard(tp,table.unpack(cm.announce_filter))
 		Duel.SetTargetParam(ac)
 		Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,ANNOUNCE_CARD_FILTER)
 	end)
@@ -92,4 +92,4 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp,c)
 	end
 	c:SetMaterial(g)
 	Duel.Release(g,REASON_COST)
-end
\ No newline at end of file
+end

expansions/script/c37564236.lua

@@ -23,7 +23,7 @@ function cm.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,1-tp,LOCATION_EXTRA)
 end
 function cm.op(e,tp,eg,ep,ev,re,r,rp)
-	local cd=Duel.AnnounceCard(tp,TYPE_MONSTER)
+	local cd=Duel.AnnounceCard(tp,TYPE_MONSTER,OPCODE_ISTYPE)
 	local g=Duel.GetFieldGroup(tp,0,LOCATION_EXTRA)
 	Duel.ConfirmCards(tp,g)
 	local tg=g:Filter(Card.IsCode,nil,cd)

expansions/script/c37564316.lua

@@ -50,7 +50,7 @@ function cm.skipop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	if #avaliable_list>0 then
 		Duel.Hint(HINT_CARD,0,e:GetHandler():GetOriginalCode())
-		local rcode=Duel.AnnounceCardFilter(tp,cm.get_announce(avaliable_list))
+		local rcode=Duel.AnnounceCard(tp,cm.get_announce(avaliable_list))
 		local et=Senya.GainEffect_3L(e:GetHandler(),rcode)
 		if et then
 			for i,te in pairs(et) do

expansions/script/c37564351.lua

@@ -51,7 +51,7 @@ function cm.target1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFieldGroupCount(tp,0,LOCATION_EXTRA)>0 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
 	cm.announce_filter={TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK,OPCODE_ISTYPE}
-	local ac=Duel.AnnounceCardFilter(tp,table.unpack(cm.announce_filter))
+	local ac=Duel.AnnounceCard(tp,table.unpack(cm.announce_filter))
 	Duel.SetTargetParam(ac)
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,ANNOUNCE_CARD_FILTER)
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_EXTRA)

expansions/script/c76121040.lua

@@ -32,7 +32,7 @@ function c76121040.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 		and (b1 or b2) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
 	c76121040.announce_filter={TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK,OPCODE_ISTYPE,OPCODE_NOT}
-	local ac=Duel.AnnounceCardFilter(tp,table.unpack(c76121040.announce_filter))
+	local ac=Duel.AnnounceCard(tp,table.unpack(c76121040.announce_filter))
 	Duel.SetTargetParam(ac)
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,ANNOUNCE_CARD_FILTER)
 	if Duel.GetFieldGroupCount(tp,LOCATION_HAND,0)==0 then
@@ -98,4 +98,4 @@ function c76121040.spop(e,tp,eg,ep,ev,re,r,rp)
 	if c:IsRelateToEffect(e) then
 		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 	end
-end
\ No newline at end of file
+end

expansions/script/c76121041.lua

@@ -36,7 +36,7 @@ function c76121041.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 		and Duel.IsExistingMatchingCard(c76121041.thfilter,tp,LOCATION_DECK,0,1,nil)  end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
 	c76121041.announce_filter={TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK,OPCODE_ISTYPE,OPCODE_NOT}
-	local ac=Duel.AnnounceCardFilter(tp,table.unpack(c76121041.announce_filter))
+	local ac=Duel.AnnounceCard(tp,table.unpack(c76121041.announce_filter))
 	Duel.SetTargetParam(ac)
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,ANNOUNCE_CARD_FILTER)
 	if Duel.GetFieldGroupCount(tp,LOCATION_HAND,0)==0 then
@@ -93,4 +93,4 @@ function c76121041.drop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.BreakEffect()
 		Duel.Draw(tp,1,REASON_EFFECT)
 	end
-end
\ No newline at end of file
+end

expansions/script/c77702009.lua

@@ -74,7 +74,7 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
 	cm.announce_filter={TYPE_MONSTER,OPCODE_ISTYPE}
-	local ac=Duel.AnnounceCardFilter(tp,table.unpack(cm.announce_filter))
+	local ac=Duel.AnnounceCard(tp,table.unpack(cm.announce_filter))
 	Duel.SetTargetParam(ac)
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,ANNOUNCE_CARD_FILTER)
 	Duel.SetOperationInfo(0,CATEGORY_EQUIP,e:GetHandler(),1,0,0)

expansions/script/c77707003.lua

@@ -15,10 +15,10 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
 	c39913299.announce_filter={TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK,OPCODE_ISTYPE,OPCODE_NOT}
-	local ac=Duel.AnnounceCardFilter(tp,table.unpack(c39913299.announce_filter))
+	local ac=Duel.AnnounceCard(tp,table.unpack(c39913299.announce_filter))
 	Duel.SetTargetParam(ac)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
-	local ac_=Duel.AnnounceCardFilter(tp,table.unpack(c39913299.announce_filter))
+	local ac_=Duel.AnnounceCard(tp,table.unpack(c39913299.announce_filter))
 	e:SetLabel(ac_)
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,ANNOUNCE_CARD_FILTER)
 end
@@ -65,4 +65,4 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	end)
 	e1:SetReset(RESET_PHASE+PHASE_DRAW+RESET_OPPO_TURN)
 	Duel.RegisterEffect(e1,tp)
-end
\ No newline at end of file
+end

expansions/script/c77777765.lua

@@ -103,7 +103,7 @@ function cm.nametg(e,tp,eg,ep,ev,re,r,rp,chk)
 	end
 	if chk==0 then return #avaliable_list>0 end
 	cm.announce_filter=cm.get_announce(avaliable_list)
-	local ac=Duel.AnnounceCardFilter(tp,table.unpack(cm.announce_filter))
+	local ac=Duel.AnnounceCard(tp,table.unpack(cm.announce_filter))
 	Duel.SetTargetParam(ac)
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,ANNOUNCE_CARD_FILTER)
 end
@@ -225,4 +225,4 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 		end
 		Duel.SpecialSummonComplete()
 	end
-end
\ No newline at end of file
+end

expansions/script/c81016003.lua

@@ -32,7 +32,7 @@ function c81016003.target(e,tp,eg,ep,ev,re,r,rp,chk)
 		and Duel.IsExistingMatchingCard(nil,tp,LOCATION_HAND,0,1,e:GetHandler()) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
 	c81016003.announce_filter={TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK+TYPE_PENDULUM,OPCODE_ISTYPE,TYPE_SPELL+TYPE_TRAP,OPCODE_ISTYPE,OPCODE_NOT,OPCODE_AND}
-	local ac=Duel.AnnounceCardFilter(tp,table.unpack(c81016003.announce_filter))
+	local ac=Duel.AnnounceCard(tp,table.unpack(c81016003.announce_filter))
 	Duel.SetTargetParam(ac)
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,ANNOUNCE_CARD_FILTER)
 end