eme

expansions/script/c60002022.lua

@@ -39,11 +39,10 @@ function cm.acop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)<10 then return end
 	Duel.ConfirmDecktop(tp,10)
 	local g=Duel.GetDecktopGroup(tp,10)
-	local g=g:Filter(cm.ckfil,nil)
+	local count=g:FilterCount(cm.ckfil,nil)--counter and 0x629
 	local cg=Group.CreateGroup()
-	if g:GetCount()>=0 and g:FilterCount(cm.thfil1,nil)>0 then
-		local g2=g:FilterSelect(tp,cm.thfil1,1,1,nil)
-		local tc=g2:GetFirst()
+	if count>=0 and g:FilterCount(cm.thfil1,nil)>0 then
+		local tc=g:FilterSelect(tp,cm.thfil1,1,1,nil):GetFirst()
 		if Duel.SendtoHand(tc,tp,REASON_EFFECT)>0 then
 			cg:AddCard(tc)
 			Duel.ConfirmCards(1-tp,tc)
@@ -58,12 +57,11 @@ function cm.acop(e,tp,eg,ep,ev,re,r,rp)
 			Duel.RegisterEffect(e1,tp)
 		end
 	end
-	if g:GetCount()>=2 and Duel.IsPlayerCanDraw(tp,1) then
-		local dc=Duel.GetDecktopGroup(tp,1):GetFirst()
-		cg:AddCard(dc)
+	if count>=2 and Duel.IsPlayerCanDraw(tp,1) then
+		cg:Merge(Duel.GetDecktopGroup(tp,1))
 		Duel.Draw(tp,1,REASON_EFFECT)
 	end
-	if g:GetCount()>=4 and g:FilterCount(Card.IsAbleToHand,cg)>0 then
+	if count>=4 and g:FilterCount(Card.IsAbleToHand,cg)>0 then
 		local g3=g:FilterSelect(tp,Card.IsAbleToHand,1,1,cg)
 		Duel.SendtoHand(g3,tp,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g3)

expansions/script/c9330016.lua

@@ -26,7 +26,7 @@ function c9330016.initial_effect(c)
 	e2:SetTargetRange(LOCATION_MZONE,0)
 	e2:SetCondition(c9330016.condition1)
 	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0xaf93))
-	e2:SetValue(1000)
+	e2:SetValue(800)
 	c:RegisterEffect(e2)
 	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_DEFENSE)
@@ -83,11 +83,11 @@ function c9330016.activate(e,tp,eg,ep,ev,re,r,rp)
 		mg1:Remove(Card.IsLocation,nil,LOCATION_HAND)
 		local mg2=Duel.GetMatchingGroup(c9330016.mfilter,tp,0,LOCATION_MZONE,nil,e)
 		mg1:Merge(mg2)
-	if  Duel.IsExistingMatchingCard(aux.RitualUltimateFilter,tp,LOCATION_HAND+LOCATION_DECK,0,1,nil,c9330016.filter1,e,tp,mg1,nil,Card.GetLevel,"Equal")
+	if  Duel.IsExistingMatchingCard(aux.RitualUltimateFilter,tp,LOCATION_HAND,0,1,nil,c9330016.filter1,e,tp,mg1,nil,Card.GetLevel,"Equal")
 		and Duel.IsExistingMatchingCard(c9330016.filter,tp,LOCATION_ONFIELD,0,1,nil)
 		and Duel.SelectYesNo(tp,aux.Stringid(9330016,0)) then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-		local tg=Duel.SelectMatchingCard(tp,aux.RitualUltimateFilter,tp,LOCATION_HAND+LOCATION_DECK,0,1,1,nil,c9330016.filter1,e,tp,mg1,nil,Card.GetLevel,"Equal")
+		local tg=Duel.SelectMatchingCard(tp,aux.RitualUltimateFilter,tp,LOCATION_HAND,0,1,1,nil,c9330016.filter1,e,tp,mg1,nil,Card.GetLevel,"Equal")
 		local tc=tg:GetFirst()
 		if tc then
 			local mg=mg1:Filter(Card.IsCanBeRitualMaterial,tc,tc)