Commit 5537126b authored by POLYMER's avatar POLYMER

fix

parent 5aaf4924
...@@ -120,13 +120,13 @@ end ...@@ -120,13 +120,13 @@ end
function c130006042.drcon(e,tp,eg,ep,ev,re,r,rp) function c130006042.drcon(e,tp,eg,ep,ev,re,r,rp)
return ep==tp and bit.band(r,REASON_BATTLE)~=0 return ep==tp and bit.band(r,REASON_BATTLE)~=0
end end
function c130006042.thfilter(c) function c130006042.thfilter(c,tp)
return c:IsFaceupEx() and Duel.IsExistingMatchingCard(c130006042.thfilter2,tp,LOCATION_GRAVE+LOCATION_DECK,LOCATION_GRAVE,2,nil,c:GetCode()) return c:IsFaceupEx() and Duel.IsExistingMatchingCard(c130006042.thfilter2,tp,LOCATION_GRAVE+LOCATION_DECK,LOCATION_GRAVE,2,nil,c:GetCode())
end end
function c130006042.thfilter2(c,code) function c130006042.thfilter2(c,code)
return c:IsAbleToHand() and c:IsCode(code) return c:IsAbleToHand() and c:IsCode(code)
end end
function c130006042.thfilter3(c,codes) function c130006042.thfilter3(c,tp,codes)
return c:IsAbleToHand() and Duel.IsExistingMatchingCard(c130006042.thfilter2,tp,LOCATION_GRAVE+LOCATION_DECK,LOCATION_GRAVE,2,nil,c:GetCode()) and c:IsCode(table.unpack(codes)) return c:IsAbleToHand() and Duel.IsExistingMatchingCard(c130006042.thfilter2,tp,LOCATION_GRAVE+LOCATION_DECK,LOCATION_GRAVE,2,nil,c:GetCode()) and c:IsCode(table.unpack(codes))
end end
function c130006042.gcheck(g,e,tp) function c130006042.gcheck(g,e,tp)
...@@ -134,7 +134,7 @@ function c130006042.gcheck(g,e,tp) ...@@ -134,7 +134,7 @@ function c130006042.gcheck(g,e,tp)
end end
function c130006042.drop(e,tp,eg,ep,ev,re,r,rp) function c130006042.drop(e,tp,eg,ep,ev,re,r,rp)
if Duel.Recover(tp,2000,REASON_EFFECT)~=0 then if Duel.Recover(tp,2000,REASON_EFFECT)~=0 then
local tg=Duel.GetMatchingGroup(c130006042.thfilter,tp,LOCATION_GRAVE+LOCATION_ONFIELD,LOCATION_GRAVE+LOCATION_ONFIELD,nil) local tg=Duel.GetMatchingGroup(c130006042.thfilter,tp,LOCATION_GRAVE+LOCATION_ONFIELD,LOCATION_GRAVE+LOCATION_ONFIELD,nil,tp)
local ag=Group.CreateGroup() local ag=Group.CreateGroup()
local codes={} local codes={}
for c in aux.Next(tg) do for c in aux.Next(tg) do
...@@ -144,7 +144,7 @@ function c130006042.drop(e,tp,eg,ep,ev,re,r,rp) ...@@ -144,7 +144,7 @@ function c130006042.drop(e,tp,eg,ep,ev,re,r,rp)
table.insert(codes,code) table.insert(codes,code)
end end
end end
local tgg=Duel.GetMatchingGroup(c130006042.thfilter3,tp,LOCATION_GRAVE+LOCATION_DECK,0,nil,codes) local tgg=Duel.GetMatchingGroup(c130006042.thfilter3,tp,LOCATION_GRAVE+LOCATION_DECK,0,nil,tp,codes)
if tgg:GetCount()>0 then if tgg:GetCount()>0 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local sg=tgg:SelectSubGroup(tp,c130006042.gcheck,false,2,2,e,tp) local sg=tgg:SelectSubGroup(tp,c130006042.gcheck,false,2,2,e,tp)
......
...@@ -33,6 +33,9 @@ function cm.initial_effect(c) ...@@ -33,6 +33,9 @@ function cm.initial_effect(c)
end end
cm.VHisc_CNTreasure=true cm.VHisc_CNTreasure=true
function cm.matfilter(c)
return VHisc_CNTdb.nck(c) and not c:IsLinkCode(m)
end
--e2 --e2
function cm.thfilter(c) function cm.thfilter(c)
return VHisc_CNTdb.nck(c) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() return VHisc_CNTdb.nck(c) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
......
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