lua and cdb fix

expansions/script/c14801017.lua

@@ -17,8 +17,8 @@ function c14801017.initial_effect(c)
     e2:SetDescription(aux.Stringid(14801017,4))
     e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
     e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-    e2:SetProperty(EFFECT_FLAG_DELAY)
-    e2:SetCode(EVENT_DESTROYED)
+    e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
+    e2:SetCode(EVENT_LEAVE_FIELD)
     e2:SetCountLimit(1,14801017)
     e2:SetCondition(c14801017.spcon2)
     e2:SetTarget(c14801017.sptg2)

expansions/script/c14801025.lua

@@ -34,8 +34,8 @@ function c14801025.initial_effect(c)
     e3:SetDescription(aux.Stringid(14801025,1))
     e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
     e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-    e3:SetProperty(EFFECT_FLAG_DELAY)
-    e3:SetCode(EVENT_DESTROYED)
+    e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
+    e3:SetCode(EVENT_LEAVE_FIELD)
     e3:SetCountLimit(1,148010251)
     e3:SetCondition(c14801025.spcon2)
     e3:SetTarget(c14801025.sptg2)

expansions/script/c14801028.lua

@@ -42,8 +42,8 @@ function c14801028.initial_effect(c)
     e4:SetDescription(aux.Stringid(14801028,2))
     e4:SetCategory(CATEGORY_SPECIAL_SUMMON)
     e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-    e4:SetProperty(EFFECT_FLAG_DELAY)
-    e4:SetCode(EVENT_DESTROYED)
+    e4:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
+    e4:SetCode(EVENT_LEAVE_FIELD)
     e4:SetCountLimit(1,14801028)
     e4:SetCondition(c14801028.spcon2)
     e4:SetTarget(c14801028.sptg2)

expansions/script/c14801039.lua

@@ -37,8 +37,8 @@ function c14801039.initial_effect(c)
     e5:SetDescription(aux.Stringid(14801039,1))
     e5:SetCategory(CATEGORY_SPECIAL_SUMMON)
     e5:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-    e5:SetProperty(EFFECT_FLAG_DELAY)
-    e5:SetCode(EVENT_DESTROYED)
+    e5:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
+    e5:SetCode(EVENT_LEAVE_FIELD)
     e5:SetCountLimit(1,14801039)
     e5:SetCondition(c14801039.spcon2)
     e5:SetTarget(c14801039.sptg2)

expansions/script/c14801052.lua

 --灾厄魔兽 格鲁吉欧博恩
 function c14801052.initial_effect(c)
-	--link summon
-	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkSetCard,0x4800),2)
-	c:EnableReviveLimit()
-	--indestructable
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
-	e1:SetCondition(c14801052.indcon)
-	e1:SetValue(1)
-	c:RegisterEffect(e1)
-	local e2=e1:Clone()
-	e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
-	c:RegisterEffect(e2)
-	--special summon
-	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(14801052,2))
-	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e3:SetProperty(EFFECT_FLAG_DELAY)
-	e3:SetCode(EVENT_DESTROYED)
-	e3:SetCountLimit(1,148010521)
-	e3:SetCondition(c14801052.spcon2)
-	e3:SetTarget(c14801052.sptg2)
-	e3:SetOperation(c14801052.spop2)
-	c:RegisterEffect(e3)
-	--indes
-	local e4=Effect.CreateEffect(c)
-	e4:SetType(EFFECT_TYPE_FIELD)
-	e4:SetCode(EFFECT_INDESTRUCTABLE_COUNT)
-	e4:SetRange(LOCATION_MZONE)
-	e4:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e4:SetTarget(c14801052.indtg)
-	e4:SetValue(c14801052.indct)
-	c:RegisterEffect(e4)
+    --link summon
+    aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkSetCard,0x4800),2)
+    c:EnableReviveLimit()
+    --indestructable
+    local e1=Effect.CreateEffect(c)
+    e1:SetType(EFFECT_TYPE_SINGLE)
+    e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+    e1:SetRange(LOCATION_MZONE)
+    e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
+    e1:SetCondition(c14801052.indcon)
+    e1:SetValue(1)
+    c:RegisterEffect(e1)
+    local e2=e1:Clone()
+    e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
+    c:RegisterEffect(e2)
+    --special summon
+    local e3=Effect.CreateEffect(c)
+    e3:SetDescription(aux.Stringid(14801052,2))
+    e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
+    e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+    e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
+    e3:SetCode(EVENT_LEAVE_FIELD)
+    e3:SetCountLimit(1,148010521)
+    e3:SetCondition(c14801052.spcon2)
+    e3:SetTarget(c14801052.sptg2)
+    e3:SetOperation(c14801052.spop2)
+    c:RegisterEffect(e3)
+    --indes
+    local e4=Effect.CreateEffect(c)
+    e4:SetType(EFFECT_TYPE_FIELD)
+    e4:SetCode(EFFECT_INDESTRUCTABLE_COUNT)
+    e4:SetRange(LOCATION_MZONE)
+    e4:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+    e4:SetTarget(c14801052.indtg)
+    e4:SetValue(c14801052.indct)
+    c:RegisterEffect(e4)
 end
 function c14801052.lkfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x4800)
+    return c:IsFaceup() and c:IsSetCard(0x4800)
 end
 function c14801052.indcon(e)
-	return e:GetHandler():GetLinkedGroup():IsExists(c14801052.lkfilter,1,nil)
+    return e:GetHandler():GetLinkedGroup():IsExists(c14801052.lkfilter,1,nil)
 end
 function c14801052.indtg(e,c)
-	return e:GetHandler():GetLinkedGroup():IsContains(c)
+    return e:GetHandler():GetLinkedGroup():IsContains(c)
 end
 function c14801052.indct(e,re,r,rp)
-	if bit.band(r,REASON_BATTLE)~=0 then
-		return 1
-	else return 0 end
+    if bit.band(r,REASON_BATTLE)~=0 then
+        return 1
+    else return 0 end
 end
 function c14801052.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	return (c:IsReason(REASON_BATTLE) or (c:GetReasonPlayer()==1-tp and c:IsReason(REASON_EFFECT) and c:GetPreviousControler()==tp))
-		and c:IsPreviousPosition(POS_FACEUP)
+    local c=e:GetHandler()
+    return (c:IsReason(REASON_BATTLE) or (c:GetReasonPlayer()==1-tp and c:IsReason(REASON_EFFECT) and c:GetPreviousControler()==tp))
+        and c:IsPreviousPosition(POS_FACEUP)
 end
 function c14801052.spfilter2(c,e,tp)
-	return c:IsSetCard(0x4800) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+    return c:IsSetCard(0x4800) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c14801052.sptg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and Duel.IsExistingMatchingCard(c14801052.spfilter2,tp,LOCATION_DECK,0,1,nil,e,tp) end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
+    if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
+        and Duel.IsExistingMatchingCard(c14801052.spfilter2,tp,LOCATION_DECK,0,1,nil,e,tp) end
+    Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
 end
 function c14801052.spop2(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectMatchingCard(tp,c14801052.spfilter2,tp,LOCATION_DECK,0,1,1,nil,e,tp)
-	if g:GetCount()>0 then
-		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
-	end
+    if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
+    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+    local g=Duel.SelectMatchingCard(tp,c14801052.spfilter2,tp,LOCATION_DECK,0,1,1,nil,e,tp)
+    if g:GetCount()>0 then
+        Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
+    end
 end
\ No newline at end of file

expansions/script/c14801053.lua

 --灾厄魔鸟 鲁格赛特
 function c14801053.initial_effect(c)
-	--link summon
-	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkSetCard,0x4800),2,99)
-	c:EnableReviveLimit()
-	--destroy
-	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(14801053,0))
-	e1:SetCategory(CATEGORY_DESTROY)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
-	e1:SetCondition(c14801053.descon)
-	e1:SetTarget(c14801053.destg)
-	e1:SetOperation(c14801053.desop)
-	c:RegisterEffect(e1)
-	--negate
-	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(14801053,1))
-	e2:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY)
-	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
-	e2:SetType(EFFECT_TYPE_QUICK_O)
-	e2:SetRange(LOCATION_MZONE)
-	e2:SetCountLimit(1,14801053)
-	e2:SetCode(EVENT_CHAINING)
-	e2:SetCondition(c14801053.discon)
-	e2:SetTarget(c14801053.distg)
-	e2:SetOperation(c14801053.disop)
-	c:RegisterEffect(e2)
-	--special summon
-	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(14801053,2))
-	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e3:SetProperty(EFFECT_FLAG_DELAY)
-	e3:SetCode(EVENT_DESTROYED)
-	e3:SetCountLimit(1,148010531)
-	e3:SetCondition(c14801053.spcon2)
-	e3:SetTarget(c14801053.sptg2)
-	e3:SetOperation(c14801053.spop2)
-	c:RegisterEffect(e3)
+    --link summon
+    aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkSetCard,0x4800),2,99)
+    c:EnableReviveLimit()
+    --destroy
+    local e1=Effect.CreateEffect(c)
+    e1:SetDescription(aux.Stringid(14801053,0))
+    e1:SetCategory(CATEGORY_DESTROY)
+    e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
+    e1:SetCode(EVENT_SPSUMMON_SUCCESS)
+    e1:SetCondition(c14801053.descon)
+    e1:SetTarget(c14801053.destg)
+    e1:SetOperation(c14801053.desop)
+    c:RegisterEffect(e1)
+    --negate
+    local e2=Effect.CreateEffect(c)
+    e2:SetDescription(aux.Stringid(14801053,1))
+    e2:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY)
+    e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
+    e2:SetType(EFFECT_TYPE_QUICK_O)
+    e2:SetRange(LOCATION_MZONE)
+    e2:SetCountLimit(1,14801053)
+    e2:SetCode(EVENT_CHAINING)
+    e2:SetCondition(c14801053.discon)
+    e2:SetTarget(c14801053.distg)
+    e2:SetOperation(c14801053.disop)
+    c:RegisterEffect(e2)
+    --special summon
+    local e3=Effect.CreateEffect(c)
+    e3:SetDescription(aux.Stringid(14801053,2))
+    e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
+    e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+    e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
+    e3:SetCode(EVENT_LEAVE_FIELD)
+    e3:SetCountLimit(1,148010531)
+    e3:SetCondition(c14801053.spcon2)
+    e3:SetTarget(c14801053.sptg2)
+    e3:SetOperation(c14801053.spop2)
+    c:RegisterEffect(e3)
 end
 function c14801053.descon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK)
+    return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK)
 end
 function c14801053.destg(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then return Duel.IsExistingMatchingCard(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,c) end
-	local g=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,c)
-	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,g:GetCount(),0,0)
+    local c=e:GetHandler()
+    if chk==0 then return Duel.IsExistingMatchingCard(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,c) end
+    local g=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,c)
+    Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,g:GetCount(),0,0)
 end
 function c14801053.desop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local g=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,c)
-	if g:GetCount()>0 then
-		Duel.Destroy(g,REASON_EFFECT)
-	end
+    local c=e:GetHandler()
+    local g=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,c)
+    if g:GetCount()>0 then
+        Duel.Destroy(g,REASON_EFFECT)
+    end
 end
 function c14801053.discon(e,tp,eg,ep,ev,re,r,rp)
-	local ph=Duel.GetCurrentPhase()
-	return not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) and re:IsHasType(EFFECT_TYPE_ACTIVATE)
-		and Duel.IsChainNegatable(ev) and (ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE)
+    local ph=Duel.GetCurrentPhase()
+    return not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) and re:IsHasType(EFFECT_TYPE_ACTIVATE)
+        and Duel.IsChainNegatable(ev) and (ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE)
 end
 function c14801053.distg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
-	Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0)
-	if re:GetHandler():IsDestructable() and re:GetHandler():IsRelateToEffect(re) then
-		Duel.SetOperationInfo(0,CATEGORY_DESTROY,eg,1,0,0)
-	end
+    if chk==0 then return true end
+    Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0)
+    if re:GetHandler():IsDestructable() and re:GetHandler():IsRelateToEffect(re) then
+        Duel.SetOperationInfo(0,CATEGORY_DESTROY,eg,1,0,0)
+    end
 end
 function c14801053.disop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then
-		Duel.Destroy(eg,REASON_EFFECT)
-		if not c:IsRelateToEffect(e) or c:IsFacedown() then return end
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetCode(EFFECT_UPDATE_ATTACK)
-		e1:SetProperty(EFFECT_FLAG_COPY_INHERIT)
-		e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE)
-		e1:SetValue(500)
-		c:RegisterEffect(e1)
-	end
+    local c=e:GetHandler()
+    if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then
+        Duel.Destroy(eg,REASON_EFFECT)
+        if not c:IsRelateToEffect(e) or c:IsFacedown() then return end
+        local e1=Effect.CreateEffect(c)
+        e1:SetType(EFFECT_TYPE_SINGLE)
+        e1:SetCode(EFFECT_UPDATE_ATTACK)
+        e1:SetProperty(EFFECT_FLAG_COPY_INHERIT)
+        e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE)
+        e1:SetValue(500)
+        c:RegisterEffect(e1)
+    end
 end
 function c14801053.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	return (c:IsReason(REASON_BATTLE) or (c:GetReasonPlayer()==1-tp and c:IsReason(REASON_EFFECT) and c:GetPreviousControler()==tp))
-		and c:IsPreviousPosition(POS_FACEUP)
+    local c=e:GetHandler()
+    return (c:IsReason(REASON_BATTLE) or (c:GetReasonPlayer()==1-tp and c:IsReason(REASON_EFFECT) and c:GetPreviousControler()==tp))
+        and c:IsPreviousPosition(POS_FACEUP)
 end
 function c14801053.spfilter2(c,e,tp)
-	return c:IsSetCard(0x4800) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+    return c:IsSetCard(0x4800) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c14801053.sptg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and Duel.IsExistingMatchingCard(c14801053.spfilter2,tp,LOCATION_DECK,0,1,nil,e,tp) end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
+    if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
+        and Duel.IsExistingMatchingCard(c14801053.spfilter2,tp,LOCATION_DECK,0,1,nil,e,tp) end
+    Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
 end
 function c14801053.spop2(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectMatchingCard(tp,c14801053.spfilter2,tp,LOCATION_DECK,0,1,1,nil,e,tp)
-	if g:GetCount()>0 then
-		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
-	end
+    if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
+    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+    local g=Duel.SelectMatchingCard(tp,c14801053.spfilter2,tp,LOCATION_DECK,0,1,1,nil,e,tp)
+    if g:GetCount()>0 then
+        Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
+    end
 end
\ No newline at end of file

expansions/script/c14801066.lua

 --灾厄破坏神 赛刚
 function c14801066.initial_effect(c)
-	--link summon
-	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkSetCard,0x4800),2,99)
-	c:EnableReviveLimit()
-	--remove
-	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(14801066,0))
-	e1:SetCategory(CATEGORY_REMOVE)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetCode(EVENT_BATTLE_START)
-	e1:SetTarget(c14801066.rmtg)
-	e1:SetOperation(c14801066.rmop)
-	c:RegisterEffect(e1)
-	--Immune
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
-	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetRange(LOCATION_MZONE)
-	e2:SetValue(1)
-	c:RegisterEffect(e2)
-	--special summon
-	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(14801066,2))
-	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e3:SetProperty(EFFECT_FLAG_DELAY)
-	e3:SetCode(EVENT_DESTROYED)
-	e3:SetCountLimit(1,14801066)
-	e3:SetCondition(c14801066.spcon2)
-	e3:SetTarget(c14801066.sptg2)
-	e3:SetOperation(c14801066.spop2)
-	c:RegisterEffect(e3)
+    --link summon
+    aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkSetCard,0x4800),2,99)
+    c:EnableReviveLimit()
+    --remove
+    local e1=Effect.CreateEffect(c)
+    e1:SetDescription(aux.Stringid(14801066,0))
+    e1:SetCategory(CATEGORY_REMOVE)
+    e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
+    e1:SetCode(EVENT_BATTLE_START)
+    e1:SetTarget(c14801066.rmtg)
+    e1:SetOperation(c14801066.rmop)
+    c:RegisterEffect(e1)
+    --Immune
+    local e2=Effect.CreateEffect(c)
+    e2:SetType(EFFECT_TYPE_SINGLE)
+    e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
+    e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+    e2:SetRange(LOCATION_MZONE)
+    e2:SetValue(1)
+    c:RegisterEffect(e2)
+    --special summon
+    local e3=Effect.CreateEffect(c)
+    e3:SetDescription(aux.Stringid(14801066,2))
+    e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
+    e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+    e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
+    e3:SetCode(EVENT_LEAVE_FIELD)
+    e3:SetCountLimit(1,14801066)
+    e3:SetCondition(c14801066.spcon2)
+    e3:SetTarget(c14801066.sptg2)
+    e3:SetOperation(c14801066.spop2)
+    c:RegisterEffect(e3)
 end
 function c14801066.rmtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	local tc=e:GetHandler():GetBattleTarget()
-	if chk==0 then return tc and tc:IsControler(1-tp) and tc:IsAbleToRemove() and not tc:IsType(TYPE_TOKEN) end
-	Duel.SetOperationInfo(0,CATEGORY_REMOVE,tc,1,0,0)
+    local tc=e:GetHandler():GetBattleTarget()
+    if chk==0 then return tc and tc:IsControler(1-tp) and tc:IsAbleToRemove() and not tc:IsType(TYPE_TOKEN) end
+    Duel.SetOperationInfo(0,CATEGORY_REMOVE,tc,1,0,0)
 end
 function c14801066.rmop(e,tp,eg,ep,ev,re,r,rp)
-	local tc=e:GetHandler():GetBattleTarget()
-	if tc:IsRelateToBattle() then
-		Duel.Remove(tc,POS_FACEDOWN,Re1SON_EFFECT)
-	end
+    local tc=e:GetHandler():GetBattleTarget()
+    if tc:IsRelateToBattle() then
+        Duel.Remove(tc,POS_FACEDOWN,Re1SON_EFFECT)
+    end
 end
 function c14801066.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	return (c:IsReason(REASON_BATTLE) or (c:GetReasonPlayer()==1-tp and c:IsReason(REASON_EFFECT) and c:GetPreviousControler()==tp))
-		and c:IsPreviousPosition(POS_FACEUP)
+    local c=e:GetHandler()
+    return (c:IsReason(REASON_BATTLE) or (c:GetReasonPlayer()==1-tp and c:IsReason(REASON_EFFECT) and c:GetPreviousControler()==tp))
+        and c:IsPreviousPosition(POS_FACEUP)
 end
 function c14801066.spfilter2(c,e,tp)
-	return c:IsSetCard(0x4800) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+    return c:IsSetCard(0x4800) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c14801066.sptg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and Duel.IsExistingMatchingCard(c14801066.spfilter2,tp,LOCATION_DECK,0,1,nil,e,tp) end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
+    if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
+        and Duel.IsExistingMatchingCard(c14801066.spfilter2,tp,LOCATION_DECK,0,1,nil,e,tp) end
+    Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
 end
 function c14801066.spop2(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectMatchingCard(tp,c14801066.spfilter2,tp,LOCATION_DECK,0,1,1,nil,e,tp)
-	if g:GetCount()>0 then
-		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
-	end
+    if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
+    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+    local g=Duel.SelectMatchingCard(tp,c14801066.spfilter2,tp,LOCATION_DECK,0,1,1,nil,e,tp)
+    if g:GetCount()>0 then
+        Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
+    end
 end
\ No newline at end of file

expansions/script/c21520067.lua

@@ -104,7 +104,7 @@ function c21520067.rhop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local g=Duel.GetMatchingGroup(c21520067.rmfilter,tp,LOCATION_DECK,0,nil,LOCATION_DECK,e:GetHandlerPlayer())
 	if g:GetCount()>0 then 
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 		local sg=g:Select(tp,1,1,nil)
 		local g2=Duel.SelectMatchingCard(tp,c21520067.ormfilter,tp,LOCATION_DECK,0,1,1,nil,sg:GetFirst():GetCode())
 		sg:Merge(g2)

expansions/script/c33400008.lua

@@ -88,7 +88,7 @@ function c33400008.activate(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c33400008.mfilter(c)
-	return c:IsLinkSetCard(0x3341)
+	return c:IsLinkSetCard(0x341)
 end
 function c33400008.afilter(c)
 	return c:IsSetCard(0x3340) and c:IsType(TYPE_QUICKPLAY)

expansions/script/c33400009.lua

 --时崎狂三-暗影之主
 function c33400009.initial_effect(c)
-	 --link summon
-	aux.AddLinkProcedure(c,c33400009.mfilter,2)
+	 -link summon
+	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x341),2,99,c33400009.lcheck)
 	c:EnableReviveLimit()
 	 --activate from hand
 	local e1=Effect.CreateEffect(c)
@@ -43,8 +43,8 @@ function c33400009.initial_effect(c)
 	e3:SetOperation(c33400009.desop)
 	c:RegisterEffect(e3)
 end
-function c33400009.mfilter(c)
-	return c:IsLinkSetCard(0x3341)
+function c33400009.lcheck(g)
+	return g:IsExists(Card.IsLinkSetCard,1,nil,0x3341)
 end
 function c33400009.afilter(c)
 	return c:IsSetCard(0x3340) and c:IsType(TYPE_QUICKPLAY)

expansions/script/c33400010.lua

 --时崎狂三-梦魇
 function c33400010.initial_effect(c)
-	 --link summon
-	aux.AddLinkProcedure(c,c33400010.mfilter,2)
+	  --link summon
+	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x341),3,99,c33400010.lcheck)
 	c:EnableReviveLimit()
 	 --activate from hand
 	local e1=Effect.CreateEffect(c)
@@ -59,8 +59,8 @@ function c33400010.initial_effect(c)
 	e5:SetLabelObject(e4)
 	c:RegisterEffect(e5)
 end
-function c33400010.mfilter(c)
-	return c:IsLinkSetCard(0x3341)
+function c33400010.lcheck(g)
+	return g:IsExists(Card.IsLinkSetCard,1,nil,0x3341)
 end
 function c33400010.afilter(c)
 	return c:IsSetCard(0x3340) and c:IsType(TYPE_QUICKPLAY)

expansions/script/c33400014.lua

@@ -38,11 +38,14 @@ function c33400014.dacon(e)
 	return e:GetHandler():GetOverlayCount()>0
 end
 function c33400014.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	local ct=e:GetLabel()
-	if chk==0 then return Duel.IsCanRemoveCounter(tp,1,0,0x34f,ct,REASON_COST) and e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
+local ft=0
+	if e:GetHandler():GetFlagEffect(33401301)>0 then ft=1 end
+	if chk==0 then return Duel.IsCanRemoveCounter(tp,1,0,0x34f,2,REASON_COST) and  ((ft==1) or e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST)) end
 	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
-	Duel.RemoveCounter(tp,1,0,0x34f,ct,REASON_COST)
+	Duel.RemoveCounter(tp,1,0,0x34f,2,REASON_COST)
+	if ft==0 then 
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
+	end
 end
 function c33400014.imop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c33400015.lua

@@ -22,7 +22,6 @@ function c33400015.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1,33400015+10000)
-	e2:SetLabel(2)
 	e2:SetCost(c33400015.spcost2)
 	e2:SetTarget(c33400015.sptg2)
 	e2:SetOperation(c33400015.spop2)
@@ -60,11 +59,14 @@ function c33400015.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c33400015.spcost2(e,tp,eg,ep,ev,re,r,rp,chk)
-	local ct=e:GetLabel()
-	if chk==0 then return Duel.IsCanRemoveCounter(tp,1,0,0x34f,ct,REASON_COST) and e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
+	local ft=0
+	if e:GetHandler():GetFlagEffect(33401301)>0 then ft=1 end
+	if chk==0 then return Duel.IsCanRemoveCounter(tp,1,0,0x34f,2,REASON_COST) and ((ft==1) or e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST)) end   
 	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
-	Duel.RemoveCounter(tp,1,0,0x34f,ct,REASON_COST)
+	Duel.RemoveCounter(tp,1,0,0x34f,2,REASON_COST)
+	if ft==0 then 
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
+	end
 end
 function c33400015.spfilter2(c,e,tp)
 	return c:IsSetCard(0x3341) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE)

expansions/script/c33400207.lua

@@ -62,15 +62,19 @@ function c33400207.ckop(e,tp,eg,ep,ev,re,r,rp)
 	else 
 		  local g=Duel.GetDecktopGroup(1-tp,cm2)
 		  Duel.ConfirmCards(tp,g)
-		  Duel.SortDecktop(tp,1-tp,cm2)				
+		  Duel.SortDecktop(tp,1-tp,cm2)			 
 	end
 end
 function c33400207.descon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetOverlayGroup():IsExists(Card.IsSetCard,1,nil,0x6342)
 end
 function c33400207.descost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
-	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)   
+   local ft=0
+	if e:GetHandler():GetFlagEffect(33401301)>0 then ft=1 end
+	if chk==0 then return  ((ft==1) or e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST)) end   
+	if ft==0 then 
+	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
+	end
 end
 function c33400207.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() and chkc:IsControler(1-tp) end
@@ -96,7 +100,7 @@ function c33400207.desop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	if tc:IsCode(ac) then 
 		  Duel.Damage(1-tp,1000,REASON_EFFECT)
-		  if tc1:IsRelateToEffect(e) and Duel.SelectYesNo(tp,aux.Stringid(33400207,4)) then			 
+		  if tc1:IsRelateToEffect(e) and Duel.SelectYesNo(tp,aux.Stringid(33400207,4)) then		  
 			  Duel.Destroy(tc1,REASON_EFFECT)
 		  end
 			local e1=Effect.CreateEffect(c)

expansions/script/c33400208.lua

@@ -55,8 +55,12 @@ function c33400208.tgop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c33400208.discost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
-	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)   
+	local ft=0
+	if e:GetHandler():GetFlagEffect(33401301)>0 then ft=1 end
+	if chk==0 then return  ((ft==1) or e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST)) end   
+	if ft==0 then 
+	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
+	end
 end
 function c33400208.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() and chkc:IsControler(1-tp) end
@@ -79,7 +83,7 @@ function c33400208.disop(e,tp,eg,ep,ev,re,r,rp)
 	local t2=bit.band(tc:GetType(),0x7)
 	if t1==t2  then 
 		 Duel.Damage(1-tp,500,REASON_EFFECT) 
-		 if Duel.SelectYesNo(tp,aux.Stringid(33400208,3)) then		 
+		 if Duel.SelectYesNo(tp,aux.Stringid(33400208,3)) then	   
 				local e1=Effect.CreateEffect(tc2)
 				e1:SetType(EFFECT_TYPE_FIELD)
 				e1:SetCode(EFFECT_DISABLE)
@@ -95,12 +99,12 @@ function c33400208.disop(e,tp,eg,ep,ev,re,r,rp)
 				e2:SetOperation(c33400208.disop2)
 				e2:SetLabelObject(tc1)
 				e2:SetReset(RESET_PHASE+PHASE_END)
-				Duel.RegisterEffect(e2,tp)	 
+				Duel.RegisterEffect(e2,tp)   
 		 end 
 	end
 	if tc:IsCode(ac) then 
 		  Duel.Damage(1-tp,500,REASON_EFFECT)
-		  if tc1:IsRelateToEffect(e) and Duel.SelectYesNo(tp,aux.Stringid(33400208,4))then	  
+		  if tc1:IsRelateToEffect(e) and Duel.SelectYesNo(tp,aux.Stringid(33400208,4))then	
 			  Duel.SendtoGrave(tc1,REASON_EFFECT)
 		  end
 		  

expansions/script/c33400209.lua

@@ -47,8 +47,12 @@ function c33400209.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c33400209.dmcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
-	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)   
+	 local ft=0
+	if e:GetHandler():GetFlagEffect(33401301)>0 then ft=1 end
+	if chk==0 then return  ((ft==1) or e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST)) end   
+	if ft==0 then 
+	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
+	end
 end
 function c33400209.dmop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
@@ -75,13 +79,13 @@ function c33400209.dmop(e,tp,eg,ep,ev,re,r,rp)
 			e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 			e2:SetCode(EVENT_CHAINING)
 			e2:SetReset(RESET_PHASE+PHASE_END)
-			e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)		
+			e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)	  
 			e2:SetOperation(c33400209.regop)
 			Duel.RegisterEffect(e2,tp)
 			local e3=Effect.CreateEffect(e:GetHandler())
 			e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 			e3:SetCode(EVENT_CHAIN_SOLVED)
-			e3:SetReset(RESET_PHASE+PHASE_END)	 
+			e3:SetReset(RESET_PHASE+PHASE_END)   
 			e3:SetCondition(c33400209.damcon)
 			e3:SetOperation(c33400209.damop)
 			Duel.RegisterEffect(e3,tp)

expansions/script/c33400313.lua

@@ -34,8 +34,12 @@ function c33400313.ovfilter(c)
 	return c:IsFaceup() and c:IsSetCard(0x3343) and c:IsType(TYPE_RITUAL)
 end
 function c33400313.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
+	  local ft=0
+	if e:GetHandler():GetFlagEffect(33401301)>0 then ft=1 end
+	if chk==0 then return  ((ft==1) or e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST)) end   
+	if ft==0 then 
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
+	end
 end
 function c33400313.filter(c,e,tp)
 	return c:IsCanBeSpecialSummoned(e,0,tp,false,false)
@@ -74,7 +78,7 @@ function c33400313.spop(e,tp,eg,ep,ev,re,r,rp)
 		tc:RegisterEffect(e3)
 		local e4=Effect.CreateEffect(c)
 		e4:SetType(EFFECT_TYPE_SINGLE)
-		e4:SetCode(EFFECT_SET_DEFENSE)		
+		e4:SetCode(EFFECT_SET_DEFENSE)	  
 		e4:SetValue(0)
 		e4:SetReset(RESET_EVENT+RESETS_STANDARD)
 		tc:RegisterEffect(e4)
@@ -101,7 +105,7 @@ function c33400313.olop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(33400313,3))
 	local g=Duel.SelectMatchingCard(tp,c33400313.olfilter,tp,LOCATION_GRAVE,0,1,1,nil)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then	 
+	if c:IsRelateToEffect(e) then	
 		if g:GetCount()>0 then
 			Duel.Overlay(c,g)
 		end