Commit b2eb3f6e authored by wind2009's avatar wind2009

Fix

parent 9fedd75b
...@@ -44,11 +44,13 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -44,11 +44,13 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
if #g>0 then if #g>0 then
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISCARD) if g:IsExists(Card.IsLocation,1,nil,LOCATION_HAND) then
local dg=Duel.SelectMatchingCard(tp,Card.IsDiscardable,tp,LOCATION_HAND,0,1,1,nil,REASON_EFFECT) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISCARD)
Duel.BreakEffect() local dg=Duel.SelectMatchingCard(tp,Card.IsDiscardable,tp,LOCATION_HAND,0,1,1,nil,REASON_EFFECT)
Duel.ShuffleHand(tp) Duel.BreakEffect()
Duel.SendtoGrave(dg,REASON_EFFECT+REASON_DISCARD) Duel.ShuffleHand(tp)
Duel.SendtoGrave(dg,REASON_EFFECT+REASON_DISCARD)
end
end end
end end
function s.cfilter(c,tp) function s.cfilter(c,tp)
...@@ -62,7 +64,7 @@ function s.tgfilter(c,e) ...@@ -62,7 +64,7 @@ function s.tgfilter(c,e)
end end
function s.thtg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.thtg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local mg=eg:Filter(s.cfilter,nil,tp):Filter(s.tgfilter,nil,e) local mg=eg:Filter(s.cfilter,nil,tp):Filter(s.tgfilter,nil,e)
if chkc then return mg:IsContains(chkc) end if chkc then return mg:IsContains(chkc) and s.tgfilter(chkc,e) end
if chk==0 then return mg:GetCount()>0 end if chk==0 then return mg:GetCount()>0 end
local g=mg local g=mg
if mg:GetCount()>1 then if mg:GetCount()>1 then
......
...@@ -19,6 +19,7 @@ function s.initial_effect(c) ...@@ -19,6 +19,7 @@ function s.initial_effect(c)
e2:SetCategory(CATEGORY_NEGATE) e2:SetCategory(CATEGORY_NEGATE)
e2:SetType(EFFECT_TYPE_QUICK_O) e2:SetType(EFFECT_TYPE_QUICK_O)
e2:SetCode(EVENT_CHAINING) e2:SetCode(EVENT_CHAINING)
e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e2:SetCountLimit(1,id+o) e2:SetCountLimit(1,id+o)
e2:SetRange(LOCATION_GRAVE) e2:SetRange(LOCATION_GRAVE)
e2:SetCondition(s.negcon) e2:SetCondition(s.negcon)
......
...@@ -24,15 +24,15 @@ function s.initial_effect(c) ...@@ -24,15 +24,15 @@ function s.initial_effect(c)
e2:SetOperation(s.desop) e2:SetOperation(s.desop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function s.mfilter(c) function s.mfilter(c,tp)
return c:IsLocation(LOCATION_MZONE) and c:IsRace(RACE_CYBERSE) return c:IsLocation(LOCATION_MZONE) and c:IsControler(tp) and c:IsRace(RACE_CYBERSE)
end end
function s.exmfilter(c) function s.exmfilter(c)
return c:IsLocation(LOCATION_HAND) and c:IsCode(id) return c:IsLocation(LOCATION_HAND) and c:IsCode(id)
end end
function s.matval(e,lc,mg,c,tp) function s.matval(e,lc,mg,c,tp)
if not lc:IsSetCard(0x135) then return false,nil end if not lc:IsSetCard(0x135) then return false,nil end
return true,not mg or mg:IsExists(s.mfilter,1,nil) and not mg:IsExists(s.exmfilter,1,nil) return true,not mg or mg:IsExists(s.mfilter,1,nil,tp) and not mg:IsExists(s.exmfilter,1,nil)
end end
function s.descon(e,tp,eg,ep,ev,re,r,rp) function s.descon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
......
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