Commit 02339d11 authored by nanahira's avatar nanahira

catchup

parent 87c1712d
...@@ -46,7 +46,7 @@ function cm.gcheck(g,mft,eft1,eft2) ...@@ -46,7 +46,7 @@ function cm.gcheck(g,mft,eft1,eft2)
return c:IsLocation(LOCATION_EXTRA) and c:IsFacedown() and not c:IsType(TYPE_LINK) return c:IsLocation(LOCATION_EXTRA) and c:IsFacedown() and not c:IsType(TYPE_LINK)
end,nil) end,nil)
local ect2=g:FilterCount(function(c) local ect2=g:FilterCount(function(c)
return c:IsLocation(LOCATION_EXTRA) and c(:IsFaceup() or c:IsType(TYPE_LINK)) return c:IsLocation(LOCATION_EXTRA) and (c:IsFaceup() or c:IsType(TYPE_LINK))
end,nil) end,nil)
return ect1<=eft1 and ect2<=eft2 and #g-ect1-ect2<=mft return ect1<=eft1 and ect2<=eft2 and #g-ect1-ect2<=mft
end end
...@@ -91,7 +91,7 @@ function cm.rmop(e,tp,eg,ep,ev,re,r,rp) ...@@ -91,7 +91,7 @@ function cm.rmop(e,tp,eg,ep,ev,re,r,rp)
return c:IsLocation(LOCATION_EXTRA) and c:IsFacedown() and not c:IsType(TYPE_LINK) return c:IsLocation(LOCATION_EXTRA) and c:IsFacedown() and not c:IsType(TYPE_LINK)
end) end)
local etg2=g:Filter(function(c) local etg2=g:Filter(function(c)
return c:IsLocation(LOCATION_EXTRA) and c(:IsFaceup() or c:IsType(TYPE_LINK)) return c:IsLocation(LOCATION_EXTRA) and (c:IsFaceup() or c:IsType(TYPE_LINK))
end,nil) end,nil)
tg:Sub(etg1) tg:Sub(etg1)
tg:Sub(etg2) tg:Sub(etg2)
......
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