Commit 1b85de46 authored by POLYMER's avatar POLYMER

fix

parent 03cf16df
...@@ -89,11 +89,13 @@ end ...@@ -89,11 +89,13 @@ end
function cm.tg(e,tp,eg,ep,ev,re,r,rp,chk) function cm.tg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then if chk==0 then
local g=Group.CreateGroup() local g=Group.CreateGroup()
local c=e:GetHandler()
for i=1,Duel.GetCurrentChain() do for i=1,Duel.GetCurrentChain() do
local te=Duel.GetChainInfo(i,CHAININFO_TRIGGERING_EFFECT) local te=Duel.GetChainInfo(i,CHAININFO_TRIGGERING_EFFECT)
local tc=te:GetHandler() local tc=te:GetHandler()
if tc:IsRelateToEffect(te) and (tc:IsReleasableByEffect() or (tc:IsLocation(LOCATION_HAND) and tc:IsType(TYPE_SPELL+TYPE_TRAP) and not tc:IsHasEffect(EFFECT_UNRELEASABLE_EFFECT) and not tc:IsHasEffect(EFFECT_UNRELEASABLE_NONSUM) and not Duel.IsPlayerAffectedByEffect(tp,EFFECT_CANNOT_RELEASE))) then g:AddCard(tc) end if tc:IsRelateToEffect(te) and (tc:IsReleasableByEffect() or (tc:IsLocation(LOCATION_HAND) and tc:IsType(TYPE_SPELL+TYPE_TRAP) and not tc:IsHasEffect(EFFECT_UNRELEASABLE_EFFECT) and not tc:IsHasEffect(EFFECT_UNRELEASABLE_NONSUM) and not Duel.IsPlayerAffectedByEffect(tp,EFFECT_CANNOT_RELEASE))) then g:AddCard(tc) end
end end
if e:IsHasType(EFFECT_TYPE_ACTIVATE) or c:IsReleasableByEffect() then g:AddCard(c) end
return #g>0 and Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_DECK,0,1,nil,#g*2) return #g>0 and Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_DECK,0,1,nil,#g*2)
end end
local g=Group.CreateGroup() local g=Group.CreateGroup()
......
...@@ -96,7 +96,7 @@ function c95101145.accost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -96,7 +96,7 @@ function c95101145.accost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.DiscardHand(tp,c95101145.disfilter,1,1,REASON_COST+REASON_DISCARD,nil,tp) Duel.DiscardHand(tp,c95101145.disfilter,1,1,REASON_COST+REASON_DISCARD,nil,tp)
end end
function c95101145.acfilter(c,tp,chk) function c95101145.acfilter(c,tp,chk)
return c:IsSetCard(0xbbf) and (c:IsType(TYPE_FIELD) or Duel.GetLocationCount(tp,LOCATION_SZONE)>0) return c:IsSetCard(0xbbf) and c:IsType(TYPE_FIELD)
and c:GetActivateEffect() and c:GetActivateEffect():IsActivatable(tp,true,true) and c:GetActivateEffect() and c:GetActivateEffect():IsActivatable(tp,true,true)
and (chk==0 or aux.NecroValleyFilter()(c)) and (chk==0 or aux.NecroValleyFilter()(c))
end 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