Commit e190cc55 authored by POLYMER's avatar POLYMER

fix

parent e6958ec4
...@@ -30,7 +30,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -30,7 +30,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
e:SetLabel(ac) e:SetLabel(ac)
end end
function s.filter(c,e,tp) function s.filter(c,e,tp)
return c:IsCanBeSpecialSummoned(e,0,tp,true,true) and c:IsType(TYPE_RITUAL) return c:IsCanBeSpecialSummoned(e,0,tp,true,true) and c:IsType(TYPE_RITUAL+TYPE_MONSTER)
end end
function s.cdfilter(c,code) function s.cdfilter(c,code)
return c:IsCode(13000757) or c:IsCode(code) return c:IsCode(13000757) or c:IsCode(code)
......
...@@ -36,7 +36,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -36,7 +36,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetCode(EFFECT_UPDATE_ATTACK)
e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTargetRange(LOCATION_MZONE,0)
e1:SetValue(1500) e1:SetValue(800)
e1:SetReset(RESET_PHASE+PHASE_END,2) e1:SetReset(RESET_PHASE+PHASE_END,2)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
...@@ -56,13 +56,14 @@ function s.rlop(e,tp,eg,ep,ev,re,r,rp) ...@@ -56,13 +56,14 @@ function s.rlop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local code=tc:GetCode() local code=tc:GetCode()
local cs=_G["c"..code] local cs=_G["c"..code]
Duel.SSet(tp,tc,tp,true) if Duel.SSet(tp,tc,tp,true) then
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_QP_ACT_IN_SET_TURN) e1:SetCode(EFFECT_QP_ACT_IN_SET_TURN)
e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE) e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
e1:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET) e1:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
end
--copy effect --copy effect
if tc:IsType(TYPE_QUICKPLAY) then return end if tc:IsType(TYPE_QUICKPLAY) then return end
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
...@@ -72,18 +73,13 @@ function s.rlop(e,tp,eg,ep,ev,re,r,rp) ...@@ -72,18 +73,13 @@ function s.rlop(e,tp,eg,ep,ev,re,r,rp)
e2:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET) e2:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET)
e2:SetValue(TYPE_QUICKPLAY) e2:SetValue(TYPE_QUICKPLAY)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
local e3=Effect.CreateEffect(c) tc:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0))
e3:SetDescription(aux.Stringid(id,1)) local eff=tc:GetActivateEffect()
e3:SetType(EFFECT_TYPE_QUICK_O+EFFECT_TYPE_ACTIVATE) local eff2=eff:Clone()
e3:SetCode(EVENT_FREE_CHAIN) eff:SetDescription(aux.Stringid(id,0))
e3:SetRange(LOCATION_SZONE) eff2:SetProperty(eff2:GetProperty(),EFFECT_FLAG2_COF)
e3:SetProperty(EFFECT_FLAG_SET_AVAILABLE) eff2:SetHintTiming(TIMING_END_PHASE,TIMING_END_PHASE)
e3:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE) eff2:SetReset(RESET_EVENT+RESETS_STANDARD)
e3:SetCountLimit(1,code+EFFECT_COUNT_CODE_OATH) tc:RegisterEffect(eff2)
e3:SetTarget(cs.target)
e3:SetOperation(cs.activate)
e3:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET)
tc:RegisterEffect(e3)
end end
end end
...@@ -6,7 +6,7 @@ function cm.initial_effect(c) ...@@ -6,7 +6,7 @@ function cm.initial_effect(c)
e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH) e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetCost(cm.cost) --e1:SetCost(cm.cost)
e1:SetTarget(cm.target) e1:SetTarget(cm.target)
e1:SetOperation(cm.activate) e1:SetOperation(cm.activate)
c:RegisterEffect(e1) c:RegisterEffect(e1)
...@@ -15,6 +15,7 @@ function cm.initial_effect(c) ...@@ -15,6 +15,7 @@ function cm.initial_effect(c)
e2:SetDescription(aux.Stringid(m,0)) e2:SetDescription(aux.Stringid(m,0))
e2:SetType(EFFECT_TYPE_SINGLE) e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetCode(EFFECT_QP_ACT_IN_NTPHAND) e2:SetCode(EFFECT_QP_ACT_IN_NTPHAND)
e2:SetCost(cm.cost)
e2:SetCondition(cm.handcon) e2:SetCondition(cm.handcon)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
...@@ -45,9 +46,10 @@ function cm.handcon(e) ...@@ -45,9 +46,10 @@ function cm.handcon(e)
end end
function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk) function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetTurnPlayer()==tp or Duel.IsExistingMatchingCard(cm.hcfil,tp,LOCATION_HAND,0,1,nil) end if chk==0 then return Duel.GetTurnPlayer()==tp or Duel.IsExistingMatchingCard(cm.hcfil,tp,LOCATION_HAND,0,1,nil) end
if Duel.GetTurnPlayer()==tp then
e:SetLabel(1) e:SetLabel(1)
else if Duel.GetTurnPlayer()~=tp then
--e:SetLabel(1)
--else
e:SetLabel(2) e:SetLabel(2)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
local g=Duel.GetMatchingGroup(cm.hcfil,tp,LOCATION_HAND,0,nil):Select(tp,1,1,nil) local g=Duel.GetMatchingGroup(cm.hcfil,tp,LOCATION_HAND,0,nil):Select(tp,1,1,nil)
......
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