Commit 2ddf27e5 authored by Momobako's avatar Momobako

Auto Push by Miyuki

parent 28df6f5b
...@@ -435,7 +435,7 @@ end ...@@ -435,7 +435,7 @@ end
function cm.GetFusionMaterial(tp,loc,oloc,f,gc,e,...) function cm.GetFusionMaterial(tp,loc,oloc,f,gc,e,...)
local g1=Duel.GetFusionMaterial(tp) local g1=Duel.GetFusionMaterial(tp)
if loc then if loc then
local floc=bit.band(loc,LOCATION_ONFIELD+LOCATION_HAND) local floc=(loc & LOCATION_ONFIELD+LOCATION_HAND)
if floc~=0 then if floc~=0 then
g1=g1:Filter(Card.IsLocation,nil,floc) g1=g1:Filter(Card.IsLocation,nil,floc)
else else
......
...@@ -75,7 +75,7 @@ function c57300025.fscon(e,g,gc,chkfnf) ...@@ -75,7 +75,7 @@ function c57300025.fscon(e,g,gc,chkfnf)
if g==nil then return true end if g==nil then return true end
local sg=Group.CreateGroup() local sg=Group.CreateGroup()
local fs=false local fs=false
local chkf=bit.band(chkfnf,0xff) local chkf=(chkfnf & 0xff)
local mg=g:Filter(c57300025.fsfilter,nil,e:GetHandler()) local mg=g:Filter(c57300025.fsfilter,nil,e:GetHandler())
if gc then if gc then
if not c57300025.fsfilter(gc,fc) then return false end if not c57300025.fsfilter(gc,fc) then return false end
...@@ -96,7 +96,7 @@ function c57300025.fsop(e,tp,eg,ep,ev,re,r,rp,gc,chkfnf) ...@@ -96,7 +96,7 @@ function c57300025.fsop(e,tp,eg,ep,ev,re,r,rp,gc,chkfnf)
local sg=Group.CreateGroup() local sg=Group.CreateGroup()
if gc then sg:AddCard(gc) end if gc then sg:AddCard(gc) end
local fs=false local fs=false
local chkf=bit.band(chkfnf,0xff) local chkf=(chkfnf & 0xff)
local mg=eg:Filter(c57300025.fsfilter,nil,e:GetHandler()) local mg=eg:Filter(c57300025.fsfilter,nil,e:GetHandler())
local tg=c57300025.SelectGroup(tp,HINTMSG_FMATERIAL,mg,c57300025.fgoal,sg,1,5,e:GetHandler(),tp,chkf) local tg=c57300025.SelectGroup(tp,HINTMSG_FMATERIAL,mg,c57300025.fgoal,sg,1,5,e:GetHandler(),tp,chkf)
Duel.SetFusionMaterial(tg) Duel.SetFusionMaterial(tg)
...@@ -183,10 +183,10 @@ function c57300025.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -183,10 +183,10 @@ function c57300025.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local g=Duel.SelectTarget(tp,c57300025.dfilter,tp,0,LOCATION_ONFIELD,1,1,nil) local g=Duel.SelectTarget(tp,c57300025.dfilter,tp,0,LOCATION_ONFIELD,1,1,nil)
Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
local cat=e:GetCategory() local cat=e:GetCategory()
if bit.band(g:GetFirst():GetOriginalType(),TYPE_MONSTER)~=0 then if (g:GetFirst():GetOriginalType() & TYPE_MONSTER)~=0 then
e:SetCategory(bit.bor(cat,CATEGORY_SPECIAL_SUMMON)) e:SetCategory((cat | CATEGORY_SPECIAL_SUMMON))
else else
e:SetCategory(bit.band(cat,bit.bnot(CATEGORY_SPECIAL_SUMMON))) e:SetCategory((cat & bit.bnot(CATEGORY_SPECIAL_SUMMON)))
end end
end end
function c57300025.activate(e,tp,eg,ep,ev,re,r,rp) function c57300025.activate(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -28,10 +28,10 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -28,10 +28,10 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local g=Duel.SelectTarget(tp,cm.dfilter,tp,0,LOCATION_ONFIELD,1,1,nil) local g=Duel.SelectTarget(tp,cm.dfilter,tp,0,LOCATION_ONFIELD,1,1,nil)
Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
local cat=e:GetCategory() local cat=e:GetCategory()
if bit.band(g:GetFirst():GetOriginalType(),TYPE_MONSTER)~=0 then if (g:GetFirst():GetOriginalType() & TYPE_MONSTER)~=0 then
e:SetCategory(bit.bor(cat,CATEGORY_SPECIAL_SUMMON)) e:SetCategory((cat | CATEGORY_SPECIAL_SUMMON))
else else
e:SetCategory(bit.band(cat,bit.bnot(CATEGORY_SPECIAL_SUMMON))) e:SetCategory((cat & bit.bnot(CATEGORY_SPECIAL_SUMMON)))
end end
end end
function cm.activate(e,tp,eg,ep,ev,re,r,rp) function cm.activate(e,tp,eg,ep,ev,re,r,rp)
......
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