cctv

expansions/script/c14010003.lua

@@ -2,110 +2,110 @@
 local m=14010003
 local cm=_G["c"..m]
 function cm.initial_effect(c)
-	--synchro summon
-	aux.AddSynchroProcedure(c,cm.synfilter,aux.NonTuner(cm.synfilter1),1,1)
-	c:EnableReviveLimit()
-	--pendulum summon
-	aux.EnablePendulumAttribute(c,false)
-	--Destroy
-	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(m,0))
-	e1:SetCategory(CATEGORY_DESTROY)
-	e1:SetType(EFFECT_TYPE_IGNITION)
-	e1:SetRange(LOCATION_PZONE)
-	e1:SetCost(cm.tecost)
-	e1:SetTarget(cm.tetg)
-	e1:SetOperation(cm.teop)
-	c:RegisterEffect(e1)
-	--to deck
-	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(m,1))
-	e2:SetCategory(CATEGORY_TODECK+CATEGORY_ATKCHANGE)
-	e2:SetType(EFFECT_TYPE_TRIGGER_F+EFFECT_TYPE_SINGLE)
-	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
-	e2:SetTarget(cm.tdtg)
-	e2:SetOperation(cm.tdop)
-	c:RegisterEffect(e2)
-	--pen set
-	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(m,2))
-	e3:SetType(EFFECT_TYPE_IGNITION)
-	e3:SetRange(LOCATION_MZONE)
-	e3:SetCost(cm.setcost)
-	e3:SetTarget(cm.settg)
-	e3:SetOperation(cm.setop)
-	c:RegisterEffect(e3)
+    --synchro summon
+    aux.AddSynchroProcedure(c,cm.synfilter,aux.NonTuner(cm.synfilter1),1,1)
+    c:EnableReviveLimit()
+    --pendulum summon
+    aux.EnablePendulumAttribute(c,false)
+    --Destroy
+    local e1=Effect.CreateEffect(c)
+    e1:SetDescription(aux.Stringid(m,0))
+    e1:SetCategory(CATEGORY_DESTROY)
+    e1:SetType(EFFECT_TYPE_IGNITION)
+    e1:SetRange(LOCATION_PZONE)
+    e1:SetCost(cm.tecost)
+    e1:SetTarget(cm.tetg)
+    e1:SetOperation(cm.teop)
+    c:RegisterEffect(e1)
+    --to deck
+    local e2=Effect.CreateEffect(c)
+    e2:SetDescription(aux.Stringid(m,1))
+    e2:SetCategory(CATEGORY_TODECK+CATEGORY_ATKCHANGE)
+    e2:SetType(EFFECT_TYPE_TRIGGER_F+EFFECT_TYPE_SINGLE)
+    e2:SetCode(EVENT_SPSUMMON_SUCCESS)
+    e2:SetTarget(cm.tdtg)
+    e2:SetOperation(cm.tdop)
+    c:RegisterEffect(e2)
+    --pen set
+    local e3=Effect.CreateEffect(c)
+    e3:SetDescription(aux.Stringid(m,2))
+    e3:SetType(EFFECT_TYPE_IGNITION)
+    e3:SetRange(LOCATION_MZONE)
+    e3:SetCost(cm.setcost)
+    e3:SetTarget(cm.settg)
+    e3:SetOperation(cm.setop)
+    c:RegisterEffect(e3)
 end
 function cm.synfilter(c)
-	return c:IsRace(RACE_FAIRY)
+    return c:IsRace(RACE_FAIRY)
 end
 function cm.synfilter1(c)
-	return c:IsRace(RACE_FIEND)
+    return c:IsRace(RACE_FIEND)
 end
 function cm.tecost(e,tp,eg,ep,ev,re,r,rp,chk)
-	c=e:GetHandler()
-	if chk==0 then return c:IsAbleToExtraAsCost() end
-	Duel.SendtoExtraP(c,tp,REASON_COST)
+    c=e:GetHandler()
+    if chk==0 then return c:IsAbleToExtraAsCost() end
+    Duel.SendtoExtraP(c,tp,REASON_COST)
 end
 function cm.tetg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,e:GetHandler()) end
-	local g=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,e:GetHandler())
-	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,g:GetCount(),0,0)
+    if chk==0 then return Duel.IsExistingMatchingCard(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,e:GetHandler()) end
+    local g=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,e:GetHandler())
+    Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,g:GetCount(),0,0)
 end
 function cm.teop(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,aux.ExceptThisCard(e))
-	Duel.Destroy(g,REASON_EFFECT)
+    local g=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,aux.ExceptThisCard(e))
+    Duel.Destroy(g,REASON_EFFECT)
 end
 function cm.tdfilter(c)
-	return c:IsFaceup() and c:IsAbleToDeck()
+    return c:IsFaceup() and c:IsAbleToDeck()
 end
 function cm.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
-	local g=Duel.GetMatchingGroup(cm.tdfilter,tp,LOCATION_EXTRA,LOCATION_EXTRA,nil)
-	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
-	Duel.SetChainLimit(aux.FALSE)
+    if chk==0 then return true end
+    local g=Duel.GetMatchingGroup(cm.tdfilter,tp,LOCATION_EXTRA,LOCATION_EXTRA,nil)
+    Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
+    Duel.SetChainLimit(aux.FALSE)
 end
 function cm.tdop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local g=Duel.GetMatchingGroup(cm.tdfilter,tp,LOCATION_EXTRA,LOCATION_EXTRA,nil)
-	local ct=Duel.SendtoDeck(g,nil,2,REASON_EFFECT)
-	Duel.BreakEffect()
-	if c:IsRelateToEffect(e) and c:IsFaceup() then
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetProperty(EFFECT_FLAG_COPY_INHERIT)
-		e1:SetCode(EFFECT_UPDATE_ATTACK)
-		e1:SetValue(ct*500)
-		e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE)
-		c:RegisterEffect(e1)
-		local e2=e1:Clone()
-		e2:SetCode(EFFECT_UPDATE_DEFENSE)
-		c:RegisterEffect(e2)
-	end
+    local c=e:GetHandler()
+    local g=Duel.GetMatchingGroup(cm.tdfilter,tp,LOCATION_EXTRA,LOCATION_EXTRA,nil)
+    local ct=Duel.SendtoDeck(g,nil,2,REASON_EFFECT)
+    Duel.BreakEffect()
+    if c:IsRelateToEffect(e) and c:IsFaceup() then
+        local e1=Effect.CreateEffect(c)
+        e1:SetType(EFFECT_TYPE_SINGLE)
+        e1:SetProperty(EFFECT_FLAG_COPY_INHERIT)
+        e1:SetCode(EFFECT_UPDATE_ATTACK)
+        e1:SetValue(ct*500)
+        e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE)
+        c:RegisterEffect(e1)
+        local e2=e1:Clone()
+        e2:SetCode(EFFECT_UPDATE_DEFENSE)
+        c:RegisterEffect(e2)
+    end
 end
 function cm.filter1(c)
-	return c:IsType(TYPE_PENDULUM) and c:IsCode(14010001) and not c:IsForbidden()
+    return c:IsType(TYPE_PENDULUM) and c:IsCode(14010001) and not c:IsForbidden()
 end
 function cm.filter2(c)
-	return c:IsType(TYPE_PENDULUM) and c:IsCode(14010002) and not c:IsForbidden()
+    return c:IsType(TYPE_PENDULUM) and c:IsCode(14010002) and not c:IsForbidden()
 end
 function cm.setcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():IsReleasable() end
-	Duel.Release(e:GetHandler(),REASON_COST)
+    if chk==0 then return e:GetHandler():IsReleasable() end
+    Duel.Release(e:GetHandler(),REASON_COST)
 end
 function cm.settg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter1,tp,LOCATION_DECK,0,1,nil) and Duel.IsExistingMatchingCard(cm.filter2,tp,LOCATION_DECK,0,1,nil) and Duel.CheckLocation(tp,LOCATION_PZONE,0) and Duel.CheckLocation(tp,LOCATION_PZONE,1) end
+    if chk==0 then return Duel.IsExistingMatchingCard(cm.filter1,tp,LOCATION_DECK,0,1,nil) and Duel.IsExistingMatchingCard(cm.filter2,tp,LOCATION_DECK,0,1,nil) and Duel.CheckLocation(tp,LOCATION_PZONE,0) and Duel.CheckLocation(tp,LOCATION_PZONE,1) end
 end
 function cm.setop(e,tp,eg,ep,ev,re,r,rp)
-	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) or not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
-	local g=Duel.SelectMatchingCard(tp,cm.filter1,tp,LOCATION_DECK,0,1,1,nil)
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
-	local g1=Duel.SelectMatchingCard(tp,cm.filter2,tp,LOCATION_DECK,0,1,1,nil)
-	g:Merge(g1)
-	local tc=g:GetFirst()
-	while tc do
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
-		tc=g:GetNext()
-	end
+    if not Duel.CheckLocation(tp,LOCATION_PZONE,0) or not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
+    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
+    local g=Duel.SelectMatchingCard(tp,cm.filter1,tp,LOCATION_DECK,0,1,1,nil)
+    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
+    local g1=Duel.SelectMatchingCard(tp,cm.filter2,tp,LOCATION_DECK,0,1,1,nil)
+    g:Merge(g1)
+    local tc=g:GetFirst()
+    while tc do
+        Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
+        tc=g:GetNext()
+    end
 end
\ No newline at end of file

expansions/script/c16100010.lua

 --黑白盾
 function c16100010.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY+CATEGORY_DRAW)
+	e1:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY+CATEGORY_TOHAND)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
 	e1:SetCode(EVENT_CHAINING)
@@ -38,7 +38,7 @@ function c16100010.filter(c)
 end
 --
 function c16100010.filter0(c)
-	return c:IsSetCard(0xccd) and c:IsAbleToHand()
+	return c:IsSetCard(0xccd) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER)
 end
 --
 function c16100010.filter1(c)

expansions/script/c17010301.lua

@@ -189,8 +189,8 @@ function cm.hspop(e,tp,eg,ep,ev,re,r,rp,c)
 	local mc=g1:GetFirst()
 	Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(17010301,11))
 	local g2=g:FilterSelect(tp,cm.spfilter2,1,1,mc,tp,mc)
-	Duel.MoveToField(g1:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
-	Duel.MoveToField(g2:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+	Duel.MoveToField(g1:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
+	Duel.MoveToField(g2:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 end
 function cm.atksuc(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SOUND,0,aux.Stringid(17010301,10))

expansions/script/c17010306.lua

@@ -120,7 +120,7 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function cm.splimit(e,se,sp,st)

expansions/script/c17011103.lua

@@ -26,7 +26,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e2)
 	--spsummon
 	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(m,0))
+	e3:SetDescription(aux.Stringid(17011103,0))
 	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e3:SetProperty(EFFECT_FLAG_DELAY)
@@ -39,7 +39,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e4)
 	--Destroy
 	local e5=Effect.CreateEffect(c)
-	e5:SetDescription(aux.Stringid(m,1))
+	e5:SetDescription(aux.Stringid(17011103,1))
 	e5:SetType(EFFECT_TYPE_IGNITION)
 	e5:SetCountLimit(1)
 	e5:SetRange(LOCATION_MZONE)
@@ -88,7 +88,7 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 		local g=Duel.SelectMatchingCard(tp,cm.penfilter,tp,LOCATION_DECK,0,1,1,nil,sc:GetAttribute())
 		local tc=g:GetFirst()
 		if tc then
-			Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+			Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 		end
 	end
 end
@@ -158,14 +158,14 @@ function cm.desop(e,tp,eg,ep,ev,re,r,rp)
 end
 function cm.atksuc(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetFieldGroupCount(e:GetHandlerPlayer(),LOCATION_MZONE,0)>1 then 
-		Duel.Hint(HINT_SOUND,0,aux.Stringid(m,2))
+		Duel.Hint(HINT_SOUND,0,aux.Stringid(17011103,2))
 	else
-		Duel.Hint(HINT_SOUND,0,aux.Stringid(m,12))
+		Duel.Hint(HINT_SOUND,0,aux.Stringid(17011103,12))
 	end
 end
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(cm.rccfilter,1,nil,tp)
 end
 function cm.sumvoice(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Hint(HINT_SOUND,0,aux.Stringid(m,6))
+	Duel.Hint(HINT_SOUND,0,aux.Stringid(17011103,6))
 end
\ No newline at end of file

expansions/script/c17011111.lua

@@ -97,7 +97,7 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 	local g=Duel.SelectMatchingCard(tp,cm.pcfilter,tp,LOCATION_GRAVE,0,1,1,nil)
 	if g:GetCount()>0 then
-		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 		end
 	end
 end

expansions/script/c17050901.lua

@@ -175,6 +175,6 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c17050943.lua

@@ -98,7 +98,7 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function cm.filter(c)

expansions/script/c17060801.lua

@@ -114,6 +114,6 @@ function cm.pcop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 	local g=Duel.SelectMatchingCard(tp,cm.psfilter,tp,LOCATION_DECK,0,1,1,nil)
 	if g:GetCount()>0 then
-		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c17060804.lua

@@ -118,6 +118,6 @@ end
 function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
-	if tc:IsRelateToEffect(e) and Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)>0 then
+	if tc:IsRelateToEffect(e) and Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)>0 then
 	end
 end
\ No newline at end of file

expansions/script/c17060810.lua

@@ -114,6 +114,6 @@ function cm.thhop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 		local mg=g:Select(tp,1,1,nil)
 		Duel.BreakEffect()
-		Duel.MoveToField(mg:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(mg:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c17060811.lua

@@ -83,6 +83,6 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c17060815.lua

@@ -107,6 +107,6 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c17060817.lua

@@ -83,7 +83,7 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function cm.cfilter1(c,ft,tp)

expansions/script/c17060827.lua

@@ -67,7 +67,7 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 	if Duel.IsExistingMatchingCard(cm.rccfilter,tp,LOCATION_MZONE,0,1,c) and Duel.IsPlayerCanDraw(tp,1) and Duel.SelectYesNo(tp,aux.Stringid(17060826,3)) then
 		Duel.Draw(tp,1,REASON_EFFECT)

expansions/script/c17060853.lua

@@ -44,7 +44,7 @@ function cm.pcop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 	local g=Duel.SelectMatchingCard(tp,cm.pcfilter,tp,LOCATION_GRAVE+LOCATION_EXTRA,0,1,1,nil)
 	if g:GetCount()>0 then
-		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function cm.sctg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)

expansions/script/c17060854.lua

@@ -75,6 +75,6 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp,chk)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 		local mg=g:Select(tp,1,1,nil)
 		Duel.BreakEffect()
-		Duel.MoveToField(mg:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(mg:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c17060863.lua

@@ -75,7 +75,7 @@ function cm.pcop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 	local g=Duel.SelectMatchingCard(tp,cm.pcfilter,tp,LOCATION_DECK,0,1,1,nil)
 	if g:GetCount()>0 then
-		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function cm.pencon(e,tp,eg,ep,ev,re,r,rp)
@@ -96,7 +96,7 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectMatchingCard(tp,cm.penfilter,tp,LOCATION_PZONE,0,1,1,nil,e,tp)
 	if g:GetCount()>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function cm.damcon1(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c17060864.lua

@@ -41,7 +41,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e3)
 	--set p
 	local e4=Effect.CreateEffect(c)
-	e4:SetDescription(aux.Stringid(m,1))
+	e4:SetDescription(aux.Stringid(17060864,2))
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e4:SetProperty(EFFECT_FLAG_DELAY)
 	e4:SetCode(EVENT_DESTROYED)
@@ -51,9 +51,6 @@ function cm.initial_effect(c)
 	e4:SetOperation(cm.penop)
 	c:RegisterEffect(e4)
 end
-cm.is_named_with_Partner=1
-cm.is_named_with_Magic_Factions=1
-cm.is_named_with_Million_Arthur=1
 function cm.IsMa_Elf(c)
 	local m=_G["c"..c:GetCode()]
 	return m and m.is_named_with_Ma_Elf
@@ -122,6 +119,6 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c17060865.lua

@@ -43,9 +43,6 @@ function cm.initial_effect(c)
 	e4:SetOperation(cm.penop)
 	c:RegisterEffect(e4)
 end
-cm.is_named_with_Partner=1
-cm.is_named_with_Skill_Field=1
-cm.is_named_with_Million_Arthur=1
 function cm.IsMa_Elf(c)
 	local m=_G["c"..c:GetCode()]
 	return m and m.is_named_with_Ma_Elf
@@ -116,6 +113,6 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
 	end
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c17060882.lua

@@ -99,9 +99,9 @@ function cm.repop(e,tp,eg,ep,ev,re,r,rp)
 		local g=Duel.SelectMatchingCard(tp,cm.psfilter,tp,LOCATION_DECK,0,1,1,nil)
 		if g:GetCount()>0 then
 		if op==0 then
-			Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+			Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 		else 
-			Duel.MoveToField(g:GetFirst(),tp,1-tp,LOCATION_SZONE,POS_FACEUP,true)
+			Duel.MoveToField(g:GetFirst(),tp,1-tp,LOCATION_PZONE,POS_FACEUP,true)
 		end
 	end
 end

expansions/script/c17060890.lua

@@ -49,7 +49,7 @@ function c17060890.psop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=g:GetFirst()
 	local atk=tc:GetLeftScale()
 	if g:GetCount()>0 then
-		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	if c:IsRelateToEffect(e) and c:IsFaceup() then
 			local e2=Effect.CreateEffect(c)
 			e2:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c17060895.lua

@@ -59,7 +59,7 @@ function cm.psop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 	local g=Duel.SelectMatchingCard(tp,cm.psfilter,tp,LOCATION_DECK+LOCATION_GRAVE+LOCATION_EXTRA,0,1,1,nil)
 	if g:GetCount()>0 then
-		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c17060896.lua

@@ -59,7 +59,7 @@ function cm.psop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 	local g=Duel.SelectMatchingCard(tp,cm.psfilter,tp,LOCATION_DECK+LOCATION_GRAVE+LOCATION_EXTRA,0,1,1,nil)
 	if g:GetCount()>0 then
-		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c17060897.lua

@@ -5,7 +5,7 @@ function cm.initial_effect(c)
 	aux.EnablePendulumAttribute(c)
 	--splimit
 	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(m,0))
+	e1:SetDescription(aux.Stringid(17060897,0))
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetRange(LOCATION_PZONE)
 	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
@@ -28,7 +28,7 @@ function cm.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetCode(EVENT_FREE_CHAIN)
 	e3:SetRange(LOCATION_GRAVE)
-	e3:SetCountLimit(1,m)
+	e3:SetCountLimit(1,17060897)
 	e3:SetCost(aux.bfgcost)
 	e3:SetTarget(cm.target)
 	e3:SetOperation(cm.activate)
@@ -59,7 +59,7 @@ function cm.psop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 	local g=Duel.SelectMatchingCard(tp,cm.psfilter,tp,LOCATION_DECK+LOCATION_GRAVE+LOCATION_EXTRA,0,1,1,nil)
 	if g:GetCount()>0 then
-		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function cm.filter(c,e,tp,m,ft)

expansions/script/c17060931.lua

@@ -7,19 +7,19 @@ function cm.initial_effect(c)
 	c:EnableReviveLimit()
 	--set pendulum and spsummon
 	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(m,0))
+	e1:SetDescription(aux.Stringid(17060931,0))
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
-	e1:SetCountLimit(1,m)
+	e1:SetCountLimit(1,17060931)
 	e1:SetCondition(cm.lspcon)
 	e1:SetTarget(cm.lsptg)
 	e1:SetOperation(cm.lspop)
 	c:RegisterEffect(e1)
 	--spsummon
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(m,1))
+	e2:SetDescription(aux.Stringid(17060931,1))
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_CHAIN_SOLVING)
@@ -32,15 +32,6 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 cm.is_named_with_Ma_Elf=1
-cm.is_named_with_Dark_Degenerate=1
-function cm.IsMa_Elf(c)
-	local m=_G["c"..c:GetCode()]
-	return m and m.is_named_with_Ma_Elf 
-end
-function cm.IsDark_Degenerate(c)
-	local m=_G["c"..c:GetCode()]
-	return m and m.is_named_with_Dark_Degenerate
-end
 function cm.lcheck(g,lc)
 	return g:IsExists(cm.IsMa_Elf,1,nil)
 end
@@ -65,7 +56,7 @@ function cm.lspop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 		local sg=Duel.SelectMatchingCard(tp,cm.pcfilter,tp,LOCATION_DECK,0,1,1,nil)
 		if sg:GetCount()>0 then
-			Duel.MoveToField(sg:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+			Duel.MoveToField(sg:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 		end
 	end
 end

expansions/script/c17060932.lua

@@ -17,7 +17,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e1)
 	--
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(m,0))
+	e2:SetDescription(aux.Stringid(17060932,0))
 	e2:SetCategory(CATEGORY_DESTROY+CATEGORY_DISABLE)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_FREE_CHAIN)
@@ -29,7 +29,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e2)
 	--pendulum
 	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(m,1))
+	e3:SetDescription(aux.Stringid(17060932,1))
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e3:SetCode(EVENT_DESTROYED)
 	e3:SetProperty(EFFECT_FLAG_DELAY)
@@ -140,6 +140,6 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c17060935.lua

@@ -95,7 +95,7 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c17060936.lua

@@ -134,7 +134,7 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function cm.ddcon(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c17060938.lua

@@ -119,7 +119,7 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function cm.diescon(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c17060939.lua

@@ -87,7 +87,7 @@ function cm.pcop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 	local g=Duel.SelectMatchingCard(tp,cm.pcfilter,tp,LOCATION_GRAVE+LOCATION_EXTRA,0,1,1,nil)
 	if g:GetCount()>0 then
-		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_pZONE,POS_FACEUP,true)
 	end
 end
 function cm.pencon(e,tp,eg,ep,ev,re,r,rp)
@@ -101,6 +101,6 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c17060940.lua

@@ -174,6 +174,6 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c17060944.lua

@@ -3,7 +3,7 @@ local m=17060944
 local cm=_G["c"..m]
 function cm.initial_effect(c)
 	aux.EnablePendulumAttribute(c)
-	--spsummon
+	--destroy
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(17060944,0))
 	e1:SetCategory(CATEGORY_DESTROY)
@@ -14,7 +14,7 @@ function cm.initial_effect(c)
 	e1:SetTarget(cm.destg)
 	e1:SetOperation(cm.desop)
 	c:RegisterEffect(e1)
-	--destroy
+	--remove
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(17060944,1))
 	e2:SetCategory(CATEGORY_REMOVE)
@@ -125,6 +125,6 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c17082109.lua

@@ -5,18 +5,18 @@ function cm.initial_effect(c)
 	aux.EnablePendulumAttribute(c)
 	--to hand
 	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(m,0))
+	e1:SetDescription(aux.Stringid(17082109,0))
 	e1:SetCategory(CATEGORY_DESTROY+CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetRange(LOCATION_PZONE)
-	e1:SetCountLimit(1,m)
+	e1:SetCountLimit(1,17082109)
 	e1:SetTarget(cm.thtg)
 	e1:SetOperation(cm.thop)
 	c:RegisterEffect(e1)
 	--pendulum
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(m,1))
+	e2:SetDescription(aux.Stringid(17082109,1))
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_MZONE)
@@ -66,13 +66,13 @@ function cm.filter(c,e,tp)
 	return c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return iCount(0,tp,m,1) and chkc:IsLocation(LOCATION_PZONE) and chkc:IsControler(tp) and cm.filter(chkc,e,tp) end
+	if chkc then return iCount(0,tp,17082109,1) and chkc:IsLocation(LOCATION_PZONE) and chkc:IsControler(tp) and cm.filter(chkc,e,tp) end
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingTarget(cm.filter,tp,LOCATION_PZONE,0,1,nil,e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectTarget(tp,cm.filter,tp,LOCATION_PZONE,0,1,1,nil,e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0)
-	Duel.RegisterFlagEffect(tp,m,RESET_PHASE+PHASE_END,0,1)
+	Duel.RegisterFlagEffect(tp,17082109,RESET_PHASE+PHASE_END,0,1)
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -81,6 +81,6 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
 		Duel.BreakEffect()
 		if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c17082110.lua

@@ -5,7 +5,7 @@ function cm.initial_effect(c)
 	aux.EnablePendulumAttribute(c)
 	--pendulum set
 	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(m,0))
+	e1:SetDescription(aux.Stringid(17082110,0))
 	e1:SetCategory(CATEGORY_DESTROY)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
@@ -15,7 +15,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e1)
 	--Special Summon
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(m,3))
+	e2:SetDescription(aux.Stringid(17082110,3))
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_SEARCH)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_DESTROYED)
@@ -57,7 +57,7 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 	local g=Duel.SelectMatchingCard(tp,cm.pcfilter,tp,LOCATION_EXTRA,0,1,1,nil)
 		if g:GetCount()>0 then
-			Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+			Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 		end
 	end
 end
@@ -86,7 +86,7 @@ function cm.efop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local rc=c:GetReasonCard()
 	local p=rc:GetControler()
-	if Duel.GetFlagEffect(p,m)~=0 then return end
+	if Duel.GetFlagEffect(p,17082110)~=0 then return end
 	local e1=Effect.CreateEffect(rc)
 	e1:SetDescription(aux.Stringid(m,1))
 	e1:SetCategory(CATEGORY_ATKCHANGE)

expansions/script/c17082112.lua

@@ -8,14 +8,13 @@ function cm.initial_effect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_PZONE)
-	e1:SetCountLimit(1,m)
+	e1:SetCountLimit(1,17082112)
 	e1:SetCondition(cm.pencon)
 	e1:SetTarget(cm.pentg)
 	e1:SetOperation(cm.penop)
 	c:RegisterEffect(e1)
 	--Special Summon
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(m,3))
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_SEARCH)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_DESTROYED)
@@ -27,7 +26,6 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e2)
 	--spsummon
 	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(m,0))
 	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetCountLimit(1)
@@ -77,7 +75,7 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 		local g=Duel.SelectMatchingCard(tp,cm.penfilter,tp,LOCATION_DECK,0,1,1,nil)
 		local tc=g:GetFirst()
 		if tc then
-			Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+			Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 		end
 	end
 end

expansions/script/c26806049.lua

@@ -84,6 +84,6 @@ end
 function c26806049.penop(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetHandler():IsRelateToEffect(e)
 		and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) then
-		Duel.MoveToField(e:GetHandler(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(e:GetHandler(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c65020001.lua

@@ -16,7 +16,6 @@ function c65020001.initial_effect(c)
 	c:RegisterEffect(e1)
 	--to hand
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(65020001,0))
 	e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_PZONE)
@@ -27,6 +26,7 @@ function c65020001.initial_effect(c)
 	c:RegisterEffect(e2)
 	--handquick
 	local e3=Effect.CreateEffect(c)
+	e3:SetDescription(aux.Stringid(65020001,0))
 	e3:SetCategory(CATEGORY_DISABLE)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetRange(LOCATION_HAND)
@@ -45,11 +45,16 @@ end
 
 function c65020001.hdcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	if chk==0 then return c:IsDiscardable() and Duel.IsExistingMatchingCard(c65020001.mifil,tp,LOCATION_HAND,0,1,c) end
+	local b=Duel.IsPlayerAffectedByEffect(tp,65020010) and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) and not c:IsForbidden() and Duel.GetTurnPlayer()~=tp
+	if chk==0 then return (c:IsDiscardable() or b) and Duel.IsExistingMatchingCard(c65020001.mifil,tp,LOCATION_HAND,0,1,c) end
 	local g=Duel.SelectMatchingCard(tp,c65020001.mifil,tp,LOCATION_HAND,0,1,1,c)
 	Duel.ConfirmCards(1-tp,g)
 	Duel.ShuffleHand(tp)
-	Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
+	if b and Duel.SelectYesNo(tp,aux.Stringid(65020010,1)) then
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
+	else
+		Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
+	end
 end
 
 function c65020001.hdfilter(c)

expansions/script/c65020002.lua

@@ -16,7 +16,6 @@ function c65020002.initial_effect(c)
 	c:RegisterEffect(e1)
 	--to hand
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(65020002,0))
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_PZONE)
@@ -27,6 +26,7 @@ function c65020002.initial_effect(c)
 	c:RegisterEffect(e2)
 	--handquick
 	local e3=Effect.CreateEffect(c)
+	e3:SetDescription(aux.Stringid(65020002,0))
 	e3:SetCategory(CATEGORY_REMOVE)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetRange(LOCATION_HAND)
@@ -44,12 +44,17 @@ function c65020002.mifil(c)
 end
 
 function c65020002.hdcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then return c:IsDiscardable() and Duel.IsExistingMatchingCard(c65020002.mifil,tp,LOCATION_HAND,0,1,c) end
+   local c=e:GetHandler()
+	local b=Duel.IsPlayerAffectedByEffect(tp,65020010) and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) and not c:IsForbidden() and Duel.GetTurnPlayer()~=tp
+	if chk==0 then return (c:IsDiscardable() or b) and Duel.IsExistingMatchingCard(c65020002.mifil,tp,LOCATION_HAND,0,1,c) end
 	local g=Duel.SelectMatchingCard(tp,c65020002.mifil,tp,LOCATION_HAND,0,1,1,c)
 	Duel.ConfirmCards(1-tp,g)
-	Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
 	Duel.ShuffleHand(tp)
+	if b and Duel.SelectYesNo(tp,aux.Stringid(65020010,1)) then
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
+	else
+		Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
+	end
 end
 
 function c65020002.hdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)

expansions/script/c65020003.lua

@@ -27,6 +27,7 @@ function c65020003.initial_effect(c)
 	c:RegisterEffect(e2)
 	--handquick
 	local e3=Effect.CreateEffect(c)
+	e3:SetDescription(aux.Stringid(65020003,0))
 	e3:SetCategory(CATEGORY_TOHAND)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetRange(LOCATION_HAND)
@@ -44,16 +45,21 @@ function c65020003.mifil(c)
 end
 
 function c65020003.hdcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then return c:IsDiscardable() and Duel.IsExistingMatchingCard(c65020003.mifil,tp,LOCATION_HAND,0,1,c) end
+   local c=e:GetHandler()
+	local b=Duel.IsPlayerAffectedByEffect(tp,65020010) and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) and not c:IsForbidden() and Duel.GetTurnPlayer()~=tp
+	if chk==0 then return (c:IsDiscardable() or b) and Duel.IsExistingMatchingCard(c65020003.mifil,tp,LOCATION_HAND,0,1,c) end
 	local g=Duel.SelectMatchingCard(tp,c65020003.mifil,tp,LOCATION_HAND,0,1,1,c)
 	Duel.ConfirmCards(1-tp,g)
-	Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
 	Duel.ShuffleHand(tp)
+	if b and Duel.SelectYesNo(tp,aux.Stringid(65020010,1)) then
+		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+	else
+		Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
+	end
 end
 
 function c65020003.hdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_ONFIELD) and chkc:IsAbleToHand() end
+  if chkc then return chkc:IsLocation(LOCATION_ONFIELD) and chkc:IsAbleToHand() end
 	if chk==0 then return Duel.IsExistingTarget(Card.IsAbleToHand,tp,0,LOCATION_ONFIELD,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectTarget(tp,Card.IsAbleToHand,tp,0,LOCATION_ONFIELD,1,1,nil)

expansions/script/c65020004.lua

@@ -27,6 +27,7 @@ function c65020004.initial_effect(c)
 	c:RegisterEffect(e2)
 	--handquick
 	local e3=Effect.CreateEffect(c)
+	e3:SetDescription(aux.Stringid(65020004,0))
 	e3:SetCategory(CATEGORY_REMOVE)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetRange(LOCATION_HAND)
@@ -44,12 +45,17 @@ function c65020004.mifil(c)
 end
 
 function c65020004.hdcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then return c:IsDiscardable() and Duel.IsExistingMatchingCard(c65020004.mifil,tp,LOCATION_HAND,0,1,c) end
-	local g=Duel.SelectMatchingCard(tp,c65020004.mifil,tp,LOCATION_HAND,0,1,1,c)
+   local c=e:GetHandler()
+	local b=Duel.IsPlayerAffectedByEffect(tp,65020010) and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) and not c:IsForbidden() and Duel.GetTurnPlayer()~=tp
+	if chk==0 then return (c:IsDiscardable() or b) and Duel.IsExistingMatchingCard(c65020003.mifil,tp,LOCATION_HAND,0,1,c) end
+	local g=Duel.SelectMatchingCard(tp,c65020003.mifil,tp,LOCATION_HAND,0,1,1,c)
 	Duel.ConfirmCards(1-tp,g)
-	Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
 	Duel.ShuffleHand(tp)
+	if b and Duel.SelectYesNo(tp,aux.Stringid(65020010,1)) then
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
+	else
+		Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
+	end
 end
 
 function c65020004.hdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
@@ -92,16 +98,16 @@ function c65020004.pcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_PZONE,0,1,e:GetHandler(),0x9da1)
 end
 function c65020004.pfilter(c,e,tp)
-	return c:IsSetCard(0x9da1) and c:IsType(TYPE_MONSTER) and c:IsFaceup() and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x9da1) and c:IsType(TYPE_MONSTER) and c:IsFaceup() and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
 end
 function c65020004.ptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c65020004.pfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp) and Duel.GetLocationCountFromEx(tp)>0 end
+	if chk==0 then return Duel.IsExistingMatchingCard(c65020004.pfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
 function c65020004.pop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if not c:IsRelateToEffect(e) then return end
-	if Duel.Destroy(c,REASON_EFFECT)~=0 and Duel.GetLocationCountFromEx(tp)>0 then
+	if Duel.Destroy(c,REASON_EFFECT)~=0 then
 		Duel.BreakEffect()
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 		local g=Duel.SelectMatchingCard(tp,c65020004.pfilter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp)

expansions/script/c65020005.lua

@@ -16,7 +16,6 @@ function c65020005.initial_effect(c)
 	c:RegisterEffect(e1)
 	--to hand
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(65020005,0))
 	e2:SetCategory(CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_PZONE)
@@ -27,6 +26,7 @@ function c65020005.initial_effect(c)
 	c:RegisterEffect(e2)
 	--handquick
 	local e3=Effect.CreateEffect(c)
+	e3:SetDescription(aux.Stringid(65020005,0))
 	e3:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetCode(EVENT_CHAINING)
@@ -49,11 +49,16 @@ end
 
 function c65020005.hdcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	if chk==0 then return c:IsDiscardable() and Duel.IsExistingMatchingCard(c65020005.mifil,tp,LOCATION_HAND,0,2,c) end
-	local g=Duel.SelectMatchingCard(tp,c65020005.mifil,tp,LOCATION_HAND,0,2,2,c)
+	local b=Duel.IsPlayerAffectedByEffect(tp,65020010) and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) and not c:IsForbidden() and Duel.GetTurnPlayer()~=tp
+	if chk==0 then return (c:IsDiscardable() or b) and Duel.IsExistingMatchingCard(c65020003.mifil,tp,LOCATION_HAND,0,2,c) end
+	local g=Duel.SelectMatchingCard(tp,c65020003.mifil,tp,LOCATION_HAND,0,2,2,c)
 	Duel.ConfirmCards(1-tp,g)
-	Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
 	Duel.ShuffleHand(tp)
+	if b and Duel.SelectYesNo(tp,aux.Stringid(65020010,1)) then
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
+	else
+		Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
+	end
 end
 
 function c65020005.hdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
@@ -103,7 +108,7 @@ function c65020005.pop(e,tp,eg,ep,ev,re,r,rp)
 		local g=Duel.SelectMatchingCard(tp,c65020005.pfilter,tp,LOCATION_DECK,0,1,1,nil)
 		if g:GetCount()>0 then
 			local tc=g:GetFirst()
-			Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+			Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 		end
 	end
 end

expansions/script/c65020006.lua

@@ -16,7 +16,6 @@ function c65020006.initial_effect(c)
 	c:RegisterEffect(e1)
 	--to hand
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(65020006,0))
 	e2:SetCategory(CATEGORY_DESTROY+CATEGORY_SEARCH+CATEGORY_TOHAND)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_PZONE)
@@ -27,6 +26,7 @@ function c65020006.initial_effect(c)
 	c:RegisterEffect(e2)
 	--handquick
 	local e3=Effect.CreateEffect(c)
+	e3:SetDescription(aux.Stringid(65020006,0))
 	e3:SetCategory(CATEGORY_DESTROY)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetCode(EVENT_ATTACK_ANNOUNCE)
@@ -47,12 +47,17 @@ function c65020006.mifil(c)
 end
 
 function c65020006.hdcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then return c:IsDiscardable() and Duel.IsExistingMatchingCard(c65020006.mifil,tp,LOCATION_HAND,0,2,c) end
+   local c=e:GetHandler()
+	local b=Duel.IsPlayerAffectedByEffect(tp,65020010) and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) and not c:IsForbidden() and Duel.GetTurnPlayer()~=tp
+	if chk==0 then return (c:IsDiscardable() or b) and Duel.IsExistingMatchingCard(c65020006.mifil,tp,LOCATION_HAND,0,2,c) end
 	local g=Duel.SelectMatchingCard(tp,c65020006.mifil,tp,LOCATION_HAND,0,2,2,c)
 	Duel.ConfirmCards(1-tp,g)
-	Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
 	Duel.ShuffleHand(tp)
+	if b and Duel.SelectYesNo(tp,aux.Stringid(65020010,1)) then
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
+	else
+		Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
+	end
 end
 
 function c65020006.desfil(c,atk)

expansions/script/c65020007.lua

@@ -16,7 +16,6 @@ function c65020007.initial_effect(c)
 	c:RegisterEffect(e1)
 	--to hand
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(65020007,0))
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_PZONE)
@@ -27,6 +26,7 @@ function c65020007.initial_effect(c)
 	c:RegisterEffect(e2)
 	--handquick
 	local e3=Effect.CreateEffect(c)
+	e3:SetDescription(aux.Stringid(65020007,0))
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetRange(LOCATION_HAND)
 	e3:SetCode(EVENT_FREE_CHAIN)
@@ -41,12 +41,17 @@ function c65020007.mifil(c)
 end
 
 function c65020007.hdcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then return c:IsDiscardable() and Duel.IsExistingMatchingCard(c65020007.mifil,tp,LOCATION_HAND,0,2,c) end
+   local c=e:GetHandler()
+	local b=Duel.IsPlayerAffectedByEffect(tp,65020010) and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) and not c:IsForbidden() and Duel.GetTurnPlayer()~=tp
+	if chk==0 then return (c:IsDiscardable() or b) and Duel.IsExistingMatchingCard(c65020007.mifil,tp,LOCATION_HAND,0,2,c) end
 	local g=Duel.SelectMatchingCard(tp,c65020007.mifil,tp,LOCATION_HAND,0,2,2,c)
 	Duel.ConfirmCards(1-tp,g)
-	Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
 	Duel.ShuffleHand(tp)
+	if b and Duel.SelectYesNo(tp,aux.Stringid(65020010,1)) then
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
+	else
+		Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
+	end
 end
 
 function c65020007.hdop(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c65020008.lua

@@ -25,7 +25,6 @@ function c65020008.initial_effect(c)
 	c:RegisterEffect(e1)
 	--to hand
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(65020008,0))
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_PZONE)
@@ -36,6 +35,7 @@ function c65020008.initial_effect(c)
 	c:RegisterEffect(e2)
 	--handquick
 	local e3=Effect.CreateEffect(c)
+	e3:SetDescription(aux.Stringid(65020008,0))
 	e3:SetCategory(CATEGORY_TODECK)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetRange(LOCATION_HAND)
@@ -55,11 +55,16 @@ end
 
 function c65020008.hdcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	if chk==0 then return c:IsDiscardable() and Duel.IsExistingMatchingCard(c65020008.mifil,tp,LOCATION_HAND,0,2,c) end
+	local b=Duel.IsPlayerAffectedByEffect(tp,65020010) and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) and not c:IsForbidden() and Duel.GetTurnPlayer()~=tp
+	if chk==0 then return (c:IsDiscardable() or b) and Duel.IsExistingMatchingCard(c65020008.mifil,tp,LOCATION_HAND,0,2,c) end
 	local g=Duel.SelectMatchingCard(tp,c65020008.mifil,tp,LOCATION_HAND,0,2,2,c)
 	Duel.ConfirmCards(1-tp,g)
-	Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
 	Duel.ShuffleHand(tp)
+	if b and Duel.SelectYesNo(tp,aux.Stringid(65020010,1)) then
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
+	else
+		Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
+	end
 end
 function c65020008.hdtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,0,LOCATION_ONFIELD,1,nil) end
@@ -117,7 +122,7 @@ function c65020008.pop(e,tp,eg,ep,ev,re,r,rp)
 		local scl1=tc1:GetLeftScale()
 		local scl2=tc2:GetRightScale()
 		if scl1>scl2 then scl1,scl2=scl2,scl1 end
-	local num=Duel.GetMatchingGroupCount(c65020008.pfilter,tp,LOCATION_EXTRA,0,nil,e,tp,scl1,scl2)
+	local num=Duel.GetLocationCountFromEx(tp,tp,nil,TYPE_PENDULUM)
 	local g=Duel.SelectMatchingCard(tp,c65020008.pfilter,tp,LOCATION_EXTRA,0,num,num,nil,e,tp,scl1,scl2)
 	if g:GetCount()>0 then
 		if Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)~=0 then

expansions/script/c65020019.lua

@@ -78,6 +78,6 @@ function c65020019.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	if Duel.GetMatchingGroupCount(Card.IsCode,tp,LOCATION_FZONE,0,1,nil,65020025)==0 and Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,nil,65020025) then
 		local tc=Duel.SelectMatchingCard(tp,Card.IsCode,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil,65020025):GetFirst()
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c65020020.lua

@@ -66,6 +66,6 @@ function c65020020.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	if Duel.GetMatchingGroupCount(Card.IsCode,tp,LOCATION_FZONE,0,1,nil,65020025)==0 and Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,nil,65020025) then
 		local tc=Duel.SelectMatchingCard(tp,Card.IsCode,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil,65020025):GetFirst()
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c65020021.lua

@@ -68,6 +68,6 @@ function c65020021.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	if Duel.GetMatchingGroupCount(Card.IsCode,tp,LOCATION_FZONE,0,1,nil,65020025)==0 and Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,nil,65020025) then
 		local tc=Duel.SelectMatchingCard(tp,Card.IsCode,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil,65020025):GetFirst()
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c65020022.lua

@@ -66,7 +66,7 @@ function c65020022.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	if Duel.GetMatchingGroupCount(Card.IsCode,tp,LOCATION_FZONE,0,1,nil,65020025)==0 and Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,nil,65020025) then
 		local tc=Duel.SelectMatchingCard(tp,Card.IsCode,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil,65020025):GetFirst()
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 	end
 end
 

expansions/script/c65030048.lua

@@ -99,7 +99,7 @@ function c65030048.op(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 		local tc=Duel.SelectMatchingCard(tp,c65030048.tffilter,tp,LOCATION_DECK,0,1,1,nil,tp):GetFirst()
 		if tc then
-			Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+			Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 		end 
 	end
 end

expansions/script/c65030053.lua

@@ -67,7 +67,7 @@ function c65030053.op(e,tp,eg,ep,ev,re,r,rp)
 	if b1 then
 		local g=Duel.SelectMatchingCard(tp,c65030053.tffil,tp,LOCATION_DECK,0,1,1,nil)
 		local tc=g:GetFirst()
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 	elseif b2 and c:IsRelateToEffect(e) then
 		if Duel.SendtoHand(c,nil,REASON_EFFECT)~=0 and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) then
 			Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)

expansions/script/c65030055.lua

@@ -32,7 +32,7 @@ end
 function c65030055.op(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.SelectMatchingCard(tp,c65030055.tffil,tp,LOCATION_DECK,0,1,1,nil)
 	local tc=g:GetFirst()
-	if tc and Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and e:GetHandler():IsRelateToEffect(e) then
+	if tc and Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and e:GetHandler():IsRelateToEffect(e) then
 		Duel.SpecialSummon(e:GetHandler(),0,tp,tp,false,false,POS_FACEUP)
 	end
 end

expansions/script/c65030057.lua

@@ -44,7 +44,7 @@ function c65030057.op(e,tp,eg,ep,ev,re,r,rp)
 	if tc:IsRelateToEffect(e) and Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)~=0 then
 		  local g=Duel.SelectMatchingCard(tp,c65030057.tffil,tp,LOCATION_DECK,0,1,1,nil)
 			local gc=g:GetFirst()
-		if gc and Duel.MoveToField(gc,tp,tp,LOCATION_SZONE,POS_FACEUP,true) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and e:GetHandler():IsRelateToEffect(e) then
+		if gc and Duel.MoveToField(gc,tp,tp,LOCATION_FZONE,POS_FACEUP,true) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and e:GetHandler():IsRelateToEffect(e) then
 			Duel.BreakEffect()
 			Duel.SpecialSummon(e:GetHandler(),0,tp,tp,false,false,POS_FACEUP)
 		end

expansions/script/c65030081.lua

@@ -97,6 +97,6 @@ function c65030081.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c65030082.lua

@@ -88,6 +88,6 @@ function c65030082.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c65030084.lua

@@ -151,6 +151,6 @@ function c65030084.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c65030086.lua

@@ -67,6 +67,6 @@ end
 function c65030086.tfop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c65030089.lua

@@ -43,6 +43,6 @@ function c65030089.op(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SpecialSummon(g1,0,tp,tp,false,false,POS_FACEUP)
 	elseif m==1 and b2 then
 		local g2=Duel.SelectMatchingCard(tp,c65030089.b2fil,tp,LOCATION_EXTRA,0,1,1,nil)
-		Duel.MoveToField(g2:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(g2:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c65050029.lua

@@ -60,7 +60,7 @@ function c65050029.op(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.SelectMatchingCard(tp,c65050029.tgfil,tp,LOCATION_DECK,0,1,1,nil)
 	local tc=g:GetFirst()
 	if tc then
-		if Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true) and Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0 and Duel.IsExistingMatchingCard(c65050029.spfil,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil,e,tp) and Duel.SelectYesNo(tp,aux.Stringid(65050029,0)) then
+		if Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true) and Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0 and Duel.IsExistingMatchingCard(c65050029.spfil,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil,e,tp) and Duel.SelectYesNo(tp,aux.Stringid(65050029,0)) then
 			local gg=Duel.SelectMatchingCard(tp,c65050029.spfil,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,tp)
 			Duel.SpecialSummon(gg,0,tp,tp,false,false,POS_FACEUP)
 		end

expansions/script/c65072000.lua

@@ -42,7 +42,7 @@ function c65072000.op(e,tp,eg,ep,ev,re,r,rp)
 		local g1=Duel.SelectMatchingCard(tp,c65072000.fil1,tp,LOCATION_DECK,0,1,1,nil)
 		local tc=g1:GetFirst()
 		local code=tc:GetCode()
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 		Duel.Hint(11,0,aux.Stringid(code,0))
 	elseif m==1 and b2 then
 		Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_EFFECT+REASON_DISCARD,e:GetHandler())

expansions/script/c65072001.lua

@@ -59,7 +59,7 @@ function c65072001.cop(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		local tc=g:GetFirst()
 		local code=tc:GetCode()
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 		Duel.Hint(HINT_MUSIC,0,aux.Stringid(code,0))
 		local e0=Effect.CreateEffect(e:GetHandler())
 		e0:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c65072003.lua

@@ -57,7 +57,7 @@ function c65072003.cop(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		local tc=g:GetFirst()
 		local code=tc:GetCode()
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 		Duel.Hint(HINT_MUSIC,0,aux.Stringid(code,0))
 		local e0=Effect.CreateEffect(e:GetHandler())
 		e0:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c65072004.lua

@@ -59,7 +59,7 @@ function c65072004.cop(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		local tc=g:GetFirst()
 		local code=tc:GetCode()
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 		Duel.Hint(HINT_MUSIC,0,aux.Stringid(code,0))
 		local e0=Effect.CreateEffect(e:GetHandler())
 		e0:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c65072006.lua

@@ -60,7 +60,7 @@ function c65072006.cop(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		local tc=g:GetFirst()
 		local code=tc:GetCode()
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 		Duel.Hint(HINT_MUSIC,0,aux.Stringid(code,0))
 		local e0=Effect.CreateEffect(e:GetHandler())
 		e0:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c65072008.lua

@@ -59,7 +59,7 @@ function c65072008.cop(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		local tc=g:GetFirst()
 		local code=tc:GetCode()
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 		Duel.Hint(HINT_MUSIC,0,aux.Stringid(code,0))
 		local e0=Effect.CreateEffect(e:GetHandler())
 		e0:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c65072009.lua

@@ -59,7 +59,7 @@ function c65072009.cop(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		local tc=g:GetFirst()
 		local code=tc:GetCode()
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 		Duel.Hint(HINT_MUSIC,0,aux.Stringid(code,0))
 		local e0=Effect.CreateEffect(e:GetHandler())
 		e0:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c65072011.lua

@@ -59,7 +59,7 @@ function c65072011.cop(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		local tc=g:GetFirst()
 		local code=tc:GetCode()
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 		Duel.Hint(HINT_MUSIC,0,aux.Stringid(code,0))
 		local e0=Effect.CreateEffect(e:GetHandler())
 		e0:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c81006037.lua

@@ -60,7 +60,7 @@ function cm.pcop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 	local g=Duel.SelectMatchingCard(tp,cm.pcfilter,tp,LOCATION_DECK,0,1,1,nil)
 	if g:GetCount()>0 then
-		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function cm.ritual_filter(c)

expansions/script/c81008002.lua

@@ -60,7 +60,7 @@ function c81008002.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not c:IsRelateToEffect(e) then return end
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) and Duel.Destroy(tc,REASON_EFFECT)~=0 then
-		Duel.MoveToField(c,tp,1-tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,1-tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function c81008002.cfilter(c)

expansions/script/c81008003.lua

@@ -61,7 +61,7 @@ function c81008003.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not c:IsRelateToEffect(e) then return end
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) and Duel.Destroy(tc,REASON_EFFECT)~=0 then
-		Duel.MoveToField(c,tp,1-tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,1-tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function c81008003.negcon(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c81008004.lua

@@ -58,7 +58,7 @@ function c81008004.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not c:IsRelateToEffect(e) then return end
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) and Duel.Destroy(tc,REASON_EFFECT)~=0 then
-		Duel.MoveToField(c,tp,1-tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,1-tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function c81008004.rmcon(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c81010034.lua

@@ -52,6 +52,6 @@ function c81010034.activate(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(81010034,1))
 		tg2=g:Select(tp,1,1,nil)
 	end
-	Duel.MoveToField(tg1:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
-	Duel.MoveToField(tg2:GetFirst(),tp,1-tp,LOCATION_SZONE,POS_FACEUP,true)
+	Duel.MoveToField(tg1:GetFirst(),tp,tp,LOCATION_FZONE,POS_FACEUP,true)
+	Duel.MoveToField(tg2:GetFirst(),tp,1-tp,LOCATION_FZONE,POS_FACEUP,true)
 end

expansions/script/c81010043.lua

@@ -63,7 +63,7 @@ function cm.cop(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		local tc=g:GetFirst()
 		local code=tc:GetCode()
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 		Duel.Hint(HINT_MUSIC,0,aux.Stringid(code,0))
 		local e0=Effect.CreateEffect(e:GetHandler())
 		e0:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c81011100.lua

@@ -145,6 +145,6 @@ function c81011100.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c81011106.lua

@@ -99,6 +99,6 @@ function c81011106.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c81012013.lua

@@ -56,6 +56,6 @@ function c81012013.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c81012018.lua

@@ -138,6 +138,6 @@ function c81012018.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c81012019.lua

@@ -132,6 +132,6 @@ function c81012019.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c81012034.lua

@@ -80,6 +80,6 @@ function c81012034.penop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.SelectMatchingCard(tp,c81012034.penfilter,tp,LOCATION_DECK,0,1,1,nil)
 	local tc=g:GetFirst()
 	if tc then
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c81012038.lua

@@ -111,6 +111,6 @@ function c81012038.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c81012039.lua

@@ -68,7 +68,7 @@ function c81012039.penop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local g=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
 	if c:IsRelateToEffect(e) then
-	   Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+	   Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	   if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(81012039,2)) then
 	   Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	   local sg=g:Select(tp,1,1,nil)

expansions/script/c81012043.lua

@@ -111,6 +111,6 @@ function c81012043.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c81012045.lua

@@ -81,7 +81,7 @@ function c81012045.spop(e,tp,eg,ep,ev,re,r,rp)
 		local g=Duel.SelectMatchingCard(tp,c81012045.penfilter,tp,LOCATION_EXTRA,0,1,1,nil)
 		local tc=g:GetFirst()
 		if tc then
-			Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+			Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 		end
 	end
 end

expansions/script/c81012046.lua

@@ -95,7 +95,7 @@ function c81012046.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function c81012046.exfilter(c)

expansions/script/c81012050.lua

@@ -151,6 +151,6 @@ function c81012050.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c81012053.lua

@@ -58,8 +58,8 @@ function c81012053.setop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 	local g2=Duel.SelectMatchingCard(tp,c81012053.setfilter2,tp,LOCATION_DECK,0,1,1,nil,tc1:GetCode())
 	local tc2=g2:GetFirst()
-	Duel.MoveToField(tc1,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
-	Duel.MoveToField(tc2,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+	Duel.MoveToField(tc1,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
+	Duel.MoveToField(tc2,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)

expansions/script/c81012056.lua

@@ -61,7 +61,7 @@ function c81012056.penop(e,tp,eg,ep,ev,re,r,rp)
 		local sg=Duel.SelectMatchingCard(tp,c81012056.penfilter,tp,LOCATION_EXTRA,0,1,1,nil)
 		local tc=sg:GetFirst()
 		if tc then
-			Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+			Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 		end
 	end
 end

expansions/script/c81012062.lua

@@ -62,7 +62,7 @@ function c81012062.setop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 	local g=Duel.SelectMatchingCard(tp,c81012062.setfilter,tp,LOCATION_GRAVE+LOCATION_EXTRA,0,1,1,nil)
 	if g:GetCount()>0 then
-		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function c81012062.recon(e)

expansions/script/c81014019.lua

@@ -121,6 +121,6 @@ function c81014019.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c81014026.lua

@@ -127,6 +127,6 @@ function c81014026.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c81014033.lua

@@ -86,7 +86,11 @@ function c81014033.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,eg,eg:GetCount(),0,0)
 end
 function c81014033.disop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.NegateSummon(eg)
-	Duel.Destroy(eg,REASON_EFFECT)
-	Duel.MoveToField(e:GetHandler(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
+	local c=e:GetHandler()
+	if c:IsRelateToEffect(e) then
+		Duel.NegateSummon(eg)
+		Duel.Destroy(eg,REASON_EFFECT)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
+	end
 end

expansions/script/c81041030.lua

@@ -138,6 +138,6 @@ function c81041030.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end