Skip to content

Y
ygopro-THC-cards
Commit 3bace96b authored by wyykak's avatar wyykak
Browse files
Options

fix aux.Tuner error 

Signed-off-by: wyykak's avatarwyykak <wyy_1414@126.com>
parent fd036f46
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
script/c1100006.lua
View file @ 3bace96b
...@@ -90,7 +90,7 @@ function c1100006.SynMixCheckGoal(tp,sg,minc,ct,syncard,sg1,smat,gc,mgchk) ...@@ -90,7 +90,7 @@ function c1100006.SynMixCheckGoal(tp,sg,minc,ct,syncard,sg1,smat,gc,mgchk)
if smat and not g:IsContains(smat) then return false end if smat and not g:IsContains(smat) then return false end
if not Auxiliary.MustMaterialCheck(g,tp,EFFECT_MUST_BE_SMATERIAL) then return false end if not Auxiliary.MustMaterialCheck(g,tp,EFFECT_MUST_BE_SMATERIAL) then return false end
local b1=g:IsExists(c1100006.ExFilter,1,nil,syncard) local b1=g:IsExists(c1100006.ExFilter,1,nil,syncard)
local b2=Duel.CheckSynchroMaterial(syncard,aux.Tuner(nil),aux.NonTuner(nil),g:GetCount()-1,g:GetCount()-1,smat,g) local b2=Duel.CheckSynchroMaterial(syncard,nil,aux.NonTuner(nil),g:GetCount()-1,g:GetCount()-1,smat,g)
if (not b1) and (not b2) then return false end if (not b1) and (not b2) then return false end
if b1 then if b1 then
local lv=0 local lv=0
...@@ -104,7 +104,7 @@ function c1100006.SynMixCheckGoal(tp,sg,minc,ct,syncard,sg1,smat,gc,mgchk) ...@@ -104,7 +104,7 @@ function c1100006.SynMixCheckGoal(tp,sg,minc,ct,syncard,sg1,smat,gc,mgchk)
Change_Lv_Effect:SetValue(lv) Change_Lv_Effect:SetValue(lv)
syncard:RegisterEffect(Change_Lv_Effect,true) syncard:RegisterEffect(Change_Lv_Effect,true)
local check=1 local check=1
if Duel.CheckSynchroMaterial(syncard,aux.Tuner(nil),aux.NonTuner(nil),g:GetCount()-1,g:GetCount()-1,smat,g) then if Duel.CheckSynchroMaterial(syncard,nil,aux.NonTuner(nil),g:GetCount()-1,g:GetCount()-1,smat,g) then
check=0 check=0
end end
Change_Lv_Effect:Reset() Change_Lv_Effect:Reset()
......
script/c66919015.lua
View file @ 3bace96b
...@@ -117,7 +117,7 @@ function cm.SynMixOperation(f1,f2,minct,maxc,gc) ...@@ -117,7 +117,7 @@ function cm.SynMixOperation(f1,f2,minct,maxc,gc)
return function(e,tp,eg,ep,ev,re,r,rp,c,smat,mg,min,max) return function(e,tp,eg,ep,ev,re,r,rp,c,smat,mg,min,max)
local g=e:GetLabelObject() local g=e:GetLabelObject()
c:SetMaterial(g) c:SetMaterial(g)
if not Duel.CheckSynchroMaterial(c,aux.Tuner(nil),aux.NonTuner(nil),g:GetCount()-1,g:GetCount()-1,smat,g) then if not Duel.CheckSynchroMaterial(c,nil,aux.NonTuner(nil),g:GetCount()-1,g:GetCount()-1,smat,g) then
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
...@@ -165,7 +165,7 @@ function cm.SynMixCheckGoal(tp,sg,minc,ct,syncard,sg1,smat,gc,mgchk) ...@@ -165,7 +165,7 @@ function cm.SynMixCheckGoal(tp,sg,minc,ct,syncard,sg1,smat,gc,mgchk)
if gc and not gc(g) then return false end if gc and not gc(g) then return false end
if smat and not g:IsContains(smat) then return false end if smat and not g:IsContains(smat) then return false end
if not Auxiliary.MustMaterialCheck(g,tp,EFFECT_MUST_BE_SMATERIAL) then return false end if not Auxiliary.MustMaterialCheck(g,tp,EFFECT_MUST_BE_SMATERIAL) then return false end
local b1=Duel.CheckSynchroMaterial(syncard,aux.Tuner(nil),aux.NonTuner(nil),g:GetCount()-1,g:GetCount()-1,smat,g) local b1=Duel.CheckSynchroMaterial(syncard,nil,aux.NonTuner(nil),g:GetCount()-1,g:GetCount()-1,smat,g)
local b2=false local b2=false
local le=Effect.CreateEffect(syncard) local le=Effect.CreateEffect(syncard)
le:SetType(EFFECT_TYPE_SINGLE) le:SetType(EFFECT_TYPE_SINGLE)
...@@ -173,7 +173,7 @@ function cm.SynMixCheckGoal(tp,sg,minc,ct,syncard,sg1,smat,gc,mgchk) ...@@ -173,7 +173,7 @@ function cm.SynMixCheckGoal(tp,sg,minc,ct,syncard,sg1,smat,gc,mgchk)
le:SetCode(EFFECT_CHANGE_LEVEL) le:SetCode(EFFECT_CHANGE_LEVEL)
le:SetValue(12) le:SetValue(12)
syncard:RegisterEffect(le,true) syncard:RegisterEffect(le,true)
if Duel.CheckSynchroMaterial(syncard,aux.Tuner(Card.IsSynchroType,TYPE_SYNCHRO),aux.NonTuner(Card.IsSynchroType,TYPE_SYNCHRO),g:GetCount()-1,g:GetCount()-1,smat,g) then b2=true end if Duel.CheckSynchroMaterial(syncard,aux.FilterBoolFunction(Card.IsSynchroType,TYPE_SYNCHRO),aux.NonTuner(Card.IsSynchroType,TYPE_SYNCHRO),g:GetCount()-1,g:GetCount()-1,smat,g) then b2=true end
le:Reset() le:Reset()
if (not b1) and (not b2) then return false end if (not b1) and (not b2) then return false end
local hg=g:Filter(Card.IsLocation,nil,LOCATION_HAND) local hg=g:Filter(Card.IsLocation,nil,LOCATION_HAND)
......
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