Commit d484c11b authored by POLYMER's avatar POLYMER

fix

parent b8fd6ed5
...@@ -57,12 +57,12 @@ end ...@@ -57,12 +57,12 @@ end
function c43990092.drcon2(e,tp,eg,ep,ev,re,r,rp) function c43990092.drcon2(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsReason(REASON_COST) and re:IsActivated() and re:IsActiveType(TYPE_MONSTER) and re:GetHandler():IsRace(RACE_ILLUSION) return e:GetHandler():IsReason(REASON_COST) and re:IsActivated() and re:IsActiveType(TYPE_MONSTER) and re:GetHandler():IsRace(RACE_ILLUSION)
end end
function c43990092.destg(e,tp,eg,ep,ev,re,r,rp,chk) function c43990092.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
local g=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil) local g=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
if chk==0 then return g:GetCount()>0 end if chk==0 then return g:GetCount()>0 end
Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
end end
function c43990092.desop(e,tp,eg,ep,ev,re,r,rp) function c43990092.drop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
local g=Duel.SelectMatchingCard(tp,aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil) local g=Duel.SelectMatchingCard(tp,aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil)
if g:GetCount()>0 then if g:GetCount()>0 then
......
...@@ -216,11 +216,11 @@ function s.lvplus(group,sc) ...@@ -216,11 +216,11 @@ function s.lvplus(group,sc)
calculateRecursive(cards, 1, 0) calculateRecursive(cards, 1, 0)
return results return results
end end
function s.IsTuner(c,sc) function s.TunerCheck(c,sc)
local p,sp=c:GetControler(),sc:GetControler() local p,sp=c:GetControler(),sc:GetControler()
return c:IsTuner(sc) and (c:IsFaceup() or p==sp or not c:IsOnField()) return c:IsTuner(sc) and (c:IsFaceup() or p==sp or not c:IsOnField())
end end
function s.IsNotTuner(c,sc) function s.NotTunerCheck(c,sc)
local p,sp=c:GetControler(),sc:GetControler() local p,sp=c:GetControler(),sc:GetControler()
return c:IsNotTuner(sc) or (c:IsFacedown() and p~=sp and c:IsOnField()) return c:IsNotTuner(sc) or (c:IsFacedown() and p~=sp and c:IsOnField())
end end
...@@ -232,12 +232,12 @@ function s.slfilter(c,tc,sc) ...@@ -232,12 +232,12 @@ function s.slfilter(c,tc,sc)
if lv1_2 and lv2_2 then res1=(((lv1_1==lv2_1) and (lv1_2==lv2_2)) or ((lv1_1==lv2_2) and (lv1_2==lv2_1))) end if lv1_2 and lv2_2 then res1=(((lv1_1==lv2_1) and (lv1_2==lv2_2)) or ((lv1_1==lv2_2) and (lv1_2==lv2_1))) end
if not res1 then return false end if not res1 then return false end
local function botht(card,syncard) local function botht(card,syncard)
return s.IsTuner(card,syncard) and s.IsNotTuner(card,syncard) return s.TunerCheck(card,syncard) and s.NotTunerCheck(card,syncard)
end end
if botht(c,sc) and botht(tc,sc) then return true if botht(c,sc) and botht(tc,sc) then return true
elseif botht(c,sc) and not botht(tc,sc) then return false elseif botht(c,sc) and not botht(tc,sc) then return false
elseif not botht(c,sc) and botht(tc,sc) then return false else elseif not botht(c,sc) and botht(tc,sc) then return false else
if (s.IsTuner(c,sc) and s.IsTuner(tc,sc)) or (s.IsNotTuner(c,sc) and s.IsNotTuner(tc,sc)) then return true end if (s.TunerCheck(c,sc) and s.TunerCheck(tc,sc)) or (s.NotTunerCheck(c,sc) and s.NotTunerCheck(tc,sc)) then return true end
end end
return false return false
end end
...@@ -283,7 +283,7 @@ function s.SynMixCondition(e,c,smat,mg1,min,max) ...@@ -283,7 +283,7 @@ function s.SynMixCondition(e,c,smat,mg1,min,max)
return res and mg:IsExists(s.ntfilter,1,nil,c,mg) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0 return res and mg:IsExists(s.ntfilter,1,nil,c,mg) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
end end
function s.ntfilter(c,sc,mg) function s.ntfilter(c,sc,mg)
return s.IsTuner(c,sc) and mg:IsExists(s.IsNotTuner,1,c,sc) return s.TunerCheck(c,sc) and mg:IsExists(s.NotTunerCheck,1,c,sc)
end end
function s.syngoal(g,sc,smat,tp,mgchk) function s.syngoal(g,sc,smat,tp,mgchk)
if not g:IsExists(s.ntfilter,1,nil,sc,g) then return false end if not g:IsExists(s.ntfilter,1,nil,sc,g) then return false end
......
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