Commit fa2e80c6 authored by POLYMER's avatar POLYMER

fix

parent 15002eb1
...@@ -59,7 +59,7 @@ function s.pcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -59,7 +59,7 @@ function s.pcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsPublic() return e:GetHandler():IsPublic()
end end
function s.cfilter(c,ec) function s.cfilter(c,ec)
return ((c:GetOriginalType()&TYPE_SPELL+TYPE_TRAP)>0 and c:IsSetCard(0x3a70) or c:IsLocation(LOCATION_ONFIELD) and ec:IsLocation(LOCATION_HAND) and ec:IsPublic()) and c:IsAbleToGraveAsCost() return c:GetOriginalType()&(TYPE_SPELL+TYPE_TRAP)>0 and (c:IsSetCard(0x3a70) or c:IsLocation(LOCATION_ONFIELD) and ec:IsLocation(LOCATION_HAND) and ec:IsPublic()) and c:IsAbleToGraveAsCost()
end end
function s.sscost(e,tp,eg,ep,ev,re,r,rp,chk) function s.sscost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
......
...@@ -20,7 +20,6 @@ function s.initial_effect(c) ...@@ -20,7 +20,6 @@ function s.initial_effect(c)
e2:SetDescription(aux.Stringid(id,1)) e2:SetDescription(aux.Stringid(id,1))
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e2:SetCode(EVENT_CHAIN_SOLVING) e2:SetCode(EVENT_CHAIN_SOLVING)
e2:SetCountLimit(1,id+100)
e2:SetRange(LOCATION_HAND) e2:SetRange(LOCATION_HAND)
e2:SetCondition(s.imncon) e2:SetCondition(s.imncon)
e2:SetOperation(s.imnop) e2:SetOperation(s.imnop)
...@@ -114,7 +113,7 @@ end ...@@ -114,7 +113,7 @@ end
function s.imnop(e,tp,eg,ep,ev,re,r,rp) function s.imnop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local g=Duel.GetMatchingGroup(s.movefilter,tp,LOCATION_MZONE,0,nil) local g=Duel.GetMatchingGroup(s.movefilter,tp,LOCATION_MZONE,0,nil)
if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(id,2)) and Duel.SendtoDeck(c,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)>0 then if g:GetCount()>0 and Duel.GetFlagEffect(tp,id+100)==0 and Duel.SelectYesNo(tp,aux.Stringid(id,2)) and Duel.SendtoDeck(c,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)>0 then
Duel.Hint(HINT_CARD,0,id) Duel.Hint(HINT_CARD,0,id)
for tc in aux.Next(g) do for tc in aux.Next(g) do
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
...@@ -125,8 +124,10 @@ function s.imnop(e,tp,eg,ep,ev,re,r,rp) ...@@ -125,8 +124,10 @@ function s.imnop(e,tp,eg,ep,ev,re,r,rp)
e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_CHAIN) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_CHAIN)
e1:SetValue(s.efilter) e1:SetValue(s.efilter)
tc:RegisterEffect(e1) tc:RegisterEffect(e1,true)
end end
Duel.AdjustAll()
Duel.RegisterFlagEffect(tp,id+100,RESET_PHASE+PHASE_END,0,1)
Duel.RegisterFlagEffect(tp,12835102,RESET_PHASE+PHASE_END,0,1) Duel.RegisterFlagEffect(tp,12835102,RESET_PHASE+PHASE_END,0,1)
end end
end end
......
...@@ -40,13 +40,14 @@ function c49811161.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -40,13 +40,14 @@ function c49811161.spop(e,tp,eg,ep,ev,re,r,rp)
local cn=Duel.GetMatchingGroupCount(nil,tp,LOCATION_HAND,LOCATION_HAND,nil) local cn=Duel.GetMatchingGroupCount(nil,tp,LOCATION_HAND,LOCATION_HAND,nil)
c:AddCounter(0x4981,cn) c:AddCounter(0x4981,cn)
c:CompleteProcedure() c:CompleteProcedure()
c:RegisterFlagEffect(49811161,RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD,0,1)
end end
end end
function c49811161.cfilter(c,tp) function c49811161.cfilter(c,tp)
return c:IsSummonPlayer(1-tp) return c:IsSummonPlayer(1-tp)
end end
function c49811161.rctcon(e,tp,eg,ep,ev,re,r,rp) function c49811161.rctcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c49811161.cfilter,1,nil,tp) return eg:IsExists(c49811161.cfilter,1,nil,tp) and e:GetHandler():GetFlagEffect(49811161)~=0
end end
function c49811161.rctop(e,tp,eg,ep,ev,re,r,rp) function c49811161.rctop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
......
...@@ -118,9 +118,8 @@ end ...@@ -118,9 +118,8 @@ end
function cm.drtg(e,tp,eg,ep,ev,re,r,rp,chk) function cm.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetLabel()==100 and Duel.IsExistingMatchingCard(cm.drfilter,tp,LOCATION_HAND+LOCATION_GRAVE+LOCATION_MZONE,0,1,nil) end if chk==0 then return e:GetLabel()==100 and Duel.IsExistingMatchingCard(cm.drfilter,tp,LOCATION_HAND+LOCATION_GRAVE+LOCATION_MZONE,0,1,nil) end
e:SetLabel(0) e:SetLabel(0)
local g=Duel.GetMatchingGroup(cm.drfilter,tp,LOCATION_HAND+LOCATION_GRAVE+LOCATION_MZONE,0,nil)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local tc=g:Select(tp,1,1,nil):GetFirst() local tc=Duel.SelectMatchingCard(tp,cm.drfilter,tp,LOCATION_HAND+LOCATION_GRAVE+LOCATION_MZONE,0,1,1,nil):GetFirst()
Duel.Remove(tc,POS_FACEUP,REASON_COST) Duel.Remove(tc,POS_FACEUP,REASON_COST)
e:SetLabelObject(tc) e:SetLabelObject(tc)
Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
......
...@@ -4,7 +4,7 @@ cm.name="歼世死士轮 贩子" ...@@ -4,7 +4,7 @@ cm.name="歼世死士轮 贩子"
function cm.initial_effect(c) function cm.initial_effect(c)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(m,0)) e1:SetDescription(aux.Stringid(m,0))
e1:SetCategory(CATEGORY_DECKDES) e1:SetCategory(CATEGORY_DESTROY)
e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e1:SetCode(EVENT_SUMMON_SUCCESS) e1:SetCode(EVENT_SUMMON_SUCCESS)
e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetProperty(EFFECT_FLAG_DELAY)
......
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