SetRange(LOCATION_FZONE)

ff9703c1 · tianchenglipu · 3f5b187a · ff9703c1 · ff9703c1 · ff9703c1
Commit ff9703c1 authored Dec 02, 2015 by tianchenglipu
92 changed files
--- a/c10080320.lua
+++ b/c10080320.lua
@@ -9,18 +9,13 @@ function c10080320.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_DINOSAUR))
 	e2:SetValue(300)
 	c:RegisterEffect(e2)
 	--Def
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_DEFENCE)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e3:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_DINOSAUR))
-	e3:SetValue(300)
 	c:RegisterEffect(e3)
 end
--- a/c11102908.lua
+++ b/c11102908.lua
@@ -9,7 +9,7 @@ function c11102908.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_DAMAGE_CALCULATING)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetOperation(c11102908.atkup)
 	c:RegisterEffect(e2)
 end

--- a/c1127737.lua
+++ b/c1127737.lua
@@ -11,7 +11,7 @@ function c1127737.initial_effect(c)
 	e2:SetCategory(CATEGORY_DAMAGE)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCondition(c1127737.damcon1)
 	e2:SetTarget(c1127737.damtg1)
 	e2:SetOperation(c1127737.damop1)
@@ -19,7 +19,7 @@ function c1127737.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_PHASE+PHASE_END)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1)
 	e2:SetCondition(c1127737.damcon2)
 	e2:SetOperation(c1127737.damop2)

--- a/c14001430.lua
+++ b/c14001430.lua
@@ -11,7 +11,7 @@ function c14001430.initial_effect(c)
 	--atkup
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x71))
@@ -23,7 +23,7 @@ function c14001430.initial_effect(c)
 	--destroy
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetCode(EFFECT_SEND_REPLACE)
 	e4:SetTarget(c14001430.reptg)
 	e4:SetValue(c14001430.repval)

--- a/c14289852.lua
+++ b/c14289852.lua
@@ -9,7 +9,7 @@ function c14289852.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_DESTROY_REPLACE)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1)
 	e2:SetTarget(c14289852.destg)
 	e2:SetValue(c14289852.value)

--- a/c15854426.lua
+++ b/c15854426.lua
@@ -11,7 +11,7 @@ function c15854426.initial_effect(c)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)	
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCode(EVENT_TO_HAND)
 	e2:SetCountLimit(1)
 	e2:SetCondition(c15854426.condition)

--- a/c1801154.lua
+++ b/c1801154.lua
@@ -11,7 +11,7 @@ function c1801154.initial_effect(c)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetTarget(c1801154.sptg)
 	e2:SetOperation(c1801154.spop)

--- a/c18114794.lua
+++ b/c18114794.lua
@@ -8,7 +8,7 @@ function c18114794.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(18114794,0))
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCode(18114794)
 	e2:SetCondition(c18114794.condition)
 	e2:SetOperation(c18114794.operation)

--- a/c18161786.lua
+++ b/c18161786.lua
@@ -8,22 +8,15 @@ function c18161786.initial_effect(c)
 	--Atk up
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetTarget(c18161786.filter)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsAttribute,ATTRIBUTE_DARK))
 	e2:SetValue(500)
 	c:RegisterEffect(e2)
 	--Def down
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_DEFENCE)
-	e3:SetTarget(c18161786.filter)
 	e3:SetValue(-400)
 	c:RegisterEffect(e3)
 end
-function c18161786.filter(e,c)
-	return c:IsAttribute(ATTRIBUTE_DARK)
-end
--- a/c19384334.lua
+++ b/c19384334.lua
@@ -8,22 +8,15 @@ function c19384334.initial_effect(c)
 	--Atk up
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetTarget(c19384334.filter)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsAttribute,ATTRIBUTE_FIRE))
 	e2:SetValue(500)
 	c:RegisterEffect(e2)
 	--Def down
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_DEFENCE)
-	e3:SetTarget(c19384334.filter)
 	e3:SetValue(-400)
 	c:RegisterEffect(e3)
 end
-function c19384334.filter(e,c)
-	return c:IsAttribute(ATTRIBUTE_FIRE)
-end
--- a/c2084239.lua
+++ b/c2084239.lua
@@ -9,7 +9,7 @@ function c2084239.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetTarget(c2084239.tg)
 	e2:SetValue(1200)

--- a/c22702055.lua
+++ b/c22702055.lua
@@ -9,17 +9,13 @@ function c22702055.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetValue(c22702055.val)
 	c:RegisterEffect(e2)
 	--Def
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_DEFENCE)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e3:SetValue(c22702055.val)
 	c:RegisterEffect(e3)
 end
 function c22702055.val(e,c)

--- a/c22751868.lua
+++ b/c22751868.lua
@@ -10,7 +10,7 @@ function c22751868.initial_effect(c)
 	e2:SetDescription(aux.Stringid(22751868,0))
 	e2:SetCategory(CATEGORY_POSITION)
 	e2:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCode(EVENT_BE_BATTLE_TARGET)
 	e2:SetCondition(c22751868.poscon)
 	e2:SetTarget(c22751868.postg)

--- a/c23424603.lua
+++ b/c23424603.lua
@@ -9,21 +9,13 @@ function c23424603.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e2:SetTarget(c23424603.tg)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_DINOSAUR+RACE_ZOMBIE+RACE_ROCK))
 	e2:SetValue(200)
 	c:RegisterEffect(e2)
 	--Def
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_DEFENCE)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e3:SetTarget(c23424603.tg)
-	e3:SetValue(200)
 	c:RegisterEffect(e3)
 end
-function c23424603.tg(e,c)
-	return c:IsRace(RACE_DINOSAUR+RACE_ZOMBIE+RACE_ROCK)
-end
--- a/c26493435.lua
+++ b/c26493435.lua
@@ -9,7 +9,7 @@ function c26493435.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e2:SetCondition(c26493435.ctcon)
 	e2:SetOperation(c26493435.ctop)
@@ -18,7 +18,7 @@ function c26493435.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_UPDATE_ATTACK)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetTargetRange(LOCATION_MZONE,0)
 	e3:SetValue(c26493435.val)
 	c:RegisterEffect(e3)
@@ -30,7 +30,7 @@ function c26493435.initial_effect(c)
 	e5:SetDescription(aux.Stringid(26493435,0))
 	e5:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e5:SetType(EFFECT_TYPE_IGNITION)
-	e5:SetRange(LOCATION_SZONE)
+	e5:SetRange(LOCATION_FZONE)
 	e5:SetCountLimit(1)
 	e5:SetCost(c26493435.spcost)
 	e5:SetTarget(c26493435.sptg)

--- a/c269012.lua
+++ b/c269012.lua
@@ -9,17 +9,13 @@ function c269012.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetTarget(c269012.target)
 	e2:SetValue(aux.tgval)
 	c:RegisterEffect(e2)
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e3:SetTarget(c269012.target)
 	e3:SetValue(1)
 	c:RegisterEffect(e3)
 	--damage
@@ -29,14 +25,14 @@ function c269012.initial_effect(c)
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e4:SetCode(EVENT_BATTLE_DESTROYED)
 	e4:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetCondition(c269012.damcon)
 	e4:SetTarget(c269012.damtg)
 	e4:SetOperation(c269012.damop)
 	c:RegisterEffect(e4)
 	--search
 	local e5=Effect.CreateEffect(c)
-	e5:SetDescription(aux.Stringid(269012,0))
+	e5:SetDescription(aux.Stringid(269012,1))
 	e5:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e5:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e5:SetProperty(EFFECT_FLAG_DAMAGE_STEP)

--- a/c27564031.lua
+++ b/c27564031.lua
@@ -11,7 +11,7 @@ function c27564031.initial_effect(c)
 	e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_PREDRAW)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCondition(c27564031.condition)
 	e2:SetTarget(c27564031.target)
 	e2:SetOperation(c27564031.operation)

--- a/c28120197.lua
+++ b/c28120197.lua
@@ -8,7 +8,7 @@ function c28120197.initial_effect(c)
 	--damage amp
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCode(EVENT_PRE_BATTLE_DAMAGE)
 	e2:SetCondition(c28120197.dcon)
 	e2:SetOperation(c28120197.dop)

--- a/c28388296.lua
+++ b/c28388296.lua
@@ -8,7 +8,7 @@ function c28388296.initial_effect(c)
 	--boost
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x24))
@@ -22,7 +22,7 @@ function c28388296.initial_effect(c)
 	e4:SetDescription(aux.Stringid(28388296,0))
 	e4:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetCode(EVENT_TO_GRAVE)
 	e4:SetCountLimit(1,28388296)
 	e4:SetCondition(c28388296.condition)

--- a/c29400787.lua
+++ b/c29400787.lua
@@ -11,13 +11,13 @@ function c29400787.initial_effect(c)
 	e2:SetCode(EFFECT_CANNOT_SELECT_BATTLE_TARGET)
 	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e2:SetValue(c29400787.atlimit)
+	e2:SetValue(aux.TargetBoolFunction(Card.IsFacedown))
 	c:RegisterEffect(e2)
 	--direct attack
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_DIRECT_ATTACK)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e3:SetTarget(c29400787.dirtg)
 	c:RegisterEffect(e3)
@@ -27,7 +27,7 @@ function c29400787.initial_effect(c)
 	e4:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e4:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetCondition(c29400787.thcon)
 	e4:SetTarget(c29400787.thtg)
 	e4:SetOperation(c29400787.thop)
@@ -37,7 +37,7 @@ function c29400787.initial_effect(c)
 	e5:SetType(EFFECT_TYPE_FIELD)
 	e5:SetCode(EFFECT_CHANGE_DAMAGE)
 	e5:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-	e5:SetRange(LOCATION_SZONE)
+	e5:SetRange(LOCATION_FZONE)
 	e5:SetTargetRange(0,1)
 	e5:SetValue(0)
 	c:RegisterEffect(e5)
@@ -45,9 +45,6 @@ function c29400787.initial_effect(c)
 	e6:SetCode(EFFECT_NO_EFFECT_DAMAGE)
 	c:RegisterEffect(e6)
 end
-function c29400787.atlimit(e,c)
-	return c:IsFacedown()
-end
 function c29400787.dirtg(e,c)
 	return not Duel.IsExistingMatchingCard(Card.IsFaceup,c:GetControler(),0,LOCATION_MZONE,1,nil)
 end

--- a/c295517.lua
+++ b/c295517.lua
@@ -9,30 +9,19 @@ function c295517.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_LEVEL)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_HAND+LOCATION_MZONE,LOCATION_HAND+LOCATION_MZONE)
-	e2:SetTarget(c295517.lvtg)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsAttribute,ATTRIBUTE_WATER))
 	e2:SetValue(-1)
 	c:RegisterEffect(e2)
 	--Atk
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_ATTACK)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTarget(c295517.lvtg)
 	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e3:SetValue(200)
 	c:RegisterEffect(e3)
 	--Def
-	local e4=Effect.CreateEffect(c)
-	e4:SetType(EFFECT_TYPE_FIELD)
+	local e4=e3:Clone()
 	e4:SetCode(EFFECT_UPDATE_DEFENCE)
-	e4:SetRange(LOCATION_SZONE)
-	e4:SetTarget(c295517.lvtg)
-	e4:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e4:SetValue(200)
 	c:RegisterEffect(e4)
 end
-function c295517.lvtg(e,c)
-	return c:IsAttribute(ATTRIBUTE_WATER)
-end
--- a/c32391631.lua
+++ b/c32391631.lua
@@ -11,7 +11,7 @@ function c32391631.initial_effect(c)
 	e2:SetCategory(CATEGORY_RECOVER)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e2:SetCode(EVENT_DAMAGE_STEP_END)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTarget(c32391631.rectg)
 	e2:SetOperation(c32391631.recop)
 	c:RegisterEffect(e2)
@@ -19,13 +19,13 @@ function c32391631.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_MUST_ATTACK)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	c:RegisterEffect(e3)
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_FIELD)
 	e4:SetCode(EFFECT_CANNOT_EP)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e4:SetTargetRange(1,1)
 	e4:SetCondition(c32391631.becon)
@@ -35,7 +35,7 @@ function c32391631.initial_effect(c)
 	e5:SetDescription(aux.Stringid(32391631,1))
 	e5:SetCategory(CATEGORY_DESTROY)
 	e5:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e5:SetRange(LOCATION_SZONE)
+	e5:SetRange(LOCATION_FZONE)
 	e5:SetCountLimit(1)
 	e5:SetCode(EVENT_PHASE+PHASE_END)
 	e5:SetTarget(c32391631.destg)

--- a/c32999573.lua
+++ b/c32999573.lua
@@ -11,7 +11,7 @@ function c32999573.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
 	e2:SetProperty(EFFECT_FLAG_BOTH_SIDE)
 	e2:SetCode(EFFECT_OVERLAY_REMOVE_REPLACE)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCondition(c32999573.rcon)
 	e2:SetOperation(c32999573.rop)
 	c:RegisterEffect(e2)

--- a/c33017655.lua
+++ b/c33017655.lua
@@ -9,26 +9,21 @@ function c33017655.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_FIEND))
 	e2:SetValue(300)
 	c:RegisterEffect(e2)
 	--defup
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_DEFENCE)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e3:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_FIEND))
-	e3:SetValue(300)
 	c:RegisterEffect(e3)
 	--discard & draw
 	local e4=Effect.CreateEffect(c)
 	e4:SetCategory(CATEGORY_HANDES+CATEGORY_DRAW)
 	e4:SetDescription(aux.Stringid(33017655,1))
 	e4:SetType(EFFECT_TYPE_IGNITION)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetCountLimit(1)
 	e4:SetCost(c33017655.cost)
 	e4:SetTarget(c33017655.target)

--- a/c33550694.lua
+++ b/c33550694.lua
@@ -10,7 +10,7 @@ function c33550694.initial_effect(c)
 	e2:SetDescription(aux.Stringid(33550694,0))
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_IGNITION)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetProperty(EFFECT_FLAG_BOTH_SIDE)
 	e2:SetTarget(c33550694.target)
 	e2:SetOperation(c33550694.operation)

--- a/c33900648.lua
+++ b/c33900648.lua
@@ -10,7 +10,7 @@ function c33900648.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e2:SetCode(EVENT_PHASE+PHASE_END)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1)
 	e2:SetCondition(c33900648.mtcon)
 	e2:SetOperation(c33900648.mtop)
@@ -19,14 +19,14 @@ function c33900648.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e3:SetCode(EVENT_ADJUST)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetOperation(c33900648.adjustop)
 	c:RegisterEffect(e3)
 	--light
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_FIELD)
 	e4:SetCode(EFFECT_PUBLIC)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetTargetRange(LOCATION_HAND,LOCATION_HAND)
 	e4:SetTarget(c33900648.lighttg)
 	c:RegisterEffect(e4)
@@ -34,7 +34,7 @@ function c33900648.initial_effect(c)
 	local e5=Effect.CreateEffect(c)
 	e5:SetType(EFFECT_TYPE_FIELD)
 	e5:SetCode(EFFECT_CANNOT_ATTACK_ANNOUNCE)
-	e5:SetRange(LOCATION_SZONE)
+	e5:SetRange(LOCATION_FZONE)
 	e5:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e5:SetTargetRange(1,0)
 	e5:SetCondition(c33900648.darkcon1)
@@ -49,7 +49,7 @@ function c33900648.initial_effect(c)
 	e7:SetCategory(CATEGORY_DESTROY)
 	e7:SetCode(EVENT_PHASE+PHASE_STANDBY)
 	e7:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e7:SetRange(LOCATION_SZONE)
+	e7:SetRange(LOCATION_FZONE)
 	e7:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e7:SetCountLimit(1)
 	e7:SetCondition(c33900648.descon)
@@ -62,7 +62,7 @@ function c33900648.initial_effect(c)
 	e8:SetCategory(CATEGORY_HANDES)
 	e8:SetCode(EVENT_PHASE+PHASE_END)
 	e8:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e8:SetRange(LOCATION_SZONE)
+	e8:SetRange(LOCATION_FZONE)
 	e8:SetCountLimit(1)
 	e8:SetCondition(c33900648.hdcon)
 	e8:SetTarget(c33900648.hdtg)
@@ -74,7 +74,7 @@ function c33900648.initial_effect(c)
 	e9:SetCategory(CATEGORY_DAMAGE)
 	e9:SetCode(EVENT_PHASE+PHASE_END)
 	e9:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e9:SetRange(LOCATION_SZONE)
+	e9:SetRange(LOCATION_FZONE)
 	e9:SetCountLimit(1)
 	e9:SetCondition(c33900648.damcon)
 	e9:SetTarget(c33900648.damtg)
@@ -84,7 +84,7 @@ function c33900648.initial_effect(c)
 	local e10=Effect.CreateEffect(c)
 	e10:SetType(EFFECT_TYPE_FIELD)
 	e10:SetCode(EFFECT_ACTIVATE_COST)
-	e10:SetRange(LOCATION_SZONE)
+	e10:SetRange(LOCATION_FZONE)
 	e10:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e10:SetTargetRange(1,0)
 	e10:SetTarget(c33900648.actarget)

--- a/c33981008.lua
+++ b/c33981008.lua
@@ -10,7 +10,7 @@ function c33981008.initial_effect(c)
 	e2:SetDescription(aux.Stringid(33981008,0))
 	e2:SetCategory(CATEGORY_TODECK+CATEGORY_DRAW)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCode(EVENT_PHASE+PHASE_STANDBY)
 	e2:SetCountLimit(1)
 	e2:SetCondition(c33981008.drcon)

--- a/c34103656.lua
+++ b/c34103656.lua
@@ -9,8 +9,8 @@ function c34103656.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
-	e2:SetTarget(c34103656.adtg)
+	e2:SetRange(LOCATION_FZONE)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsAttribute,ATTRIBUTE_WATER))
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetValue(200)
 	c:RegisterEffect(e2)
@@ -21,15 +21,12 @@ function c34103656.initial_effect(c)
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(34103656,0))
 	e4:SetType(EFFECT_TYPE_IGNITION)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetCountLimit(1)
 	e4:SetTarget(c34103656.lvtg)
 	e4:SetOperation(c34103656.lvop)
 	c:RegisterEffect(e4)
 end
-function c34103656.adtg(e,c)
-	return c:IsAttribute(ATTRIBUTE_WATER)
-end
 function c34103656.cfilter(c)
 	return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_WATER) and c:GetLevel()>0
 end
@@ -48,7 +45,7 @@ function c34103656.lvop(e,tp,eg,ep,ev,re,r,rp)
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_FIELD)
 		e1:SetCode(EFFECT_UPDATE_LEVEL)
-		e1:SetRange(LOCATION_SZONE)
+		e1:SetRange(LOCATION_FZONE)
 		e1:SetTargetRange(LOCATION_MZONE,0)
 		e1:SetTarget(c34103656.efftg)
 		e1:SetValue(lv)

--- a/c34487429.lua
+++ b/c34487429.lua
@@ -10,7 +10,7 @@ function c34487429.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)
 	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCondition(c34487429.desrepcon)
 	e2:SetValue(1)
 	c:RegisterEffect(e2)
@@ -20,7 +20,7 @@ function c34487429.initial_effect(c)
 	e3:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetCode(EVENT_CHAINING)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetCondition(c34487429.discon)
 	e3:SetCost(c34487429.discost)
 	e3:SetTarget(c34487429.distg)
@@ -31,7 +31,7 @@ function c34487429.initial_effect(c)
 	e4:SetDescription(aux.Stringid(34487429,2))
 	e4:SetCategory(CATEGORY_DRAW)
 	e4:SetType(EFFECT_TYPE_IGNITION)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetCountLimit(1)
 	e4:SetCondition(c34487429.drcon)
 	e4:SetTarget(c34487429.drtg)
@@ -43,7 +43,7 @@ function c34487429.initial_effect(c)
 	e5:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e5:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e5:SetType(EFFECT_TYPE_IGNITION)
-	e5:SetRange(LOCATION_SZONE)
+	e5:SetRange(LOCATION_FZONE)
 	e5:SetCountLimit(1)
 	e5:SetCondition(c34487429.spcon)
 	e5:SetTarget(c34487429.sptg)
@@ -53,7 +53,7 @@ function c34487429.initial_effect(c)
 	local e6=Effect.CreateEffect(c)
 	e6:SetDescription(aux.Stringid(34487429,0))
 	e6:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
-	e6:SetRange(LOCATION_SZONE)
+	e6:SetRange(LOCATION_FZONE)
 	e6:SetCode(EVENT_PRE_BATTLE_DAMAGE)
 	e6:SetCondition(c34487429.rdcon)
 	e6:SetOperation(c34487429.rdop)

--- a/c35956022.lua
+++ b/c35956022.lua
@@ -8,22 +8,15 @@ function c35956022.initial_effect(c)
 	--Atk up
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetTarget(c35956022.filter)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsAttribute,ATTRIBUTE_EARTH))
 	e2:SetValue(-500)
 	c:RegisterEffect(e2)
 	--Def down
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_DEFENCE)
-	e3:SetTarget(c35956022.filter)
 	e3:SetValue(400)
 	c:RegisterEffect(e3)
 end
-function c35956022.filter(e,c)
-	return c:IsAttribute(ATTRIBUTE_EARTH)
-end
--- a/c36099620.lua
+++ b/c36099620.lua
@@ -9,14 +9,14 @@ function c36099620.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
 	e2:SetCode(EVENT_TO_GRAVE)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetOperation(c36099620.acop)
 	c:RegisterEffect(e2)
 	--atkup
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_UPDATE_ATTACK)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e3:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x38))
 	e3:SetValue(c36099620.atkval)
@@ -26,7 +26,7 @@ function c36099620.initial_effect(c)
 	e4:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_SINGLE)
 	e4:SetCode(EFFECT_DESTROY_REPLACE)
 	e4:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetTarget(c36099620.desreptg)
 	e4:SetOperation(c36099620.desrepop)
 	c:RegisterEffect(e4)

--- a/c37322745.lua
+++ b/c37322745.lua
@@ -10,7 +10,7 @@ function c37322745.initial_effect(c)
 	e2:SetDescription(aux.Stringid(37322745,0))
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCode(EVENT_CHAIN_NEGATED)
 	e2:SetCondition(c37322745.condition)
 	e2:SetTarget(c37322745.target)

--- a/c37694547.lua
+++ b/c37694547.lua
@@ -9,7 +9,7 @@ function c37694547.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_DECREASE_TRIBUTE)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_HAND,LOCATION_HAND)
 	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x7))
 	e2:SetValue(0x1)

--- a/c39910367.lua
+++ b/c39910367.lua
@@ -11,7 +11,7 @@ function c39910367.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
 	e3:SetCode(EVENT_CHAIN_SOLVING)
 	e3:SetProperty(EFFECT_FLAG_DELAY)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetOperation(c39910367.op)
 	c:RegisterEffect(e3)
 	--Remove counter replace
@@ -19,7 +19,7 @@ function c39910367.initial_effect(c)
 	e4:SetDescription(aux.Stringid(39910367,0))
 	e4:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
 	e4:SetCode(EFFECT_RCOUNTER_REPLACE+0x3001)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetCountLimit(1)
 	e4:SetCondition(c39910367.rcon)
 	e4:SetOperation(c39910367.rop)
@@ -29,7 +29,7 @@ function c39910367.initial_effect(c)
 	e5:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_SINGLE)
 	e5:SetCode(EFFECT_DESTROY_REPLACE)
 	e5:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e5:SetRange(LOCATION_SZONE)
+	e5:SetRange(LOCATION_FZONE)
 	e5:SetTarget(c39910367.desreptg)
 	e5:SetOperation(c39910367.desrepop)
 	c:RegisterEffect(e5)
@@ -37,7 +37,7 @@ function c39910367.initial_effect(c)
 	local e6=Effect.CreateEffect(c)
 	e6:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
 	e6:SetCode(EVENT_LEAVE_FIELD)
-	e6:SetRange(LOCATION_SZONE)
+	e6:SetRange(LOCATION_FZONE)
 	e6:SetOperation(c39910367.addop2)
 	c:RegisterEffect(e6)
 end

--- a/c4064256.lua
+++ b/c4064256.lua
@@ -8,7 +8,7 @@ function c4064256.initial_effect(c)
 	--race
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE+LOCATION_GRAVE,LOCATION_MZONE+LOCATION_GRAVE)
 	e2:SetCode(EFFECT_CHANGE_RACE)
 	e2:SetValue(RACE_ZOMBIE)
@@ -16,7 +16,7 @@ function c4064256.initial_effect(c)
 	--summon limit
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetCode(EFFECT_CANNOT_SUMMON)
 	e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e3:SetTargetRange(1,1)

--- a/c42015635.lua
+++ b/c42015635.lua
@@ -9,16 +9,16 @@ function c42015635.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetTarget(c42015635.atktg)
 	e2:SetValue(500)
 	c:RegisterEffect(e2)
-	--Def
+	--may not return
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(42015635)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	c:RegisterEffect(e3)
 end

--- a/c4215636.lua
+++ b/c4215636.lua
@@ -10,7 +10,7 @@ function c4215636.initial_effect(c)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetDescription(aux.Stringid(4215636,0))
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetCountLimit(1)
 	e2:SetCondition(c4215636.condition)

--- a/c43034264.lua
+++ b/c43034264.lua
@@ -8,7 +8,7 @@ function c43034264.initial_effect(c)
 	--extra summon
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCode(EFFECT_EXTRA_SUMMON_COUNT)
 	e2:SetTargetRange(LOCATION_HAND+LOCATION_MZONE,0)
 	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0xaa))
@@ -17,7 +17,7 @@ function c43034264.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_CANNOT_DISABLE_SUMMON)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetProperty(EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_SET_AVAILABLE)
 	e3:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0xaa))
 	c:RegisterEffect(e3)

--- a/c4357063.lua
+++ b/c4357063.lua
@@ -11,7 +11,7 @@ function c4357063.initial_effect(c)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e2:SetType(EFFECT_TYPE_IGNITION)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1)
 	e2:SetTarget(c4357063.sptg)
 	e2:SetOperation(c4357063.spop)

--- a/c43912676.lua
+++ b/c43912676.lua
@@ -9,7 +9,7 @@ function c43912676.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_WYRM))
 	e2:SetValue(300)
@@ -23,7 +23,7 @@ function c43912676.initial_effect(c)
 	e4:SetCategory(CATEGORY_DESTROY)
 	e4:SetType(EFFECT_TYPE_IGNITION)
 	e4:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetCountLimit(1)
 	e4:SetCost(c43912676.cost)
 	e4:SetTarget(c43912676.target)

--- a/c4545854.lua
+++ b/c4545854.lua
@@ -9,7 +9,7 @@ function c4545854.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_DAMAGE_CALCULATING)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetOperation(c4545854.atkup)
 	c:RegisterEffect(e2)
 	--Destroy replace
@@ -17,7 +17,7 @@ function c4545854.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_SINGLE)
 	e3:SetCode(EFFECT_DESTROY_REPLACE)
 	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetTarget(c4545854.desreptg)
 	c:RegisterEffect(e3)
 end

--- a/c45778932.lua
+++ b/c45778932.lua
@@ -8,22 +8,15 @@ function c45778932.initial_effect(c)
 	--Atk up
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetTarget(c45778932.filter)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsAttribute,ATTRIBUTE_WIND))
 	e2:SetValue(500)
 	c:RegisterEffect(e2)
 	--Def down
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_DEFENCE)
-	e3:SetTarget(c45778932.filter)
 	e3:SetValue(-400)
 	c:RegisterEffect(e3)
 end
-function c45778932.filter(e,c)
-	return c:IsAttribute(ATTRIBUTE_WIND)
-end
--- a/c47596607.lua
+++ b/c47596607.lua
@@ -11,7 +11,7 @@ function c47596607.initial_effect(c)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e2:SetType(EFFECT_TYPE_IGNITION)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1)
 	e2:SetTarget(c47596607.sptg)
 	e2:SetOperation(c47596607.spop)

--- a/c48179391.lua
+++ b/c48179391.lua
@@ -12,7 +12,7 @@ function c48179391.initial_effect(c)
 	--spsummon limit
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
 	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e2:SetTargetRange(1,0)
@@ -21,7 +21,7 @@ function c48179391.initial_effect(c)
 	--
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetCode(EFFECT_UPDATE_ATTACK)
 	e3:SetTargetRange(LOCATION_MZONE,0)
 	e3:SetValue(500)
@@ -30,7 +30,7 @@ function c48179391.initial_effect(c)
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_SINGLE)
 	e4:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetCode(EFFECT_INDESTRUCTABLE_COUNT)
 	e4:SetCountLimit(1)
 	e4:SetValue(c48179391.valcon)

--- a/c50433147.lua
+++ b/c50433147.lua
@@ -9,7 +9,7 @@ function c50433147.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetTarget(c50433147.indtg)
 	e2:SetValue(1)

--- a/c50913601.lua
+++ b/c50913601.lua
@@ -9,21 +9,14 @@ function c50913601.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_fZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e2:SetTarget(c50913601.tg)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_DRAGON+RACE_WINDBEAST+RACE_THUNDER))
 	e2:SetValue(200)
 	c:RegisterEffect(e2)
 	--Def
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_DEFENCE)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e3:SetTarget(c50913601.tg)
 	e3:SetValue(200)
 	c:RegisterEffect(e3)
 end
-function c50913601.tg(e,c)
-	return c:IsRace(RACE_DRAGON+RACE_WINDBEAST+RACE_THUNDER)
-end
--- a/c52518793.lua
+++ b/c52518793.lua
@@ -10,7 +10,7 @@ function c52518793.initial_effect(c)
 	e2:SetDescription(aux.Stringid(52518793,0))
 	e2:SetType(EFFECT_TYPE_TRIGGER_F+EFFECT_TYPE_FIELD)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCondition(c52518793.accon)
 	e2:SetOperation(c52518793.acop)
 	c:RegisterEffect(e2)
@@ -18,7 +18,7 @@ function c52518793.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_UPDATE_ATTACK)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e3:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x19))
 	e3:SetValue(c52518793.atkval)
@@ -31,7 +31,7 @@ function c52518793.initial_effect(c)
 	e5:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_SINGLE)
 	e5:SetCode(EFFECT_DESTROY_REPLACE)
 	e5:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e5:SetRange(LOCATION_SZONE)
+	e5:SetRange(LOCATION_FZONE)
 	e5:SetTarget(c52518793.desreptg)
 	e5:SetOperation(c52518793.desrepop)
 	c:RegisterEffect(e5)

--- a/c53039326.lua
+++ b/c53039326.lua
@@ -10,7 +10,7 @@ function c53039326.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e2:SetCode(EVENT_PHASE+PHASE_END)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1)
 	e2:SetCondition(c53039326.mtcon)
 	e2:SetOperation(c53039326.mtop)
@@ -20,7 +20,7 @@ function c53039326.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e3:SetCode(EVENT_DESTROY)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetOperation(c53039326.check)
 	c:RegisterEffect(e3)
 	local e4=Effect.CreateEffect(c)

--- a/c53527835.lua
+++ b/c53527835.lua
@@ -9,7 +9,7 @@ function c53527835.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_DAMAGE_CALCULATING)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetOperation(c53527835.atkup)
 	c:RegisterEffect(e2)
 end

--- a/c53819808.lua
+++ b/c53819808.lua
@@ -9,7 +9,7 @@ function c53819808.initial_effect(c)
 	--add counter
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCode(EVENT_SUMMON_SUCCESS)
 	e2:SetOperation(c53819808.ctop)
 	c:RegisterEffect(e2)
@@ -20,7 +20,7 @@ function c53819808.initial_effect(c)
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_FIELD)
 	e4:SetCode(EFFECT_UPDATE_ATTACK)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetTargetRange(0,LOCATION_MZONE)
 	e4:SetValue(c53819808.val)
 	c:RegisterEffect(e4)

--- a/c54250060.lua
+++ b/c54250060.lua
@@ -11,7 +11,7 @@ function c54250060.initial_effect(c)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
-	e2:SetTarget(c54250060.atktg)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_DRAGON+RACE_WARRIOR+RACE_SPELLCASTER))
 	e2:SetValue(300)
 	c:RegisterEffect(e2)
 	local e3=e2:Clone()
@@ -40,9 +40,6 @@ function c54250060.initial_effect(c)
 	e5:SetOperation(c54250060.thop)
 	c:RegisterEffect(e5)
 end
-function c54250060.atktg(e,c)
-	return c:IsRace(RACE_DRAGON+RACE_WARRIOR+RACE_SPELLCASTER)
-end
 function c54250060.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) end
 	Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_DISCARD+REASON_COST,nil)

--- a/c55742055.lua
+++ b/c55742055.lua
@@ -10,7 +10,7 @@ function c55742055.initial_effect(c)
 	e2:SetDescription(aux.Stringid(55742055,0))
 	e2:SetCategory(CATEGORY_TOGRAVE)
 	e2:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCode(EVENT_PHASE+PHASE_END)
 	e2:SetLabel(3)
 	e2:SetCountLimit(1)
@@ -23,7 +23,7 @@ function c55742055.initial_effect(c)
 	e3:SetDescription(aux.Stringid(55742055,1))
 	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e3:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_FIELD)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetCode(EVENT_PHASE+PHASE_END)
 	e3:SetLabel(6)
 	e3:SetCountLimit(1)
@@ -36,7 +36,7 @@ function c55742055.initial_effect(c)
 	e4:SetDescription(aux.Stringid(55742055,2))
 	e4:SetCategory(CATEGORY_TOHAND)
 	e4:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_FIELD)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetCode(EVENT_PHASE+PHASE_END)
 	e4:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e4:SetLabel(9)
@@ -50,7 +50,7 @@ function c55742055.initial_effect(c)
 	e5:SetDescription(aux.Stringid(55742055,3))
 	e5:SetCategory(CATEGORY_DRAW)
 	e5:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_FIELD)
-	e5:SetRange(LOCATION_SZONE)
+	e5:SetRange(LOCATION_FZONE)
 	e5:SetCode(EVENT_PHASE+PHASE_END)
 	e5:SetCountLimit(1)
 	e5:SetCondition(c55742055.condition4)

--- a/c56074358.lua
+++ b/c56074358.lua
@@ -9,7 +9,7 @@ function c56074358.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_CHANGE_POS)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCondition(c56074358.accon)
 	e2:SetOperation(c56074358.acop)
 	c:RegisterEffect(e2)
@@ -17,7 +17,7 @@ function c56074358.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_UPDATE_ATTACK)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e3:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x26))
 	e3:SetValue(c56074358.atkval)

--- a/c56433456.lua
+++ b/c56433456.lua
@@ -10,12 +10,9 @@ function c56433456.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_AVOID_BATTLE_DAMAGE)
 	e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e2:SetTarget(c56433456.tg)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_FAIRY))
 	e2:SetValue(1)
 	c:RegisterEffect(e2)
 end
-function c56433456.tg(e,c)
-	return c:IsRace(RACE_FAIRY)
-end
--- a/c56594520.lua
+++ b/c56594520.lua
@@ -8,22 +8,15 @@ function c56594520.initial_effect(c)
 	--Atk up
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetTarget(c56594520.filter)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsAttribute,ATTRIBUTE_EARTH))
 	e2:SetValue(500)
 	c:RegisterEffect(e2)
 	--Def down
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_DEFENCE)
-	e3:SetTarget(c56594520.filter)
 	e3:SetValue(-400)
 	c:RegisterEffect(e3)
 end
-function c56594520.filter(e,c)
-	return c:IsAttribute(ATTRIBUTE_EARTH)
-end
--- a/c58924378.lua
+++ b/c58924378.lua
@@ -9,7 +9,7 @@ function c58924378.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_BATTLED)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetOperation(c58924378.atkdn)
 	c:RegisterEffect(e2)
 end

--- a/c59048135.lua
+++ b/c59048135.lua
@@ -9,7 +9,7 @@ function c59048135.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(59048135,0))
 	e2:SetType(EFFECT_TYPE_IGNITION)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1)
 	e2:SetCost(c59048135.thcost)
 	e2:SetTarget(c59048135.thtg)
@@ -19,7 +19,7 @@ function c59048135.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e3:SetTarget(c59048135.etarget)
 	e3:SetValue(c59048135.evalue)

--- a/c59197169.lua
+++ b/c59197169.lua
@@ -9,17 +9,13 @@ function c59197169.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetValue(c59197169.val)
 	c:RegisterEffect(e2)
 	--Def
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_DEFENCE)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e3:SetValue(c59197169.val)
 	c:RegisterEffect(e3)
 end
 function c59197169.val(e,c)

--- a/c60946968.lua
+++ b/c60946968.lua
@@ -8,7 +8,7 @@ function c60946968.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_DAMAGE_CALCULATING)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetOperation(c60946968.adval)
 	c:RegisterEffect(e2)
 end

--- a/c62188962.lua
+++ b/c62188962.lua
@@ -8,7 +8,7 @@ function c62188962.initial_effect(c)
 	--atk
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_ZOMBIE))
@@ -21,7 +21,7 @@ function c62188962.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e3:SetCode(EVENT_TO_GRAVE)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetCountLimit(1)
 	e3:SetCondition(c62188962.descon)
 	e3:SetTarget(c62188962.destg)

--- a/c62265044.lua
+++ b/c62265044.lua
@@ -10,19 +10,15 @@ function c62265044.initial_effect(c)
 	e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e2:SetDescription(aux.Stringid(62265044,1))
 	e2:SetType(EFFECT_TYPE_IGNITION)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1,EFFECT_COUNT_CODE_SINGLE)
 	e2:SetCost(c62265044.cost)
 	e2:SetTarget(c62265044.target1)
 	e2:SetOperation(c62265044.operation1)
 	c:RegisterEffect(e2)
-	local e3=Effect.CreateEffect(c)
+	local e3=e2:Clone()
 	e3:SetCategory(CATEGORY_TOGRAVE)
 	e3:SetDescription(aux.Stringid(62265044,2))
-	e3:SetType(EFFECT_TYPE_IGNITION)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetCountLimit(1,EFFECT_COUNT_CODE_SINGLE)
-	e3:SetCost(c62265044.cost)
 	e3:SetTarget(c62265044.target2)
 	e3:SetOperation(c62265044.operation2)
 	c:RegisterEffect(e3)

--- a/c63035430.lua
+++ b/c63035430.lua
@@ -9,7 +9,7 @@ function c63035430.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_DAMAGE_CALCULATING)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetOperation(c63035430.atkup)
 	c:RegisterEffect(e2)
 end

--- a/c63883999.lua
+++ b/c63883999.lua
@@ -9,7 +9,7 @@ function c63883999.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
 	e2:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_FIEND))
 	e2:SetValue(500)
@@ -20,7 +20,7 @@ function c63883999.initial_effect(c)
 	e3:SetCategory(CATEGORY_REMOVE+CATEGORY_SPECIAL_SUMMON)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetCountLimit(1,63883999)
 	e3:SetTarget(c63883999.target)
 	e3:SetOperation(c63883999.operation)

--- a/c67328336.lua
+++ b/c67328336.lua
@@ -9,7 +9,7 @@ function c67328336.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
 	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x3013))
 	e2:SetValue(c67328336.effval)

--- a/c67616300.lua
+++ b/c67616300.lua
@@ -38,26 +38,17 @@ function c67616300.initial_effect(c)
 	e4:SetOperation(c67616300.drop)
 	c:RegisterEffect(e4)
 	--destroy
-	local e5=Effect.CreateEffect(c)
+	local e5=e4:Clone()
 	e5:SetDescription(aux.Stringid(67616300,1))
 	e5:SetCategory(CATEGORY_DESTROY)
-	e5:SetType(EFFECT_TYPE_IGNITION)
-	e5:SetRange(LOCATION_FZONE)
 	e5:SetProperty(EFFECT_FLAG_BOTH_SIDE)
-	e5:SetCountLimit(1,EFFECT_COUNT_CODE_SINGLE)
-	e5:SetCost(c67616300.effcost)
 	e5:SetTarget(c67616300.destg)
 	e5:SetOperation(c67616300.desop)
 	c:RegisterEffect(e5)
 	--recover
-	local e6=Effect.CreateEffect(c)
+	local e6=e4:Clone()
 	e6:SetDescription(aux.Stringid(67616300,2))
 	e6:SetCategory(CATEGORY_RECOVER)
-	e6:SetType(EFFECT_TYPE_IGNITION)
-	e6:SetRange(LOCATION_FZONE)
-	e6:SetProperty(EFFECT_FLAG_BOTH_SIDE+EFFECT_FLAG_PLAYER_TARGET)
-	e6:SetCountLimit(1,EFFECT_COUNT_CODE_SINGLE)
-	e6:SetCost(c67616300.effcost)
 	e6:SetTarget(c67616300.rectg)
 	e6:SetOperation(c67616300.recop)
 	c:RegisterEffect(e6)

--- a/c68462976.lua
+++ b/c68462976.lua
@@ -9,7 +9,7 @@ function c68462976.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_ADJUST)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetOperation(c68462976.adjustop)
 	c:RegisterEffect(e2)
 	--cannot activate
@@ -17,7 +17,7 @@ function c68462976.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_CANNOT_ACTIVATE)
 	e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetTargetRange(1,1)
 	e3:SetLabel(0)
 	e3:SetValue(c68462976.actlimit)

--- a/c69296555.lua
+++ b/c69296555.lua
@@ -10,7 +10,7 @@ function c69296555.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_CANNOT_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetTarget(c69296555.atktg)
 	c:RegisterEffect(e2)

--- a/c69408987.lua
+++ b/c69408987.lua
@@ -9,7 +9,7 @@ function c69408987.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_DAMAGE_STEP_END)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCondition(c69408987.poscon)
 	e2:SetOperation(c69408987.posop)
 	c:RegisterEffect(e2)

--- a/c70222318.lua
+++ b/c70222318.lua
@@ -8,7 +8,7 @@ function c70222318.initial_effect(c)
 	--
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_IGNITION)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1,70222318)
 	e2:SetCost(c70222318.cost)
 	e2:SetTarget(c70222318.target)
@@ -18,7 +18,7 @@ function c70222318.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(70222318,3))
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetCode(EVENT_PHASE+PHASE_END)
 	e3:SetCountLimit(1)
 	e3:SetCondition(c70222318.tgcon)

--- a/c70422863.lua
+++ b/c70422863.lua
@@ -9,7 +9,7 @@ function c70422863.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetTarget(c70422863.atktg)
 	e2:SetValue(c70422863.atkval)
@@ -20,7 +20,7 @@ function c70422863.initial_effect(c)
 	--negate
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetCode(EVENT_BE_BATTLE_TARGET)
 	e4:SetCondition(c70422863.negcon)
 	e4:SetCost(c70422863.negcost)

--- a/c712559.lua
+++ b/c712559.lua
@@ -9,7 +9,7 @@ function c712559.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x4))
 	e2:SetValue(200)
@@ -20,7 +20,7 @@ function c712559.initial_effect(c)
 	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetCode(EVENT_TO_GRAVE)
 	e3:SetCountLimit(1)
 	e3:SetCondition(c712559.condition)

--- a/c73206827.lua
+++ b/c73206827.lua
@@ -10,7 +10,7 @@ function c73206827.initial_effect(c)
 	e2:SetDescription(aux.Stringid(73206827,0))
 	e2:SetCategory(CATEGORY_COIN)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1)
 	e2:SetCode(EVENT_PHASE+PHASE_STANDBY)
 	e2:SetCondition(c73206827.coincon)
@@ -21,7 +21,7 @@ function c73206827.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(73206827)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetTargetRange(LOCATION_MZONE,0)
 	e3:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x5))
 	e3:SetCondition(c73206827.effectcon)
@@ -31,7 +31,7 @@ function c73206827.initial_effect(c)
 	e4:SetDescription(aux.Stringid(73206827,1))
 	e4:SetCategory(CATEGORY_RECOVER)
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetCode(EVENT_BATTLE_DESTROYING)
 	e4:SetCondition(c73206827.reccon)
 	e4:SetTarget(c73206827.rectg)

--- a/c73787254.lua
+++ b/c73787254.lua
@@ -9,9 +9,9 @@ function c73787254.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e2:SetTarget(c73787254.target)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x100d))
 	e2:SetValue(c73787254.val1)
 	c:RegisterEffect(e2)
 	local e3=e2:Clone()
@@ -19,9 +19,6 @@ function c73787254.initial_effect(c)
 	e3:SetValue(c73787254.val2)
 	c:RegisterEffect(e3)
 end
-function c73787254.target(e,c)
-	return c:IsSetCard(0x100d)
-end
 function c73787254.val1(e,c)
 	return c:GetLevel()*100
 end

--- a/c75041269.lua
+++ b/c75041269.lua
@@ -10,7 +10,7 @@ function c75041269.initial_effect(c)
 	e2:SetDescription(aux.Stringid(75041269,0))
 	e2:SetCategory(CATEGORY_COUNTER)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1)
 	e2:SetCode(EVENT_PHASE+PHASE_STANDBY)
 	e2:SetCondition(c75041269.ctcon)
@@ -21,7 +21,7 @@ function c75041269.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_AVOID_BATTLE_DAMAGE)
 	e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetTargetRange(1,0)
 	e3:SetCondition(c75041269.dcon)
 	c:RegisterEffect(e3)

--- a/c75782277.lua
+++ b/c75782277.lua
@@ -10,7 +10,7 @@ function c75782277.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e2:SetCode(EVENT_SUMMON_SUCCESS)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetOperation(c75782277.check)
 	c:RegisterEffect(e2)
 	local e3=e2:Clone()
@@ -29,7 +29,7 @@ function c75782277.initial_effect(c)
 	local e5=Effect.CreateEffect(c)
 	e5:SetType(EFFECT_TYPE_FIELD)
 	e5:SetCode(EFFECT_UPDATE_ATTACK)
-	e5:SetRange(LOCATION_SZONE)
+	e5:SetRange(LOCATION_FZONE)
 	e5:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_WINDBEAST))
 	e5:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e5:SetValue(200)

--- a/c77584012.lua
+++ b/c77584012.lua
@@ -9,7 +9,7 @@ function c77584012.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(77584012,0))
 	e2:SetType(EFFECT_TYPE_IGNITION)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1)
 	e2:SetCost(c77584012.cost)
 	e2:SetOperation(c77584012.operation)

--- a/c78082039.lua
+++ b/c78082039.lua
@@ -9,7 +9,7 @@ function c78082039.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
 	e2:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_BEAST))
 	e2:SetValue(c78082039.val)
@@ -18,7 +18,7 @@ function c78082039.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_CANNOT_ACTIVATE)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e3:SetTargetRange(1,1)
 	e3:SetValue(c78082039.efilter)

--- a/c80921533.lua
+++ b/c80921533.lua
@@ -12,7 +12,7 @@ function c80921533.initial_effect(c)
 	e2:SetProperty(EFFECT_FLAG_BOTH_SIDE)
 	e2:SetCategory(CATEGORY_SUMMON)
 	e2:SetType(EFFECT_TYPE_IGNITION)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTarget(c80921533.target)
 	e2:SetOperation(c80921533.operation)
 	e2:SetLabelObject(e1)

--- a/c81231742.lua
+++ b/c81231742.lua
@@ -8,20 +8,16 @@ function c81231742.initial_effect(c)
 	--atk
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetCondition(c81231742.atkcon)
 	e2:SetValue(300)
 	c:RegisterEffect(e2)
 	--def
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_MZONE,0)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_DEFENCE)
 	e3:SetCondition(c81231742.defcon)
-	e3:SetValue(300)
 	c:RegisterEffect(e3)
 end
 function c81231742.atkcon(e)

--- a/c81380218.lua
+++ b/c81380218.lua
@@ -8,13 +8,10 @@ function c81380218.initial_effect(c)
 	--Def up
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetCode(EFFECT_UPDATE_DEFENCE)
-	e2:SetTarget(c81380218.filter)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsDefencePos))
 	e2:SetValue(500)
 	c:RegisterEffect(e2)
 end
-function c81380218.filter(e,c)
-	return c:IsDefencePos()
-end
--- a/c81777047.lua
+++ b/c81777047.lua
@@ -8,22 +8,15 @@ function c81777047.initial_effect(c)
 	--Atk up
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetTarget(c81777047.filter)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsAttribute,ATTRIBUTE_LIGHT))
 	e2:SetValue(500)
 	c:RegisterEffect(e2)
 	--Def down
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_DEFENCE)
-	e3:SetTarget(c81777047.filter)
 	e3:SetValue(-400)
 	c:RegisterEffect(e3)
 end
-function c81777047.filter(e,c)
-	return c:IsAttribute(ATTRIBUTE_LIGHT)
-end
\ No newline at end of file
--- a/c81788994.lua
+++ b/c81788994.lua
@@ -10,7 +10,7 @@ function c81788994.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCondition(c81788994.ctcon)
 	e2:SetOperation(c81788994.ctop)
 	c:RegisterEffect(e2)
@@ -18,7 +18,7 @@ function c81788994.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_UPDATE_ATTACK)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetTargetRange(0,LOCATION_MZONE)
 	e3:SetCondition(c81788994.atkcon)
 	e3:SetValue(c81788994.atkval)
@@ -28,7 +28,7 @@ function c81788994.initial_effect(c)
 	e4:SetDescription(aux.Stringid(81788994,0))
 	e4:SetType(EFFECT_TYPE_SINGLE)
 	e4:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetCode(81788994)
 	c:RegisterEffect(e4)
 end

--- a/c82999629.lua
+++ b/c82999629.lua
@@ -8,22 +8,15 @@ function c82999629.initial_effect(c)
 	--Atk up
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetTarget(c82999629.filter)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsAttribute,ATTRIBUTE_WATER))
 	e2:SetValue(500)
 	c:RegisterEffect(e2)
 	--Def down
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_DEFENCE)
-	e3:SetTarget(c82999629.filter)
 	e3:SetValue(-400)
 	c:RegisterEffect(e3)
 end
-function c82999629.filter(e,c)
-	return c:IsAttribute(ATTRIBUTE_WATER)
-end
--- a/c85668449.lua
+++ b/c85668449.lua
@@ -9,7 +9,7 @@ function c85668449.initial_effect(c)
 	--extra summon
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_HAND+LOCATION_MZONE,LOCATION_HAND+LOCATION_MZONE)
 	e2:SetCode(EFFECT_EXTRA_SUMMON_COUNT)
 	e2:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_PSYCHO))
@@ -19,7 +19,7 @@ function c85668449.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(85668449,0))
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetCode(EFFECT_LPCOST_REPLACE)
 	e3:SetCondition(c85668449.lrcon)
 	e3:SetOperation(c85668449.lrop)

--- a/c86318356.lua
+++ b/c86318356.lua
@@ -9,21 +9,13 @@ function c86318356.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e2:SetTarget(c86318356.tg)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_WARRIOR+RACE_BEASTWARRIOR))
 	e2:SetValue(200)
 	c:RegisterEffect(e2)
 	--Def
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_DEFENCE)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e3:SetTarget(c86318356.tg)
-	e3:SetValue(200)
 	c:RegisterEffect(e3)
 end
-function c86318356.tg(e,c)
-	return c:IsRace(RACE_WARRIOR+RACE_BEASTWARRIOR)
-end
--- a/c86997073.lua
+++ b/c86997073.lua
@@ -11,7 +11,7 @@ function c86997073.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetCountLimit(1)
-	e1:SetRange(LOCATION_SZONE)
+	e1:SetRange(LOCATION_FZONE)
 	e1:SetTarget(c86997073.target)
 	e1:SetOperation(c86997073.operation)
 	c:RegisterEffect(e1)

--- a/c87430998.lua
+++ b/c87430998.lua
@@ -9,21 +9,13 @@ function c87430998.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e2:SetTarget(c87430998.tg)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_INSECT+RACE_BEAST+RACE_PLANT+RACE_BEASTWARRIOR))
 	e2:SetValue(200)
 	c:RegisterEffect(e2)
 	--Def
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
+	local e3=e2:Clone()
 	e3:SetCode(EFFECT_UPDATE_DEFENCE)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e3:SetTarget(c87430998.tg)
-	e3:SetValue(200)
 	c:RegisterEffect(e3)
 end
-function c87430998.tg(e,c)
-	return c:IsRace(RACE_INSECT+RACE_BEAST+RACE_PLANT+RACE_BEASTWARRIOR)
-end
--- a/c87624166.lua
+++ b/c87624166.lua
@@ -13,7 +13,7 @@ function c87624166.initial_effect(c)
 	e2:SetDescription(aux.Stringid(87624166,0))
 	e2:SetCategory(CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1)
 	e2:SetCode(EVENT_PHASE+PHASE_BATTLE)
 	e2:SetTarget(c87624166.destg)

--- a/c87902575.lua
+++ b/c87902575.lua
@@ -15,7 +15,7 @@ function c87902575.initial_effect(c)
 	e2:SetCategory(CATEGORY_REMOVE)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCode(EVENT_SUMMON_SUCCESS)
 	e2:SetTarget(c87902575.rmtg)
 	e2:SetOperation(c87902575.rmop)
@@ -25,7 +25,7 @@ function c87902575.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(87902575,1))
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetCode(EVENT_PHASE+PHASE_STANDBY)
 	e3:SetCountLimit(1)
 	e3:SetCondition(c87902575.retcon)
@@ -35,7 +35,7 @@ function c87902575.initial_effect(c)
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e4:SetCode(EVENT_PHASE_START+PHASE_MAIN1)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e4:SetCountLimit(1)
 	e4:SetOperation(c87902575.clearop)

--- a/c90011152.lua
+++ b/c90011152.lua
@@ -11,7 +11,7 @@ function c90011152.initial_effect(c)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e2:SetType(EFFECT_TYPE_IGNITION)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1)
 	e2:SetCost(c90011152.spcost)
 	e2:SetTarget(c90011152.sptg)
@@ -20,7 +20,7 @@ function c90011152.initial_effect(c)
 	--swap ad
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e3:SetCondition(c90011152.atcon)
 	e3:SetCode(EFFECT_SWAP_BASE_AD)

--- a/c94243005.lua
+++ b/c94243005.lua
@@ -8,7 +8,7 @@ function c94243005.initial_effect(c)
 	--add counter
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetCode(EVENT_REMOVE)
 	e2:SetOperation(c94243005.ctop)
 	c:RegisterEffect(e2)
@@ -19,7 +19,7 @@ function c94243005.initial_effect(c)
 	e3:SetDescription(aux.Stringid(94243005,0))
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetCountLimit(1)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetTarget(c94243005.sptg)
 	e3:SetOperation(c94243005.spop)
 	c:RegisterEffect(e3)

--- a/c99795159.lua
+++ b/c99795159.lua
@@ -9,31 +9,28 @@ function c99795159.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_CANNOT_SELECT_BATTLE_TARGET)
-	e2:SetRange(LOCATION_SZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e2:SetValue(c99795159.atlimit)
+	e2:SetValue(aux.TargetBoolFunction(Card.IsFacedown))
 	c:RegisterEffect(e2)
 	--direct attack
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_DIRECT_ATTACK)
-	e3:SetRange(LOCATION_SZONE)
+	e3:SetRange(LOCATION_FZONE)
 	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e3:SetTarget(c99795159.dirtg)
 	c:RegisterEffect(e3)
 	--
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_FIELD)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetCode(EFFECT_CHANGE_DAMAGE)
 	e4:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e4:SetTargetRange(1,1)
 	e4:SetValue(c99795159.val)
 	c:RegisterEffect(e4)
 end
-function c99795159.atlimit(e,c)
-	return c:IsFacedown()
-end
 function c99795159.dirtg(e,c)
 	return not Duel.IsExistingMatchingCard(Card.IsFaceup,c:GetControler(),0,LOCATION_MZONE,1,nil)
 end