Commit 41107e45 authored by fallenstardust's avatar fallenstardust

fix

parent 796be62a
...@@ -29,11 +29,12 @@ function s.initial_effect(c) ...@@ -29,11 +29,12 @@ function s.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
--move --move
local e4=Effect.CreateEffect(c) local e4=Effect.CreateEffect(c)
e4:SetDescription(aux.Stringid(id,0)) e4:SetDescription(aux.Stringid(id,2))
e4:SetCategory(CATEGORY_LEAVE_GRAVE)
e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e4:SetCode(EVENT_TO_GRAVE) e4:SetCode(EVENT_TO_GRAVE)
e4:SetCountLimit(1,id+o*2)
e4:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET) e4:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
e4:SetCountLimit(1,id+o*2)
e4:SetTarget(s.mvtg) e4:SetTarget(s.mvtg)
e4:SetOperation(s.mvop) e4:SetOperation(s.mvop)
c:RegisterEffect(e4) c:RegisterEffect(e4)
...@@ -74,7 +75,7 @@ function s.filter(c,tp) ...@@ -74,7 +75,7 @@ function s.filter(c,tp)
return c:IsAttribute(ATTRIBUTE_FIRE) and c:IsControler(tp) return c:IsAttribute(ATTRIBUTE_FIRE) and c:IsControler(tp)
end end
function s.mvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.mvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_GRAVE) and s.filter(chkc,tp) end if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and s.filter(chkc,tp) end
if chk==0 then return Duel.IsExistingTarget(s.filter,tp,LOCATION_GRAVE,0,1,nil) end if chk==0 then return Duel.IsExistingTarget(s.filter,tp,LOCATION_GRAVE,0,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
local g=Duel.SelectTarget(tp,s.filter,tp,LOCATION_GRAVE,0,1,1,nil) local g=Duel.SelectTarget(tp,s.filter,tp,LOCATION_GRAVE,0,1,1,nil)
......
...@@ -43,7 +43,7 @@ function c101203047.thcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -43,7 +43,7 @@ function c101203047.thcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
end end
function c101203047.filter(c) function c101203047.filter(c)
return c:IsSetCard(0xac) and c:IsAbleToHand() return c:IsSetCard(0xac) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER)
end end
function c101203047.thtg(e,tp,eg,ep,ev,re,r,rp,chk) function c101203047.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c101203047.filter,tp,LOCATION_DECK,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c101203047.filter,tp,LOCATION_DECK,0,1,nil) end
...@@ -79,7 +79,7 @@ function c101203047.xmop(e,tp,eg,ep,ev,re,r,rp) ...@@ -79,7 +79,7 @@ function c101203047.xmop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c101203047.mtfilter(c) function c101203047.mtfilter(c)
return c:IsSetCard(0xac) and c:IsCanOverlay() return c:IsSetCard(0xac) and c:IsCanOverlay() and c:IsType(TYPE_MONSTER)
end end
function c101203047.mttg(e,tp,eg,ep,ev,re,r,rp,chk) function c101203047.mttg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsType(TYPE_XYZ) if chk==0 then return e:GetHandler():IsType(TYPE_XYZ)
......
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