fix

expansions/script/c12400042.lua

@@ -158,6 +158,7 @@ function s.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetTurnPlayer()==tp
 end
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
+	local c=e:GetHandler()
 	if chk==0 then return Duel.GetMatchingGroupCount(s.filter10,tp,LOCATION_MZONE,0,e:GetHandler())>0 and c:GetMaterialCount()>0 end
 end
 function s.filter10(c)

expansions/script/c12400130.lua

@@ -41,11 +41,14 @@ function s.initial_effect(c)
 	e4:SetOperation(s.atkop)
 	c:RegisterEffect(e4)
 end
+function s.mobfilter2(c)
+	return c:IsSetCard(0x52a2) and c:IsFaceup() and c:IsSummonLocation(LOCATION_EXTRA)
+end
 function s.spcon1(e,tp,eg,ep,ev,re,r,rp)
-	return not Duel.IsExistingMatchingCard(s.mobfilter,tp,LOCATION_MZONE,0,1,nil)
+	return not Duel.IsExistingMatchingCard(s.mobfilter2,tp,LOCATION_MZONE,0,1,nil)
 end
 function s.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(s.mobfilter,tp,LOCATION_MZONE,0,1,nil)
+	return Duel.IsExistingMatchingCard(s.mobfilter2,tp,LOCATION_MZONE,0,1,nil)
 end
 function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() end
@@ -64,7 +67,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	local b1=Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 	local b2=Duel.GetLocationCount(tc:GetOwner(),LOCATION_SZONE)>0
 	if tc then
-		local op=aux.SelectFromOptions(tp,{b1,1190},{b2,aux.Stringid(id,4)})
+		local op=aux.SelectFromOptions(tp,{b1,1118},{b2,aux.Stringid(id,4)})
 		if op==1 then
 			Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
 		end

expansions/script/c5012639.lua

@@ -47,13 +47,6 @@ function s.initial_effect(c)
 	ed2:SetOperation(s.desop)
 	c:RegisterEffect(ed2)
 
-	--做超量素材时送去墓地
-	local e4=Effect.CreateEffect(c)
-	e4:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
-	e4:SetCode(EVENT_ADJUST)
-	e4:SetOperation(s.rmop)
-	Duel.RegisterEffect(e4,0)
-
 end
 function s.SpiritReturnTargetForced(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
@@ -90,7 +83,7 @@ function s.XyzLevelFreeCondition(f,gf,minct,maxct)
 				if og then
 					mg=og:Filter(s.XyzLevelFreeFilter,nil,c,f)
 				else
-					mg=Duel.GetMatchingGroup(s.XyzLevelFreeFilter,tp,LOCATION_MZONE+LOCATION_REMOVED,0,nil,c,f)
+					mg=Duel.GetMatchingGroup(s.XyzLevelFreeFilter,tp,LOCATION_MZONE+LOCATION_HAND,0,nil,c,f)
 				end
 				local sg=Duel.GetMustMaterial(tp,EFFECT_MUST_BE_XMATERIAL)
 				if sg:IsExists(Auxiliary.MustMaterialCounterFilter,1,nil,mg) then return false end
@@ -116,7 +109,7 @@ function s.XyzLevelFreeTarget(f,gf,minct,maxct)
 				if og then
 					mg=og:Filter(s.XyzLevelFreeFilter,nil,c,f)
 				else
-					mg=Duel.GetMatchingGroup(s.XyzLevelFreeFilter,tp,LOCATION_MZONE+LOCATION_REMOVED,0,nil,c,f)
+					mg=Duel.GetMatchingGroup(s.XyzLevelFreeFilter,tp,LOCATION_MZONE+LOCATION_HAND,0,nil,c,f)
 				end
 				local sg=Duel.GetMustMaterial(tp,EFFECT_MUST_BE_XMATERIAL)
 				Duel.SetSelectedCard(sg)