Merge remote-tracking branch 'upstream/patch-engraver' into 888_master

c50078320.lua

@@ -22,30 +22,55 @@ function c50078320.initial_effect(c)
 	e2:SetOperation(c50078320.regop)
 	c:RegisterEffect(e2)
 end
+
+function c50078320.GetAnnounceFilter(ep,ev,re)
+	local code=Duel.GetChainInfo(ev,CHAININFO_TARGET_PARAM)
+	local announce_filter=re:GetHandler().announce_filter
+	if not announce_filter then
+		-- announce_filter not specified
+		return {code,OPCODE_ISCODE,OPCODE_NOT}
+	end
+	local function AddNotCodeCondition(t)
+		-- ... and not c:IsCode(code)
+		local afilter={table.unpack(t)}
+		table.insert(afilter,code)
+		table.insert(afilter,OPCODE_ISCODE)
+		table.insert(afilter,OPCODE_NOT)
+		table.insert(afilter,OPCODE_AND)
+		return afilter
+	end
+	if aux.GetValueType(announce_filter)=="function" then
+		-- function form
+		local res=announce_filter(re,ep,ev)
+		if res==true then
+			-- allow any except announced code
+			return {code,OPCODE_ISCODE,OPCODE_NOT}
+		elseif not res then
+			-- cannot be reannounced
+			return false
+		else
+			-- returns a table, so we wrap it
+			return AddNotCodeCondition(res)
+		end
+	else
+		-- table form
+		return AddNotCodeCondition(announce_filter)
+	end
+end
+
 function c50078320.condition(e,tp,eg,ep,ev,re,r,rp)
 	local ex=Duel.GetOperationInfo(ev,CATEGORY_ANNOUNCE)
-	return rp==1-tp and ex
+	return rp==1-tp and ex and c50078320.GetAnnounceFilter(ep,ev,re)~=false
 end
 function c50078320.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() end
 	Duel.SendtoGrave(e:GetHandler(),REASON_COST)
 end
 function c50078320.operation(e,tp,eg,ep,ev,re,r,rp)
-	local code=Duel.GetChainInfo(ev,CHAININFO_TARGET_PARAM)
-	local ac=0
+	local afilter=c50078320.GetAnnounceFilter(ep,ev,re)
+	if afilter==false then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
-	if re:GetHandler().announce_filter==nil then
-		--not c:IsCode(code)
-		ac=Duel.AnnounceCard(tp,code,OPCODE_ISCODE,OPCODE_NOT)
-	else
-		local afilter={table.unpack(re:GetHandler().announce_filter)}
-		--and not c:IsCode(code)
-		table.insert(afilter,code)
-		table.insert(afilter,OPCODE_ISCODE)
-		table.insert(afilter,OPCODE_NOT)
-		table.insert(afilter,OPCODE_AND)
-		ac=Duel.AnnounceCard(tp,table.unpack(afilter))
-	end
+	local ac=Duel.AnnounceCard(tp,table.unpack(afilter))
 	Duel.ChangeTargetParam(ev,ac)
 end
 function c50078320.desfilter(c)

c74733322.lua

@@ -21,12 +21,39 @@ function s.initial_effect(c)
 	e3:SetCategory(CATEGORY_SEARCH+CATEGORY_TOHAND+CATEGORY_ANNOUNCE)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetRange(LOCATION_FZONE)
-	e3:SetCode(EVENT_FREE_CHAIN)
 	e3:SetCost(s.thcost)
 	e3:SetTarget(s.thtg)
 	e3:SetOperation(s.thop)
 	c:RegisterEffect(e3)
+	--global resetter
+	if not s.global_check then
+		s.global_check=true
+		s.announced={}
+		s.announced_set={}
+		s.clearop()
+		local ge1=Effect.CreateEffect(c)
+		ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+		ge1:SetCode(EVENT_PHASE_START+PHASE_DRAW)
+		ge1:SetOperation(s.clearop)
+		Duel.RegisterEffect(ge1,0)
+	end
+end
+
+-- workaround for Engraver
+local ARTMEGIA_COUNT=4
+
+function s.AddToAnnounced(tp,code)
+	table.insert(s.announced[tp],code)
+	s.announced_set[tp][code]=true
 end
+
+function s.clearop()
+	s.announced[0]={}
+	s.announced[1]={}
+	s.announced_set[0]={}
+	s.announced_set[1]={}
+end
+
 function s.costfilter(c)
 	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsDiscardable()
 end
@@ -36,26 +63,57 @@ function s.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function s.anfilter(c,tp)
 	return c:IsSetCard(0x1cd) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
-		and not Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_MZONE,0,1,nil,c:GetCode())
-		and not c:IsHasEffect(id,tp)
+		and not s.announced_set[tp][c:GetCode()]
 end
 function s.thfilter(c,code)
 	return c:IsSetCard(0x1cd) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 		and c:IsCode(code)
 end
-function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(s.anfilter,tp,LOCATION_DECK,0,1,nil,tp) end
-	local g=Duel.GetMatchingGroup(s.anfilter,tp,LOCATION_DECK,0,nil,tp)
-	local ag=Group.CreateGroup()
+
+function s.CreateCodeList(g,list,exg,exlist)
 	local codes={}
+	local existing={}
+	-- exclude group
+	if exg then
+		for c in aux.Next(exg) do
+			local code=c:GetCode()
+			existing[code]=true
+		end
+	end
+	-- exclude list
+	if exlist then
+		for _,code in ipairs(exlist) do
+			existing[code]=true
+		end
+	end
+	-- add group
+	if g then
 		for c in aux.Next(g) do
 			local code=c:GetCode()
-		if not ag:IsExists(Card.IsCode,1,nil,code) then
-			ag:AddCard(c)
+			if not existing[code] then
+				existing[code]=true
 				table.insert(codes,code)
 			end
 		end
+	end
+	-- add list
+	if list then
+		for _,code in ipairs(list) do
+			if not existing[code] then
+				existing[code]=true
+				table.insert(codes,code)
+			end
+		end
+	end
 	table.sort(codes)
+	return codes
+end
+
+function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
+	local g=Duel.GetMatchingGroup(s.anfilter,tp,LOCATION_DECK,0,nil,tp)
+	local exg=Duel.GetMatchingGroup(Card.IsFaceup,tp,LOCATION_MZONE,0,nil)
+	local codes=s.CreateCodeList(g,nil,exg,nil)
+	if chk==0 then return #codes>0 end
 	local afilter={codes[1],OPCODE_ISCODE}
 	if #codes>1 then
 		--or ... or c:IsCode(codes[i])
@@ -65,41 +123,13 @@ function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 			table.insert(afilter,OPCODE_OR)
 		end
 	end
-	ag:Clear()
-	local ncodes={}
-	local exg=Duel.GetMatchingGroup(aux.AND(Card.IsFaceup,Card.IsSetCard),tp,LOCATION_MZONE,0,nil,0x1cd)
-	for c in aux.Next(exg) do
-		local code=c:GetCode()
-		if not ag:IsExists(Card.IsCode,1,nil,code) then
-			ag:AddCard(c)
-			table.insert(ncodes,code)
-		end
-	end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
 	local ac=Duel.AnnounceCard(tp,table.unpack(afilter))
-	local af={
-		TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK,OPCODE_ISTYPE,OPCODE_NOT,
-		0x1cd,OPCODE_ISSETCARD,OPCODE_AND,
-		TYPE_MONSTER,OPCODE_ISTYPE,OPCODE_AND
-	}
-	for i=1,#ncodes do
-		table.insert(af,ncodes[i])
-		table.insert(af,OPCODE_ISCODE)
-		table.insert(af,OPCODE_NOT)
-		table.insert(af,OPCODE_AND)
-	end
-	getmetatable(e:GetHandler()).announce_filter=af
+	s.AddToAnnounced(tp,ac)
 	Duel.SetTargetParam(ac)
+	getmetatable(e:GetHandler()).announce_filter=s.announce_filter_func
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,0)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
-	local e0=Effect.CreateEffect(e:GetHandler())
-	e0:SetType(EFFECT_TYPE_FIELD)
-	e0:SetCode(id)
-	e0:SetTargetRange(1,0)
-	e0:SetTarget(s.thlimit)
-	e0:SetLabel(ac)
-	e0:SetReset(RESET_PHASE+PHASE_END)
-	Duel.RegisterEffect(e0,tp)
 end
 function s.thlimit(e,c,tp,re)
 	return c:IsCode(e:GetLabel())
@@ -124,3 +154,23 @@ end
 function s.splimit(e,c)
 	return not (c:IsSetCard(0x1cd) or c:IsCode(97556336)) and not c:IsLocation(LOCATION_EXTRA)
 end
+
+function s.announce_filter_func(e,tp,ev)
+	local exg=Duel.GetMatchingGroup(aux.AND(Card.IsFaceup,Card.IsSetCard),tp,LOCATION_MZONE,0,nil,0x1cd)
+	local ncodes=s.CreateCodeList(exg,s.announced[tp],nil,nil)
+	if #ncodes>=ARTMEGIA_COUNT then
+		return false
+	end
+	local af={
+		TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK,OPCODE_ISTYPE,OPCODE_NOT,
+		0x1cd,OPCODE_ISSETCARD,OPCODE_AND,
+		TYPE_MONSTER,OPCODE_ISTYPE,OPCODE_AND
+	}
+	for i=1,#ncodes do
+		table.insert(af,ncodes[i])
+		table.insert(af,OPCODE_ISCODE)
+		table.insert(af,OPCODE_NOT)
+		table.insert(af,OPCODE_AND)
+	end
+	return af
+end