Commit 00ab9df6 authored by DailyShana's avatar DailyShana

fix

parent 30add956
...@@ -17,7 +17,7 @@ function c18096222.initial_effect(c) ...@@ -17,7 +17,7 @@ function c18096222.initial_effect(c)
e2:SetDescription(aux.Stringid(18096222,0)) e2:SetDescription(aux.Stringid(18096222,0))
e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
e2:SetProperty(EFFECT_FLAG_CARD_TARGET) e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
e2:SetCode(EVENT_LEAVE_FIELD) e2:SetCode(EVENT_TO_GRAVE)
e2:SetCondition(c18096222.dacon) e2:SetCondition(c18096222.dacon)
e2:SetTarget(c18096222.datg) e2:SetTarget(c18096222.datg)
e2:SetOperation(c18096222.daop) e2:SetOperation(c18096222.daop)
...@@ -91,11 +91,8 @@ function c18096222.eqlimit(e,c) ...@@ -91,11 +91,8 @@ function c18096222.eqlimit(e,c)
end end
function c18096222.dacon(e,tp,eg,ep,ev,re,r,rp) function c18096222.dacon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local ec=c:GetEquipTarget() local ec=c:GetPreviousEquipTarget()
if c:IsReason(REASON_LOST_TARGET) then return c:IsReason(REASON_DESTROY) and ec~=nil
ec=c:GetPreviousEquipTarget()
end
return c:IsLocation(LOCATION_GRAVE) and c:IsReason(REASON_DESTROY) and ec~=nil
end end
function c18096222.dafilter(c) function c18096222.dafilter(c)
return c:IsFaceup() and c:IsType(TYPE_DUAL) and not c:IsDualState() return c:IsFaceup() and c:IsType(TYPE_DUAL) and not c:IsDualState()
......
...@@ -21,7 +21,7 @@ function c21790410.initial_effect(c) ...@@ -21,7 +21,7 @@ function c21790410.initial_effect(c)
e3:SetDescription(aux.Stringid(21790410,1)) e3:SetDescription(aux.Stringid(21790410,1))
e3:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH) e3:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e3:SetCode(EVENT_LEAVE_FIELD) e3:SetCode(EVENT_TO_GRAVE)
e3:SetProperty(EFFECT_FLAG_DELAY) e3:SetProperty(EFFECT_FLAG_DELAY)
e3:SetRange(LOCATION_MZONE) e3:SetRange(LOCATION_MZONE)
e3:SetCondition(c21790410.shcon) e3:SetCondition(c21790410.shcon)
...@@ -59,7 +59,7 @@ function c21790410.eqlimit(e,c) ...@@ -59,7 +59,7 @@ function c21790410.eqlimit(e,c)
return e:GetOwner()==c return e:GetOwner()==c
end end
function c21790410.cfilter(c,ec,tp) function c21790410.cfilter(c,ec,tp)
return c:IsLocation(LOCATION_GRAVE) and c:IsControler(tp) and c:GetEquipTarget()==ec return c:IsControler(tp) and c:GetPreviousEquipTarget()==ec
end end
function c21790410.shcon(e,tp,eg,ep,ev,re,r,rp) function c21790410.shcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c21790410.cfilter,1,nil,e:GetHandler(),tp) return eg:IsExists(c21790410.cfilter,1,nil,e:GetHandler(),tp)
......
...@@ -26,5 +26,6 @@ function c27877771.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -26,5 +26,6 @@ function c27877771.operation(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstMatchingCard(c27877771.filter,tp,LOCATION_DECK,0,nil) local tc=Duel.GetFirstMatchingCard(c27877771.filter,tp,LOCATION_DECK,0,nil)
if tc then if tc then
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,tc)
end end
end end
...@@ -72,7 +72,7 @@ function c34959756.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -72,7 +72,7 @@ function c34959756.activate(e,tp,eg,ep,ev,re,r,rp)
end end
function c34959756.rmop(e,tp,eg,ep,ev,re,r,rp) function c34959756.rmop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local tc=e:GetHandler():GetEquipTarget() local tc=e:GetHandler():GetEquipPreviousTarget()
if tc then if tc then
Duel.Remove(tc,POS_FACEUP,REASON_EFFECT) Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)
end end
......
...@@ -96,6 +96,7 @@ function c35952884.sumtg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -96,6 +96,7 @@ function c35952884.sumtg(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
end end
function c35952884.sumop(e,tp,eg,ep,ev,re,r,rp) function c35952884.sumop(e,tp,eg,ep,ev,re,r,rp)
if Duel.GetLocationCountFromEx(tp)<=0 then return end
local tg=Duel.GetFirstMatchingCard(c35952884.filter,tp,LOCATION_EXTRA,0,nil,e,tp) local tg=Duel.GetFirstMatchingCard(c35952884.filter,tp,LOCATION_EXTRA,0,nil,e,tp)
if tg then if tg then
Duel.SpecialSummon(tg,0,tp,tp,false,true,POS_FACEUP) Duel.SpecialSummon(tg,0,tp,tp,false,true,POS_FACEUP)
......
...@@ -26,7 +26,7 @@ function c38450736.initial_effect(c) ...@@ -26,7 +26,7 @@ function c38450736.initial_effect(c)
e3:SetDescription(aux.Stringid(38450736,1)) e3:SetDescription(aux.Stringid(38450736,1))
e3:SetCategory(CATEGORY_ATKCHANGE) e3:SetCategory(CATEGORY_ATKCHANGE)
e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F) e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
e3:SetCode(EVENT_LEAVE_FIELD) e3:SetCode(EVENT_TO_GRAVE)
e3:SetCondition(c38450736.atkcon) e3:SetCondition(c38450736.atkcon)
e3:SetTarget(c38450736.atktg) e3:SetTarget(c38450736.atktg)
e3:SetOperation(c38450736.atkop) e3:SetOperation(c38450736.atkop)
...@@ -63,7 +63,7 @@ function c38450736.eqlimit(e,c) ...@@ -63,7 +63,7 @@ function c38450736.eqlimit(e,c)
end end
function c38450736.atkcon(e,tp,eg,ep,ev,re,r,rp) function c38450736.atkcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local ec=c:GetEquipTarget() local ec=c:GetPreviousEquipTarget()
e:SetLabelObject(ec) e:SetLabelObject(ec)
return ec and c:IsLocation(LOCATION_GRAVE) and ec:IsFaceup() and ec:IsLocation(LOCATION_MZONE) return ec and c:IsLocation(LOCATION_GRAVE) and ec:IsFaceup() and ec:IsLocation(LOCATION_MZONE)
end end
......
...@@ -68,5 +68,6 @@ function c63053267.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -68,5 +68,6 @@ function c63053267.thop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstMatchingCard(c63053267.filter,tp,LOCATION_DECK,0,nil) local tc=Duel.GetFirstMatchingCard(c63053267.filter,tp,LOCATION_DECK,0,nil)
if tc then if tc then
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,tc)
end end
end end
...@@ -21,7 +21,7 @@ function c68184115.initial_effect(c) ...@@ -21,7 +21,7 @@ function c68184115.initial_effect(c)
e3:SetDescription(aux.Stringid(68184115,1)) e3:SetDescription(aux.Stringid(68184115,1))
e3:SetCategory(CATEGORY_SPECIAL_SUMMON) e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e3:SetCode(EVENT_LEAVE_FIELD) e3:SetCode(EVENT_TO_GRAVE)
e3:SetProperty(EFFECT_FLAG_DELAY) e3:SetProperty(EFFECT_FLAG_DELAY)
e3:SetRange(LOCATION_MZONE) e3:SetRange(LOCATION_MZONE)
e3:SetCondition(c68184115.spcon) e3:SetCondition(c68184115.spcon)
...@@ -59,7 +59,7 @@ function c68184115.eqlimit(e,c) ...@@ -59,7 +59,7 @@ function c68184115.eqlimit(e,c)
return e:GetOwner()==c return e:GetOwner()==c
end end
function c68184115.cfilter(c,ec,tp) function c68184115.cfilter(c,ec,tp)
return c:IsLocation(LOCATION_GRAVE) and c:IsControler(tp) and c:GetEquipTarget()==ec return c:IsControler(tp) and c:GetPreviousEquipTarget()==ec
end end
function c68184115.spcon(e,tp,eg,ep,ev,re,r,rp) function c68184115.spcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c68184115.cfilter,1,nil,e:GetHandler(),tp) return eg:IsExists(c68184115.cfilter,1,nil,e:GetHandler(),tp)
......
...@@ -82,5 +82,6 @@ function c9547962.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -82,5 +82,6 @@ function c9547962.thop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstMatchingCard(c9547962.filter,tp,LOCATION_DECK,0,nil) local tc=Duel.GetFirstMatchingCard(c9547962.filter,tp,LOCATION_DECK,0,nil)
if tc then if tc then
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,tc)
end end
end 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