Commit a5afa8a0 authored by wind2009's avatar wind2009

Merge branch 'patch-6' into 'master'

Fix アビスチーム

See merge request mycard/pre-release-database-cdb!140
parents 054b2e76 6ab8ebfd
...@@ -61,15 +61,15 @@ end ...@@ -61,15 +61,15 @@ end
function s.splimit(e,c) function s.splimit(e,c)
return not c:IsAttribute(ATTRIBUTE_WATER) and c:IsLocation(LOCATION_EXTRA) return not c:IsAttribute(ATTRIBUTE_WATER) and c:IsLocation(LOCATION_EXTRA)
end end
function s.cfilter2(c,se) function s.cfilter2(c,tp,se)
return c:IsReason(REASON_BATTLE+REASON_EFFECT) return c:IsReason(REASON_BATTLE+REASON_EFFECT)
and c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousControler(tp)
and bit.band(c:GetPreviousAttributeOnField(),ATTRIBUTE_WATER)~=0 and bit.band(c:GetPreviousAttributeOnField(),ATTRIBUTE_WATER)~=0
and c:IsPreviousLocation(LOCATION_MZONE) and (se==nil or c:GetReasonEffect()~=se) and c:IsPreviousLocation(LOCATION_MZONE) and (se==nil or c:GetReasonEffect()~=se)
end end
function s.thcon(e,tp,eg,ep,ev,re,r,rp) function s.thcon(e,tp,eg,ep,ev,re,r,rp)
local se=e:GetLabelObject():GetLabelObject() local se=e:GetLabelObject():GetLabelObject()
return eg:IsExists(s.cfilter2,1,e:GetHandler(),se) return eg:IsExists(s.cfilter2,1,e:GetHandler(),tp,se)
end end
function s.thfilter(c) function s.thfilter(c)
return c:IsFaceupEx() and c:IsSetCard(0x74) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() return c:IsFaceupEx() and c:IsSetCard(0x74) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
......
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