Commit c9a79d72 authored by 聖園ミカ's avatar 聖園ミカ 🐟

54188

parent da23423e
Pipeline #30900 failed with stages
in 21 minutes and 13 seconds
...@@ -41,7 +41,7 @@ function s.initial_effect(c) ...@@ -41,7 +41,7 @@ function s.initial_effect(c)
e4:SetCode(EVENT_FREE_CHAIN) e4:SetCode(EVENT_FREE_CHAIN)
e4:SetRange(LOCATION_MZONE) e4:SetRange(LOCATION_MZONE)
e4:SetCountLimit(1,id+1) e4:SetCountLimit(1,id+1)
e4:SetCondition(s.recon) --e4:SetCondition(s.recon)
e4:SetTarget(s.retg) e4:SetTarget(s.retg)
e4:SetOperation(s.reop) e4:SetOperation(s.reop)
c:RegisterEffect(e4) c:RegisterEffect(e4)
......
...@@ -104,7 +104,7 @@ function s.imcon(e) ...@@ -104,7 +104,7 @@ function s.imcon(e)
return c:GetOverlayCount()>0 return c:GetOverlayCount()>0
end end
function s.efilter(e,re) function s.efilter(e,re)
return e:GetHandlerPlayer()~=re:GetOwnerPlayer() and re:IsActivated() return e:GetHandlerPlayer()~=re:GetOwnerPlayer()
end end
......
...@@ -63,7 +63,7 @@ function s.specialsum(c) ...@@ -63,7 +63,7 @@ function s.specialsum(c)
e2:SetDescription(2) e2:SetDescription(2)
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_MOVE) e2:SetCode(EVENT_DETACH_MATERIAL)
e2:SetRange(LOCATION_HAND) e2:SetRange(LOCATION_HAND)
e2:SetProperty(EFFECT_FLAG_DELAY) e2:SetProperty(EFFECT_FLAG_DELAY)
e2:SetCountLimit(1,id) e2:SetCountLimit(1,id)
...@@ -72,12 +72,11 @@ function s.specialsum(c) ...@@ -72,12 +72,11 @@ function s.specialsum(c)
e2:SetOperation(s.spop) e2:SetOperation(s.spop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function s.cfilter(c) function s.cfilter(c,tp)
return c:IsPreviousLocation(LOCATION_OVERLAY) and not c:IsReason(REASON_RULE) return c:IsLocation(LOCATION_MZONE) and c:IsControler(tp)
--and not c:IsLocation(LOCATION_EXTRA+LOCATION_DECK+LOCATION_HAND)
end end
function s.spcon(e,tp,eg,ep,ev,re,r,rp) function s.spcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(s.cfilter,1,nil) return eg:IsExists(s.cfilter,1,nil,tp)
end end
function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
......
...@@ -63,7 +63,7 @@ function s.specialsum(c) ...@@ -63,7 +63,7 @@ function s.specialsum(c)
e2:SetDescription(2) e2:SetDescription(2)
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_MOVE) e2:SetCode(EVENT_DETACH_MATERIAL)
e2:SetRange(LOCATION_HAND) e2:SetRange(LOCATION_HAND)
e2:SetProperty(EFFECT_FLAG_DELAY) e2:SetProperty(EFFECT_FLAG_DELAY)
e2:SetCountLimit(1,id) e2:SetCountLimit(1,id)
...@@ -72,12 +72,11 @@ function s.specialsum(c) ...@@ -72,12 +72,11 @@ function s.specialsum(c)
e2:SetOperation(s.spop) e2:SetOperation(s.spop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function s.cfilter(c) function s.cfilter(c,tp)
return c:IsPreviousLocation(LOCATION_OVERLAY) and not c:IsReason(REASON_RULE) return c:IsLocation(LOCATION_MZONE) and c:IsControler(tp)
--and not c:IsLocation(LOCATION_EXTRA+LOCATION_DECK+LOCATION_HAND)
end end
function s.spcon(e,tp,eg,ep,ev,re,r,rp) function s.spcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(s.cfilter,1,nil) return eg:IsExists(s.cfilter,1,nil,tp)
end end
function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
......
...@@ -66,7 +66,7 @@ function s.specialsum(c) ...@@ -66,7 +66,7 @@ function s.specialsum(c)
e1:SetCategory(CATEGORY_SPECIAL_SUMMON) e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetCountLimit(1,id+114) e1:SetCountLimit(1,id+EFFECT_COUNT_CODE_OATH)
e1:SetCondition(s.condition) e1:SetCondition(s.condition)
e1:SetTarget(s.target) e1:SetTarget(s.target)
e1:SetOperation(s.activate) e1:SetOperation(s.activate)
......
...@@ -35,7 +35,7 @@ function s.tgfilter(e,c) ...@@ -35,7 +35,7 @@ function s.tgfilter(e,c)
return c:IsSetCard(0x5528) return c:IsSetCard(0x5528)
end end
function s.xyzfilter(c) function s.xyzfilter(c)
return c:IsSetCard(0x5528) and c:IsFaceup() return c:IsSetCard(0x5528) and c:IsFaceup() and c:IsType(TYPE_XYZ)
end end
function s.ofilter(c,tp) function s.ofilter(c,tp)
return c:IsCanOverlay() and Duel.IsExistingMatchingCard(s.xyzfilter,tp,LOCATION_MZONE,0,1,c) return c:IsCanOverlay() and Duel.IsExistingMatchingCard(s.xyzfilter,tp,LOCATION_MZONE,0,1,c)
......
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