Commit 56762cc5 authored by VanillaSalt's avatar VanillaSalt

fix

parent a5ad1bf2
...@@ -58,6 +58,7 @@ function c12678870.sprop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -58,6 +58,7 @@ function c12678870.sprop(e,tp,eg,ep,ev,re,r,rp,c)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local g2=Duel.SelectMatchingCard(tp,c12678870.spfilter2,tp,LOCATION_MZONE,0,1,1,g1:GetFirst()) local g2=Duel.SelectMatchingCard(tp,c12678870.spfilter2,tp,LOCATION_MZONE,0,1,1,g1:GetFirst())
g1:Merge(g2) g1:Merge(g2)
c:SetMaterial(g1)
Duel.Remove(g1,POS_FACEUP,REASON_COST) Duel.Remove(g1,POS_FACEUP,REASON_COST)
end end
function c12678870.spcost(e,tp,eg,ep,ev,re,r,rp,chk) function c12678870.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
......
...@@ -58,11 +58,13 @@ function c21495657.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -58,11 +58,13 @@ function c21495657.operation(e,tp,eg,ep,ev,re,r,rp)
e1:SetValue(TYPE_TUNER) e1:SetValue(TYPE_TUNER)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
end end
local e2=Effect.CreateEffect(c) if c:IsRelateToEffect(e) then
e2:SetType(EFFECT_TYPE_SINGLE) local e2=Effect.CreateEffect(c)
e2:SetCode(EFFECT_LEAVE_FIELD_REDIRECT) e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e2:SetCode(EFFECT_LEAVE_FIELD_REDIRECT)
e2:SetReset(RESET_EVENT+0x47e0000) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e2:SetValue(LOCATION_DECKBOT) e2:SetReset(RESET_EVENT+0x47e0000)
c:RegisterEffect(e2) e2:SetValue(LOCATION_DECKBOT)
c:RegisterEffect(e2)
end
end end
...@@ -15,34 +15,49 @@ function c32354768.initial_effect(c) ...@@ -15,34 +15,49 @@ function c32354768.initial_effect(c)
e2:SetCategory(CATEGORY_TODECK) e2:SetCategory(CATEGORY_TODECK)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetRange(LOCATION_FZONE) e2:SetRange(LOCATION_FZONE)
e2:SetCode(EVENT_BE_MATERIAL) e2:SetCode(EVENT_SPSUMMON_SUCCESS)
e2:SetCountLimit(1) e2:SetCountLimit(1)
e2:SetCondition(c32354768.effcon) e2:SetCondition(c32354768.effcon)
e2:SetTarget(c32354768.tdtg) e2:SetTarget(c32354768.tdtg)
e2:SetOperation(c32354768.tdop) e2:SetOperation(c32354768.tdop)
e2:SetLabel(REASON_RITUAL) e2:SetLabel(TYPE_RITUAL)
c:RegisterEffect(e2) c:RegisterEffect(e2)
local e3=e2:Clone() local e3=e2:Clone()
e3:SetDescription(aux.Stringid(32354768,1)) e3:SetDescription(aux.Stringid(32354768,1))
e3:SetCategory(CATEGORY_SPECIAL_SUMMON) e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
e3:SetTarget(c32354768.sptg) e3:SetTarget(c32354768.sptg)
e3:SetOperation(c32354768.spop) e3:SetOperation(c32354768.spop)
e3:SetLabel(REASON_FUSION) e3:SetLabel(TYPE_FUSION)
c:RegisterEffect(e3) c:RegisterEffect(e3)
local e4=e2:Clone() local e4=e2:Clone()
e4:SetDescription(aux.Stringid(32354768,2)) e4:SetDescription(aux.Stringid(32354768,2))
e4:SetCategory(0) e4:SetCategory(0)
e4:SetTarget(c32354768.sttg) e4:SetTarget(c32354768.sttg)
e4:SetOperation(c32354768.stop) e4:SetOperation(c32354768.stop)
e4:SetLabel(REASON_SYNCHRO) e4:SetLabel(TYPE_SYNCHRO)
c:RegisterEffect(e4) c:RegisterEffect(e4)
local e5=e2:Clone() local e5=e2:Clone()
e5:SetDescription(aux.Stringid(32354768,3)) e5:SetDescription(aux.Stringid(32354768,3))
e5:SetCategory(CATEGORY_DRAW+CATEGORY_HANDES) e5:SetCategory(CATEGORY_DRAW+CATEGORY_HANDES)
e5:SetTarget(c32354768.drtg) e5:SetTarget(c32354768.drtg)
e5:SetOperation(c32354768.drop) e5:SetOperation(c32354768.drop)
e5:SetLabel(REASON_XYZ) e5:SetLabel(TYPE_XYZ)
c:RegisterEffect(e5) c:RegisterEffect(e5)
local e6=Effect.CreateEffect(c)
e6:SetType(EFFECT_TYPE_FIELD)
e6:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE)
e6:SetRange(LOCATION_FZONE)
e6:SetCode(EFFECT_MATERIAL_CHECK)
e6:SetValue(c32354768.valcheck)
c:RegisterEffect(e6)
end
function c32354768.mtfilter(c)
return c:IsSetCard(0xc4) and c:IsType(TYPE_MONSTER)
end
function c32354768.valcheck(e,c)
if c:GetMaterial():IsExists(c32354768.mtfilter,1,nil) then
c:RegisterFlagEffect(32354768,RESET_EVENT+0x4fe0000+RESET_PHASE+PHASE_END,0,1)
end
end end
function c32354768.filter(c) function c32354768.filter(c)
return c:IsSetCard(0xc4) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() return c:IsSetCard(0xc4) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
...@@ -60,11 +75,8 @@ function c32354768.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -60,11 +75,8 @@ function c32354768.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
end end
end end
function c32354768.mtfilter(c)
return c:IsSetCard(0xc4) and c:IsType(TYPE_MONSTER)
end
function c32354768.effcon(e,tp,eg,ep,ev,re,r,rp) function c32354768.effcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c32354768.mtfilter,1,nil) and r==e:GetLabel() return eg:GetCount()==1 and eg:GetFirst():IsType(e:GetLabel()) and eg:GetFirst():GetFlagEffect(32354768)~=0
end end
function c32354768.tdtg(e,tp,eg,ep,ev,re,r,rp,chk) function c32354768.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
......
...@@ -62,6 +62,7 @@ function c48063985.sprop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -62,6 +62,7 @@ function c48063985.sprop(e,tp,eg,ep,ev,re,r,rp,c)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local g2=Duel.SelectMatchingCard(tp,c48063985.spfilter2,tp,LOCATION_MZONE,0,1,1,g1:GetFirst()) local g2=Duel.SelectMatchingCard(tp,c48063985.spfilter2,tp,LOCATION_MZONE,0,1,1,g1:GetFirst())
g1:Merge(g2) g1:Merge(g2)
c:SetMaterial(g1)
Duel.Remove(g1,POS_FACEUP,REASON_COST) Duel.Remove(g1,POS_FACEUP,REASON_COST)
end end
function c48063985.tgfilter(c) function c48063985.tgfilter(c)
......
...@@ -52,6 +52,7 @@ function c56655675.spop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -52,6 +52,7 @@ function c56655675.spop(e,tp,eg,ep,ev,re,r,rp,c)
local g3=Duel.SelectMatchingCard(tp,c56655675.spfilter3,tp,LOCATION_MZONE,0,1,1,nil) local g3=Duel.SelectMatchingCard(tp,c56655675.spfilter3,tp,LOCATION_MZONE,0,1,1,nil)
g1:Merge(g2) g1:Merge(g2)
g1:Merge(g3) g1:Merge(g3)
c:SetMaterial(g1)
Duel.Remove(g1,POS_FACEUP,REASON_COST) Duel.Remove(g1,POS_FACEUP,REASON_COST)
end end
function c56655675.condition(e,tp,eg,ep,ev,re,r,rp) function c56655675.condition(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -56,6 +56,7 @@ function c86274272.sprop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -56,6 +56,7 @@ function c86274272.sprop(e,tp,eg,ep,ev,re,r,rp,c)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local g2=Duel.SelectMatchingCard(tp,c86274272.spfilter2,tp,LOCATION_MZONE,0,1,1,g1:GetFirst()) local g2=Duel.SelectMatchingCard(tp,c86274272.spfilter2,tp,LOCATION_MZONE,0,1,1,g1:GetFirst())
g1:Merge(g2) g1:Merge(g2)
c:SetMaterial(g1)
Duel.Remove(g1,POS_FACEUP,REASON_COST) Duel.Remove(g1,POS_FACEUP,REASON_COST)
end end
function c86274272.atkop(e,tp,eg,ep,ev,re,r,rp) function c86274272.atkop(e,tp,eg,ep,ev,re,r,rp)
......
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