Commit 054bf77e authored by argon.sun's avatar argon.sun

fix

parent 403d2592
...@@ -39,7 +39,7 @@ function c26533075.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -39,7 +39,7 @@ function c26533075.activate(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c26533075.descon(e,tp,eg,ep,ev,re,r,rp) function c26533075.descon(e,tp,eg,ep,ev,re,r,rp)
return bit.band(r,REASON_DESTROY)~=0 and rp~=tp and re:GetHandler():IsType(TYPE_SPELL+TYPE_TRAP) return bit.band(r,REASON_DESTROY)~=0 and rp~=tp and re:IsActiveType(TYPE_SPELL+TYPE_TRAP)
and e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD) and e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
and e:GetHandler():IsPreviousPosition(POS_FACEDOWN) and e:GetHandler():IsPreviousPosition(POS_FACEDOWN)
end end
......
...@@ -38,7 +38,7 @@ function c3129635.destg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -38,7 +38,7 @@ function c3129635.destg(e,tp,eg,ep,ev,re,r,rp,chk)
local d=Duel.GetAttackTarget() local d=Duel.GetAttackTarget()
if chk==0 then if chk==0 then
if a:IsControler(tp) then return d and a~=e:GetHandler() and bit.band(a:GetOriginalType(),TYPE_TRAP)~=0 if a:IsControler(tp) then return d and a~=e:GetHandler() and bit.band(a:GetOriginalType(),TYPE_TRAP)~=0
else return d and d~=e:Gethandler() and bit.band(d:GetOriginalType(),TYPE_TRAP)~=0 end else return d and d~=e:GetHandler() and bit.band(d:GetOriginalType(),TYPE_TRAP)~=0 end
end end
if a:IsControler(tp) then if a:IsControler(tp) then
Duel.SetOperationInfo(0,CATEGORY_DESTROY,d,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DESTROY,d,1,0,0)
......
...@@ -30,7 +30,7 @@ function c34004470.initial_effect(c) ...@@ -30,7 +30,7 @@ function c34004470.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function c34004470.atcost(e,tp,eg,ep,ev,re,r,rp,chk) function c34004470.atcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingDuel.CheckLPCost(tp,1000) if chk==0 then return Duel.CheckLPCost(tp,1000)
and Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) end and Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) end
Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD) Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD)
Duel.PayLPCost(tp,1000) Duel.PayLPCost(tp,1000)
......
...@@ -15,7 +15,7 @@ function c4376658.spfilter1(c,tp) ...@@ -15,7 +15,7 @@ function c4376658.spfilter1(c,tp)
and Duel.IsExistingMatchingCard(c4376658.spfilter2,tp,LOCATION_MZONE,0,1,c) and Duel.IsExistingMatchingCard(c4376658.spfilter2,tp,LOCATION_MZONE,0,1,c)
end end
function c4376658.spfilter2(c) function c4376658.spfilter2(c)
return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_WATER) and c:IsAbleToGraveAsCost() return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_FIRE) and c:IsAbleToGraveAsCost()
end end
function c4376658.spcon(e,c) function c4376658.spcon(e,c)
if c==nil then return true end if c==nil then return true end
......
...@@ -22,15 +22,12 @@ function c62950604.initial_effect(c) ...@@ -22,15 +22,12 @@ function c62950604.initial_effect(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
e1:SetLabelObject(e2) e1:SetLabelObject(e2)
end end
function c62950604.cfilter(c,e,tp)
return c:IsRace(RACE_PSYCHO) and c:IsAbleToRemove() and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end
function c62950604.filter(c) function c62950604.filter(c)
return c:IsRace(RACE_PSYCHO) and c:IsAbleToRemove() return c:IsRace(RACE_PSYCHO) and c:IsAbleToRemove()
end end
function c62950604.rmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c62950604.rmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chk:IsControler(tp) and c62950604.filter(chkc) end if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chk:IsControler(tp) and c62950604.filter(chkc) end
if chk==0 then return Duel.IsExistingTarget(c62950604.cfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end if chk==0 then return Duel.IsExistingTarget(c62950604.filter,tp,LOCATION_GRAVE,0,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local g=Duel.SelectTarget(tp,c62950604.filter,tp,LOCATION_GRAVE,0,1,1,nil) local g=Duel.SelectTarget(tp,c62950604.filter,tp,LOCATION_GRAVE,0,1,1,nil)
Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0)
......
...@@ -24,15 +24,11 @@ function c69303178.ntop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -24,15 +24,11 @@ function c69303178.ntop(e,tp,eg,ep,ev,re,r,rp,c)
e1:SetProperty(EFFECT_FLAG_REPEAT) e1:SetProperty(EFFECT_FLAG_REPEAT)
e1:SetCountLimit(1) e1:SetCountLimit(1)
e1:SetCode(EVENT_PHASE+PHASE_END) e1:SetCode(EVENT_PHASE+PHASE_END)
e1:SetCondition(c69303178.tgcon)
e1:SetTarget(c69303178.tgtg) e1:SetTarget(c69303178.tgtg)
e1:SetOperation(c69303178.tgop) e1:SetOperation(c69303178.tgop)
e1:SetReset(RESET_EVENT+0xee0000) e1:SetReset(RESET_EVENT+0xee0000)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c69303178.tgcon(e,tp,eg,ep,ev,re,r,rp)
return tp==Duel.GetTurnPlayer()
end
function c69303178.tgtg(e,tp,eg,ep,ev,re,r,rp,chk) function c69303178.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,e:GetHandler(),1,0,0) Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,e:GetHandler(),1,0,0)
......
...@@ -48,14 +48,14 @@ function c8310162.exfilter(c,fid) ...@@ -48,14 +48,14 @@ function c8310162.exfilter(c,fid)
return c:IsFaceup() and c:IsCode(8310162) and (fid==nil or c:GetFieldID()<fid) return c:IsFaceup() and c:IsCode(8310162) and (fid==nil or c:GetFieldID()<fid)
end end
function c8310162.excon(e) function c8310162.excon(e)
return Duel.IsExistingMatchingCard(c8310162.exfilter,0,LOCATION_ONFILED,LOCATION_ONFILED,1,nil) return Duel.IsExistingMatchingCard(c8310162.exfilter,0,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
end end
function c8310162.descon(e) function c8310162.descon(e)
local c=e:GetHandler() local c=e:GetHandler()
local f1=Duel.GetFieldCard(0,LOCATION_SZONE,5) local f1=Duel.GetFieldCard(0,LOCATION_SZONE,5)
local f2=Duel.GetFieldCard(1,LOCATION_SZONE,5) local f2=Duel.GetFieldCard(1,LOCATION_SZONE,5)
return ((f1==nil or not f1:IsFaceup() or f1:GetCode()~=27564031) and (f2==nil or not f2:IsFaceup() or f2:GetCode()~=27564031)) return ((f1==nil or not f1:IsFaceup() or f1:GetCode()~=27564031) and (f2==nil or not f2:IsFaceup() or f2:GetCode()~=27564031))
or Duel.IsExistingMatchingCard(c8310162.exfilter,0,LOCATION_ONFILED,LOCATION_ONFILED,1,nil,c:GetFieldID()) or Duel.IsExistingMatchingCard(c8310162.exfilter,0,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil,c:GetFieldID())
end end
function c8310162.spcon(e,tp,eg,ep,ev,re,r,rp) function c8310162.spcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
......
...@@ -33,15 +33,11 @@ function c95701283.otop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -33,15 +33,11 @@ function c95701283.otop(e,tp,eg,ep,ev,re,r,rp,c)
e1:SetProperty(EFFECT_FLAG_REPEAT) e1:SetProperty(EFFECT_FLAG_REPEAT)
e1:SetCountLimit(1) e1:SetCountLimit(1)
e1:SetCode(EVENT_PHASE+PHASE_END) e1:SetCode(EVENT_PHASE+PHASE_END)
e1:SetCondition(c95701283.tgcon)
e1:SetTarget(c95701283.tgtg) e1:SetTarget(c95701283.tgtg)
e1:SetOperation(c95701283.tgop) e1:SetOperation(c95701283.tgop)
e1:SetReset(RESET_EVENT+0xee0000) e1:SetReset(RESET_EVENT+0xee0000)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c95701283.tgcon(e,tp,eg,ep,ev,re,r,rp)
return tp==Duel.GetTurnPlayer()
end
function c95701283.tgtg(e,tp,eg,ep,ev,re,r,rp,chk) function c95701283.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,e:GetHandler(),1,0,0) Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,e:GetHandler(),1,0,0)
......
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