Commit 84b26ce9 authored by argon.sun's avatar argon.sun

bug fix

parent 37ddbd7d
...@@ -247,7 +247,7 @@ int32 effect::is_activate_ready(uint8 playerid, event e, int32 neglect_cond, int ...@@ -247,7 +247,7 @@ int32 effect::is_activate_ready(uint8 playerid, event e, int32 neglect_cond, int
return TRUE; return TRUE;
} }
int32 effect::is_condition_check(uint8 playerid, event e) { int32 effect::is_condition_check(uint8 playerid, event e) {
if ((handler->current.location & LOCATION_ONFIELD) if ((handler->current.location & LOCATION_ONFIELD) && (type & EFFECT_TYPE_FIELD)
&& (!handler->is_position(POS_FACEUP) || !handler->is_status(STATUS_EFFECT_ENABLED))) && (!handler->is_position(POS_FACEUP) || !handler->is_status(STATUS_EFFECT_ENABLED)))
return FALSE; return FALSE;
if(!condition) if(!condition)
......
...@@ -23,6 +23,6 @@ end ...@@ -23,6 +23,6 @@ end
function c30683373.activate(e) function c30683373.activate(e)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc and tc:IsRelateToEffect(e) then if tc and tc:IsRelateToEffect(e) then
Duel.Destroy(sg,REASON_EFFECT) Duel.Destroy(tc,REASON_EFFECT)
end end
end end
...@@ -14,7 +14,7 @@ function c48445393.desfilter(c) ...@@ -14,7 +14,7 @@ function c48445393.desfilter(c)
return c:IsFaceup() and c:IsSetCard(0x24) and c:IsDestructable() return c:IsFaceup() and c:IsSetCard(0x24) and c:IsDestructable()
end end
function c48445393.sfilter(c) function c48445393.sfilter(c)
return c:IsSetCard(0x24) and c:IsAbleToGrave() return c:IsSetCard(0x24) and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
end end
function c48445393.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c48445393.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c48445393.desfilter(chkc) end if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c48445393.desfilter(chkc) end
...@@ -24,7 +24,7 @@ function c48445393.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -24,7 +24,7 @@ function c48445393.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
local g=Duel.SelectTarget(tp,c48445393.desfilter,tp,LOCATION_MZONE,0,1,1,nil) local g=Duel.SelectTarget(tp,c48445393.desfilter,tp,LOCATION_MZONE,0,1,1,nil)
Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
Duel.SetOperationInfo(0,CATEGORY_TPGRAVE,nil,1,tp,LOCATION_DECK) Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,tp,LOCATION_DECK)
Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1) Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
end end
function c48445393.activate(e,tp,eg,ep,ev,re,r,rp) function c48445393.activate(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -34,7 +34,7 @@ function c55136228.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -34,7 +34,7 @@ function c55136228.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local g=Duel.SelectTarget(tp,c55136228.filter,tp,LOCATION_MZONE,0,1,1,nil) local g=Duel.SelectTarget(tp,c55136228.filter,tp,LOCATION_MZONE,0,1,1,nil)
end end
function c55136228.activate(e,tp,eg,ep,ev,re,r,rp) function c55136228.activate(e,tp,eg,ep,ev,re,r,rp)
local sg=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) and tc:IsFaceup() then if tc:IsRelateToEffect(e) and tc:IsFaceup() then
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
......
...@@ -39,7 +39,7 @@ end ...@@ -39,7 +39,7 @@ end
function c64550682.spcon(e,c) function c64550682.spcon(e,c)
if c==nil then return true end if c==nil then return true end
return Duel.GetLocationCount(c:GetControler(),LOCATION_MZONE)>0 return Duel.GetLocationCount(c:GetControler(),LOCATION_MZONE)>0
and Duel.IsExistingMatchingCard(c64550682.spfilter,tp,LOCATION_MZONE,0,1,nil) and Duel.IsExistingMatchingCard(c64550682.spfilter,c:GetControler(),LOCATION_MZONE,0,1,nil)
end end
function c64550682.descon(e,tp,eg,ep,ev,re,r,rp) function c64550682.descon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+1 return e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+1
......
...@@ -35,7 +35,7 @@ function c79979666.filter(c) ...@@ -35,7 +35,7 @@ function c79979666.filter(c)
return not c:IsStatus(STATUS_LEAVE_CONFIRMED) return not c:IsStatus(STATUS_LEAVE_CONFIRMED)
end end
function c79979666.condition(e,tp,eg,ep,ev,re,r,rp) function c79979666.condition(e,tp,eg,ep,ev,re,r,rp)
return not Duel.IsExistingMatchingCard(c79979666.filter,tp,LOCATION_ONFIELD,0,1,e:GetHandler()) return not Duel.IsExistingMatchingCard(c79979666.filter,tp,LOCATION_ONFIELD+LOCATION_HAND,0,1,e:GetHandler())
end end
function c79979666.target(e,tp,eg,ep,ev,re,r,rp,chk) function c79979666.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
......
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