Commit 44c716f2 authored by xiaoye's avatar xiaoye

fix

parent 06325e96
......@@ -15,6 +15,5 @@ function cm.op2(e,tp,eg,ep,ev,re,r,rp)
Duel.ChangePosition(g,POS_FACEUP_ATTACK)
end
function cm.con2(e,tp,eg,ep,ev,re,r,rp)
local ct=Duel.GetFlagEffectLabel(tp,FLAG_CONDITION)
return vgf.GetValueType(ct)=="number" and ct==10102001 and vgf.con.IsV(e)
return vgf.filter.FinalRush(tp) and vgf.con.IsV(e)
end
\ No newline at end of file
......@@ -4,8 +4,7 @@ function cm.initial_effect(c)
vgd.action.AbilityCont(c, m, LOCATION_CIRCLE, EFFECT_TYPE_SINGLE, EFFECT_UPDATE_ATTACK, 5000, cm.con)
end
function cm.con(e,tp,eg,ep,ev,re,r,rp)
local ct=Duel.GetFlagEffectLabel(tp,FLAG_CONDITION)
return vgf.GetValueType(ct)=="number" and ct==10102001
return vgf.filter.FinalRush(tp)
end
function cm.op(e,tp,eg,ep,ev,re,r,rp)
......
......@@ -6,8 +6,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
vgf.op.SoulCharge(1)
Duel.BreakEffect()
local ct=Duel.GetFlagEffectLabel(tp,FLAG_CONDITION)
if vgf.GetValueType(ct)=="number" and ct==10102001 and vgf.IsExistingMatchingCard(Card.IsFaceup,tp,LOCATION_DAMAGE,0,1,nil) and Duel.SelectEffectYesNo(tp,vgf.stringid(VgID,10)) then
if vgf.filter.FinalRush(tp) and vgf.IsExistingMatchingCard(Card.IsFaceup,tp,LOCATION_DAMAGE,0,1,nil) and Duel.SelectEffectYesNo(tp,vgf.stringid(VgID,10)) then
local g=vgf.SelectMatchingCard(HINTMSG_DAMAGE,e,tp,Card.IsFaceup,tp,LOCATION_DAMAGE,0,1,1,nil)
Duel.ChangePosition(g,POS_FACEDOWN_ATTACK)
if c:IsRelateToEffect(e) and c:IsFaceup() then
......
......@@ -5,8 +5,7 @@ function cm.initial_effect(c)
end
function cm.op(e,tp,eg,ep,ev,re,r,rp)
local num=1
local ct=Duel.GetFlagEffectLabel(tp,FLAG_CONDITION)
if vgf.GetValueType(ct)=="number" and ct==10102001 then num=num+1 end
if vgf.filter.FinalRush(tp) then num=num+1 end
vgf.op.SoulCharge(num)(e,tp,eg,ep,ev,re,r,rp)
end
function cm.con1(e,tp,eg,ep,ev,re,r,rp)
......
......@@ -9,8 +9,7 @@ function cm.checkcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsContains(e:GetHandler())
end
function cm.con(e,tp,eg,ep,ev,re,r,rp)
local ct=Duel.GetFlagEffectLabel(tp,FLAG_CONDITION)
return vgf.GetValueType(ct)=="number" and ct==10102001
return vgf.filter.FinalRush(tp)
end
function cm.con1(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetFlagEffect(tp,m)>0 and cm.con(e,tp,eg,ep,ev,re,r,rp)
......
......@@ -17,6 +17,5 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
vgf.Sendto(LOCATION_SOUL,g)
end
function cm.con(e,tp,eg,ep,ev,re,r,rp)
local ct=Duel.GetFlagEffectLabel(tp,FLAG_CONDITION)
return vgf.GetValueType(ct)=="number" and ct==10102001 and vgf.con.IsR(e)
return vgf.filter.FinalRush(tp) and vgf.con.IsR(e)
end
\ No newline at end of file
......@@ -12,8 +12,7 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp)
e1:SetValue(cm.aclimit)
e1:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e1,tp)
local ct=Duel.GetFlagEffectLabel(tp,FLAG_CONDITION)
if vgf.GetValueType(ct)=="number" and ct==10102001 and c:IsRelateToEffect(e) and c:IsFaceup() then
if vgf.filter.FinalRush(tp) and c:IsRelateToEffect(e) and c:IsFaceup() then
vgf.AtkUp(c,c,5000,nil)
end
end
......
......@@ -6,8 +6,7 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
Duel.Draw(tp,1,REASON_EFFECT)
vgf.op.CardsFromTo(REASON_EFFECT,LOCATION_CIRCLE,LOCATION_HAND,Card.IsCanBeCalled,1,1,e,tp)
local ct=Duel.GetFlagEffectLabel(tp,FLAG_CONDITION)
if vgf.GetValueType(ct)=="number" and ct==10102001 then
if vgf.filter.FinalRush(tp) then
Duel.BreakEffect()
local g=vgf.GetMatchingGroup(Card.IsFrontrow,tp,LOCATION_CIRCLE,0,nil)
vgf.AtkUp(c,g,10000,nil)
......
......@@ -4,10 +4,12 @@ VgF.Operation = {}
VgF.Cost = {}
VgF.Condition = {}
VgF.Effect = {}
VgF.Filter = {}
VgF.op = VgF.Operation
VgF.cost = VgF.Cost
VgF.con = VgF.Condition
VgF.effect = VgF.Effect
VgF.filter = VgF.Filter
vgf = VgF
bit = {}
......@@ -1202,6 +1204,13 @@ function VgF.CallFilter(c, tp, zone)
return c:IsRearguard() and zone == VgF.SequenceToGlobal(tp, c:GetLocation(), c:GetSequence())
end
--catalogue:关键字相关检测函数----------------------------------------------------------------------------------
-- 一气呵成之势
function VgF.Filter.FinalRush(tp)
local ct = Duel.GetFlagEffectLabel(tp,FLAG_CONDITION)
return type(ct) == "number" and ct == 10102001
end
--catalogue:其他关键字----------------------------------------------------------------------------------
---返回p场上的先导者。
......
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