fix

expansions/script/c12866865.lua

@@ -26,6 +26,7 @@ function s.initial_effect(c)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_TO_GRAVE)
+	e2:SetProperty(EFFECT_FLAG_DELAY)
 	e2:SetCountLimit(1,id+1)
 	e2:SetTarget(s.sptg)
 	e2:SetOperation(s.spop)
@@ -58,10 +59,7 @@ function s.spfilter(c,e,tp)
 	return c:IsSetCard(0xaa7c) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then
-		return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-			and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp)
-	end
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
 end
 function s.spop(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c16400273.lua

 --光之战士 爱迪
 function c16400273.initial_effect(c)
-	--set
+	--spsummon
 	local e1=Effect.CreateEffect(c)
+	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_HAND)
 	e1:SetCountLimit(1,16400273)
-	e1:SetCondition(c16400273.stcon)
-	e1:SetCost(c16400273.stcost)
-	e1:SetTarget(c16400273.sttg)
-	e1:SetOperation(c16400273.stop)
+	e1:SetTarget(c16400273.target)
+	e1:SetOperation(c16400273.operation)
 	c:RegisterEffect(e1)
-	--fusion summon
+	--spsummon
 	local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
-	e2:SetType(EFFECT_TYPE_QUICK_O)
-	e2:SetCode(EVENT_FREE_CHAIN)
-	e2:SetRange(LOCATION_MZONE)
-	e2:SetHintTiming(0,TIMING_MAIN_END)
+	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e2:SetType(EFFECT_TYPE_IGNITION)
+	e2:SetRange(LOCATION_GRAVE)
 	e2:SetCountLimit(1,16400273)
-	e2:SetCondition(c16400273.condition)
-	e2:SetTarget(c16400273.target)
-	e2:SetOperation(c16400273.operation)
+	e2:SetCost(aux.bfgcost)
+	e2:SetTarget(c16400273.sptg)
+	e2:SetOperation(c16400273.spop)
 	c:RegisterEffect(e2)
 end
-c16400273.fusion_effect=true
-function c16400273.stcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetFieldGroupCount(tp,0,LOCATION_MZONE)>0
-end
-function c16400273.stcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():IsDiscardable() end
-	Duel.SendtoGrave(e:GetHandler(),REASON_COST+REASON_DISCARD)
-end
-function c16400273.stfilter(c)
-	return c:IsSetCard(0xce9) and c:IsType(TYPE_SPELL) and c:IsSSetable()
-end
-function c16400273.sttg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c16400273.stfilter,tp,LOCATION_DECK,0,1,nil) end
-end
-function c16400273.stop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
-	local g=Duel.SelectMatchingCard(tp,c16400273.stfilter,tp,LOCATION_DECK,0,1,1,nil)
-	if g:GetCount()>0 then
-		Duel.SSet(tp,g)
-	end
-	local e1=Effect.CreateEffect(e:GetHandler())
-	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
-	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-	e1:SetTargetRange(1,0)
-	e1:SetTarget(c16400273.splimit)
-	e1:SetReset(RESET_PHASE+PHASE_END)
-	Duel.RegisterEffect(e1,tp)
-end
-function c16400273.splimit(e,c)
-	return not c:IsSetCard(0xce9)
-end
-function c16400273.condition(e,tp,eg,ep,ev,re,r,rp)
-	local ph=Duel.GetCurrentPhase()
-	return ph==PHASE_MAIN1 or ph==PHASE_MAIN2
-end
-function c16400273.filter0(c)
-	return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
-end
 function c16400273.filter1(c,e)
-	return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove() and not c:IsImmuneToEffect(e)
+	return c:IsLocation(LOCATION_HAND) and not c:IsImmuneToEffect(e)
 end
 function c16400273.filter2(c,e,tp,m,f,gc,chkf)
-	return c:IsType(TYPE_FUSION) and c:IsSetCard(0xce9) and (not f or f(c))
+	return c:IsType(TYPE_FUSION) and c:IsSetCard(0xc9) and (not f or f(c))
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,gc,chkf)
 		and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
 end
@@ -74,7 +32,7 @@ function c16400273.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then
 		local chkf=tp
-		local mg1=Duel.GetMatchingGroup(c16400273.filter0,tp,LOCATION_GRAVE,0,nil)
+		local mg1=Duel.GetFusionMaterial(tp):Filter(Card.IsLocation,nil,LOCATION_HAND)
 		local res=Duel.IsExistingMatchingCard(c16400273.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg1,nil,c,chkf)
 		if not res then
 			local ce=Duel.GetChainMaterial(tp)
@@ -88,13 +46,12 @@ function c16400273.target(e,tp,eg,ep,ev,re,r,rp,chk)
 		return res
 	end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
-	Duel.SetOperationInfo(0,CATEGORY_REMOVE,c,1,tp,LOCATION_GRAVE)
 end
 function c16400273.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local chkf=tp
 	if not c:IsRelateToEffect(e) or c:IsImmuneToEffect(e) then return end
-	local mg1=Duel.GetMatchingGroup(c16400273.filter1,tp,LOCATION_GRAVE,0,nil,e)
+	local mg1=Duel.GetFusionMaterial(tp):Filter(c16400273.filter1,nil,e)
 	local sg1=Duel.GetMatchingGroup(c16400273.filter2,tp,LOCATION_EXTRA,0,nil,e,tp,mg1,nil,c,chkf)
 	local mg2=nil
 	local sg2=nil
@@ -114,7 +71,7 @@ function c16400273.operation(e,tp,eg,ep,ev,re,r,rp)
 		if sg1:IsContains(tc) and (sg2==nil or not sg2:IsContains(tc) or not Duel.SelectYesNo(tp,ce:GetDescription())) then
 			local mat1=Duel.SelectFusionMaterial(tp,tc,mg1,c,chkf)
 			tc:SetMaterial(mat1)
-			Duel.Remove(mat1,POS_FACEUP,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION)
+			Duel.SendtoGrave(mat1,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION)
 			Duel.BreakEffect()
 			Duel.SpecialSummon(tc,SUMMON_TYPE_FUSION,tp,tp,false,false,POS_FACEUP)
 		else
@@ -125,3 +82,19 @@ function c16400273.operation(e,tp,eg,ep,ev,re,r,rp)
 		tc:CompleteProcedure()
 	end
 end
+function c16400273.spfilter(c,e,tp)
+	return c:IsSetCard(0xc9) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+end
+function c16400273.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
+		and Duel.IsExistingMatchingCard(c16400273.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp) end
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
+end
+function c16400273.spop(e,tp,eg,ep,ev,re,r,rp)
+	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+	local g=Duel.SelectMatchingCard(tp,c16400273.spfilter,tp,LOCATION_HAND,0,1,1,nil,e,tp)
+	if g:GetCount()>0 then
+		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
+	end
+end

expansions/script/c36700245.lua

@@ -89,13 +89,13 @@ function s.spfilter(c)
 	return c:IsSetCard(0x866) and c:IsFaceupEx() and c:IsType(TYPE_MONSTER)
 	and c:IsAbleToDeckOrExtraAsCost()
 end
-function s.sptfilter(c)
+function s.sptfilter(c,g)
 	return c:IsSetCard(0x866) and c:IsFaceupEx() and c:IsLevelAbove(5)
 	and c:IsAbleToDeckOrExtraAsCost() and c:IsType(TYPE_MONSTER)
+	and g:IsExists(s.spfilter,1,c)
 end
 function s.gfilter(g)
-	return g:IsExists(s.spfilter,1,nil)
-	and g:IsExists(s.sptfilter,1,nil)
+	return g:IsExists(s.sptfilter,1,nil,g)
 end
 
 function s.splimit(e,se,sp,st)

expansions/script/c47310301.lua

@@ -82,17 +82,17 @@ end
 function s.thfilter(c)
     return c:IsSetCard(0x6ca0) and c:IsAbleToHand()
 end
-function s.rmfilter(c)
+function s.rmfilter(c,tp)
     return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_GRAVE,0,1,c) and c:IsAbleToRemove()
 end
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
-    if chk==0 then return Duel.IsExistingMatchingCard(s.rmfilter,tp,LOCATION_GRAVE,0,1,nil) end
+    if chk==0 then return Duel.IsExistingMatchingCard(s.rmfilter,tp,LOCATION_GRAVE,0,1,nil,tp) end
     Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_GRAVE)
     Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_GRAVE)
 end
 function s.thop(e,tp,eg,ep,ev,re,r,rp)
     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-    local g=Duel.SelectMatchingCard(tp,s.rmfilter,tp,LOCATION_GRAVE,0,1,1,nil)
+    local g=Duel.SelectMatchingCard(tp,s.rmfilter,tp,LOCATION_GRAVE,0,1,1,nil,tp)
     if #g>0 and Duel.Remove(g,POS_FACEUP,REASON_EFFECT)~=0 then
         Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
         local tg=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_GRAVE,0,1,1,nil)

expansions/script/c81902611.lua

@@ -33,61 +33,58 @@ function cm.initial_effect(c)
 	e1:SetValue(1)
 	c:RegisterEffect(e1)
 	--immune
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetCode(EFFECT_IMMUNE_EFFECT)
-	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetRange(LOCATION_MZONE)
-	e2:SetCondition(cm.imcon)
-	e2:SetValue(cm.efilter)
-	c:RegisterEffect(e2)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetCode(EFFECT_SET_BASE_ATTACK)
-	e3:SetRange(LOCATION_MZONE)
+	e3:SetCode(EFFECT_IMMUNE_EFFECT)
 	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e3:SetRange(LOCATION_MZONE)
 	e3:SetCondition(cm.imcon)
-	e3:SetValue(cm.atkval)
+	e3:SetValue(cm.efilter)
 	c:RegisterEffect(e3)
+	local e4=Effect.CreateEffect(c)
+	e4:SetType(EFFECT_TYPE_SINGLE)
+	e4:SetCode(EFFECT_SET_BASE_ATTACK)
+	e4:SetRange(LOCATION_MZONE)
+	e4:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e4:SetCondition(cm.imcon)
+	e4:SetValue(cm.atkval)
+	c:RegisterEffect(e4)
 	--镜界不止的推演
+	local e2=Effect.CreateEffect(c)
+	e2:SetDescription(aux.Stringid(m,1))
+	e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e2:SetCode(EVENT_PREDRAW)
+	e2:SetRange(LOCATION_MZONE)
+	e2:SetCondition(cm.condition)
+	e2:SetTarget(cm.target)
+	e2:SetOperation(cm.operation)
+	c:RegisterEffect(e2)
+	--终局的圣德兵谏
+	local e3=Effect.CreateEffect(c)
+	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e3:SetCode(EVENT_LEAVE_FIELD)
+	e3:SetRange(LOCATION_MZONE)
+	e3:SetProperty(EFFECT_FLAG_DELAY)
+	e3:SetCondition(cm.lvcon)
+	e3:SetOperation(cm.lvop)
+	c:RegisterEffect(e3)
+	local e4=Effect.CreateEffect(c)
+	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e4:SetCode(EVENT_TO_GRAVE)
+	e4:SetRange(LOCATION_MZONE)
+	e4:SetProperty(EFFECT_FLAG_DELAY)
+	e4:SetCondition(cm.lvcon2)
+	e4:SetOperation(cm.lvop2)
+	c:RegisterEffect(e4)
 	local e5=Effect.CreateEffect(c)
-	e5:SetDescription(aux.Stringid(m,1))
-	e5:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
-	e5:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e5:SetCode(EVENT_PREDRAW)
+	e5:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e5:SetCode(EVENT_REMOVE)
 	e5:SetRange(LOCATION_MZONE)
-	e5:SetCondition(cm.condition)
-	e5:SetTarget(cm.target)
-	e5:SetOperation(cm.operation)
+	e5:SetProperty(EFFECT_FLAG_DELAY)
+	e5:SetCondition(cm.lvcon3)
+	e5:SetOperation(cm.lvop3)
 	c:RegisterEffect(e5)
-	--终局的圣德兵谏
-	local e6=Effect.CreateEffect(c)
-	e6:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e6:SetCode(EVENT_LEAVE_FIELD)
-	e6:SetRange(LOCATION_MZONE)
-	e6:SetProperty(EFFECT_FLAG_DELAY)
-	e6:SetCountLimit(1)
-	e6:SetCondition(cm.lvcon)
-	e6:SetOperation(cm.lvop)
-	c:RegisterEffect(e6)
-	local e7=Effect.CreateEffect(c)
-	e7:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e7:SetCode(EVENT_TO_GRAVE)
-	e7:SetRange(LOCATION_MZONE)
-	e7:SetProperty(EFFECT_FLAG_DELAY)
-	e7:SetCountLimit(1)
-	e7:SetCondition(cm.lvcon2)
-	e7:SetOperation(cm.lvop2)
-	c:RegisterEffect(e7)
-	local e8=Effect.CreateEffect(c)
-	e8:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e8:SetCode(EVENT_REMOVE)
-	e8:SetRange(LOCATION_MZONE)
-	e8:SetProperty(EFFECT_FLAG_DELAY)
-	e8:SetCountLimit(1)
-	e8:SetCondition(cm.lvcon3)
-	e8:SetOperation(cm.lvop3)
-	c:RegisterEffect(e8)
 end
 --splimit
 function cm.splimit(e,se,sp,st)
@@ -104,7 +101,7 @@ function cm.imfilter(c)
 	return c:IsType(TYPE_XYZ) and c:IsType(TYPE_MONSTER) and c:IsFaceup() 
 end
 function cm.imcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(cm.imfilter,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,e:GetHandler())
+	return Duel.IsExistingMatchingCard(cm.imfilter,tp,LOCATION_MZONE,0,1,e:GetHandler())
 end
 function cm.efilter(e,te)
 	return te:GetOwner()~=e:GetOwner()
@@ -237,7 +234,7 @@ end
 function cm.lvop2(e,tp,eg,ep,ev,re,r,rp)
     local c=e:GetHandler()
     local g=eg:Filter(cm.lvfilter2,nil)
-	if #g>0 and c:GetFlagEffect(m+100)==0 and Duel.SelectYesNo(tp,aux.Stringid(m,3)) then
+    if #g>0 and c:GetFlagEffect(m+100)==0 and Duel.SelectYesNo(tp,aux.Stringid(m,14)) then
         Duel.Hint(24,0,aux.Stringid(m,7))
         local tc=g:GetFirst()
         while tc do
@@ -254,7 +251,7 @@ end
 function cm.lvop3(e,tp,eg,ep,ev,re,r,rp)
     local c=e:GetHandler()
     local g=eg:Filter(cm.lvfilter3,nil)
-	if #g>0 and c:GetFlagEffect(m+200)==0 and Duel.SelectYesNo(tp,aux.Stringid(m,3)) then
+    if #g>0 and c:GetFlagEffect(m+200)==0 and Duel.SelectYesNo(tp,aux.Stringid(m,15)) then
         Duel.Hint(24,0,aux.Stringid(m,7))
         local tc=g:GetFirst()
         while tc do