adds and fixes

expansions/script/c9980716.lua

@@ -25,20 +25,17 @@ function c9980716.necost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsDiscardable() end
 	Duel.SendtoGrave(e:GetHandler(),REASON_COST+REASON_DISCARD)
 end
-function c9980716.filter1(c)
+function c9980716.filter(c)
 	return c:IsFaceup() and c:IsType(TYPE_SPELL+TYPE_TRAP) and not c:IsDisabled()
 end
-function c9980716.filter2(c)
-	return c:IsFaceup() and c:IsType(TYPE_SPELL+TYPE_TRAP)
-end
 function c9980716.netg(e,tp,eg,ep,ev,re,r,rp,chk)
 	 if chk==0 then return
-		Duel.IsExistingMatchingCard(c9980716.filter1,tp,0,LOCATION_ONFIELD,1,nil)
+		Duel.IsExistingMatchingCard(c9980716.filter,tp,0,LOCATION_ONFIELD,1,nil)
 	end
 end
 function c9980716.neop(e,tp,eg,ep,ev,re,r,rp)
 	 local c=e:GetHandler()
-	local g=Duel.GetMatchingGroup(c9980716.filter2,tp,0,LOCATION_ONFIELD,1,nil)
+	local g=Duel.GetMatchingGroup(c9980716.filter,tp,0,LOCATION_ONFIELD,1,nil)
 	local tc=g:GetFirst()
 	while tc do
 		local e1=Effect.CreateEffect(c)

expansions/script/c9980742.lua

@@ -12,49 +12,49 @@ function c9980742.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetCountLimit(1)
-	e2:SetCost(c9980742.cost)
-	e2:SetTarget(c9980742.target)
-	e2:SetOperation(c9980742.operation)
-	c:RegisterEffect(e2)
-	--spsummon
-	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(9980742,0))
-	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
-	e2:SetType(EFFECT_TYPE_IGNITION)
-	e2:SetRange(LOCATION_SZONE)
-	e2:SetCountLimit(1,9980742)
-	e2:SetTarget(c9980742.sptg)
-	e2:SetOperation(c9980742.spop)
+	e2:SetCost(c9980742.thcost)
+	e2:SetTarget(c9980742.thtg)
+	e2:SetOperation(c9980742.thop)
 	c:RegisterEffect(e2)
+	--Activate
+	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(9980742,0))
+	e1:SetCategory(CATEGORY_REMOVE+CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
+	e1:SetType(EFFECT_TYPE_IGNITION)
+	e1:SetRange(LOCATION_SZONE)
+	e1:SetCountLimit(1,9980742)
+	e1:SetTarget(c9980742.sptg)
+	e1:SetOperation(c9980742.spop)
+	c:RegisterEffect(e1)
 end
-function c9980742.cost(e,tp,eg,ep,ev,re,r,rp,chk)
+function c9980742.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,e:GetHandler()) end
 	Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD)
 end
-function c9980742.filter(c)
+function c9980742.thfilter(c)
 	return c:IsSetCard(0xabcc) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
-function c9980742.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c9980742.filter,tp,LOCATION_DECK,0,1,nil) end
+function c9980742.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(c9980742.thfilter,tp,LOCATION_DECK,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 end
-function c9980742.operation(e,tp,eg,ep,ev,re,r,rp)
+function c9980742.thop(e,tp,eg,ep,ev,re,r,rp)
 	if not e:GetHandler():IsRelateToEffect(e) then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectMatchingCard(tp,c9980742.filter,tp,LOCATION_DECK,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,c9980742.thfilter,tp,LOCATION_DECK,0,1,1,nil)
 	if g:GetCount()>0 then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)
 	end
 end
 function c9980742.filter0(c)
-	return c:IsAbleToRemove()
+	return c:IsOnField() and c:IsAbleToRemove()
 end
 function c9980742.filter1(c,e)
-	return c:IsAbleToRemove() and not c:IsImmuneToEffect(e)
+	return c:IsOnField() and c:IsAbleToRemove() and not c:IsImmuneToEffect(e)
 end
 function c9980742.filter2(c,e,tp,m,f,chkf)
-	return c:IsType(TYPE_FUSION) and (not f or f(c)) and c:IsSetCard(0xabcc)
+	return c:IsType(TYPE_FUSION) and c:IsSetCard(0xabcc) and (not f or f(c))
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
 end
 function c9980742.filter3(c)
@@ -64,7 +64,7 @@ function c9980742.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then
 		local chkf=tp
 		local mg1=Duel.GetFusionMaterial(tp):Filter(c9980742.filter0,nil)
-		local mg2=Duel.GetMatchingGroup(c9980742.filter3,tp,LOCATION_MZONE+LOCATION_HAND+LOCATION_GRAVE,0,nil)
+		local mg2=Duel.GetMatchingGroup(c9980742.filter3,tp,LOCATION_GRAVE,0,nil)
 		mg1:Merge(mg2)
 		local res=Duel.IsExistingMatchingCard(c9980742.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg1,nil,chkf)
 		if not res then
@@ -79,11 +79,12 @@ function c9980742.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 		return res
 	end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
+	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_ONFIELD+LOCATION_GRAVE)
 end
 function c9980742.spop(e,tp,eg,ep,ev,re,r,rp)
 	local chkf=tp
 	local mg1=Duel.GetFusionMaterial(tp):Filter(c9980742.filter1,nil,e)
-	local mg2=Duel.GetMatchingGroup(c9980742.filter3,tp,LOCATION_MZONE+LOCATION_HAND+LOCATION_GRAVE,0,nil)
+	local mg2=Duel.GetMatchingGroup(c9980742.filter3,tp,LOCATION_GRAVE,0,nil)
 	mg1:Merge(mg2)
 	local sg1=Duel.GetMatchingGroup(c9980742.filter2,tp,LOCATION_EXTRA,0,nil,e,tp,mg1,nil,chkf)
 	local mg3=nil
@@ -114,4 +115,4 @@ function c9980742.spop(e,tp,eg,ep,ev,re,r,rp)
 		end
 		tc:CompleteProcedure()
 	end
-end
\ No newline at end of file
+end

expansions/script/c9981001.lua

@@ -27,7 +27,7 @@ function c9981001.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c9981001.matfilter(c)
-	return c:IsLinkSetCard(0x3bc1) and not c:IsLinkCode(9981001)
+	return c:IsLinkSetCard(0x5bc1) and not c:IsLinkCode(9981001)
 end
 function c9981001.splimit(e,c,sump,sumtype,sumpos,targetp)
 	return not c:IsRace(RACE_AQUA)
@@ -40,7 +40,7 @@ function c9981001.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.DiscardHand(tp,c9981001.cfilter,1,1,REASON_COST+REASON_DISCARD)
 end
 function c9981001.spfilter(c,e,tp,zone)
-	return c:IsSetCard(0x3bc1) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE,tp,zone)
+	return c:IsSetCard(0x5bc1) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE,tp,zone)
 end
 function c9981001.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local zone=bit.band(e:GetHandler():GetLinkedZone(tp),0x1f)

expansions/script/c9981002.lua

@@ -29,7 +29,7 @@ function c9981002.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD)
 end
 function c9981002.filter(c,e,tp)
-	return c:IsSetCard(0x3bc1) and c:GetCode()~=9981002 and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x5bc1) and c:GetCode()~=9981002 and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c9981002.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) and chkc:IsControler(tp) and c9981002.filter(chkc,e,tp) end
@@ -46,7 +46,7 @@ function c9981002.spop(e,tp,eg,ep,ev,re,r,rp,chk)
 	end
 end
 function c9981002.tgfilter(c)
-	return c:IsSetCard(0x3bc1) and c:IsType(TYPE_MONSTER) and c:GetCode()~=9981002 and c:IsAbleToGrave()
+	return c:IsSetCard(0x5bc1) and c:IsType(TYPE_MONSTER) and c:GetCode()~=9981002 and c:IsAbleToGrave()
 end
 function c9981002.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c9981002.tgfilter,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c9981003.lua

@@ -48,7 +48,7 @@ function c9981003.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c9981003.filter(c,e,tp)
 	local rk=c:GetRank()
-	return c:IsType(TYPE_XYZ) and c:IsFaceup() and c:IsSetCard(0x3bc1) 
+	return c:IsType(TYPE_XYZ) and c:IsFaceup() and c:IsSetCard(0x5bc1) 
 		and Duel.IsExistingMatchingCard(c9981003.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp,rk)
 end
 function c9981003.spfilter(c,e,tp,rk)

expansions/script/c9981004.lua

@@ -6,7 +6,7 @@ function c9981004.initial_effect(c)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
-	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x3bc1))
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x5bc1))
 	e2:SetValue(800)
 	c:RegisterEffect(e2)
 	local e3=e2:Clone()
@@ -30,7 +30,7 @@ function c9981004.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_COST)
 end
 function c9981004.spfilter(c,e,tp)
-	return c:IsFaceup() and c:IsSetCard(0x3bc1) and not c:IsCode(9981004) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsFaceup() and c:IsSetCard(0x5bc1) and not c:IsCode(9981004) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c9981004.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_REMOVED) and chkc:IsControler(tp) and c9981004.spfilter(chkc,e,tp) end

expansions/script/c9981005.lua

@@ -22,7 +22,7 @@ function c9981005.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c9981005.filter(c)
-	return c:IsSetCard(0x3bc1) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
+	return c:IsSetCard(0x5bc1) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
 end
 function c9981005.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c9981005.filter,tp,LOCATION_DECK,0,1,nil) end
@@ -37,7 +37,7 @@ function c9981005.op(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c9981005.rfilter(c)
-	return (c:IsRace(RACE_AQUA) or (c:IsSetCard(0x3bc1) and c:IsType(TYPE_MONSTER))) and c:IsAbleToRemoveAsCost()
+	return (c:IsRace(RACE_AQUA) or (c:IsSetCard(0x5bc1) and c:IsType(TYPE_MONSTER))) and c:IsAbleToRemoveAsCost()
 end
 function c9981005.hspcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c9981005.rfilter,tp,LOCATION_HAND+LOCATION_GRAVE,0,2,e:GetHandler()) end

expansions/script/c9981006.lua

@@ -31,7 +31,7 @@ function c9981006.spcon(e,c)
 		and Duel.IsExistingMatchingCard(c9981006.filter0,c:GetControler(),LOCATION_MZONE,0,1,nil)
 end
 function c9981006.cfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3bc1) and c:IsType(TYPE_MONSTER)
+	return c:IsFaceup() and c:IsSetCard(0x5bc1) and c:IsType(TYPE_MONSTER)
 end
 function c9981006.descon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c9981006.cfilter,tp,LOCATION_MZONE,0,1,nil)
@@ -41,7 +41,7 @@ function c9981006.descost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SendtoDeck(e:GetHandler(),c,nil,1,REASON_COST)
 end
 function c9981006.filter(c)
-	 return c:IsSetCard(0x3bc1) and c:IsType(TYPE_MONSTER) and c:GetCode()~=9981006 and (c:IsAbleToHand() or c:IsAbleToGrave())
+	 return c:IsSetCard(0x5bc1) and c:IsType(TYPE_MONSTER) and c:GetCode()~=9981006 and (c:IsAbleToHand() or c:IsAbleToGrave())
 end
 function c9981006.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingMatchingCard(c9981006.filter,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c9981007.lua

@@ -13,7 +13,7 @@ function c9981007.initial_effect(c)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x3bc1))
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x5bc1))
 	e2:SetValue(200)
 	c:RegisterEffect(e2)
 	local e3=e2:Clone()
@@ -33,7 +33,7 @@ function c9981007.initial_effect(c)
 	c:RegisterEffect(e2) 
 end
 function c9981007.filter(c)
-	return c:IsSetCard(0x3bc1) and c:IsType(TYPE_MONSTER)  and c:IsAbleToHand()
+	return c:IsSetCard(0x5bc1) and c:IsType(TYPE_MONSTER)  and c:IsAbleToHand()
 end
 function c9981007.activate(e,tp,eg,ep,ev,re,r,rp)
 	if not e:GetHandler():IsRelateToEffect(e) then return end
@@ -51,11 +51,11 @@ function c9981007.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c9981007.filter(c,e,tp)
 	local rk=c:GetRank()
-	return c:IsType(TYPE_XYZ) and c:IsFaceup() and c:IsSetCard(0x3bc1) 
+	return c:IsType(TYPE_XYZ) and c:IsFaceup() and c:IsSetCard(0x5bc1) 
 		and Duel.IsExistingMatchingCard(c9981007.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp,rk)
 end
 function c9981007.spfilter(c,e,tp,rk)
-	return c:IsType(TYPE_XYZ) and c:GetRank()==rk+1 and c:IsSetCard(0x3bc1) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsType(TYPE_XYZ) and c:GetRank()==rk+1 and c:IsSetCard(0x5bc1) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c9981007.chkfilter(c,tc)
 	local rk=tc:GetRank()

expansions/script/c9981008.lua

@@ -22,7 +22,7 @@ function c9981008.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c9981008.cfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3bc1)
+	return c:IsFaceup() and c:IsSetCard(0x5bc1)
 end
 function c9981008.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() and chkc:IsControler(1-tp) and chkc:IsAbleToHand() end
@@ -44,7 +44,7 @@ function c9981008.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_EFFECT)
 end
 function c9981008.thfilter(c)
-	 return c:IsFaceup() and c:IsSetCard(0x3bc1) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+	 return c:IsFaceup() and c:IsSetCard(0x5bc1) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function c9981008.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chkc then return chkc:IsLocation(LOCATION_REMOVED) and c9981008.filter(chkc) end

expansions/script/c9981009.lua

@@ -56,10 +56,10 @@ function c9981009.initial_effect(c)
 	c:RegisterEffect(e2) 
 end
 function c9981009.eqlimit(e,c)
-	return c:IsSetCard(0x3bc1)
+	return c:IsSetCard(0x5bc1)
 end
 function c9981009.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3bc1)
+	return c:IsFaceup() and c:IsSetCard(0x5bc1)
 end
 function c9981009.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c9981009.filter(chkc) end
@@ -97,7 +97,7 @@ function c9981009.valcon(e,re,r,rp)
 	return bit.band(r,REASON_BATTLE+REASON_EFFECT)~=0
 end
 function c9981009.thfilter(c)
-	return c:IsSetCard(0x3bc1) and c:IsType(TYPE_MONSTER) and c:GetCode()~=9981009 and c:IsAbleToRemoveAsCost()
+	return c:IsSetCard(0x5bc1) and c:IsType(TYPE_MONSTER) and c:GetCode()~=9981009 and c:IsAbleToRemoveAsCost()
 end
 function c9981009.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c9981009.thfilter,tp,LOCATION_GRAVE,0,1,nil) end

expansions/script/c9981011.lua

 --湛樱花吹雪-诹访子
 function c9981011.initial_effect(c)
 	--xyz summon
-	aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x3bc1),3,2)
+	aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x5bc1),3,2)
 	c:EnableReviveLimit()
 	--equip
 	local e1=Effect.CreateEffect(c)
@@ -98,7 +98,7 @@ function c9981011.tgcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_COST)
 end
 function c9981011.tgfilter(c)
-	return c:IsSetCard(0x3bc1) and c:IsAbleToGrave()
+	return c:IsSetCard(0x5bc1) and c:IsAbleToGrave()
 end
 function c9981011.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c9981011.tgfilter,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c9981013.lua

@@ -58,7 +58,7 @@ function c9981013.operation(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c9981013.filter1(c)
-	return c:IsSetCard(0x3bc1)
+	return c:IsSetCard(0x5bc1)
 end
 function c9981013.dircon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetOverlayGroup():IsExists(c9981013.filter1,1,nil)

expansions/script/c9981014.lua

@@ -34,7 +34,7 @@ function c9981014.initial_effect(c)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x3bc1))
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x5bc1))
 	e2:SetValue(300)
 	c:RegisterEffect(e2)
 	local e3=e2:Clone()
@@ -52,7 +52,7 @@ function c9981014.initial_effect(c)
 	c:RegisterEffect(e2) 
 end
 function c9981014.filter(c,e,tp)
-	return c:IsSetCard(0x3bc1) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x5bc1) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c9981014.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c9981014.filter(chkc,e,tp) end
@@ -120,7 +120,7 @@ function c9981014.tgcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_COST)
 end
 function c9981014.tgfilter(c)
-	return c:IsSetCard(0x3bc1) and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
+	return c:IsSetCard(0x5bc1) and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
 end
 function c9981014.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c9981014.tgfilter,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c9981015.lua

 --赤口大人-诹访子
 function c9981015.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x3bc1),aux.NonTuner(Card.IsAttribute,ATTRIBUTE_WATER),1)
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x5bc1),aux.NonTuner(Card.IsAttribute,ATTRIBUTE_WATER),1)
 	c:EnableReviveLimit()
 	--tograve
 	local e1=Effect.CreateEffect(c)
@@ -38,7 +38,7 @@ function c9981015.condition(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
 end
 function c9981015.filter(c,ec)
-	return c:IsSetCard(0x3bc1) and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
+	return c:IsSetCard(0x5bc1) and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
 end
 function c9981015.target(e,tp,eg,ep,ev,re,r,rp,chk)
    if chk==0 then return Duel.IsExistingMatchingCard(c9981015.filter,tp,LOCATION_DECK,0,1,nil) end
@@ -66,7 +66,7 @@ function c9981015.drop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Draw(p,d,REASON_EFFECT)
 end
 function c9981015.atkfilter(c)
-	return c:IsType(TYPE_MONSTER) and c:IsSetCard(0x3bc1)
+	return c:IsType(TYPE_MONSTER) and c:IsSetCard(0x5bc1)
 end
 function c9981015.value(e,c)
 	return Duel.GetMatchingGroupCount(c9981015.atkfilter,c:GetControler(),LOCATION_GRAVE+LOCATION_REMOVED,0,nil)*300

expansions/script/c9981025.lua

@@ -40,7 +40,7 @@ function c9981025.sprcon(e,c)
 		and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 end
 function c9981025.filter(c)
-	return c:IsSetCard(0x56) and c:IsType(TYPE_MONSTER) and not c:IsForbidden()
+	return c:IsRace(RACE_DRAGON) and not c:IsForbidden()
 end
 function c9981025.eqtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0

expansions/strings.conf

@@ -57,6 +57,11 @@
 
 !setname 0x356 飞球
 !setname 0x3356 元始飞球
+!setname 0x351 超时空战斗机
+!setname 0x352 超时空武装
+!setname 0x3352 超时空武装 主炮
+!setname 0x5352 超时空武装 装甲
+!setname 0x6352 超时空武装 副炮
 
 #鸟神 998 0xbc0-0xbcf
 !setname 0x3bc1 戈尔贡