Commit c4b90a2b authored by 花桃白音's avatar 花桃白音

fix #124s

parent 19f14918
......@@ -14,6 +14,7 @@ function s.initial_effect(c)
e1:SetCountLimit(1,id+10000)
e1:SetTarget(s.tg)
e1:SetOperation(s.regop)
c:RegisterEffect(e1)
--
local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(id,1))
......@@ -64,7 +65,7 @@ end
function s.regop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
local tg=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_DECK+LOCATION_HAND+LOCATION_REMOVED,0,1,1,nil)
if tg:GetCount()>0 and Duel.Overlay(c,tg)~=0 then
if tg:GetCount()>0 and Duel.Overlay(c,tg)~=0 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,1,1,nil)
if g:GetCount()>0 then
......
......@@ -135,7 +135,7 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp)
end
function s.tdfilter(c)
return c:IsSetCard(0x32a1) and not c:IsType(TYPE_MONSTER)
return c:IsSetCard(0x32a1) and c:IsType(TYPE_MONSTER)
and c:IsAbleToGrave()
end
function s.spcon3(e,c)
......@@ -144,7 +144,7 @@ function s.spcon3(e,c)
return Duel.IsExistingMatchingCard(s.tdfilter,tp,LOCATION_HAND,0,1,nil)
end
function s.spop3(e,tp,eg,ep,ev,re,r,rp,c)
local g=Duel.SelectMatchingCard(tp,s.tdfilter,1,1,nil)
local g=Duel.SelectMatchingCard(tp,s.tdfilter,tp,LOCATION_HAND,0,1,1,nil)
c:SetMaterial(g)
Duel.SendtoGrave(g,REASON_EFFECT)
end
......
......@@ -29,10 +29,10 @@ function s.initial_effect(c)
e3:SetCode(EVENT_SUMMON_SUCCESS)
e3:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
e3:SetCountLimit(1,id)
e3:SetTarget(s.e3tg)
e3:SetOperation(s.e3op)
e3:SetTarget(s.e1tg)
e3:SetOperation(s.e1op)
c:RegisterEffect(e3)
local e31=e3:Clone()
local e11=e3:Clone()
e11:SetCode(EVENT_SPSUMMON_SUCCESS)
c:RegisterEffect(e11)
end
......
......@@ -32,8 +32,8 @@ function s.initial_effect(c)
e3:SetRange(LOCATION_MZONE)
e3:SetCountLimit(1,id+20000)
e3:SetCondition(s.condition)
e3:SetTarget(s.tg2)
e3:SetOperation(s.op2)
e3:SetTarget(s.sptg)
e3:SetOperation(s.spop)
c:RegisterEffect(e3)
end
function s.cfilter(c)
......
......@@ -61,10 +61,10 @@ function s.initial_effect(c)
c:RegisterEffect(e9)
end
function s.lcheck(g)
return g:IsExists(s.mfilter,1,nil)
return g:IsExists(s.mfilter,3,nil)
end
function s.mfilter(c)
return c:IsAttribute(ATTRIBUTE_WATER)
return c:IsRace(RACE_MACHINE) and c:IsType(TYPE_LINK)
end
--
function s.efilter2(e,te)
......
......@@ -20,7 +20,7 @@ function s.initial_effect(c)
c:RegisterEffect(e1)
--
local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_CONTINUOUS)
e4:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
e4:SetCode(EVENT_CHAINING)
e4:SetRange(LOCATION_MZONE)
e4:SetCondition(s.con4)
......@@ -102,7 +102,7 @@ function s.operation1(e,tp,eg,ep,ev,re,r,rp)
e1:SetValue(1)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e1)
end
end
end
if e:GetLabel()==2 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
......@@ -114,12 +114,12 @@ function s.operation1(e,tp,eg,ep,ev,re,r,rp)
e3:SetProperty(EFFECT_FLAG_CLIENT_HINT)
e3:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_TOGRAVE)
e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
e3:SetCode(EVENT_BATTLE_START)
e3:SetCode(EVENT_BATTLE_START)
e3:SetCondition(s.atkcon)
e3:SetOperation(s.atkop)
e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
c:RegisterEffect(e3)
end
end
end
end
function s.atkcon(e,tp,eg,ep,ev,re,r,rp)
......@@ -153,7 +153,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp)
end
--
function s.con4(e,tp,eg,ep,ev,re,r,rp)
return re:GetHandler():IsType(TYPE_SPELL) and rp==tp
return re:IsActiveType(TYPE_SPELL) and rp==tp
end
function s.op4(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
......
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