Commit 20cda9c2 authored by VanillaSalt's avatar VanillaSalt

merge

parents 7a2bb808 89b97a8a
...@@ -28,9 +28,9 @@ function c10282757.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -28,9 +28,9 @@ function c10282757.activate(e,tp,eg,ep,ev,re,r,rp)
e3:SetTarget(c10282757.filter2) e3:SetTarget(c10282757.filter2)
Duel.RegisterEffect(e3,tp) Duel.RegisterEffect(e3,tp)
end end
function c10282757.filter1(c) function c10282757.filter1(e,c)
return c:IsType(TYPE_XYZ) and c:IsRankBelow(3) return c:IsType(TYPE_XYZ) and c:IsRankBelow(3)
end end
function c10282757.filter2(c) function c10282757.filter2(e,c)
return c:IsType(TYPE_XYZ) and c:IsRankAbove(4) return c:IsType(TYPE_XYZ) and c:IsRankAbove(4)
end end
...@@ -40,7 +40,7 @@ function c42776960.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -40,7 +40,7 @@ function c42776960.activate(e,tp,eg,ep,ev,re,r,rp)
e2:SetCode(EVENT_LEAVE_FIELD) e2:SetCode(EVENT_LEAVE_FIELD)
e2:SetLabel(1-tp) e2:SetLabel(1-tp)
e2:SetOperation(c42776960.leaveop) e2:SetOperation(c42776960.leaveop)
e2:SetReset(RESET_EVENT+0x1fe0000) e2:SetReset(RESET_EVENT+RESET_OVERLAY)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
end end
end end
......
...@@ -25,7 +25,7 @@ function c75380687.initial_effect(c) ...@@ -25,7 +25,7 @@ function c75380687.initial_effect(c)
e3:SetDescription(aux.Stringid(75380687,1)) e3:SetDescription(aux.Stringid(75380687,1))
e3:SetCategory(CATEGORY_SPECIAL_SUMMON) e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e3:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY) e3:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP)
e3:SetCode(EVENT_DESTROYED) e3:SetCode(EVENT_DESTROYED)
e3:SetTarget(c75380687.sptg) e3:SetTarget(c75380687.sptg)
e3:SetOperation(c75380687.spop) e3:SetOperation(c75380687.spop)
......
...@@ -4,6 +4,7 @@ function c77505534.initial_effect(c) ...@@ -4,6 +4,7 @@ function c77505534.initial_effect(c)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetHintTiming(0,0x1e0+TIMING_END_PHASE)
e1:SetTarget(c77505534.target) e1:SetTarget(c77505534.target)
e1:SetOperation(c77505534.activate) e1:SetOperation(c77505534.activate)
c:RegisterEffect(e1) c:RegisterEffect(e1)
......
...@@ -21,7 +21,7 @@ function c89397517.rmfilter(c) ...@@ -21,7 +21,7 @@ function c89397517.rmfilter(c)
return c:IsSetCard(0xa1) and c:IsType(TYPE_SPELL) and c:IsAbleToRemove() return c:IsSetCard(0xa1) and c:IsType(TYPE_SPELL) and c:IsAbleToRemove()
end end
function c89397517.spfilter(c,e,tp) function c89397517.spfilter(c,e,tp)
return c:IsSetCard(0xa0) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,true,false) return c:IsSetCard(0xa0) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,true,true)
end end
function c89397517.target(e,tp,eg,ep,ev,re,r,rp,chk) function c89397517.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
...@@ -54,7 +54,7 @@ function c89397517.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -54,7 +54,7 @@ function c89397517.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local tc=spg:Select(tp,1,1,nil):GetFirst() local tc=spg:Select(tp,1,1,nil):GetFirst()
spg:Remove(Card.IsCode,nil,tc:GetCode()) spg:Remove(Card.IsCode,nil,tc:GetCode())
Duel.SpecialSummonStep(tc,0,tp,tp,true,false,POS_FACEUP) Duel.SpecialSummonStep(tc,0,tp,tp,true,true,POS_FACEUP)
tc:CompleteProcedure() tc:CompleteProcedure()
ct=ct-1 ct=ct-1
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