Commit 8e60200b authored by wind2009's avatar wind2009

Fix ARG☆S-GiantKilling

parent b846fce5
...@@ -36,11 +36,13 @@ function s.sumfilter(c) ...@@ -36,11 +36,13 @@ function s.sumfilter(c)
return c:IsSummonable(true,nil) and c:IsRace(RACE_WARRIOR) return c:IsSummonable(true,nil) and c:IsRace(RACE_WARRIOR)
end end
function s.chkfilter(c) function s.chkfilter(c)
return c:IsAllTypes(TYPE_CONTINUOUS|TYPE_TRAP) and (c:IsLocation(LOCATION_MZONE) or (c:GetOriginalLevel()>0 return c:IsAllTypes(TYPE_CONTINUOUS|TYPE_TRAP) and c:IsFaceup() and
or bit.band(c:GetOriginalRace(),0x3fffffff)~=0 (c:IsLocation(LOCATION_MZONE) or
or bit.band(c:GetOriginalAttribute(),0x7f)~=0 (c:GetOriginalLevel()>0
or c:GetBaseAttack()>0 or bit.band(c:GetOriginalRace(),0x3fffffff)~=0
or c:GetBaseDefense()>0)) or bit.band(c:GetOriginalAttribute(),0x7f)~=0
or c:GetBaseAttack()>0
or c:GetBaseDefense()>0))
end end
function s.thop(e,tp,eg,ep,ev,re,r,rp) function s.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
...@@ -49,6 +51,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -49,6 +51,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
if Duel.IsExistingMatchingCard(s.sumfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,1,nil) if Duel.IsExistingMatchingCard(s.sumfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,1,nil)
and Duel.IsExistingMatchingCard(s.chkfilter,tp,LOCATION_MZONE+LOCATION_SZONE,0,1,nil)
and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then
Duel.BreakEffect() Duel.BreakEffect()
Duel.ShuffleHand(tp) Duel.ShuffleHand(tp)
......
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