Commit eac91028 authored by TanakaKotoha's avatar TanakaKotoha

fix

parent 7b1ae4f5
...@@ -20,9 +20,9 @@ end ...@@ -20,9 +20,9 @@ end
function cm.regop(e,tp,eg,ep,ev,re,r,rp) function cm.regop(e,tp,eg,ep,ev,re,r,rp)
for i=0,1 do for i=0,1 do
if rp==i and eg:IsExists(cm.cfilter,1,nil,rp) then if rp==i and eg:IsExists(cm.cfilter,1,nil,rp) then
local flag=0
for tc in aux.Next(eg) do for tc in aux.Next(eg) do
if cm.cfilter(tc,rp) then if cm.cfilter(tc,rp) then
local flag=0
if not flag then flag=0 end if not flag then flag=0 end
if tc:IsOriginalComplexType(TYPE_SPELL) then if tc:IsOriginalComplexType(TYPE_SPELL) then
flag=TYPE_SPELL flag=TYPE_SPELL
...@@ -69,7 +69,14 @@ function cm.spfilter(c,e,tp) ...@@ -69,7 +69,14 @@ function cm.spfilter(c,e,tp)
end end
function cm.spop(e,tp,eg) function cm.spop(e,tp,eg)
local c=rscf.GetSelf(e) local c=rscf.GetSelf(e)
if not c or rssf.SpecialSummon(c,0,tp,tp,true,true,POS_FACEUP)<=0 then return end if not c then return end
local res=false
if c:IsLocation(LOCATION_GRAVE) then
res=rssf.SpecialSummon(c,0,tp,tp,true,true,POS_FACEUP,nil,{"leave",LOCATION_REMOVED })<=0
else
res=rssf.SpecialSummon(c,0,tp,tp,true,true,POS_FACEUP)<=0
end
if not res then return end
c:CompleteProcedure() c:CompleteProcedure()
local flaglist={Duel.GetFlagEffectLabel(tp,m)} local flaglist={Duel.GetFlagEffectLabel(tp,m)}
local flag=0 local flag=0
...@@ -90,7 +97,7 @@ function cm.tgop(e,tp) ...@@ -90,7 +97,7 @@ function cm.tgop(e,tp)
rsop.SelectToGrave(tp,Card.IsAbleToGrave,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil,{}) rsop.SelectToGrave(tp,Card.IsAbleToGrave,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil,{})
end end
function cm.thop(e,tp) function cm.thop(e,tp)
rsop.SelectToHand(tp,Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil,{}) rsop.SelectToHand(tp,Card.IsAbleToHand,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,1,nil,{tp})
end end
function cm.drop(e,tp) function cm.drop(e,tp)
local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
......
...@@ -52,7 +52,14 @@ function cm.spfilter(c,e,tp) ...@@ -52,7 +52,14 @@ function cm.spfilter(c,e,tp)
end end
function cm.spop(e,tp,eg) function cm.spop(e,tp,eg)
local c=rscf.GetSelf(e) local c=rscf.GetSelf(e)
if not c or rssf.SpecialSummon(c,0,tp,tp,true,true,POS_FACEUP)<=0 then return end if not c then return end
local res=false
if c:IsLocation(LOCATION_GRAVE) then
res=rssf.SpecialSummon(c,0,tp,tp,true,true,POS_FACEUP,nil,{"leave",LOCATION_REMOVED })<=0
else
res=rssf.SpecialSummon(c,0,tp,tp,true,true,POS_FACEUP)<=0
end
if not res then return end
c:CompleteProcedure() c:CompleteProcedure()
local g=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,LOCATION_GRAVE,LOCATION_GRAVE,nil) local g=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,LOCATION_GRAVE,LOCATION_GRAVE,nil)
if #g>0 then if #g>0 then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment