Commit 2e1ebefd authored by POLYMER's avatar POLYMER

fix

parent 5f933e40
...@@ -40,7 +40,7 @@ function c20250330.spcfilter(e,tp) ...@@ -40,7 +40,7 @@ function c20250330.spcfilter(e,tp)
return Duel.GetCounter(tp,1,0,0x154a)>=1 return Duel.GetCounter(tp,1,0,0x154a)>=1
end end
function c20250330.spcon(e,tp,eg,ep,ev,re,r,rp) function c20250330.spcon(e,tp,eg,ep,ev,re,r,rp)
return not Duel.IsExistingMatchingCard(c20250330.spcfilter,tp,LOCATION_MZONE,0,1,nil) return not Duel.IsExistingMatchingCard(c20250330.spcfilter,tp,LOCATION_ONFIELD,0,1,nil)
end end
function c20250330.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function c20250330.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
......
...@@ -46,7 +46,7 @@ function c20250336.spcfilter(tp) ...@@ -46,7 +46,7 @@ function c20250336.spcfilter(tp)
return Duel.GetCounter(tp,1,0,0x154a)>0 return Duel.GetCounter(tp,1,0,0x154a)>0
end end
function c20250336.spcon(e,tp,eg,ep,ev,re,r,rp) function c20250336.spcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(c20250336.spcfilter,tp,LOCATION_MZONE,0,1,nil,tp) return Duel.IsExistingMatchingCard(c20250336.spcfilter,tp,LOCATION_ONFIELD,0,1,nil,tp)
end end
function c20250336.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function c20250336.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
......
...@@ -44,9 +44,8 @@ function s.initial_effect(c) ...@@ -44,9 +44,8 @@ function s.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function s.ffilter(c,fc,sub,mg,sg) function s.ffilter(c,fc,sub,mg,sg)
if not sg then return true end return c:IsRace(RACE_DINOSAUR) and (not sg or sg:FilterCount(aux.TRUE,c)==0
return sg:IsExists(Card.IsFusionAttribute,1,c,c:GetFusionAttribute()) or sg:IsExists(Card.IsFusionAttribute,1,c,c:GetFusionAttribute()))
and c:IsRace(RACE_DINOSAUR)
end end
function s.splimit(e,se,sp,st) function s.splimit(e,se,sp,st)
return not (e:GetHandler():IsLocation(LOCATION_EXTRA) and e:GetHandler():IsFacedown()) return not (e:GetHandler():IsLocation(LOCATION_EXTRA) and e:GetHandler():IsFacedown())
......
...@@ -16,7 +16,7 @@ function c95101105.initial_effect(c) ...@@ -16,7 +16,7 @@ function c95101105.initial_effect(c)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(95101105,1)) e2:SetDescription(aux.Stringid(95101105,1))
e2:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_MAIN_END) e2:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_MAIN_END)
e2:SetCategory(CATEGORY_DRAW) e2:SetCategory(CATEGORY_REMOVE+CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
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_MZONE) e2:SetRange(LOCATION_MZONE)
......
...@@ -16,7 +16,7 @@ function c95101107.initial_effect(c) ...@@ -16,7 +16,7 @@ function c95101107.initial_effect(c)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(95101107,1)) e2:SetDescription(aux.Stringid(95101107,1))
e2:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_MAIN_END) e2:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_MAIN_END)
e2:SetCategory(CATEGORY_DRAW) e2:SetCategory(CATEGORY_REMOVE+CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
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_MZONE) e2:SetRange(LOCATION_MZONE)
......
...@@ -16,7 +16,7 @@ function c95101109.initial_effect(c) ...@@ -16,7 +16,7 @@ function c95101109.initial_effect(c)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(95101109,1)) e2:SetDescription(aux.Stringid(95101109,1))
e2:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_MAIN_END) e2:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_MAIN_END)
e2:SetCategory(CATEGORY_DRAW) e2:SetCategory(CATEGORY_REMOVE+CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
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_MZONE) e2:SetRange(LOCATION_MZONE)
......
...@@ -31,7 +31,7 @@ function c98500320.initial_effect(c) ...@@ -31,7 +31,7 @@ function c98500320.initial_effect(c)
c:RegisterEffect(e4) c:RegisterEffect(e4)
-- 启动效果注册 -- 启动效果注册
local e5=Effect.CreateEffect(c) local e5=Effect.CreateEffect(c)
e5:SetDescription(aux.Stringid(98500320,0)) e5:SetDescription(aux.Stringid(98500320,1))
e5:SetType(EFFECT_TYPE_QUICK_O) e5:SetType(EFFECT_TYPE_QUICK_O)
e5:SetCode(EVENT_FREE_CHAIN) e5:SetCode(EVENT_FREE_CHAIN)
e5:SetHintTiming(0,TIMINGS_CHECK_MONSTER) e5:SetHintTiming(0,TIMINGS_CHECK_MONSTER)
...@@ -90,6 +90,6 @@ function c98500320.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -90,6 +90,6 @@ function c98500320.operation(e,tp,eg,ep,ev,re,r,rp)
e2:SetValue(1) e2:SetValue(1)
e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
tc:RegisterFlagEffect(98500320,RESET_EVENT+0xff0000+RESET_PHASE+PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(98500320,3)) tc:RegisterFlagEffect(98500320,RESET_EVENT+0xff0000+RESET_PHASE+PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(98500320,2))
end end
end end
\ No newline at end of file
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