Commit 19850028 authored by nekrozar's avatar nekrozar

fix

parent af03594a
......@@ -22,7 +22,7 @@ function c29719112.initial_effect(c)
--to hand
local e3=Effect.CreateEffect(c)
e3:SetDescription(aux.Stringid(29719112,1))
e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
e3:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e3:SetRange(LOCATION_GRAVE)
e3:SetCode(EVENT_BATTLE_DESTROYED)
......@@ -104,11 +104,11 @@ function c29719112.spop(e,tp,eg,ep,ev,re,r,rp)
tc:CompleteProcedure()
end
end
function c29719112.cfilter(c,e,tp)
return c:IsType(TYPE_FUSION) and c:IsControler(tp) and c:IsLocation(LOCATION_GRAVE) and c:IsReason(REASON_BATTLE)
function c29719112.cfilter(c,tp)
return c:IsType(TYPE_FUSION) and c:GetPreviousControler()==tp
end
function c29719112.thcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c29719112.cfilter,1,nil,e,tp)
return eg:IsExists(c29719112.cfilter,1,nil,tp)
end
function c29719112.thfilter(c)
return c:IsCode(37630732) and c:IsAbleToHand()
......
......@@ -56,7 +56,7 @@ end
function c3113667.spcon1(e,tp,eg,ep,ev,re,r,rp)
local tc=eg:GetFirst()
local bc=tc:GetBattleTarget()
return tc:GetPreviousControler()~=tp and tc:IsLocation(LOCATION_GRAVE)
return tc:GetPreviousControler()~=tp
and bc:IsControler(tp) and bc:GetOriginalAttribute()==ATTRIBUTE_DARK and bc:GetOriginalRace()==RACE_MACHINE
end
function c3113667.cfilter(c)
......
......@@ -43,7 +43,7 @@ function c37440988.initial_effect(c)
c:RegisterEffect(e4)
end
function c37440988.hspfilter(c,tp,sc)
return c:IsSetCard(0x2034) and c:IsLevel(10) and c:IsControler(tp) and Duel.GetLocationCountFromEx(tp,tp,sc,c)>0
return c:IsSetCard(0x2034) and c:IsLevel(10) and c:IsControler(tp) and Duel.GetLocationCountFromEx(tp,tp,c,sc)>0
end
function c37440988.hspcon(e,c)
if c==nil then return true end
......
......@@ -33,6 +33,7 @@ function c47963370.initial_effect(c)
e3:SetOperation(c47963370.spop)
c:RegisterEffect(e3)
end
c47963370.card_code_list={46986414}
function c47963370.descon(e,tp,eg,ep,ev,re,r,rp)
return re:IsActiveType(TYPE_SPELL+TYPE_TRAP)
end
......
......@@ -31,7 +31,7 @@ function c50548657.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
end
function c50548657.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
end
function c50548657.spop(e,tp,eg,ep,ev,re,r,rp)
local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
......
......@@ -28,7 +28,7 @@ function c57288708.initial_effect(c)
--tohand
local e3=Effect.CreateEffect(c)
e3:SetDescription(aux.Stringid(57288708,2))
e3:SetCategory(CATEGORY_SEARCH)
e3:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
e3:SetType(EFFECT_TYPE_IGNITION)
e3:SetRange(LOCATION_GRAVE)
e3:SetCountLimit(1,57288709)
......
......@@ -67,6 +67,7 @@ function c64178424.sptg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
end
function c64178424.spop2(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget()
if not tc:IsRelateToEffect(e) then return end
local ft=math.min(Duel.GetLocationCount(tp,LOCATION_MZONE),tc:GetLink())
if ft<=0 then return end
if Duel.IsPlayerAffectedByEffect(tp,59822133) then ft=1 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