Commit f6243fc4 authored by Nemo Ma's avatar Nemo Ma

fix

parent 630b9daf
......@@ -87,7 +87,7 @@ function cm.thfilter(c,tp)
return c:GetPreviousControler()==tp and c:IsPreviousLocation(LOCATION_OVERLAY)
end
function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(cm.thfilter,1,1,nil,tp)
return eg:IsExists(cm.thfilter,1,1,nil,tp) and not eg:IsContains(e:GetHandler())
end
function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
local g=Duel.GetFieldGroup(tp,0,LOCATION_MZONE)
......
......@@ -53,7 +53,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
end
end
function cm.con(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(Card.IsPreviousLocation,1,nil,LOCATION_FZONE)
return eg:IsExists(Card.IsPreviousLocation,1,nil,LOCATION_FZONE) and not eg:IsContains(e:GetHandler())
end
function cm.tg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsSSetable() end
......
......@@ -114,7 +114,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
end
end
function cm.drcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(cm.filter,1,nil)
return eg:IsExists(cm.filter,1,nil) and not eg:IsContains(e:GetHandler())
end
function cm.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end
......
......@@ -103,7 +103,7 @@ function cm.tgop(e,tp,eg,ep,ev,re,r,rp)
end
end
function cm.setcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(cm.filter,1,nil) and e:GetHandler():IsSummonType(SUMMON_TYPE_ADVANCE)
return eg:IsExists(cm.filter,1,nil) and e:GetHandler():IsSummonType(SUMMON_TYPE_ADVANCE) and not eg:IsContains(e:GetHandler())
end
function cm.settg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(cm.setfilter,tp,LOCATION_DECK,0,1,nil) end
......
......@@ -97,7 +97,7 @@ function cm.filter(c)
return c:IsSummonType(SUMMON_TYPE_ADVANCE)
end
function cm.con(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(cm.filter,1,nil) and aux.bpcon()
return eg:IsExists(cm.filter,1,nil) and aux.bpcon() and not eg:IsContains(e:GetHandler())
end
function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler()
......
......@@ -122,7 +122,7 @@ function cm.cfilter(c)
return (c:IsType(TYPE_MONSTER) and not c:IsPreviousLocation(LOCATION_SZONE)) or c:IsPreviousLocation(LOCATION_MZONE)
end
function cm.con(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(cm.cfilter,1,nil)
return eg:IsExists(cm.cfilter,1,nil) and not eg:IsContains(e:GetHandler())
end
function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler()
......
......@@ -73,7 +73,7 @@ function cm.otop(e,tp,eg,ep,ev,re,r,rp,c)
end
function cm.con(e,tp,eg,ep,ev,re,r,rp)
e:SetLabel(#eg)
return true
return not eg:IsContains(e:GetHandler())
end
function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler()
......
......@@ -73,7 +73,7 @@ function cm.acfilter(c,tp)
return c:IsPreviousControler(tp) and c:GetEquipTarget()
end
function cm.accon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(cm.acfilter,1,nil,tp)
return eg:IsExists(cm.acfilter,1,nil,tp) and not eg:IsContains(e:GetHandler())
end
function cm.accost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) end
......
......@@ -81,7 +81,8 @@ end
function cm.dfilter(c)
return c:IsFaceup() and c:IsCode(40010230)
end
function cm.actcon(e,tp,eg,ep,ev,re,r,rp)
function cm.actcon(e,c)
local tp=e:GetHandlerPlayer()
return Duel.GetFlagEffect(tp,40009560)>0 or Duel.IsExistingMatchingCard(cm.dfilter,tp,LOCATION_MZONE,0,1,nil)
end
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