Commit 062c8839 authored by POLYMER's avatar POLYMER

fix

parent 143a549a
......@@ -64,7 +64,7 @@ end
-- 2
function c75075600.con2(e,tp,eg,ep,ev,re,r,rp)
local loc=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION)
return ep==1-tp and loc==LOCATION_HAND and re:IsActiveType(TYPE_MONSTER) and Duel.GetMatchingGroupCount(Card.IsFaceup,tp,LOCATION_MZONE,0,nil)>0 and Duel.GetFieldCard(tp,LOCATION_FZONE,0)~=nil and Duel.GetFieldCard(1-tp,LOCATION_FZONE,0)~=nil
return ep==1-tp and loc==LOCATION_HAND and re:IsActiveType(TYPE_MONSTER) and Duel.IsExistingMatchingCard(aux.TRUE,e:GetHandlerPlayer(),LOCATION_FZONE,LOCATION_FZONE,1,nil)
end
function c75075600.tg2(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then
......
......@@ -68,7 +68,7 @@ function c75075612.initial_effect(c)
end
-- 1
function c75075612.con1(e)
return Duel.IsExistingMatchingCard(Card.IsSetCard,e:GetHandlerPlayer(),LOCATION_ONFIELD,0,1,nil,0x5754)
return Duel.IsExistingMatchingCard(Card.IsSetCard,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,nil,0x5754)
end
function c75075612.tg1(e,c)
return c:IsSetCard(0x5754) and c:IsFaceup()
......
......@@ -52,7 +52,7 @@ function c75075614.tg1(e,c)
return c:IsFaceup() and Duel.IsExistingMatchingCard(Card.IsSetCard,e:GetHandlerPlayer(),LOCATION_ONFIELD,0,1,nil,0x5754) and not c:IsSetCard(0x5754)
end
function c75075614.con1(e)
return Duel.IsExistingMatchingCard(Card.IsSetCard,e:GetHandlerPlayer(),LOCATION_ONFIELD,0,1,nil,0x5754)
return Duel.IsExistingMatchingCard(Card.IsSetCard,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,nil,0x5754)
end
function c75075614.con11(e,tp,eg,ep,ev,re,r,rp)
return re:GetHandler()==e:GetHandler()
......
......@@ -83,7 +83,7 @@ function c75075616.op0(e,tp,eg,ep,ev,re,r,rp)
end
-- 1
function c75075616.con1(e)
return Duel.IsExistingMatchingCard(Card.IsSetCard,e:GetHandlerPlayer(),LOCATION_ONFIELD,0,1,nil,0x5754)
return Duel.IsExistingMatchingCard(Card.IsSetCard,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,nil,0x5754)
end
function c75075616.tg1(e,c)
return c:IsSetCard(0x5754) and c:IsType(TYPE_MONSTER)
......
......@@ -38,7 +38,7 @@ function c75075618.initial_effect(c)
e7:SetDescription(aux.Stringid(75075618,0))
e7:SetCategory(CATEGORY_DAMAGE+CATEGORY_RECOVER)
e7:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
e7:SetCode(EVENT_MOVE)
e7:SetCode(EVENT_LEAVE_DECK)
e7:SetRange(LOCATION_MZONE)
e7:SetProperty(EFFECT_FLAG_DELAY)
e7:SetCountLimit(1)
......@@ -49,6 +49,7 @@ function c75075618.initial_effect(c)
e6:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_GRANT)
e6:SetRange(LOCATION_FZONE)
e6:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
e6:SetCondition(c75075618.con1)
e6:SetTarget(c75075618.tg1)
e6:SetLabelObject(e7)
c:RegisterEffect(e6)
......@@ -65,7 +66,7 @@ function c75075618.initial_effect(c)
end
-- 1
function c75075618.con1(e)
return Duel.IsExistingMatchingCard(Card.IsSetCard,e:GetHandlerPlayer(),LOCATION_ONFIELD,0,1,nil,0x5754)
return Duel.IsExistingMatchingCard(Card.IsSetCard,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,nil,0x5754)
end
function c75075618.tg1(e,c)
return c:IsFaceup() and Duel.IsExistingMatchingCard(Card.IsSetCard,e:GetHandlerPlayer(),LOCATION_ONFIELD,0,1,nil,0x5754) and not c:IsSetCard(0x5754)
......@@ -78,12 +79,10 @@ function c75075618.atkcon(e)
end
-- 2
function c75075618.filter2(c,tp)
return (c:GetPreviousLocation()==LOCATION_DECK or c:GetPreviousLocation()==LOCATION_EXTRA)
and c:GetOwner()==tp
return c:IsPreviousLocation(LOCATION_DECK+LOCATION_EXTRA)
end
function c75075618.con2(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c75075618.filter2,1,nil,tp)
or eg:IsExists(c75075618.filter2,1,nil,1-tp)
return eg:IsExists(c75075618.filter2,1,nil)
end
function c75075618.tg2(e,tp,eg,ep,ev,re,r,rp,chk)
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