Commit 2682a2b7 authored by Nemo Ma's avatar Nemo Ma Committed by GitHub

Merge pull request #16 from Sonic714/master

23.5.1 yume fix
parents 16db89c0 f2de9654
...@@ -45,16 +45,19 @@ end ...@@ -45,16 +45,19 @@ end
function c71400030.filter1(c,e) function c71400030.filter1(c,e)
return c:IsRelateToEffect(e) and c:IsAbleToRemove() return c:IsRelateToEffect(e) and c:IsAbleToRemove()
end end
function c71400030.filter2(c)
return c:IsType(TYPE_MONSTER) and c:IsAbleToRemove()
end
function c71400030.op1(e,tp,eg,ep,ev,re,r,rp) function c71400030.op1(e,tp,eg,ep,ev,re,r,rp)
local g1=eg:Filter(c71400030.filter1,nil,e) local g1=eg:Filter(c71400030.filter1,nil,e)
if g1:GetCount()>0 then if g1:GetCount()>0 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local sg1=g1:Select(tp,1,1,nil) local sg1=g1:Select(tp,1,1,nil)
local mg=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,LOCATION_MZONE+LOCATION_GRAVE,LOCATION_MZONE+LOCATION_GRAVE,aux.ExceptThisCard(e)) local mg=Duel.GetMatchingGroup(c71400030.filter2,tp,LOCATION_MZONE+LOCATION_GRAVE,LOCATION_MZONE+LOCATION_GRAVE,aux.ExceptThisCard(e))
local g2=mg:Sub(sg1) mg:Sub(sg1)
if g2:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(71400032,1)) then if mg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(71400032,1)) then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local sg2=g2:Select(tp,1,2,nil) local sg2=mg:Select(tp,1,2,nil)
sg1:Merge(sg2) sg1:Merge(sg2)
end end
Duel.HintSelection(sg1) Duel.HintSelection(sg1)
...@@ -63,4 +66,4 @@ function c71400030.op1(e,tp,eg,ep,ev,re,r,rp) ...@@ -63,4 +66,4 @@ function c71400030.op1(e,tp,eg,ep,ev,re,r,rp)
Duel.SetLP(tp,Duel.GetLP(tp)-sg1:GetCount()*600) Duel.SetLP(tp,Duel.GetLP(tp)-sg1:GetCount()*600)
end end
end end
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