Commit 37f9927f authored by wind2009's avatar wind2009

Fix INFO

* 怒之业火添加王谷过滤。
* 黑魔术防护罩在双方场上存在黄金柜记述怪兽时均能发动。
parent 54661e35
Pipeline #25233 passed with stages
in 1 minute and 8 seconds
...@@ -65,7 +65,7 @@ end ...@@ -65,7 +65,7 @@ end
function s.thop(e,tp,eg,ep,ev,re,r,rp) function s.thop(e,tp,eg,ep,ev,re,r,rp)
if e:GetLabel()==0 then if e:GetLabel()==0 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.thfilter),tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
......
...@@ -18,7 +18,7 @@ function s.cfilter1(c) ...@@ -18,7 +18,7 @@ function s.cfilter1(c)
return aux.IsCodeListed(c,101204051) and c:IsFaceup() return aux.IsCodeListed(c,101204051) and c:IsFaceup()
end end
function s.condition1(e,tp,eg,ep,ev,re,r,rp) function s.condition1(e,tp,eg,ep,ev,re,r,rp)
return tp~=Duel.GetTurnPlayer() and Duel.IsExistingMatchingCard(s.cfilter1,tp,LOCATION_MZONE,0,1,nil) return tp~=Duel.GetTurnPlayer() and Duel.IsExistingMatchingCard(s.cfilter1,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil)
end end
function s.filter(c) function s.filter(c)
return c:IsAttackPos() return c:IsAttackPos()
...@@ -65,5 +65,5 @@ function s.condition2(e,tp,eg,ep,ev,re,r,rp) ...@@ -65,5 +65,5 @@ function s.condition2(e,tp,eg,ep,ev,re,r,rp)
if tp==ep then return false end if tp==ep then return false end
if not re:IsActiveType(TYPE_MONSTER) then return false end if not re:IsActiveType(TYPE_MONSTER) then return false end
local ex,tg,tc=Duel.GetOperationInfo(ev,CATEGORY_DESTROY) local ex,tg,tc=Duel.GetOperationInfo(ev,CATEGORY_DESTROY)
return ex and tg~=nil and tc+tg:FilterCount(s.cfilter3,nil)-tg:GetCount()>0 and Duel.IsExistingMatchingCard(s.cfilter1,tp,LOCATION_MZONE,0,1,nil) return ex and tg~=nil and tc+tg:FilterCount(s.cfilter3,nil)-tg:GetCount()>0 and Duel.IsExistingMatchingCard(s.cfilter1,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil)
end end
\ No newline at end of file
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