Commit 6adab656 authored by POLYMER's avatar POLYMER

fix

parent 07763e7c
...@@ -7027,6 +7027,7 @@ ...@@ -7027,6 +7027,7 @@
99108884 0 99108884 0
99108886 0 99108886 0
99108888 0 99108888 0
11180031 0
#limit #limit
33403513 1 33403513 1
82204250 0 82204250 0
......
...@@ -115,13 +115,9 @@ function s.mtop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -115,13 +115,9 @@ function s.mtop2(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function s.pbfilter(c)
return c:IsSetCard(0x611) and not c:IsPublic()
end
-- 效果②:赋予场发效果 -- 效果②:赋予场发效果
function s.sctg(e,tp,eg,ep,ev,re,r,rp,chk) function s.sctg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(s.pbfilter,tp,LOCATION_HAND,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_ONFIELD,0,1,nil) and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,0,LOCATION_ONFIELD,1,nil) end
Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,0,tp,1) Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,0,tp,1)
end end
......
...@@ -11,7 +11,7 @@ function s.initial_effect(c) ...@@ -11,7 +11,7 @@ function s.initial_effect(c)
e2:SetType(EFFECT_TYPE_FIELD) e2:SetType(EFFECT_TYPE_FIELD)
e2:SetCode(EFFECT_ACTIVATE_COST) e2:SetCode(EFFECT_ACTIVATE_COST)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_IGNORE_IMMUNE)
e2:SetTargetRange(1,1) e2:SetTargetRange(1,1)
e2:SetCondition(s.accon) e2:SetCondition(s.accon)
e2:SetTarget(s.actarget) e2:SetTarget(s.actarget)
......
...@@ -28,7 +28,6 @@ function s.initial_effect(c) ...@@ -28,7 +28,6 @@ function s.initial_effect(c)
e2:SetType(EFFECT_TYPE_QUICK_O) e2:SetType(EFFECT_TYPE_QUICK_O)
e2:SetCode(EVENT_FREE_CHAIN) e2:SetCode(EVENT_FREE_CHAIN)
e2:SetRange(LOCATION_GRAVE+LOCATION_REMOVED) e2:SetRange(LOCATION_GRAVE+LOCATION_REMOVED)
e2:SetCondition(s.setcon)
e2:SetTarget(s.settg) e2:SetTarget(s.settg)
e2:SetOperation(s.setop) e2:SetOperation(s.setop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
...@@ -82,14 +81,6 @@ function s.distg(e,c) ...@@ -82,14 +81,6 @@ function s.distg(e,c)
end end
function s.cfilter1(c,se)
if not (se==nil or c:GetReasonEffect()~=se) then return false end
local code1,code2=c:GetPreviousCodeOnField()
return c:IsPreviousLocation(LOCATION_ONFIELD) and c:IsPreviousPosition(POS_FACEUP) and (code1==65812000 or code2==65812000)
end
function s.setcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(s.cfilter1,1,nil,se) and not eg:IsContains(e:GetHandler())
end
function s.settg(e,tp,eg,ep,ev,re,r,rp,chk) function s.settg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToDeck() and Duel.GetFlagEffect(tp,id+1)==0 end if chk==0 then return e:GetHandler():IsAbleToDeck() and Duel.GetFlagEffect(tp,id+1)==0 end
local ph=Duel.GetCurrentPhase() local ph=Duel.GetCurrentPhase()
......
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