Commit f7a368b9 authored by POLYMER's avatar POLYMER

fix

parent cf00ca85
...@@ -52,7 +52,6 @@ function s.initial_effect(c) ...@@ -52,7 +52,6 @@ function s.initial_effect(c)
c:RegisterEffect(e77) c:RegisterEffect(e77)
end end
function s.atlimit(e,c) function s.atlimit(e,c)
local tp=e:GetHandlerPlayer()
return c:IsSummonLocation(LOCATION_EXTRA) and not c:IsImmuneToEffect(e) return c:IsSummonLocation(LOCATION_EXTRA) and not c:IsImmuneToEffect(e)
end end
function s.efilter(e,te) function s.efilter(e,te)
...@@ -94,7 +93,7 @@ end ...@@ -94,7 +93,7 @@ end
function s.rtg2(e,tp,eg,ep,ev,re,r,rp,chk) function s.rtg2(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,0,LOCATION_HAND,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,0,LOCATION_HAND,1,nil) end
Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription()) Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,0,1-tp,LOCATION_HAND) Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,1-tp,LOCATION_HAND)
end end
function s.rop2(e,tp,eg,ep,ev,re,r,rp) function s.rop2(e,tp,eg,ep,ev,re,r,rp)
local g0=Duel.GetFieldGroup(tp,0,LOCATION_HAND) local g0=Duel.GetFieldGroup(tp,0,LOCATION_HAND)
......
...@@ -25,7 +25,7 @@ function s.initial_effect(c) ...@@ -25,7 +25,7 @@ function s.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function s.spcfilter(c,tp) function s.spcfilter(c,tp)
return c:IsPreviousLocation(LOCATION_HAND+LOCATION_ONFIELD) and c:IsPreviousControler(tp) and bit.band(c:GetPreviousRaceOnField(),RACE_WYRM)~=0 and bit.band(c:GetPreviousAttributeOnField(),ATTRIBUTE_FIRE)~=0 and (se==nil or c:GetReasonEffect()~=se) return c:IsPreviousLocation(LOCATION_HAND+LOCATION_ONFIELD) and c:IsPreviousControler(tp) and bit.band(c:GetPreviousRaceOnField(),RACE_WYRM)~=0 and bit.band(c:GetPreviousAttributeOnField(),ATTRIBUTE_FIRE)~=0
end end
function s.spcon(e,tp,eg,ep,ev,re,r,rp) function s.spcon(e,tp,eg,ep,ev,re,r,rp)
local f=not eg:IsContains(e:GetHandler()) and eg:IsExists(s.spcfilter,1,nil,tp) local f=not eg:IsContains(e:GetHandler()) and eg:IsExists(s.spcfilter,1,nil,tp)
......
...@@ -18,7 +18,7 @@ function s.initial_effect(c) ...@@ -18,7 +18,7 @@ function s.initial_effect(c)
e5:SetCategory(CATEGORY_REMOVE) e5:SetCategory(CATEGORY_REMOVE)
e5:SetType(EFFECT_TYPE_IGNITION) e5:SetType(EFFECT_TYPE_IGNITION)
e5:SetRange(LOCATION_MZONE) e5:SetRange(LOCATION_MZONE)
e5:SetCountLimit(1) e5:SetCountLimit(1,EFFECT_COUNT_CODE_SINGLE)
e5:SetCondition(aux.NOT(s.qcon)) e5:SetCondition(aux.NOT(s.qcon))
e5:SetCost(s.rcost) e5:SetCost(s.rcost)
e5:SetTarget(s.rtg) e5:SetTarget(s.rtg)
...@@ -41,7 +41,6 @@ function s.initial_effect(c) ...@@ -41,7 +41,6 @@ function s.initial_effect(c)
c:RegisterEffect(e4) c:RegisterEffect(e4)
end end
function s.atlimit(e,c) function s.atlimit(e,c)
local tp=e:GetHandlerPlayer()
return c:IsLevel(0) and not c:IsImmuneToEffect(e) return c:IsLevel(0) and not c:IsImmuneToEffect(e)
end end
function s.efilter(e,te) function s.efilter(e,te)
...@@ -70,7 +69,6 @@ function s.rtg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -70,7 +69,6 @@ function s.rtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return #g==5 and g:FilterCount(Card.IsAbleToRemove,nil)>0 end if chk==0 then return #g==5 and g:FilterCount(Card.IsAbleToRemove,nil)>0 end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE)
e:SetLabel(Duel.AnnounceType(tp)) e:SetLabel(Duel.AnnounceType(tp))
Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,1-tp,LOCATION_DECK)
end end
function s.rop(e,tp,eg,ep,ev,re,r,rp) function s.rop(e,tp,eg,ep,ev,re,r,rp)
if Duel.GetFieldGroupCount(tp,0,LOCATION_DECK)<5 then return end if Duel.GetFieldGroupCount(tp,0,LOCATION_DECK)<5 then return end
......
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