Commit 998fa932 authored by Amiya's avatar Amiya

修复

parent c5db5fd3
...@@ -75,6 +75,8 @@ function s.cfop(e,tp,eg,ep,ev,re,r,rp,ac) ...@@ -75,6 +75,8 @@ function s.cfop(e,tp,eg,ep,ev,re,r,rp,ac)
Duel.BreakEffect() Duel.BreakEffect()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
local tc=g:Select(tp,1,1,nil):GetFirst() local tc=g:Select(tp,1,1,nil):GetFirst()
Duel.ConfirmCards(1-tp,tc)
Duel.ShuffleHand(tp)
if tc:IsType(TYPE_MONSTER) then if tc:IsType(TYPE_MONSTER) then
Duel.ChangePosition(ac,POS_FACEUP_DEFENSE) Duel.ChangePosition(ac,POS_FACEUP_DEFENSE)
elseif tc:IsType(TYPE_SPELL) then elseif tc:IsType(TYPE_SPELL) then
......
...@@ -32,7 +32,7 @@ function s.spcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -32,7 +32,7 @@ function s.spcon(e,tp,eg,ep,ev,re,r,rp)
return ep==tp and bit.band(r,REASON_BATTLE+REASON_EFFECT)~=0 return ep==tp and bit.band(r,REASON_BATTLE+REASON_EFFECT)~=0
end end
function s.spfilter(c,e,tp) function s.spfilter(c,e,tp)
return c:IsLevelAbove(3) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsLevelAbove(3) and c:IsRace(RACE_ILLUSION) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
and (not c:IsLocation(LOCATION_EXTRA) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and (not c:IsLocation(LOCATION_EXTRA) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
or Duel.GetLocationCountFromEx(tp,tp,nil,c)>0) or Duel.GetLocationCountFromEx(tp,tp,nil,c)>0)
end end
......
...@@ -72,7 +72,7 @@ function s.setfilter(c) ...@@ -72,7 +72,7 @@ function s.setfilter(c)
end end
function s.settg(e,tp,eg,ep,ev,re,r,rp,chk) function s.settg(e,tp,eg,ep,ev,re,r,rp,chk)
local g=e:GetHandler():GetOverlayGroup() local g=e:GetHandler():GetOverlayGroup()
if chk==0 then return eg:IsExists(s.setfilter,1,nil) end if chk==0 then return g:IsExists(s.setfilter,1,nil) end
end end
function s.setop(e,tp,eg,ep,ev,re,r,rp) function s.setop(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