fix

expansions/script/c29000838.lua

 --方舟骑士团-灰毫
 local cm,m,o=GetID()
+cm.named_with_Arknight=1
 function cm.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(1190)
@@ -48,7 +49,7 @@ function cm.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,0,LOCATION_DECK)
 end
 function cm.opf1(c)
-	return c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsSetCard(0x87af) and c:IsAbleToHand()
+	return c:IsAttribute(ATTRIBUTE_LIGHT) and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsAbleToHand()
 end
 function cm.op1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c29001857.lua

 --方舟骑士团-瑕光
 local cm,m,o=GetID()
+cm.named_with_Arknight=1
 function cm.initial_effect(c)
 	--SpecialSummon
 	local e2=Effect.CreateEffect(c)
@@ -43,7 +44,7 @@ function cm.reop(e,tp,eg,ep,ev,re,r,rp)
 		local g=Duel.GetMatchingGroup(cm.posfilter,tp,0,LOCATION_MZONE,nil)
 			if g:GetCount()>0 then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_POSCHANGE)
-				local sg=Duel.SelectMatchingCard(tp,cm.posfilter,tp,0,LOCATION_MZONE,1,1,nil)	   
+				local sg=Duel.SelectMatchingCard(tp,cm.posfilter,tp,0,LOCATION_MZONE,1,1,nil)	  
 				if #sg>0 then
 				Duel.HintSelection(sg)
 				Duel.ChangePosition(sg,POS_FACEDOWN_DEFENSE)
@@ -52,7 +53,7 @@ function cm.reop(e,tp,eg,ep,ev,re,r,rp)
 end
 --e1
 function cm.tdfilter(c)
-	return c:IsSetCard(0x87af) and c:IsAbleToDeck()
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsAbleToDeck()
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.tdfilter,tp,LOCATION_GRAVE,0,1,nil) and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end

expansions/script/c29002020.lua

@@ -84,7 +84,7 @@ function c29002020.splimit(e,se,sp,st)
 	return not e:GetHandler():IsLocation(LOCATION_EXTRA)
 end
 function c29002020.cfilter(c,tp)
-	return c:IsSetCard(0x87af) and (c:IsControler(tp) or c:IsFaceup())
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and (c:IsControler(tp) or c:IsFaceup())
 end
 function c29002020.sprcon(e,c)
 	if c==nil then return true end

expansions/script/c29004690.lua

@@ -51,7 +51,7 @@ function c29004690.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
 end
 function c29004690.filter(c)
-	return c:IsFaceup() and c:IsRace(RACE_FISH) and c:IsSetCard(0x87af) and c:IsType(TYPE_MONSTER)
+	return c:IsFaceup() and c:IsRace(RACE_FISH) and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsType(TYPE_MONSTER)
 end
 function c29004690.desop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c29009213.lua

 --先驱者 -方舟骑士团-
+c29009213.named_with_Arknight=1
 function c29009213.initial_effect(c)
 	--link summon
 	c:EnableReviveLimit()
-	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkSetCard,0x87af),2,2)
+	aux.AddLinkProcedure(c,c29009213.mfilter,2,2)
 	aux.AddCodeList(c,29056009,29065510) 
 	--activate Arknights RHOSDES ISLAND
 	local e2=Effect.CreateEffect(c)
@@ -27,7 +28,9 @@ function c29009213.initial_effect(c)
 	e3:SetOperation(c29009213.regop)
 	c:RegisterEffect(e3)
 end
----e2
+function c29009213.mfilter(c)
+	return c:IsLinkSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)
+end
 function c29009213.accon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()==PHASE_MAIN2
 end

expansions/script/c29009845.lua

 --方舟骑士团-格雷伊
+c29009845.named_with_Arknight=1
 function c29009845.initial_effect(c)
 	--token
 	local e1=Effect.CreateEffect(c)
@@ -31,7 +32,7 @@ end
 c29009845.kinkuaoi_Akscsst=true
 --e3
 function c29009845.rthfilter(c)
-	return c:IsSetCard(0x87af) and c:IsAbleToHand() and c:IsType(TYPE_RITUAL) and c:IsType(TYPE_MONSTER)
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsAbleToHand() and c:IsType(TYPE_RITUAL) and c:IsType(TYPE_MONSTER)
 end
 function c29009845.rfilter(c)
 	return c:IsType(TYPE_TOKEN) and c:IsReleasableByEffect()

expansions/script/c29011741.lua

@@ -32,6 +32,12 @@ function c29011741.initial_effect(c)
 	c:RegisterEffect(e2)
 	Duel.AddCustomActivityCounter(29011741,ACTIVITY_CHAIN,c29011741.chainfilter)
 end
+function c29011741.chainfilter(re,tp,cid)
+	local c=re:GetHandler()
+	local attr=Duel.GetChainInfo(cid,CHAININFO_TRIGGERING_ATTRIBUTE)
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight))
+		or not re:IsActiveType(TYPE_MONSTER) or attr&ATTRIBUTE_WATER~=0
+end
 --SpecialSummon and Destroy
 function c29011741.cfilter(c)
 	return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_WATER)
@@ -83,11 +89,6 @@ function c29011741.thop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.ConfirmCards(1-tp,g)
 	end
 end
---Cost
-function c29011741.chainfilter(re,tp,cid)
-	local rc=re:GetHandler()
-	return (rc:IsSetCard(0x87af) and rc:IsAttribute(ATTRIBUTE_WATER)) or not re:IsActiveType(TYPE_MONSTER) or not rc:IsAttribute(ATTRIBUTE_WATER)
-end
 function c29011741.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetCustomActivityCount(29011741,tp,ACTIVITY_CHAIN)==0 end
 	local e1=Effect.CreateEffect(e:GetHandler())
@@ -100,5 +101,6 @@ function c29011741.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RegisterEffect(e1,tp)
 end
 function c29011741.aclimit(e,re,tp)
-	return not re:GetHandler():IsSetCard(0x87af) and re:IsActiveType(TYPE_MONSTER) and re:GetHandler():IsAttribute(ATTRIBUTE_WATER)
+	local c=re:GetHandler()
+	return not (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and re:IsActiveType(TYPE_MONSTER) and re:GetHandler():IsAttribute(ATTRIBUTE_WATER)
 end
\ No newline at end of file

expansions/script/c29012288.lua

 --方舟骑士团·驰援
 local m=29012288
 local c29012288=_G["c"..m]
+c29012288.named_with_Arknight=1
 function c29012288.initial_effect(c)
 	--Activate
 	local e0=Effect.CreateEffect(c)
@@ -39,7 +40,7 @@ function c29012288.initial_effect(c)
 	
 end
 function c29012288.spfilter(c,e,tp)
-	return c:IsSetCard(0x87af) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and (Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)<Duel.GetFieldGroupCount(1-tp,LOCATION_MZONE,0) or c:IsLocation(LOCATION_HAND))
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and (Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)<Duel.GetFieldGroupCount(1-tp,LOCATION_MZONE,0) or c:IsLocation(LOCATION_HAND))
 end
 function c29012288.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
@@ -59,10 +60,10 @@ function c29012288.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c29012288.eftg(e,c)
-	return c:IsSetCard(0x87af) and c:IsLocation(LOCATION_EXTRA) and c:IsType(TYPE_MONSTER) and c:IsType(TYPE_XYZ) and c:IsRankBelow(6)
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsLocation(LOCATION_EXTRA) and c:IsType(TYPE_MONSTER) and c:IsType(TYPE_XYZ) and c:IsRankBelow(6)
 end
 function c29012288.xyzfilter(c,e)
-	return c:IsSetCard(0x87af) and c:IsType(TYPE_MONSTER) and c:IsCanBeXyzMaterial(e:GetHandler()) and not c:IsCode(e:GetHandler():GetCode())
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsType(TYPE_MONSTER) and c:IsCanBeXyzMaterial(e:GetHandler()) and not c:IsCode(e:GetHandler():GetCode())
 end
 function c29012288.cfilter(c)
 	return c:IsDiscardable()

expansions/script/c29012513.lua

 --方舟骑士共赴黎明
+c29012513.named_with_Arknight=1
 function c29012513.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
@@ -22,7 +23,7 @@ function c29012513.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c29012513.tdfilter(c,e,tp)
-	return c:IsSetCard(0x87af) and c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsAbleToDeck()
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsAbleToDeck()
 end
 function c29012513.drtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c29012513.tdfilter(chkc) end
@@ -46,7 +47,7 @@ function c29012513.drop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c29012513.filter(c,ft,e,tp)
-	return c:IsSetCard(0x87af) and c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsType(TYPE_MONSTER) and (c:IsAbleToHand() or (ft>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false)))
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsType(TYPE_MONSTER) and (c:IsAbleToHand() or (ft>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false)))
 end
 function c29012513.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then

expansions/script/c29015391.lua

@@ -15,7 +15,7 @@ end
 cm.kinkuaoi_Lightakm=true
 --e1
 function cm.tgf1(c,e,tp,code)
-	if not (c:IsSetCard(0x87af) and c:IsAttribute(ATTRIBUTE_LIGHT)) then return false end
+	if not ((c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsAttribute(ATTRIBUTE_LIGHT)) then return false end
 	if code then return c:IsCanBeSpecialSummoned(e,0,tp,false,false) and not c:IsCode(code) end
 	if not Duel.IsExistingMatchingCard(cm.tgf1,tp,LOCATION_DECK+LOCATION_HAND,0,1,nil,e,tp,c:GetCode()) then return false end
 	local seq=c:GetSequence()

expansions/script/c29016278.lua

@@ -11,7 +11,7 @@ function c29016278.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c29016278.filter1(c)
-	return c:IsRace(RACE_FISH) and c:IsSetCard(0x87af) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+	return c:IsRace(RACE_FISH) and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function c29016278.filter2(c)
 	return c:IsSetCard(0x67af) and c:IsType(TYPE_TRAP) and c:IsAbleToHand()

expansions/script/c29016634.lua

 --方舟骑士团-临光·耀骑士
 local m=29016634
 local cm=_G["c"..m]
+cm.named_with_Arknight=1
 function cm.initial_effect(c)
 	aux.AddCodeList(c,29080291) 
 	c:EnableReviveLimit()
@@ -38,7 +39,7 @@ function cm.splimit(e,se,sp,st)
 	return sc:IsSetCard(0x87af) 
 end
 function cm.filter(c)
-	return c:IsSetCard(0x87af) and c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c29019317.lua

 --足践烈火
 local m=29019317
 local cm=_G["c"..m]
+cm.named_with_Arknight=1
 function cm.initial_effect(c)
 	--activate
 	local e1=Effect.CreateEffect(c)
@@ -20,10 +21,10 @@ function c29019317.cfilter(c)
 	return c:IsSummonLocation(LOCATION_EXTRA)
 end
 function c29019317.spfilter1(c,e,tp)
-	return c:IsFaceup() and c:IsSetCard(0x87af) and Duel.IsExistingMatchingCard(c29019317.spfilter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,c) and aux.MustMaterialCheck(c,tp,EFFECT_MUST_BE_XMATERIAL) and Duel.IsExistingMatchingCard(c29019317.cfilter,tp,0,LOCATION_MZONE,1,nil)
+	return c:IsFaceup() and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and Duel.IsExistingMatchingCard(c29019317.spfilter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,c) and aux.MustMaterialCheck(c,tp,EFFECT_MUST_BE_XMATERIAL) and Duel.IsExistingMatchingCard(c29019317.cfilter,tp,0,LOCATION_MZONE,1,nil)
 end
 function c29019317.spfilter2(c,e,tp,mc)
-	return c:IsType(TYPE_XYZ) and c:IsSetCard(0x87af) and mc:IsCanBeXyzMaterial(c)
+	return c:IsType(TYPE_XYZ) and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and mc:IsCanBeXyzMaterial(c)
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,mc,c)>0
 		and not Duel.IsExistingMatchingCard(c29019317.cfilter,tp,LOCATION_ONFIELD,0,1,nil,c:GetCode())
 end

expansions/script/c29019367.lua

 --方舟骑士团·出鞘
 local m=29019367
 local cm=_G["c"..m]
+cm.named_with_Arknight=1
 function cm.initial_effect(c)
 	
 	local e1=Effect.CreateEffect(c)
@@ -37,13 +38,13 @@ function c29019367.rop(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_COST)
 end
 function c29019367.hafilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x87af) and c:IsType(TYPE_XYZ)
+	return c:IsFaceup() and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsType(TYPE_XYZ)
 end
 function c29019367.actcon(e)
 	return Duel.IsExistingMatchingCard(c29019367.hafilter,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,nil)
 end
 function c29019367.tgfilter(c,tp)
-	return c:IsLocation(LOCATION_MZONE) and c:IsFaceup() and c:IsSetCard(0x87af) and c:IsControler(tp)
+	return c:IsLocation(LOCATION_MZONE) and c:IsFaceup() and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsControler(tp)
 end
 function c29019367.wxcon(e,tp,eg,ep,ev,re,r,rp)
 	if not re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) then return false end

expansions/script/c29020954.lua

@@ -56,7 +56,7 @@ function c29020954.condition2(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsPlayerAffectedByEffect(tp,29063234) and e:GetLabelObject():CheckCountLimit(tp)
 end
 function c29020954.filter(c,e,tp)
-	return c:IsRace(RACE_FISH) and c:IsSetCard(0x87af) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP)
+	return c:IsRace(RACE_FISH) and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP)
 end
 function c29020954.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
@@ -94,7 +94,7 @@ function c29020954.condition(e,tp,eg,ep,ev,re,r,rp)
 	return (ph==PHASE_MAIN2 or ph==PHASE_END)
 end
 function c29020954.tdfilter(c)
-	return ((c:IsRace(RACE_FISH) and c:IsSetCard(0x87af)) or c:IsType(TYPE_TRAP)) and c:IsAbleToDeck()
+	return ((c:IsRace(RACE_FISH) and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight))) or c:IsType(TYPE_TRAP)) and c:IsAbleToDeck()
 end
 function c29020954.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsPlayerCanDraw(tp,1)
@@ -113,7 +113,7 @@ function c29020954.operation(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c29020954.actfilter(c)
-	return c:IsFaceup() and c:IsRace(RACE_FISH) and c:IsSetCard(0x87af)
+	return c:IsFaceup() and c:IsRace(RACE_FISH) and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight))
 end
 function c29020954.handcon(e)
 	local g=Duel.GetMatchingGroup(c29020954.actfilter,e:GetHandlerPlayer(),LOCATION_MZONE,0,nil)

expansions/script/c29024390.lua

 --深海歌者·斯卡蒂
+c29024390.named_with_Arknight=1
 function c29024390.initial_effect(c)
 	aux.AddCodeList(c,22702055)
 	--activate
@@ -34,7 +35,7 @@ function c29024390.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Release(e:GetHandler(),REASON_COST)
 end
 function c29024390.spfilter(c,e,tp)
-	if not (c:IsSetCard(0x87af) and c:IsLevelAbove(5) and c:IsRace(RACE_FISH) and c:IsType(TYPE_MONSTER)) then return false end
+	if not ((c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsLevelAbove(5) and c:IsRace(RACE_FISH) and c:IsType(TYPE_MONSTER)) then return false end
 	local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
 	return c:IsAbleToHand() or (ft>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false))
 end

expansions/script/c29033034.lua

@@ -49,7 +49,7 @@ function c29033034.nefilter(c)
 	return c:IsFaceup() and not (c:IsType(TYPE_NORMAL) or c:IsType(TYPE_TOKEN))
 end
 function c29033034.filter(c)
-	return c:IsFaceup() and c:IsRace(RACE_FISH) and c:IsSetCard(0x87af) and c:IsType(TYPE_MONSTER)
+	return c:IsFaceup() and c:IsRace(RACE_FISH) and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsType(TYPE_MONSTER)
 end
 function c29033034.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingMatchingCard(aux.NegateAnyFilter,tp,0,LOCATION_ONFIELD,1,nil) and Duel.IsExistingMatchingCard(c29033034.filter,tp,LOCATION_MZONE,0,1,nil) end

expansions/script/c29039869.lua

@@ -22,7 +22,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function cm.atktg(e,c)
-	return c:IsSetCard(0x87af) and c:GetDefense()>=2000
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:GetDefense()>=2000
 end
 --e1
 function cm.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -37,7 +37,7 @@ function cm.op1(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetOperatedGroup():GetFirst()
 	Duel.ConfirmCards(1-tp,tc)
 	Duel.BreakEffect()
-	if tc:IsType(TYPE_MONSTER) and tc:IsSetCard(0x87af) then
+	if tc:IsType(TYPE_MONSTER) and (tc:IsSetCard(0x87af) or (_G["c"..tc:GetCode()] and  _G["c"..tc:GetCode()].named_with_Arknight)) then
 		if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and tc:IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.SelectYesNo(tp,aux.Stringid(m,1)) then
 		Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
 		end

expansions/script/c29043151.lua

 --方舟骑士团-天火
+c29043151.named_with_Arknight=1
 local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,29065532)
@@ -30,7 +31,7 @@ function s.initial_effect(c)
 end
 s.kinkuaoi_Akscsst=true
 function s.cpfilter(c)
-	return c:IsSetCard(0x87af) and c:GetType()==TYPE_SPELL+TYPE_RITUAL and c:IsAbleToGraveAsCost()
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:GetType()==TYPE_SPELL+TYPE_RITUAL and c:IsAbleToGraveAsCost()
 		and c:CheckActivateEffect(true,true,false)~=nil
 end
 function s.cpcost(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c29046579.lua

 --方舟骑士-焰尾
 local cm,m,o=GetID()
+cm.named_with_Arknight=1
 function cm.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,3))
@@ -41,7 +42,7 @@ function cm.atkop(e,tp,eg,ep,ev,re,r,rp)
 end
 --e2
 function cm.spfilter(c,e,tp)
-	return c:IsSetCard(0x87af) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

expansions/script/c29048675.lua

@@ -57,7 +57,7 @@ function c29048675.initial_effect(c)
 end
 --e1 NegateEffect
 function c29048675.cfilter(c)
-	return c:IsFaceup() and c:IsRace(RACE_FISH) and c:IsSetCard(0x87af)
+	return c:IsFaceup() and c:IsRace(RACE_FISH) and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight))
 end
 function c29048675.condition(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(c29048675.cfilter,tp,LOCATION_MZONE,0,nil)

expansions/script/c29052475.lua

@@ -61,7 +61,7 @@ function c29052475.tkop(e,tp,eg,ep,ev,re,r,rp)
 end
 --e1
 function c29052475.thfilter(c,e,tp)
-	return c:IsSetCard(0x87af) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER) and c.kinkuaoi_Akscsst
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER) and c.kinkuaoi_Akscsst
 end
 function c29052475.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

expansions/script/c29056009.lua

 --方舟骑士-凯尔希
+c29056009.named_with_Arknight=1
 function c29056009.initial_effect(c)
 	aux.AddCodeList(c,29065500,29065502,29065578)
 --search
@@ -60,7 +61,7 @@ function c29056009.spop(e,tp,eg,ep,ev,re,r,rp)
 end
 --search
 function c29056009.thfilter(c)
-	return c:IsSetCard(0x87af) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 
 function c29056009.amyfilter(c)
@@ -81,12 +82,4 @@ function c29056009.thop(e,tp,eg,ep,ev,re,r,rp)
 	local sg1=g:SelectSubGroup(tp,aux.dncheck,false,1,ct)
 	Duel.SendtoHand(sg1,nil,REASON_EFFECT)
 	Duel.ConfirmCards(1-tp,sg1)
-end
---summon with no tribute
-function c29056009.cfilter(c)
-	return not c:IsSetCard(0x87af) and c:IsType(TYPE_EFFECT)
-end
-function c29056009.ntcon(e,c,minc)
-	if c==nil then return true end
-	return minc==0 and c:IsLevelAbove(5) and Duel.GetLocationCount(c:GetControler(),LOCATION_MZONE)>0 and not Duel.IsExistingMatchingCard(c29056009.cfilter,c:GetControler(),LOCATION_MZONE,0,1,nil)
 end
\ No newline at end of file

expansions/script/c29056890.lua

@@ -38,8 +38,12 @@ function cm.op1(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SpecialSummon(e:GetHandler(),0,tp,tp,false,false,POS_FACEUP)
 end
 --e2
+function cm.rmfilter(c)
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight))
+		and c:IsAbleToRemoveAsCost(POS_FACEDOWN)
+end
 function cm.cos2(e,tp,eg,ep,ev,re,r,rp,chk)
-	local g=Duel.GetMatchingGroup(Card.IsAbleToRemoveAsCost,tp,LOCATION_DECK,0,nil):Filter(Card.IsSetCard,nil,0x87af)
+	local g=Duel.GetMatchingGroup(cm.rmfilter,tp,LOCATION_DECK,0,nil)
 	if chk==0 then return #g>0 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	g=g:Select(tp,1,1,nil):GetFirst()

expansions/script/c29059050.lua

 --方舟骑士团－Mon3tr
 local m=29059050
 local cm=_G["c"..m]
+cm.named_with_Arknight=1
 function cm.initial_effect(c)
 	--pendulum summon
 	aux.EnablePendulumAttribute(c)   
@@ -108,7 +109,7 @@ function cm.spop1(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 end
 function cm.addfilter(c,e,tp)
-	if not (c:IsSetCard(0x87af) and c:IsAttribute(ATTRIBUTE_DARK) and c:IsType(TYPE_MONSTER) and not Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_ONFIELD,0,1,nil,c:GetCode())) then return false end
+	if not ((c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsAttribute(ATTRIBUTE_DARK) and c:IsType(TYPE_MONSTER) and not Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_ONFIELD,0,1,nil,c:GetCode())) then return false end
 	local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
 	return c:IsAbleToHand() or (ft>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false))  
 end
@@ -140,7 +141,7 @@ function cm.addop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function cm.splimit(e,c)
-	return not c:IsSetCard(0x87af) and c:IsLocation(LOCATION_EXTRA)
+	return not (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsLocation(LOCATION_EXTRA)
 end
 function cm.pentg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c29060474.lua

@@ -17,7 +17,8 @@ function cm.con1(e,tp,eg,ep,ev,re,r,rp)
 	local ct=Duel.GetCurrentChain()
 	if ct<2 then return end
 	local te,p=Duel.GetChainInfo(ct-1,CHAININFO_TRIGGERING_EFFECT,CHAININFO_TRIGGERING_PLAYER)
-	return te and te:GetHandler():IsSetCard(0x87af) and p==tp and rp==1-tp
+	local c=te:GetHandler()
+	return te and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and p==tp and rp==1-tp
 end
 function cm.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
@@ -31,7 +32,7 @@ function cm.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_NEGATE,ng,ng:GetCount(),0,0)
 end
 function cm.opf1(c)
-	return c:IsSetCard(0x87af) and c:IsAttribute(ATTRIBUTE_LIGHT)
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsAttribute(ATTRIBUTE_LIGHT)
 end
 function cm.op1(e,tp,eg,ep,ev,re,r,rp)
 	for i=1,ev do

expansions/script/c29062558.lua

 --方舟骑士团·燃血
 local m=29062558
 local cm=_G["c"..m]
+cm.named_with_Arknight=1
 function cm.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
@@ -74,7 +75,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0x87af) and c:IsType(TYPE_XYZ)
+	return c:IsFaceup() and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsType(TYPE_XYZ)
 end
 function cm.handcon(e)
 	return Duel.IsExistingMatchingCard(cm.filter,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,nil)

expansions/script/c29063597.lua

 --方舟骑士团-白金
 local cm,m,o=GetID()
+cm.named_with_Arknight=1
 function cm.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,1))
@@ -25,7 +26,7 @@ function cm.initial_effect(c)
 end
 --e2
 function cm.thf1(c)
-	return c:IsSetCard(0x87af) and c:IsFaceup()
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsFaceup()
 end
 function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(cm.thf1,tp,LOCATION_FZONE,0,1,nil)
@@ -41,7 +42,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 end
 --e1
 function cm.cof1(c)
-	return not c:IsCode(m) and c:IsSetCard(0x87af) and c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsAbleToGraveAsCost()
+	return not c:IsCode(m) and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsAbleToGraveAsCost()
 end
 function cm.cos1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.cof1,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c29065500.lua

@@ -90,10 +90,7 @@ function c29065500.thandop2(e,tp,eg,ep,ev,re,r,rp)
 	e:GetHandler():RegisterFlagEffect(29065500,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_BATTLE,0,1)
 end
 function c29065500.thfilter(c)
-	return c:IsSetCard(0x87af) and c:IsType(TYPE_SPELL) and c:IsAbleToHand()
-end
-function c29065500.thfilter1(c)
-	return c:IsSetCard(0x87af) and c:IsAbleToHand()
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsType(TYPE_SPELL) and c:IsAbleToHand()
 end
 function c29065500.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c29065500.thfilter,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c29065502.lua

 --方舟骑士团-博士
 local m=29065502
 local cm=_G["c"..m]
+c29065502.named_with_Arknight=1
 function cm.initial_effect(c)
 	aux.AddCodeList(c,29065500) 
 	--draw
@@ -51,7 +52,7 @@ function c29065502.amyfilter(c)
 	return c:IsCode(29065500) and c:IsFaceup()
 end
 function c29065502.spfilter(c,e,tp)
-	return c:IsSetCard(0x87af) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c29065502.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
@@ -67,7 +68,7 @@ function c29065502.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	end
 end
 function c29065502.spfilter2(c,e,tp)
-	return c:IsSetCard(0x87af) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c29065502.drop(e,tp,eg,ep,ev,re,r,rp)
 	local off=1

expansions/script/c29065508.lua

 --方舟骑士-陈
+c29065508.named_with_Arknight=1
 function c29065508.initial_effect(c)
 	aux.AddCodeList(c,29065500) 
 	--xyz summon
@@ -35,7 +36,7 @@ function c29065508.thfilter(c,tc)
 	return aux.IsCodeListed(c,tc:GetCode()) and c:IsAbleToHand()
 end
 function c29065508.tgfilter(c,tp)
-	return c:IsSetCard(0x87af) and c:IsFaceup() and Duel.IsExistingMatchingCard(c29065508.thfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil,c)
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsFaceup() and Duel.IsExistingMatchingCard(c29065508.thfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil,c)
 end
 function c29065508.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingTarget(c29065508.tgfilter,tp,LOCATION_MZONE,0,1,e:GetHandler(),tp) end

expansions/script/c29065510.lua

@@ -60,11 +60,11 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e12)
 end
 function c29065510.lvtg(e,c)
-	return c:IsLevelAbove(1) and c:IsSetCard(0x87af)
+	return c:IsLevelAbove(1) and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight))
 end
 function c29065510.lvval(e,c,rc)
 	local lv=c:GetLevel()
-	if rc:IsSetCard(0x87af) then return rc:GetRank()+lv*0x10000
+	if (rc:IsSetCard(0x87af) or (_G["c"..rc:GetCode()] and  _G["c"..rc:GetCode()].named_with_Arknight)) then return rc:GetRank()+lv*0x10000
 	else return lv end
 end
 -------------------------------------------------

expansions/script/c29065511.lua

 --方舟骑士深层归还
+c29065511.named_with_Arknight=1
 function c29065511.initial_effect(c)
 	aux.AddCodeList(c,29065500)
 	--Activate
@@ -12,7 +13,7 @@ function c29065511.initial_effect(c)
 	c:RegisterEffect(e1)
 end 
 function c29065511.spfil1(c,e,tp) 
-	return c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsSetCard(0x87af)
+	return c:IsCanBeSpecialSummoned(e,0,tp,false,false) and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight))
 end 
 function c29065511.spfil2(c,e,tp) 
 	return c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsCode(29065502)

expansions/script/c29065514.lua

@@ -89,7 +89,7 @@ function c29065514.ffilter(c)
 	return c:IsCode(29065500) and c:IsFaceup()
 end
 function c29065514.filter(c,e,tp,ft)
-	return ((c:IsSetCard(0x87af) and Duel.IsExistingMatchingCard(c29065514.ffilter,tp,LOCATION_MZONE,0,1,nil)) or c:IsCode(29065500)) and c:IsType(TYPE_MONSTER) and (c:IsAbleToHand() or ft>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP))
+	return (((c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and Duel.IsExistingMatchingCard(c29065514.ffilter,tp,LOCATION_MZONE,0,1,nil)) or c:IsCode(29065500)) and c:IsType(TYPE_MONSTER) and (c:IsAbleToHand() or ft>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP))
 end
 function c29065514.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)

expansions/script/c29065549.lua

@@ -42,7 +42,7 @@ function c29065549.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c29065549.matfilter(c)
-	return c:IsLinkSetCard(0x87af) or (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight))
+	return c:IsLinkSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)
 end
 function c29065549.cocon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsCanAddCounter(0x10ae,1) and e:GetHandler():IsRelateToBattle()

expansions/script/c29066704.lua

 --方舟骑士团-远牙
 local cm,m,o=GetID()
+cm.named_with_Arknight=1
 function cm.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))
@@ -16,7 +17,7 @@ function cm.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>4 end
 end
 function cm.opf1(c)
-	return c:IsType(TYPE_SPELL) and c:IsSetCard(0x87af) and c:IsAbleToHand()
+	return c:IsType(TYPE_SPELL) and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsAbleToHand()
 end
 function cm.opf2(c)
 	return c:IsType(TYPE_MONSTER) and c:IsAttribute(ATTRIBUTE_LIGHT)

expansions/script/c29068155.lua

 --引领者 -方舟骑士-
+c29068155.named_with_Arknight=1
 function c29068155.initial_effect(c)
 	aux.AddCodeList(c,29065500)
 	--change name
@@ -25,7 +26,7 @@ function c29068155.initial_effect(c)
 end
 --e2
 function c29068155.spfilter(c,e,tp)
-	return c:IsSetCard(0x87af) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c29068155.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

expansions/script/c29070796.lua

 --方舟骑士团-夜烟
 local cm,m=GetID()
+cm.named_with_Arknight=1
 function cm.initial_effect(c)
 	--token
 	local e1=Effect.CreateEffect(c)

expansions/script/c29072102.lua

@@ -38,8 +38,10 @@ function c29072102.initial_effect(c)
 end
 --cost
 function c29072102.chainfilter(re,tp,cid)
-	local rc=re:GetHandler()
-	return (rc:IsSetCard(0x87af) and rc:IsAttribute(ATTRIBUTE_WATER)) or not re:IsActiveType(TYPE_MONSTER) or not rc:IsAttribute(ATTRIBUTE_WATER)
+	local c=re:GetHandler()
+	local attr=Duel.GetChainInfo(cid,CHAININFO_TRIGGERING_ATTRIBUTE)
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight))
+		or not re:IsActiveType(TYPE_MONSTER) or attr&ATTRIBUTE_WATER~=0
 end
 function c29072102.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetCustomActivityCount(29072102,tp,ACTIVITY_CHAIN)==0 end
@@ -53,7 +55,8 @@ function c29072102.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RegisterEffect(e1,tp)
 end
 function c29072102.aclimit(e,re,tp)
-	return not re:GetHandler():IsSetCard(0x87af) and re:IsActiveType(TYPE_MONSTER) and re:GetHandler():IsAttribute(ATTRIBUTE_WATER)
+	local c=re:GetHandler()
+	return not (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and re:IsActiveType(TYPE_MONSTER) and re:GetHandler():IsAttribute(ATTRIBUTE_WATER)
 end
 --e2
 function c29072102.efilter(e,re)

expansions/script/c29080291.lua

 --方舟骑士团-临光
 local cm,m,o=GetID()
+cm.named_with_Arknight=1
 function cm.initial_effect(c)
 	--summon
 	local e0=Effect.CreateEffect(c)
@@ -46,7 +47,7 @@ function cm.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>2 end
 end
 function cm.opf1(c,e,tp)
-	return c:IsSetCard(0x87af) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function cm.op1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -83,7 +84,7 @@ function cm.condition(e,tp,eg,ep,ev,re,r,rp)
 	return rp==1-tp and ex and tg~=nil and tc+tg:FilterCount(cm.descheck,nil,tp)-tg:GetCount()>0
 end
 function cm.check(c)
-	return c:IsFaceup() and c:IsSetCard(0x87af)
+	return c:IsFaceup() and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight))
 end
 function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c29092293.lua

 --方舟骑士团-乌尔比安
 local m=29092293
 local cm=_G["c"..m]
+cm.named_with_Arknight=1
 function cm.initial_effect(c)
 	--disable summon
 	local e1=Effect.CreateEffect(c)
@@ -30,8 +31,10 @@ function cm.initial_effect(c)
 	Duel.AddCustomActivityCounter(m,ACTIVITY_CHAIN,cm.chainfilter)
 end
 function cm.chainfilter(re,tp,cid)
+	local c=re:GetHandler()
 	local attr=Duel.GetChainInfo(cid,CHAININFO_TRIGGERING_ATTRIBUTE)
-	return not (re:IsActiveType(TYPE_MONSTER) and attr&ATTRIBUTE_WATER~=0 and not re:GetHandler():IsSetCard(0x87af))
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight))
+		or not re:IsActiveType(TYPE_MONSTER) or attr&ATTRIBUTE_WATER~=0
 end
 function cm.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentChain()==0 and eg:IsExists(Card.IsAttribute,1,nil,ATTRIBUTE_WATER)
@@ -48,7 +51,8 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RegisterEffect(e1,tp)
 end
 function cm.aclimit(e,re,tp)
-	return re:IsActiveType(TYPE_MONSTER) and re:GetHandler():IsAttribute(ATTRIBUTE_WATER) and not re:GetHandler():IsSetCard(0x87af)
+	local c=re:GetHandler()
+	return not (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and re:IsActiveType(TYPE_MONSTER) and re:GetHandler():IsAttribute(ATTRIBUTE_WATER)
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
@@ -66,7 +70,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.thcheck(c)
-	return c:IsAbleToHand() and c:IsSetCard(0x87af) and c:IsFaceup() and c:IsRace(RACE_FISH)
+	return c:IsAbleToHand() and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsFaceup() and c:IsRace(RACE_FISH)
 end
 function cm.gthcheck(c)
 	return c:IsAbleToHand() and c:IsType(TYPE_TRAP)

expansions/script/c29092320.lua

 --方舟骑士团-逻各斯
 local s,id,o=GetID()
+cm.named_with_Arknight=1
 function s.initial_effect(c)
 	---xyz summon
 	aux.AddXyzProcedure(c,s.mfilter,6,3,nil,nil,3)
@@ -33,14 +34,14 @@ function s.initial_effect(c)
 	
 end
 function s.mfilter(c)
-	return c:IsSetCard(0x87af) and c:IsAttribute(ATTRIBUTE_DARK)
+	return (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsAttribute(ATTRIBUTE_DARK)
 end
 function s.cost(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)
 end
 function s.thfilter(c)
-	return c:IsType(TYPE_SPELL) and c:IsSetCard(0x87af) and c:IsAbleToHand()
+	return c:IsType(TYPE_SPELL) and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and  _G["c"..c:GetCode()].named_with_Arknight)) and c:IsAbleToHand()
 end
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_GRAVE+LOCATION_DECK,0,1,nil) end

expansions/script/c47310208.lua

@@ -121,7 +121,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
     local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.thfilter2),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil,e,tp)
     if #g>0 then
         local tc=g:GetFirst()
-        if not tc:IsType(TYPE_EFFECT) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+        if not tc:IsType(TYPE_EFFECT) and tc:IsCanBeSpecialSummoned(e,0,tp,false,false)
          and Duel.GetMZoneCount(tp)>0 and Duel.SelectEffectYesNo(tp,e:GetHandler(),aux.Stringid(id,4)) then
             Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
         else

expansions/script/c47310211.lua

@@ -122,7 +122,7 @@ function s.indop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetDescription(aux.Stringid(id,3))
 	e1:SetProperty(EFFECT_FLAG_CLIENT_HINT)
 	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
+	e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
 	e1:SetValue(1)
 	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 	rc:RegisterEffect(e1,true)

expansions/script/c88100303.lua

@@ -5,7 +5,7 @@ function c88100303.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetCondition(c88100303.condition)
+	--e1:SetCondition(c88100303.condition)
 	e1:SetCost(c88100303.cost)
 	e1:SetTarget(c88100303.target)
 	e1:SetOperation(c88100303.activate)