Commit 8dad14df authored by mercury233's avatar mercury233

fix

parent ceb35537
...@@ -38,7 +38,7 @@ end ...@@ -38,7 +38,7 @@ end
function c19801646.thcon(e,tp,eg,ep,ev,re,r,rp) function c19801646.thcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
return (c:IsReason(REASON_BATTLE) or (c:GetReasonPlayer()~=tp and c:IsReason(REASON_EFFECT))) return (c:IsReason(REASON_BATTLE) or (c:GetReasonPlayer()~=tp and c:IsReason(REASON_EFFECT)))
and c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousPosition(POS_FACEUP) and not c:IsLocation(LOCATION_DECK)
end end
function c19801646.thfilter(c) function c19801646.thfilter(c)
return c:GetLevel()==7 and c:IsAttribute(ATTRIBUTE_WATER) and c:IsAbleToHand() return c:GetLevel()==7 and c:IsAttribute(ATTRIBUTE_WATER) and c:IsAbleToHand()
......
...@@ -42,7 +42,7 @@ function c47126872.rmop(e,tp,eg,ep,ev,re,r,rp) ...@@ -42,7 +42,7 @@ function c47126872.rmop(e,tp,eg,ep,ev,re,r,rp)
end end
function c47126872.setcon(e,tp,eg,ep,ev,re,r,rp) function c47126872.setcon(e,tp,eg,ep,ev,re,r,rp)
local tc=e:GetLabelObject():GetLabelObject() local tc=e:GetLabelObject():GetLabelObject()
return tc and tc:GetFlagEffect(47126872)~=0 return tc and tc:GetFlagEffect(47126872)~=0 and not e:GetHandler():IsLocation(LOCATION_DECK)
end end
function c47126872.settg(e,tp,eg,ep,ev,re,r,rp,chk) function c47126872.settg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
......
...@@ -61,7 +61,7 @@ function c57288708.tgop(e,tp,eg,ep,ev,re,r,rp) ...@@ -61,7 +61,7 @@ function c57288708.tgop(e,tp,eg,ep,ev,re,r,rp)
end end
function c57288708.spcon(e,tp,eg,ep,ev,re,r,rp) function c57288708.spcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
return c:IsPreviousPosition(POS_FACEUP) and not c:IsSummonType(SUMMON_TYPE_SPECIAL) return c:IsPreviousPosition(POS_FACEUP) and not c:IsSummonType(SUMMON_TYPE_SPECIAL) and not c:IsLocation(LOCATION_DECK)
end end
function c57288708.spfilter(c,e,tp) function c57288708.spfilter(c,e,tp)
return c:IsSetCard(0xfd) and not c:IsCode(57288708) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsSetCard(0xfd) and not c:IsCode(57288708) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
......
...@@ -91,7 +91,7 @@ function c73734821.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -91,7 +91,7 @@ function c73734821.thop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c73734821.descon(e,tp,eg,ep,ev,re,r,rp) function c73734821.descon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsPreviousPosition(POS_FACEUP) return e:GetHandler():IsPreviousPosition(POS_FACEUP) and not e:GetHandler():IsLocation(LOCATION_DECK)
end end
function c73734821.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c73734821.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsOnField() end if chkc then return chkc:IsOnField() end
......
...@@ -37,8 +37,8 @@ function c94982447.initial_effect(c) ...@@ -37,8 +37,8 @@ function c94982447.initial_effect(c)
end end
function c94982447.spcon(e,tp,eg,ep,ev,re,r,rp) function c94982447.spcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
return c:IsPreviousPosition(POS_FACEUP) and return c:IsPreviousPosition(POS_FACEUP)
c:IsSummonType(SUMMON_TYPE_ADVANCE) and c:IsSummonType(SUMMON_TYPE_ADVANCE) and not c:IsLocation(LOCATION_DECK)
end end
function c94982447.spfilter(c,e,tp) function c94982447.spfilter(c,e,tp)
return c:IsSetCard(0xf9) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE) return c:IsSetCard(0xf9) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE)
......
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