fix

expansions/script/c1300900.lua

@@ -17,7 +17,7 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function s.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local g=Duel.GetMatchingGroup(Card.IsType,tp,0xff,0,nil,TYPE_COUNTER)
+	local g=Group.__add(Duel.GetMatchingGroup(Card.IsType,tp,0x7f,0x7f,nil,TYPE_COUNTER),Duel.GetOverlayGroup(tp,1,1):Filter(Card.IsType,nil,TYPE_COUNTER))
 	for tc in aux.Next(g) do
 		local e0=Effect.CreateEffect(c)
 		e0:SetType(EFFECT_TYPE_FIELD)
@@ -73,7 +73,7 @@ function s.rsop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.op(e,tp,eg,ep,ev,re,r,rp)
-	local sg=Duel.GetMatchingGroup(Card.IsType,tp,0xff,0,nil,TYPE_COUNTER)
+	local sg=Group.__add(Duel.GetMatchingGroup(Card.IsType,tp,0x7f,0,nil,TYPE_COUNTER),Duel.GetOverlayGroup(tp,1,0):Filter(Card.IsType,nil,TYPE_COUNTER))
 	local g=sg:Filter(function(c)return c:GetFlagEffect(id)==0 end,nil)
 	if #g==0 then return end
 	for tc in aux.Next(g) do

expansions/script/c5012629.lua

@@ -36,22 +36,35 @@ end
 function s.sfliter(c)
 	return c.MoJin and c:IsType(TYPE_MONSTER)
 end
-function s.hspfilter(c,tp,fc)
+function s.hspfilter1(c,tp,fc)
 	return c.MoJin and c:IsType(TYPE_MONSTER) and Duel.GetLocationCountFromEx(tp,tp,c,fc)>0
 		and c:IsCanBeFusionMaterial(fc,SUMMON_TYPE_SPECIAL) and c:IsAbleToDeckOrExtraAsCost() and not (c:IsLocation(LOCATION_REMOVED) and c:IsFacedown())
 end
+function s.hspfilter2(c,tp,fc)
+	return c.MoJin and c:IsType(TYPE_MONSTER) and c:IsAbleToDeckOrExtraAsCost()
+		and c:IsCanBeFusionMaterial(fc,SUMMON_TYPE_SPECIAL) and not (c:IsLocation(LOCATION_REMOVED) and c:IsFacedown())
+end
 function s.hspcon(e,c)
 	if c==nil then return true end
-	return Duel.IsExistingMatchingCard(s.hspfilter,c:GetControler(),LOCATION_MZONE+LOCATION_GRAVE+LOCATION_REMOVED,0,2,nil,c:GetControler())
+	return Duel.IsExistingMatchingCard(s.hspfilter1,c:GetControler(),LOCATION_MZONE+LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil,c:GetControler(),c)
+		and Duel.IsExistingMatchingCard(s.hspfilter2,c:GetControler(),LOCATION_MZONE+LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil,c:GetControler(),c)
 end
 function s.hsptg(e,tp,eg,ep,ev,re,r,rp,chk,c)
-	local g=Duel.GetMatchingGroup(s.hspfilter,tp,LOCATION_MZONE+LOCATION_GRAVE+LOCATION_REMOVED,0,nil,tp)
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local sg=g:CancelableSelect(tp,2,2,nil)
-	if sg then
-		sg:KeepAlive()
-		e:SetLabelObject(sg)
-		return true
+	local g1=Duel.GetMatchingGroup(s.hspfilter1,tp,LOCATION_MZONE+LOCATION_GRAVE+LOCATION_REMOVED,0,nil,tp,c)
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
+	local tc1=g1:SelectUnselect(nil,tp,false,true,1,1)
+	if tc1 then
+		local g2=Duel.GetMatchingGroup(s.hspfilter2,tp,LOCATION_MZONE+LOCATION_GRAVE+LOCATION_REMOVED,0,tc1,tp,c)
+		local tc2=g2:SelectUnselect(nil,tp,false,true,1,1)
+		if tc2 then
+			local mg=Group.CreateGroup()
+			mg:AddCard(tc1)
+			mg:AddCard(tc2)
+			mg:KeepAlive()
+			e:SetLabelObject(mg)
+			return true
+		end
+		return false
 	else return false end
 end
 function s.hspop(e,tp,eg,ep,ev,re,r,rp,c)

expansions/script/c65040064.lua → expansions/script/c65041064.lua

 --牺牲少女 安娜拉
-function c65040064.initial_effect(c)
+function c65041064.initial_effect(c)
 	 --ritual level
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetCode(EFFECT_RITUAL_LEVEL)
-	e1:SetValue(c65040064.rlevel)
+	e1:SetValue(c65041064.rlevel)
 	c:RegisterEffect(e1)
 	--become material
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_EVENT_PLAYER)
 	e2:SetCode(EVENT_BE_MATERIAL)
-	e2:SetCondition(c65040064.condition)
-	e2:SetOperation(c65040064.operation)
+	e2:SetCondition(c65041064.condition)
+	e2:SetOperation(c65041064.operation)
 	c:RegisterEffect(e2)
 end
-function c65040064.rlevel(e,c)
+function c65041064.rlevel(e,c)
 	local lv=aux.GetCappedLevel(e:GetHandler())
 	if c:IsCode(65040053) then
 		local clv=c:GetLevel()
 		return (lv<<16)+clv
 	else return lv end
 end
-function c65040064.condition(e,tp,eg,ep,ev,re,r,rp)
+function c65041064.condition(e,tp,eg,ep,ev,re,r,rp)
 	return r==REASON_RITUAL and not e:GetHandler():IsPreviousLocation(LOCATION_OVERLAY)
 end
-function c65040064.operation(e,tp,eg,ep,ev,re,r,rp)
+function c65041064.operation(e,tp,eg,ep,ev,re,r,rp)
 	local rc=eg:GetFirst()
 	while rc do
-		if rc:GetFlagEffect(65040064)==0 then
+		if rc:GetFlagEffect(65041064)==0 then
 			--cannot special summon
 			local e1=Effect.CreateEffect(e:GetHandler())
-			e1:SetDescription(aux.Stringid(65040064,0))
+			e1:SetDescription(aux.Stringid(65041064,0))
 			e1:SetProperty(EFFECT_FLAG_CLIENT_HINT+EFFECT_FLAG_PLAYER_TARGET)
 			e1:SetType(EFFECT_TYPE_FIELD)
 			e1:SetRange(LOCATION_MZONE)
@@ -39,7 +39,7 @@ function c65040064.operation(e,tp,eg,ep,ev,re,r,rp)
 			e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 			e1:SetAbsoluteRange(ep,0,1)
 			rc:RegisterEffect(e1,true)
-			rc:RegisterFlagEffect(65040064,RESET_EVENT+RESETS_STANDARD,0,1)
+			rc:RegisterFlagEffect(65041064,RESET_EVENT+RESETS_STANDARD,0,1)
 		end
 		rc=eg:GetNext()
 	end

expansions/script/c82000590.lua

@@ -60,6 +60,7 @@ function c82000590.op(e,tp,eg,ep,ev,re,r,rp)
 		local g=Duel.SelectMatchingCard(tp,c82000590.filter,tp,LOCATION_DECK,0,1,1,nil)
 		if g:GetCount()>0 then
 			Duel.SendtoHand(g,nil,REASON_EFFECT)
+			Duel.ConfirmCards(1-tp,g)
 		end
 	end
 end

expansions/script/c82000593.lua

@@ -47,6 +47,7 @@ function c82000593.op(e,tp,eg,ep,ev,re,r,rp)
 		local g=Duel.SelectMatchingCard(tp,c82000593.filter,tp,LOCATION_DECK,0,1,1,nil)
 		if g:GetCount()>0 then
 			Duel.SendtoHand(g,nil,REASON_EFFECT)
+			Duel.ConfirmCards(1-tp,g)
 		end
 	end
 end

expansions/script/c82000596.lua

@@ -31,6 +31,7 @@ function c82000596.op(e,tp,eg,ep,ev,re,r,rp)
 		local g=Duel.SelectMatchingCard(tp,c82000596.filter,tp,LOCATION_DECK,0,1,1,nil)
 		if g:GetCount()>0 then
 			Duel.SendtoHand(g,nil,REASON_EFFECT)
+			Duel.ConfirmCards(1-tp,g)
 		end
 	end
 end

expansions/script/c82000599.lua

@@ -43,6 +43,7 @@ function c82000599.op(e,tp,eg,ep,ev,re,r,rp)
 		local g=Duel.SelectMatchingCard(tp,c82000599.filter,tp,LOCATION_DECK,0,1,1,nil)
 		if g:GetCount()>0 then
 			Duel.SendtoHand(g,nil,REASON_EFFECT)
+			Duel.ConfirmCards(1-tp,g)
 		end
 	end
 end