fix (#1575)

1266e341 · Chrono-Genex · GitHub · 72c98120 · 1266e341 · 1266e341
Commit 1266e341 authored Mar 07, 2021 by Chrono-Genex Committed by GitHub Mar 07, 2021
73 changed files
--- a/c10928224.lua
+++ b/c10928224.lua
@@ -17,13 +17,7 @@ function c10928224.initial_effect(c)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
 	c:RegisterEffect(e2)
 	--code
-	local e3=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,10979723,LOCATION_MZONE+LOCATION_GRAVE)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e3:SetCode(EFFECT_CHANGE_CODE)
-	e3:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e3:SetValue(10979723)
-	c:RegisterEffect(e3)
 	--atkup
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_SINGLE)

--- a/c1142880.lua
+++ b/c1142880.lua
 --サイバー・ドラゴン・ネクステア
 function c1142880.initial_effect(c)
 	--code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,70095154,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(70095154)
-	c:RegisterEffect(e1)
 	--special summon (self)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(1142880,0))

--- a/c1322368.lua
+++ b/c1322368.lua
@@ -4,13 +4,7 @@ function c1322368.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkSetCard,0xee),2,2)
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,41091257,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(41091257)
-	c:RegisterEffect(e1)
 	--special summon
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(1322368,0))

--- a/c13518809.lua
+++ b/c13518809.lua
@@ -2,13 +2,7 @@
 function c13518809.initial_effect(c)
 	c:EnableReviveLimit()
 	--code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,46427957,LOCATION_MZONE+LOCATION_HAND)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_HAND)
-	e1:SetValue(46427957)
-	c:RegisterEffect(e1)
 	--indes
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)

--- a/c1357146.lua
+++ b/c1357146.lua
 --粋カエル
 function c1357146.initial_effect(c)
 	--change code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,84451804)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetValue(84451804)
-	c:RegisterEffect(e1)
 	--draw
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(1357146,0))

--- a/c15449853.lua
+++ b/c15449853.lua
@@ -7,13 +7,7 @@ function c15449853.initial_effect(c)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	c:RegisterEffect(e1)
 	--change
-	local e2=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,56433456,LOCATION_SZONE+LOCATION_GRAVE)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetCode(EFFECT_CHANGE_CODE)
-	e2:SetRange(LOCATION_SZONE+LOCATION_GRAVE)
-	e2:SetValue(56433456)
-	c:RegisterEffect(e2)
 	--atk/def
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)

--- a/c15989522.lua
+++ b/c15989522.lua
@@ -5,13 +5,7 @@ function c15989522.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0xbd),c15989522.ffilter2,true)
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,66889139)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(66889139)
-	c:RegisterEffect(e1)
 	--destroy
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(15989522,0))

--- a/c18138630.lua
+++ b/c18138630.lua
@@ -6,13 +6,7 @@ function c18138630.initial_effect(c)
 	e0:SetCode(EVENT_FREE_CHAIN)
 	c:RegisterEffect(e0)
 	--change code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,70245411,LOCATION_SZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_SZONE+LOCATION_GRAVE)
-	e1:SetValue(70245411)
-	c:RegisterEffect(e1)
 	--destroy
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(18138630,0))

--- a/c19801646.lua
+++ b/c19801646.lua
 --伝説のフィッシャーマン二世
 function c19801646.initial_effect(c)
 	--code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,3643300,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(3643300)
-	c:RegisterEffect(e1)
 	--immune
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)

--- a/c20584712.lua
+++ b/c20584712.lua
 --SPYRAL－タフネス
 function c20584712.initial_effect(c)
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,41091257,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(41091257)
-	c:RegisterEffect(e1)
 	--destroy
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(20584712,0))

--- a/c21546416.lua
+++ b/c21546416.lua
 --アームド・ドラゴン・サンダー LV5
 function c21546416.initial_effect(c)
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,46384672,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(46384672)
-	c:RegisterEffect(e1)
 	--spsummon
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(21546416,0))

--- a/c21620076.lua
+++ b/c21620076.lua
 --ペインペインター
 function c21620076.initial_effect(c)
 	--alias
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,33420078)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetValue(33420078)
-	c:RegisterEffect(e1)
 	--lvchange
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(21620076,0))

--- a/c22339232.lua
+++ b/c22339232.lua
@@ -2,13 +2,7 @@
 function c22339232.initial_effect(c)
 	aux.AddCodeList(c,32274490)
 	--change code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,32274490,LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_GRAVE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetValue(32274490)
-	c:RegisterEffect(e1)
 	--to grave
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(22339232,0))

--- a/c23893227.lua
+++ b/c23893227.lua
@@ -23,13 +23,7 @@ function c23893227.initial_effect(c)
 	e2:SetOperation(c23893227.spop)
 	c:RegisterEffect(e2)
 	--code
-	local e3=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,70095154,LOCATION_MZONE+LOCATION_GRAVE)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetCode(EFFECT_CHANGE_CODE)
-	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e3:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e3:SetValue(70095154)
-	c:RegisterEffect(e3)
 end
 function c23893227.filter(c)
 	return c:IsSetCard(0x93,0x94) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()

--- a/c2519690.lua
+++ b/c2519690.lua
@@ -5,13 +5,7 @@ function c2519690.initial_effect(c)
 	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0xbd),aux.FilterBoolFunction(Card.IsRace,RACE_DRAGON),true)
 	aux.AddCodeList(c,66889139)
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,66889139)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(66889139)
-	c:RegisterEffect(e1)
 	--search
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(2519690,0))

--- a/c26439287.lua
+++ b/c26439287.lua
 --プロト・サイバー・ドラゴン
 function c26439287.initial_effect(c)
 	--code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,70095154)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(70095154)
-	c:RegisterEffect(e1)
 end
--- a/c28957126.lua
+++ b/c28957126.lua
@@ -11,13 +11,7 @@ function c28957126.initial_effect(c)
 	e1:SetOperation(c28957126.operation)
 	c:RegisterEffect(e1)
 	--change code
-	local e2=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,44133040)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetCode(EFFECT_CHANGE_CODE)
-	e2:SetRange(LOCATION_SZONE)
-	e2:SetValue(44133040)
-	c:RegisterEffect(e2)
 	--atkup
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_EQUIP)

--- a/c29975188.lua
+++ b/c29975188.lua
 --サイバー・ドラゴン・フィーア
 function c29975188.initial_effect(c)
 	--code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,70095154,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(70095154)
-	c:RegisterEffect(e1)
 	--spsummon
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(29975188,0))

--- a/c30822527.lua
+++ b/c30822527.lua
@@ -3,13 +3,7 @@ function c30822527.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkType,TYPE_EFFECT),2)
 	--Change Name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,1861629)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(1861629)
-	c:RegisterEffect(e1)
 	--Atk Up
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)

--- a/c32775808.lua
+++ b/c32775808.lua
@@ -4,13 +4,7 @@ function c32775808.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.AddFusionProcCodeFun(c,70781052,aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_DARK),1,true,true)
 	--code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,70781052)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(70781052)
-	c:RegisterEffect(e1)
 	--atkup
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)

--- a/c34093683.lua
+++ b/c34093683.lua
@@ -2,13 +2,7 @@
 function c34093683.initial_effect(c)
 	c:EnableReviveLimit()
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,4388680)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(4388680)
-	c:RegisterEffect(e1)
 	--cannot be target
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)

--- a/c3428069.lua
+++ b/c3428069.lua
 --破壊剣の使い手－バスター・ブレイダー
 function c3428069.initial_effect(c)
 	--Code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,78193831,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(78193831)
-	c:RegisterEffect(e1)
 	--Equip
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(3428069,0))

--- a/c35191415.lua
+++ b/c35191415.lua
@@ -2,13 +2,7 @@
 function c35191415.initial_effect(c)
 	aux.AddCodeList(c,46986414)
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,46986414)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(46986414)
-	c:RegisterEffect(e1)
 	--spsummon (self)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(35191415,0))

--- a/c38517737.lua
+++ b/c38517737.lua
@@ -12,13 +12,7 @@ function c38517737.initial_effect(c)
 	e1:SetOperation(c38517737.spop)
 	c:RegisterEffect(e1)
 	--code
-	local e2=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,89631139,LOCATION_MZONE+LOCATION_GRAVE)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetCode(EFFECT_CHANGE_CODE)
-	e2:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e2:SetValue(89631139)
-	c:RegisterEffect(e2)
 	--destroy
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(38517737,0))

--- a/c39392286.lua
+++ b/c39392286.lua
@@ -16,13 +16,7 @@ function c39392286.initial_effect(c)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
 	c:RegisterEffect(e2)
 	--change name
-	local e3=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,76812113,LOCATION_MZONE+LOCATION_GRAVE)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e3:SetCode(EFFECT_CHANGE_CODE)
-	e3:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e3:SetValue(76812113)
-	c:RegisterEffect(e3)
 end
 function c39392286.thfilter(c)
 	return aux.IsCodeListed(c,12206212) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()

--- a/c40364916.lua
+++ b/c40364916.lua
@@ -6,13 +6,7 @@ function c40364916.initial_effect(c)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	c:RegisterEffect(e1)
 	--change code
-	local e2=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,40005099)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetCode(EFFECT_CHANGE_CODE)
-	e2:SetRange(LOCATION_SZONE)
-	e2:SetValue(40005099)
-	c:RegisterEffect(e2)
 	--summon limit
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(40364916,0))

--- a/c40991587.lua
+++ b/c40991587.lua
@@ -2,13 +2,7 @@
 function c40991587.initial_effect(c)
 	aux.AddCodeList(c,32274490)
 	--change code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,32274490,LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_GRAVE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetValue(32274490)
-	c:RegisterEffect(e1)
 	--battle indestructable
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)

--- a/c41578483.lua
+++ b/c41578483.lua
@@ -32,6 +32,7 @@ function c41578483.initial_effect(c)
 	--disable
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_FIELD)
+	e4:SetProperty(0,EFFECT_FLAG2_MILLENNIUM_RESTRICT)
 	e4:SetCode(EFFECT_DISABLE)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
@@ -122,14 +123,7 @@ end
 function c41578483.distg(e,c)
 	if c:IsFacedown() then return false end
 	local g=e:GetHandler():GetEquipGroup():Filter(c41578483.disfilter,nil)
-	local code=c:GetCode()
+	return g:IsExists(Card.IsCode,1,nil,c:GetCode())
-	local code2=c:GetFlagEffectLabel(41578484)
-	if code2 then code=code2 end
-	local res=g:IsExists(Card.IsCode,1,nil,code)
-	if res and code2==nil and code~=c:GetOriginalCode() then
-		c:RegisterFlagEffect(41578484,RESET_EVENT+RESETS_STANDARD,0,0,code)
-	end
-	return res
 end
 function c41578483.discon(e,tp,eg,ep,ev,re,r,rp)
 	local g=e:GetHandler():GetEquipGroup():Filter(c41578483.disfilter,nil)

--- a/c41721210.lua
+++ b/c41721210.lua
@@ -4,13 +4,7 @@ function c41721210.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.AddFusionProcCodeFun(c,46986414,aux.FilterBoolFunction(Card.IsRace,RACE_DRAGON),1,true,true)
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,46986414,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(46986414)
-	c:RegisterEffect(e1)
 	--cannot be target
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)

--- a/c43175858.lua
+++ b/c43175858.lua
@@ -10,13 +10,7 @@ function c43175858.initial_effect(c)
 	e1:SetOperation(c43175858.activate)
 	c:RegisterEffect(e1)
 	--change code
-	local e2=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,15259703,LOCATION_FZONE)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetCode(EFFECT_CHANGE_CODE)
-	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetRange(LOCATION_FZONE)
-	e2:SetValue(15259703)
-	c:RegisterEffect(e2)
 	--cannot be target
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)

--- a/c43266605.lua
+++ b/c43266605.lua
 --PSYフレーム・マルチスレッダー
 function c43266605.initial_effect(c)
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,49036338,LOCATION_HAND+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_HAND+LOCATION_GRAVE)
-	e1:SetValue(49036338)
-	c:RegisterEffect(e1)
 	--destroy replace
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)

--- a/c43889633.lua
+++ b/c43889633.lua
@@ -18,13 +18,7 @@ function c43889633.initial_effect(c)
 	e2:SetOperation(c43889633.operation)
 	c:RegisterEffect(e2)
 	--code
-	local e3=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,22702055)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetCode(EFFECT_CHANGE_CODE)
-	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetValue(22702055)
-	c:RegisterEffect(e3)
 end
 function c43889633.filter(c)
 	return c:IsFaceup() and c:IsLevelBelow(4) and c:IsRace(RACE_FISH+RACE_SEASERPENT+RACE_AQUA) and c:IsAbleToRemove()

--- a/c46239604.lua
+++ b/c46239604.lua
 --魔知ガエル
 function c46239604.initial_effect(c)
 	--change code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,84451804)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetValue(84451804)
-	c:RegisterEffect(e1)
 	--search
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(46239604,0))

--- a/c46724542.lua
+++ b/c46724542.lua
@@ -4,13 +4,7 @@ function c46724542.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkRace,RACE_MACHINE),2,2,c46724542.lcheck)
 	--code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,70095154,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(70095154)
-	c:RegisterEffect(e1)
 	--atk/def
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(46724542,1))

--- a/c47963370.lua
+++ b/c47963370.lua
@@ -3,13 +3,7 @@ function c47963370.initial_effect(c)
 	aux.AddCodeList(c,46986414)
 	c:EnableReviveLimit()
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,46986414,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(46986414)
-	c:RegisterEffect(e1)
 	--destroy
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(47963370,0))

--- a/c50139096.lua
+++ b/c50139096.lua
@@ -19,13 +19,7 @@ function c50139096.initial_effect(c)
 	e2:SetOperation(c50139096.operation)
 	c:RegisterEffect(e2)
 	--name change
-	local e3=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,46427957,LOCATION_MZONE+LOCATION_HAND)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e3:SetCode(EFFECT_CHANGE_CODE)
-	e3:SetRange(LOCATION_MZONE+LOCATION_HAND)
-	e3:SetValue(46427957)
-	c:RegisterEffect(e3)
 end
 function c50139096.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL)

--- a/c51916032.lua
+++ b/c51916032.lua
@@ -2,13 +2,7 @@
 function c51916032.initial_effect(c)
 	aux.AddCodeList(c,77585513)
 	--change
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,77585513,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(77585513)
-	c:RegisterEffect(e1)
 	--tohand
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(51916032,0))

--- a/c52198054.lua
+++ b/c52198054.lua
@@ -20,13 +20,7 @@ function c52198054.initial_effect(c)
 	e2:SetHintTiming(0,TIMING_MAIN_END)
 	c:RegisterEffect(e2)
 	--change
-	local e3=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,21420702)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e3:SetCode(EFFECT_CHANGE_CODE)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetValue(21420702)
-	c:RegisterEffect(e3)
 	--tograve
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(52198054,1))

--- a/c5285665.lua
+++ b/c5285665.lua
@@ -17,13 +17,7 @@ function c5285665.initial_effect(c)
 	e2:SetOperation(c5285665.spop)
 	c:RegisterEffect(e2)
 	--change code
-	local e3=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,79979666)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e3:SetRange(LOCATION_MZONE)
-	e3:SetCode(EFFECT_CHANGE_CODE)
-	e3:SetValue(79979666)
-	c:RegisterEffect(e3)
 	--destroy
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(5285665,0))

--- a/c5373478.lua
+++ b/c5373478.lua
@@ -19,13 +19,7 @@ function c5373478.initial_effect(c)
 	e2:SetOperation(c5373478.cdop)
 	c:RegisterEffect(e2)
 	--code
-	local e3=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,70095154,LOCATION_GRAVE)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetCode(EFFECT_CHANGE_CODE)
-	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e3:SetRange(LOCATION_GRAVE)
-	e3:SetValue(70095154)
-	c:RegisterEffect(e3)
 end
 function c5373478.atkcon(e)
 	local phase=Duel.GetCurrentPhase()

--- a/c56364287.lua
+++ b/c56364287.lua
 --サイバー・ドラゴン・ヘルツ
 function c56364287.initial_effect(c)
 	--name change
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,70095154,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(70095154)
-	c:RegisterEffect(e1)
 	--level change
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(56364287,0))

--- a/c56585883.lua
+++ b/c56585883.lua
 --ハーピィ・ハーピスト
 function c56585883.initial_effect(c)
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,76812113,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(76812113)
-	c:RegisterEffect(e1)
 	--return
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(56585883,0))

--- a/c57030525.lua
+++ b/c57030525.lua
 --アームド・ドラゴン・サンダー LV3
 function c57030525.initial_effect(c)
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,980973,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(980973)
-	c:RegisterEffect(e1)
 	--spsummon
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(57030525,0))

--- a/c57473560.lua
+++ b/c57473560.lua
@@ -2,13 +2,7 @@
 function c57473560.initial_effect(c)
 	aux.AddCodeList(c,32274490)
 	--change code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,32274490,LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_GRAVE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetValue(32274490)
-	c:RegisterEffect(e1)
 	--to grave
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(57473560,0))

--- a/c58153103.lua
+++ b/c58153103.lua
@@ -17,16 +17,11 @@ end
 function c58153103.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	--change name
-	local e1=Effect.CreateEffect(c)
+	local e0,e1=aux.EnableChangeCode(c,59464593,LOCATION_MZONE,c58153103.condition)
-	e1:SetType(EFFECT_TYPE_SINGLE)
+	e0:SetLabel(1)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e0:SetReset(RESET_EVENT+RESETS_STANDARD)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(59464593)
 	e1:SetLabel(1)
-	e1:SetCondition(c58153103.condition)
 	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
-	c:RegisterEffect(e1)
 	--control
 	local e2=e1:Clone()
 	e2:SetCode(EFFECT_CANNOT_CHANGE_CONTROL)

--- a/c59281922.lua
+++ b/c59281922.lua
@@ -19,13 +19,7 @@ function c59281922.initial_effect(c)
 	e2:SetOperation(c59281922.operation)
 	c:RegisterEffect(e2)
 	--code
-	local e3=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,70095154,LOCATION_MZONE+LOCATION_GRAVE)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e3:SetCode(EFFECT_CHANGE_CODE)
-	e3:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e3:SetValue(70095154)
-	c:RegisterEffect(e3)
 	Duel.AddCustomActivityCounter(59281922,ACTIVITY_SPSUMMON,c59281922.counterfilter)
 end
 function c59281922.counterfilter(c)

--- a/c59913418.lua
+++ b/c59913418.lua
@@ -2,13 +2,7 @@
 function c59913418.initial_effect(c)
 	c:EnableReviveLimit()
 	--code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,72426662,LOCATION_MZONE+LOCATION_HAND)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_HAND)
-	e1:SetValue(72426662)
-	c:RegisterEffect(e1)
 	--indes
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)

--- a/c60110982.lua
+++ b/c60110982.lua
@@ -4,13 +4,7 @@ function c60110982.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.AddFusionProcCode3(c,6007213,32491822,69890967,true,true)
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,43378048)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(43378048)
-	c:RegisterEffect(e1)
 	--control
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(60110982,0))

--- a/c61248471.lua
+++ b/c61248471.lua
@@ -4,13 +4,7 @@ function c61248471.initial_effect(c)
 	aux.AddXyzProcedure(c,nil,6,2)
 	c:EnableReviveLimit()
 	--code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,70781052)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(70781052)
-	c:RegisterEffect(e1)
 	--destroy replace
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)

--- a/c6128460.lua
+++ b/c6128460.lua
@@ -2,13 +2,7 @@
 function c6128460.initial_effect(c)
 	aux.AddCodeList(c,32274490)
 	--change code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,32274490,LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_GRAVE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetValue(32274490)
-	c:RegisterEffect(e1)
 	--destroy replace
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)

--- a/c63261835.lua
+++ b/c63261835.lua
@@ -4,13 +4,7 @@ function c63261835.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.AddSynchroMixProcedure(c,c63261835.matfilter1,nil,nil,aux.NonTuner(nil),1,99)
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,76812113,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(76812113)
-	c:RegisterEffect(e1)
 	--to hand
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(63261835,0))

--- a/c64635042.lua
+++ b/c64635042.lua
@@ -3,13 +3,7 @@ function c64635042.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.AddSynchroProcedure(c,nil,aux.NonTuner(nil),1)
 	--code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,70781052)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(70781052)
-	c:RegisterEffect(e1)
 	--cannot be target
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)

--- a/c65342096.lua
+++ b/c65342096.lua
@@ -8,13 +8,7 @@ function c65342096.initial_effect(c)
 	e1:SetCountLimit(1,65342096+EFFECT_COUNT_CODE_OATH)
 	c:RegisterEffect(e1)
 	--Code Change
-	local e2=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,39910367)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetCode(EFFECT_CHANGE_CODE)
-	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetRange(LOCATION_SZONE)
-	e2:SetValue(39910367)
-	c:RegisterEffect(e2)
 	--Add Counter
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)

--- a/c66386380.lua
+++ b/c66386380.lua
@@ -15,13 +15,7 @@ function c66386380.initial_effect(c)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
 	c:RegisterEffect(e2)
 	--change name
-	local e3=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,76812113,LOCATION_MZONE+LOCATION_GRAVE)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e3:SetCode(EFFECT_CHANGE_CODE)
-	e3:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e3:SetValue(76812113)
-	c:RegisterEffect(e3)
 	--Special Summon
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(66386380,1))

--- a/c68815132.lua
+++ b/c68815132.lua
@@ -12,13 +12,7 @@ function c68815132.initial_effect(c)
 	e1:SetOperation(c68815132.operation)
 	c:RegisterEffect(e1)
 	--change name
-	local e2=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,76812113,LOCATION_MZONE+LOCATION_GRAVE)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetCode(EFFECT_CHANGE_CODE)
-	e2:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e2:SetValue(76812113)
-	c:RegisterEffect(e2)
 end
 function c68815132.filter(c)
 	return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_WIND) and c:IsAbleToHand()

--- a/c69884162.lua
+++ b/c69884162.lua
@@ -3,12 +3,5 @@ function c69884162.initial_effect(c)
 	aux.AddCodeList(c,89943723)
 	aux.EnableDualAttribute(c)
 	--code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,89943723,LOCATION_MZONE,aux.IsDualState)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetCondition(aux.IsDualState)
-	e1:SetValue(89943723)
-	c:RegisterEffect(e1)
 end
--- a/c74889525.lua
+++ b/c74889525.lua
@@ -4,13 +4,7 @@ function c74889525.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x1142),c74889525.matfilter,true)
 	--change name
-	local e2=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,95440946)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetCode(EFFECT_CHANGE_CODE)
-	e2:SetRange(LOCATION_MZONE)
-	e2:SetValue(95440946)
-	c:RegisterEffect(e2)
 	--indes
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)

--- a/c75064463.lua
+++ b/c75064463.lua
@@ -11,13 +11,7 @@ function c75064463.initial_effect(c)
 	e1:SetOperation(c75064463.operation)
 	c:RegisterEffect(e1)
 	--change name
-	local e2=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,76812113,LOCATION_MZONE+LOCATION_GRAVE)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetCode(EFFECT_CHANGE_CODE)
-	e2:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e2:SetValue(76812113)
-	c:RegisterEffect(e2)
 end
 function c75064463.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

--- a/c7852509.lua
+++ b/c7852509.lua
@@ -6,13 +6,7 @@ function c7852509.initial_effect(c)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	c:RegisterEffect(e1)
 	--change code
-	local e2=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,83555666)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetCode(EFFECT_CHANGE_CODE)
-	e2:SetRange(LOCATION_SZONE)
-	e2:SetValue(83555666)
-	c:RegisterEffect(e2)
 	--destroy
 	local e3=Effect.CreateEffect(c)
 	e3:SetCategory(CATEGORY_DESTROY+CATEGORY_DAMAGE)

--- a/c78765160.lua
+++ b/c78765160.lua
@@ -6,13 +6,7 @@ function c78765160.initial_effect(c)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	c:RegisterEffect(e1)
 	--change code
-	local e2=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,40005099)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetCode(EFFECT_CHANGE_CODE)
-	e2:SetRange(LOCATION_SZONE)
-	e2:SetValue(40005099)
-	c:RegisterEffect(e2)
 	--no damage
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(78765160,0))

--- a/c80666118.lua
+++ b/c80666118.lua
@@ -4,13 +4,7 @@ function c80666118.initial_effect(c)
 	aux.AddSynchroProcedure(c,nil,aux.NonTuner(nil),1)
 	c:EnableReviveLimit()
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,70902743,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(70902743)
-	c:RegisterEffect(e1)
 	--destroy
 	local e2=Effect.CreateEffect(c)
 	e2:SetCategory(CATEGORY_DESTROY+CATEGORY_DAMAGE)

--- a/c84539520.lua
+++ b/c84539520.lua
 --アマゾネス王女
 function c84539520.initial_effect(c)
 	--code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,15951532,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(15951532)
-	c:RegisterEffect(e1)
 	--search
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(84539520,0))

--- a/c85696777.lua
+++ b/c85696777.lua
@@ -4,13 +4,7 @@ function c85696777.initial_effect(c)
 	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkAttribute,ATTRIBUTE_WIND),2,2)
 	c:EnableReviveLimit()
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,76812113,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(76812113)
-	c:RegisterEffect(e1)
 	--destroy replace
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)

--- a/c86124104.lua
+++ b/c86124104.lua
@@ -2,13 +2,7 @@
 function c86124104.initial_effect(c)
 	c:EnableReviveLimit()
 	--code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,72426662,LOCATION_MZONE+LOCATION_HAND)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_HAND)
-	e1:SetValue(72426662)
-	c:RegisterEffect(e1)
 	--destroy
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(86124104,0))

--- a/c8978197.lua
+++ b/c8978197.lua
 --ロード・オブ・ドラゴン－ドラゴンの統制者－
 function c8978197.initial_effect(c)
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,17985575)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(17985575)
-	c:RegisterEffect(e1)
 	--search
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(8978197,0))

--- a/c90238142.lua
+++ b/c90238142.lua
@@ -12,13 +12,7 @@ function c90238142.initial_effect(c)
 	e1:SetOperation(c90238142.spop)
 	c:RegisterEffect(e1)
 	--change name
-	local e2=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,76812113,LOCATION_MZONE+LOCATION_GRAVE)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetCode(EFFECT_CHANGE_CODE)
-	e2:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e2:SetValue(76812113)
-	c:RegisterEffect(e2)
 	--change level
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE)

--- a/c90243945.lua
+++ b/c90243945.lua
@@ -2,13 +2,7 @@
 function c90243945.initial_effect(c)
 	aux.AddCodeList(c,32274490)
 	--change code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,32274490,LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_GRAVE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetValue(32274490)
-	c:RegisterEffect(e1)
 	--to grave
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(90243945,0))

--- a/c91420202.lua
+++ b/c91420202.lua
@@ -3,13 +3,7 @@ function c91420202.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkRace,RACE_ZOMBIE),2,2)
 	--code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,4388680)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(4388680)
-	c:RegisterEffect(e1)
 	--to hand
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(91420202,0))

--- a/c94141712.lua
+++ b/c94141712.lua
 --アームド・ドラゴン・サンダー LV7
 function c94141712.initial_effect(c)
 	--change name
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,73879377,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(73879377)
-	c:RegisterEffect(e1)
 	--spsummon
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(94141712,0))

--- a/c95825679.lua
+++ b/c95825679.lua
@@ -2,13 +2,7 @@
 function c95825679.initial_effect(c)
 	c:EnableReviveLimit()
 	--code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,70781052)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(70781052)
-	c:RegisterEffect(e1)
 	--indes
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)

--- a/c97973962.lua
+++ b/c97973962.lua
@@ -4,13 +4,7 @@ function c97973962.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.AddLinkProcedure(c,nil,2,2,c97973962.spcheck)
 	--code
-	local e1=Effect.CreateEffect(c)
+	aux.EnableChangeCode(c,86120751,LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_CODE)
-	e1:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e1:SetValue(86120751)
-	c:RegisterEffect(e1)
 	--search
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(97973962,0))

--- a/constant.lua
+++ b/constant.lua
@@ -307,7 +307,7 @@ EFFECT_FLAG_COF				=0x20000000 --N/A
 EFFECT_FLAG_CVAL_CHECK		=0x40000000	--N/A
 EFFECT_FLAG_IMMEDIATELY_APPLY	=0x80000000	--卡在发动时效果就立即适用
-EFFECT_FLAG2_NAGA			=0x0001 --N/A
+EFFECT_FLAG2_MILLENNIUM_RESTRICT	=0x0001 --
 EFFECT_FLAG2_COF			=0x0002 --通常魔法卡在MP1以外发动（邪恶的仪式的特殊处理）
 --========== Codes ==========	--对永续性效果表示效果类型(EFFECT开头)，对诱发型效果表示触发效果的事件/时点(EVENT开头)
 EFFECT_IMMUNE_EFFECT			=1		--效果免疫

--- a/utility.lua
+++ b/utility.lua
@@ -246,6 +246,33 @@ function Auxiliary.EnableUnionAttribute(c,f)
 	e2:SetValue(f)
 	c:RegisterEffect(e2)
 end
+function Auxiliary.ChangeCodeCondition(check,condition)
+	return  function(e)
+				if condition and not condition(e) then return false end
+				local le={e:GetHandler():IsHasEffect(EFFECT_DISABLE)}
+				for _,te in ipairs(le) do
+					if not te:IsHasProperty(0,EFFECT_FLAG2_MILLENNIUM_RESTRICT) then return check end
+				end
+				return not check
+			end
+end
+function Auxiliary.EnableChangeCode(c,code,location,condition)
+	local loc=c:GetOriginalType()&TYPE_MONSTER~=0 and LOCATION_MZONE or LOCATION_SZONE
+	loc=location or loc
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e1:SetCode(EFFECT_CHANGE_CODE)
+	e1:SetRange(loc)
+	e1:SetValue(code)
+	e1:SetCondition(Auxiliary.ChangeCodeCondition(true,condition))
+	c:RegisterEffect(e1)
+	local e2=e1:Clone()
+	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CANNOT_DISABLE)
+	e2:SetCondition(Auxiliary.ChangeCodeCondition(false,condition))
+	c:RegisterEffect(e2)
+	return e1,e2
+end
 function Auxiliary.TargetEqualFunction(f,value,...)
 	local ext_params={...}
 	return	function(effect,target)