ndyd

2e732a83 · Tachibana · addb8557 · 2e732a83 · 2e732a83 · 2e732a83
Commit 2e732a83 authored Jul 21, 2021 by Tachibana
48 changed files
--- a/expansions/222DIY.cdb
+++ b/expansions/222DIY.cdb
--- a/expansions/script/c12014000.lua
+++ b/expansions/script/c12014000.lua
@@ -7,8 +7,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_MACHINE)
 	c:RegisterEffect(e1)
 	--special summon proc

--- a/expansions/script/c12014001.lua
+++ b/expansions/script/c12014001.lua
@@ -7,8 +7,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_MACHINE)
 	c:RegisterEffect(e1)
 	

--- a/expansions/script/c12014003.lua
+++ b/expansions/script/c12014003.lua
@@ -7,8 +7,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_MACHINE)
 	c:RegisterEffect(e1)
 	--

--- a/expansions/script/c12014011.lua
+++ b/expansions/script/c12014011.lua
@@ -7,8 +7,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_MACHINE)
 	c:RegisterEffect(e1)
 	--tohand

--- a/expansions/script/c12014012.lua
+++ b/expansions/script/c12014012.lua
@@ -7,8 +7,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_MACHINE)
 	c:RegisterEffect(e1)


--- a/expansions/script/c12014013.lua
+++ b/expansions/script/c12014013.lua
@@ -7,8 +7,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_MACHINE)
 	c:RegisterEffect(e1)


--- a/expansions/script/c12014014.lua
+++ b/expansions/script/c12014014.lua
@@ -10,8 +10,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_MACHINE)
 	c:RegisterEffect(e1)
 	--to hand

--- a/expansions/script/c12014015.lua
+++ b/expansions/script/c12014015.lua
@@ -10,8 +10,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_MACHINE)
 	c:RegisterEffect(e1)
 	--immune

--- a/expansions/script/c12014016.lua
+++ b/expansions/script/c12014016.lua
@@ -7,8 +7,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_MACHINE)
 	c:RegisterEffect(e1)
 	--tohand

--- a/expansions/script/c12014020.lua
+++ b/expansions/script/c12014020.lua
@@ -10,8 +10,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_MACHINE)
 	c:RegisterEffect(e1)
 	--special summon

--- a/expansions/script/c12025009.lua
+++ b/expansions/script/c12025009.lua
@@ -21,6 +21,15 @@ function c12025009.initial_effect(c)
 	e1:SetTarget(c12025009.target)
 	e1:SetOperation(c12025009.operation)
 	c:RegisterEffect(e1)  
+	--RACE_DRAGON
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_SINGLE)
+	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e2:SetCode(EFFECT_ADD_RACE)
+	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e2:SetRange(LOCATION_MZONE)
+	e2:SetValue(RACE_DRAGON)
+	c:RegisterEffect(e2)
 end
 function c12025009.cfilter(c,tp)
 	return  c:IsPreviousLocation(LOCATION_DECK)

--- a/expansions/script/c12083001.lua
+++ b/expansions/script/c12083001.lua
@@ -7,7 +7,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_SPELLCASTER)
 	c:RegisterEffect(e1)
 	--special summon proc

--- a/expansions/script/c12083003.lua
+++ b/expansions/script/c12083003.lua
@@ -7,7 +7,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_SPELLCASTER)
 	c:RegisterEffect(e1)
 	--target
@@ -81,7 +82,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetCode(EFFECT_ADD_TYPE)
 	e1:SetRange(LOCATION_SZONE)
 	e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
 	e1:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TEMP_REMOVE-RESET_TURN_SET)
 	c:RegisterEffect(e1)
 	local e2=e1:Clone()

--- a/expansions/script/c12083004.lua
+++ b/expansions/script/c12083004.lua
@@ -7,7 +7,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetRange(LOCATION_ONFIELD+LOCATION_EXTRA+LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_SPELLCASTER)
 	c:RegisterEffect(e1)
 	--search

--- a/expansions/script/c12083005.lua
+++ b/expansions/script/c12083005.lua
@@ -7,7 +7,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_SPELLCASTER)
 	c:RegisterEffect(e1)
 	--

--- a/expansions/script/c12083010.lua
+++ b/expansions/script/c12083010.lua
@@ -7,7 +7,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_SPELLCASTER)
 	c:RegisterEffect(e1)
 	--target

--- a/expansions/script/c12083011.lua
+++ b/expansions/script/c12083011.lua
@@ -7,7 +7,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_SPELLCASTER)
 	c:RegisterEffect(e1)
 	--draw

--- a/expansions/script/c12083012.lua
+++ b/expansions/script/c12083012.lua
@@ -7,7 +7,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_SPELLCASTER)
 	c:RegisterEffect(e1)
 	--draw

--- a/expansions/script/c12083013.lua
+++ b/expansions/script/c12083013.lua
@@ -7,7 +7,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_SPELLCASTER)
 	c:RegisterEffect(e1)


--- a/expansions/script/c12083014.lua
+++ b/expansions/script/c12083014.lua
@@ -10,7 +10,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_SPELLCASTER)
 	c:RegisterEffect(e1)
 	--to hand
@@ -87,7 +88,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetCode(EFFECT_ADD_TYPE)
 	e1:SetRange(LOCATION_SZONE)
 	e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
 	e1:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TEMP_REMOVE-RESET_TURN_SET)
 	c:RegisterEffect(e1)
 	local e2=e1:Clone()

--- a/expansions/script/c12083015.lua
+++ b/expansions/script/c12083015.lua
@@ -10,7 +10,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_SPELLCASTER)
 	c:RegisterEffect(e1)
 	--immune

--- a/expansions/script/c12083020.lua
+++ b/expansions/script/c12083020.lua
@@ -10,7 +10,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_SPELLCASTER)
 	c:RegisterEffect(e1)
 	--to grave
@@ -26,7 +27,7 @@ function cm.initial_effect(c)

 	local e5=Effect.CreateEffect(c)
 	e5:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e5:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+	e5:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
 	e5:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e5:SetCondition(cm.matcon)
 	e5:SetOperation(cm.matop)

--- a/expansions/script/c12083021.lua
+++ b/expansions/script/c12083021.lua
@@ -11,13 +11,14 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetRange(0xff)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_SPELLCASTER)
 	c:RegisterEffect(e1)
 	--indes
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e2:SetCondition(cm.immcon)
 	e2:SetOperation(cm.immop)

--- a/expansions/script/c16101183.lua
+++ b/expansions/script/c16101183.lua
@@ -7,7 +7,8 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-	e1:SetRange(0x7f)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_ZOMBIE)
 	c:RegisterEffect(e1) 
 end
--- a/expansions/script/c16107119.lua
+++ b/expansions/script/c16107119.lua
@@ -54,6 +54,15 @@ function cm.initial_effect(c)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetCondition(cm.copycon2)
 	c:RegisterEffect(e4)
+	--attribute
+	local e5=Effect.CreateEffect(c)
+	e5:SetType(EFFECT_TYPE_SINGLE)
+	e5:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e5:SetCode(EFFECT_ADD_ATTRIBUTE)
+	e5:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e5:SetRange(LOCATION_MZONE)
+	e5:SetValue(0x2f)
+	c:RegisterEffect(e5)
 end
 function cm.mfilter(c,xyzc)
 	return c:IsRankAbove(10)

--- a/expansions/script/c40008626.lua
+++ b/expansions/script/c40008626.lua
@@ -12,6 +12,7 @@ function c40008626.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)
 	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e2:SetCode(EFFECT_ADD_ATTRIBUTE)
+	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetValue(ATTRIBUTE_DARK)
 	c:RegisterEffect(e2)

--- a/expansions/script/c4210007.lua
+++ b/expansions/script/c4210007.lua
@@ -28,7 +28,8 @@ function c4210007.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE)
 	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e3:SetCode(EFFECT_ADD_ATTRIBUTE)
-	e3:SetRange(0xff)
+	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e3:SetRange(LOCATION_MZONE)
 	e3:SetValue(ATTRIBUTE_EARTH)
 	c:RegisterEffect(e3)
 end

--- a/expansions/script/c4210008.lua
+++ b/expansions/script/c4210008.lua
@@ -28,7 +28,8 @@ function c4210008.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE)
 	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e3:SetCode(EFFECT_ADD_ATTRIBUTE)
-	e3:SetRange(0xff)
+	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e3:SetRange(LOCATION_MZONE)
 	e3:SetValue(ATTRIBUTE_WIND)
 	c:RegisterEffect(e3)
 end

--- a/expansions/script/c4210009.lua
+++ b/expansions/script/c4210009.lua
@@ -26,7 +26,8 @@ function c4210009.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE)
 	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e3:SetCode(EFFECT_ADD_ATTRIBUTE)
-	e3:SetRange(0xff)
+	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e3:SetRange(LOCATION_MZONE)
 	e3:SetValue(ATTRIBUTE_DARK)
 	c:RegisterEffect(e3)
 	c4210009.tgcard = nil

--- a/expansions/script/c46564044.lua
+++ b/expansions/script/c46564044.lua
@@ -26,18 +26,10 @@ function cm.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE)
 	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e3:SetCode(EFFECT_ADD_RACE)
+	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetValue(RACE_ZOMBIE)
 	c:RegisterEffect(e3)
-	local e4=e3:Clone()
-	e4:SetRange(LOCATION_EXTRA)
-	c:RegisterEffect(e4)
-	local e5=e3:Clone()
-	e5:SetRange(LOCATION_GRAVE)
-	c:RegisterEffect(e5)
-	local e6=e3:Clone()
-	e6:SetRange(LOCATION_REMOVED)
-	c:RegisterEffect(e6)
 	--spsummon
 	local e7=Effect.CreateEffect(c)
 	e7:SetCategory(CATEGORY_SPECIAL_SUMMON)

--- a/expansions/script/c47500015.lua
+++ b/expansions/script/c47500015.lua
@@ -20,7 +20,8 @@ function c47500015.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
-    e1:SetRange(LOCATION_ONFIELD+LOCATION_EXTRA+LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_BEASTWARRIOR)
 	c:RegisterEffect(e1)
 	--moon magic

--- a/expansions/script/c47510025.lua
+++ b/expansions/script/c47510025.lua
@@ -17,6 +17,7 @@ function c47510025.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE)
 	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e3:SetCode(EFFECT_ADD_ATTRIBUTE)
+	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetValue(ATTRIBUTE_WATER)
 	c:RegisterEffect(e3)

--- a/expansions/script/c47510028.lua
+++ b/expansions/script/c47510028.lua
@@ -55,6 +55,15 @@ function c47510028.initial_effect(c)
 	e8:SetTarget(c47510028.drtg)
 	e8:SetOperation(c47510028.drop)
 	c:RegisterEffect(e8)
+	--attribute light
+	local ea=Effect.CreateEffect(c)
+	ea:SetType(EFFECT_TYPE_SINGLE)
+	ea:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	ea:SetCode(EFFECT_ADD_ATTRIBUTE)
+	ea:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	ea:SetRange(LOCATION_MZONE)
+	ea:SetValue(ATTRIBUTE_FIRE)
+	c:RegisterEffect(ea)
 end
 function c47510028.pcon(e,tp,eg,ep,ev,re,r,rp)
 	local a=Duel.GetAttacker()
@@ -74,7 +83,8 @@ function c47510028.pop(e,tp,eg,ep,ev,re,r,rp)
 	if a:IsControler(1-tp) then a,d=d,a end
 	if c:IsRelateToEffect(e) then
 	   if Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) then
-		local e1=Effect.CreateEffect(c)
+		local e1=Effect.
+CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_UPDATE_ATTACK)
 		e1:SetValue(2700)

--- a/expansions/script/c47510115.lua
+++ b/expansions/script/c47510115.lua
@@ -30,6 +30,7 @@ function c47510115.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE)
 	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e3:SetCode(EFFECT_ADD_ATTRIBUTE)
+	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetValue(ATTRIBUTE_FIRE)
 	c:RegisterEffect(e3)

--- a/expansions/script/c47510119.lua
+++ b/expansions/script/c47510119.lua
@@ -29,15 +29,10 @@ function c47510119.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)
 	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e2:SetCode(EFFECT_ADD_RACE)
+	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetValue(RACE_DRAGON)
 	c:RegisterEffect(e2)
-    local e3=e2:Clone()
-    e3:SetRange(LOCATION_EXTRA)
-    c:RegisterEffect(e3)
-    local e4=e2:Clone()
-    e4:SetRange(LOCATION_GRAVE)
-    c:RegisterEffect(e4)
 	--Judecca
 	local e5=Effect.CreateEffect(c)
 	e5:SetDescription(aux.Stringid(47510119,0))

--- a/expansions/script/c47510241.lua
+++ b/expansions/script/c47510241.lua
@@ -10,6 +10,15 @@ function c47510241.initial_effect(c)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(c47510241.efilter)
 	c:RegisterEffect(e1)
+	--RACE_DRAGON
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_SINGLE)
+	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e2:SetCode(EFFECT_ADD_RACE)
+	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e2:SetRange(LOCATION_MZONE)
+	e2:SetValue(RACE_FIEND)
+	c:RegisterEffect(e2)
 	--charnge
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_QUICK_O)

--- a/expansions/script/c47510254.lua
+++ b/expansions/script/c47510254.lua
@@ -64,6 +64,15 @@ function c47510254.initial_effect(c)
 	e9:SetCondition(c47510254.backon)
 	e9:SetOperation(c47510254.backop)
 	c:RegisterEffect(e9)
+	--attribute light
+	local ea=Effect.CreateEffect(c)
+	ea:SetType(EFFECT_TYPE_SINGLE)
+	ea:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	ea:SetCode(EFFECT_ADD_ATTRIBUTE)
+	ea:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	ea:SetRange(LOCATION_MZONE)
+	ea:SetValue(ATTRIBUTE_DARK)
+	c:RegisterEffect(ea)
 end
 c47510254.list={
 		CATEGORY_DESTROY,

--- a/expansions/script/c47530157.lua
+++ b/expansions/script/c47530157.lua
@@ -7,6 +7,7 @@ function c47530157.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetCode(EFFECT_ADD_RACE)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(RACE_PSYCHO)
 	c:RegisterEffect(e1)	

--- a/expansions/script/c60150814.lua
+++ b/expansions/script/c60150814.lua
@@ -16,7 +16,8 @@ function c60150814.initial_effect(c)
 	e12:SetType(EFFECT_TYPE_SINGLE)
 	e12:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e12:SetCode(EFFECT_ADD_ATTRIBUTE)
-	e12:SetRange(LOCATION_ONFIELD+LOCATION_GRAVE+LOCATION_REMOVED+LOCATION_EXTRA+LOCATION_OVERLAY)
+	e12:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e12:SetRange(LOCATION_MZONE)
 	e12:SetValue(ATTRIBUTE_DARK)
 	c:RegisterEffect(e12)
 	--特招免疫

--- a/expansions/script/c60159907.lua
+++ b/expansions/script/c60159907.lua
@@ -7,7 +7,8 @@ function c60159907.initial_effect(c)
 	e12:SetType(EFFECT_TYPE_SINGLE)
 	e12:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e12:SetCode(EFFECT_ADD_ATTRIBUTE)
-	e12:SetRange(LOCATION_ONFIELD+LOCATION_GRAVE+LOCATION_REMOVED+LOCATION_EXTRA+LOCATION_OVERLAY)
+	e12:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e12:SetRange(LOCATION_MZONE)
 	e12:SetValue(ATTRIBUTE_DARK)
 	c:RegisterEffect(e12)
 	--spsummon condition

--- a/expansions/script/c60159941.lua
+++ b/expansions/script/c60159941.lua
@@ -27,6 +27,15 @@ function c60159941.initial_effect(c)
 	local e3=e2:Clone()
 	e3:SetCode(EFFECT_SET_BASE_DEFENSE)
 	c:RegisterEffect(e3)
+	--attribute light
+	local ea=Effect.CreateEffect(c)
+	ea:SetType(EFFECT_TYPE_SINGLE)
+	ea:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	ea:SetCode(EFFECT_ADD_ATTRIBUTE)
+	ea:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	ea:SetRange(LOCATION_MZONE)
+	ea:SetValue(ATTRIBUTE_DARK)
+	c:RegisterEffect(ea)
 end
 function c60159941.cfilter(c,tp,lc)
 	return c:IsCanBeLinkMaterial(lc) and c:IsFaceup() and c:GetSummonLocation()&(LOCATION_DECK+LOCATION_EXTRA)~=0

--- a/expansions/script/c72411180.lua
+++ b/expansions/script/c72411180.lua
@@ -4,16 +4,16 @@ function c72411180.initial_effect(c)
 	--link summon
 	aux.AddLinkProcedure(c,nil,2,2,c72411180.lcheck)
 	c:EnableReviveLimit()   
-  --[[as spellcaster
+	--
 	local e0=Effect.CreateEffect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE)
 	e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e0:SetCode(EFFECT_ADD_RACE)
-	e0:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
-	e0:SetRange(0xff)
+	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e0:SetRange(LOCATION_MZONE)
 	e0:SetValue(RACE_SPELLCASTER)
-	c:RegisterEffect(e0)]]
-	--des
+	c:RegisterEffect(e0)
+	--def
 	local e2=Effect.CreateEffect(c)
 	e2:SetCategory(CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_QUICK_O)

--- a/expansions/script/c72411190.lua
+++ b/expansions/script/c72411190.lua
@@ -4,16 +4,16 @@ function c72411190.initial_effect(c)
 	--link summon
 	aux.AddLinkProcedure(c,nil,2,4,c72411190.lcheck)
 	c:EnableReviveLimit()   
-	--[[
+	--
 	local e0=Effect.CreateEffect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE)
 	e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e0:SetCode(EFFECT_ADD_RACE)
-	e0:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
-	e0:SetRange(0xff)
+	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e0:SetRange(LOCATION_MZONE)
 	e0:SetValue(RACE_SPELLCASTER)
 	c:RegisterEffect(e0)
-	]]
+	--
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
@@ -82,13 +82,13 @@ function c72411190.atkop(e,tp,eg,ep,ev,re,r,rp)
 		local e2=Effect.CreateEffect(c)
 		e2:SetType(EFFECT_TYPE_SINGLE)
 		e2:SetCode(EFFECT_UPDATE_ATTACK)
-		e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+		e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
 		e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 		e2:SetValue(math.ceil(atk/2))
 		c:RegisterEffect(e2)
 		local e3=Effect.CreateEffect(c)
 		e3:SetType(EFFECT_TYPE_SINGLE)
-		e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+		e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
 		e3:SetCode(EFFECT_EXTRA_ATTACK)
 		e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 		e3:SetValue(1)

--- a/expansions/script/c72411200.lua
+++ b/expansions/script/c72411200.lua
@@ -7,8 +7,8 @@ function c72411200.initial_effect(c)
 	e7:SetType(EFFECT_TYPE_SINGLE)
 	e7:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e7:SetCode(EFFECT_ADD_RACE)
-	e7:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
-	e7:SetRange(0xff)
+	e7:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e7:SetRange(LOCATION_MZONE)
 	e7:SetValue(RACE_SPELLCASTER)
 	c:RegisterEffect(e7)
 	--des

--- a/expansions/script/c72411440.lua
+++ b/expansions/script/c72411440.lua
@@ -4,15 +4,15 @@ function c72411440.initial_effect(c)
 	--xyz summon
 	aux.AddXyzProcedure(c,nil,10,3)
 	c:EnableReviveLimit()
-  --[[ --as spellcaster
+	--
 	local e0=Effect.CreateEffect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE)
 	e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e0:SetCode(EFFECT_ADD_RACE)
-	e0:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
-	e0:SetRange(0xff)
+	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e0:SetRange(LOCATION_MZONE)
 	e0:SetValue(RACE_SPELLCASTER)
-	c:RegisterEffect(e0)]]
+	c:RegisterEffect(e0)
 	--negate
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(72411440,0))

--- a/expansions/script/c72411510.lua
+++ b/expansions/script/c72411510.lua
@@ -5,14 +5,14 @@ function c72411510.initial_effect(c)
 	aux.AddXyzProcedure(c,nil,6,2)
 	c:EnableReviveLimit()
 	--as spellcaster
-  --[[  local e0=Effect.CreateEffect(c)
+	local e0=Effect.CreateEffect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE)
 	e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e0:SetCode(EFFECT_ADD_RACE)
-	e0:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
-	e0:SetRange(0xff)
+	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e0:SetRange(LOCATION_MZONE)
 	e0:SetValue(RACE_SPELLCASTER)
-	c:RegisterEffect(e0)]]
+	c:RegisterEffect(e0)
 	--cannot be targeted
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)

--- a/expansions/script/c72411610.lua
+++ b/expansions/script/c72411610.lua
 --雷格尼斯之主·古蕾娅
 function c72411610.initial_effect(c)
+	--
+	local e0=Effect.CreateEffect(c)
+	e0:SetType(EFFECT_TYPE_SINGLE)
+	e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e0:SetCode(EFFECT_ADD_RACE)
+	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e0:SetRange(LOCATION_MZONE)
+	e0:SetValue(RACE_SPELLCASTER)
+	c:RegisterEffect(e0)
 		--search
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_TOGRAVE+CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE)