Merge remote-tracking branch 'upstream/master' into master

c11102908.lua

@@ -18,7 +18,7 @@ function c11102908.initial_effect(c)
 end
 function c11102908.atkcon(e)
 	local d=Duel.GetAttackTarget()
-	return Duel.GetCurrentPhase()==PHASE_DAMAGE_CAL and d and d:IsSetCard(0x3d)
+	return Duel.GetCurrentPhase()==PHASE_DAMAGE_CAL and d and d:IsSetCard(0x103d)
 end
 function c11102908.atktg(e,c)
 	return c==Duel.GetAttacker()

c12324546.lua

@@ -36,10 +36,10 @@ function c12324546.initial_effect(c)
 	c:RegisterEffect(e5)
 end
 function c12324546.eqlimit(e,c)
-	return c:IsSetCard(0x3d)
+	return c:IsSetCard(0x103d)
 end
 function c12324546.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c12324546.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c12324546.filter(chkc) end

c1498130.lua

@@ -16,7 +16,7 @@ function c1498130.tgcon(e,tp,eg,ep,ev,re,r,rp)
 	if not g or g:GetCount()~=1 then return false end
 	local tc=g:GetFirst()
 	local c=e:GetHandler()
-	if tc==c or tc:IsControler(1-tp) or tc:IsFacedown() or not tc:IsLocation(LOCATION_MZONE) or not tc:IsSetCard(0x3d) then return false end
+	if tc==c or tc:IsControler(1-tp) or tc:IsFacedown() or not tc:IsLocation(LOCATION_MZONE) or not tc:IsSetCard(0x103d) then return false end
 	return Duel.CheckChainTarget(ev,c)
 end
 function c1498130.tgop(e,tp,eg,ep,ev,re,r,rp)

c15327215.lua

@@ -26,7 +26,7 @@ function c15327215.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c15327215.cfilter(c,tp)
-	return c:IsFaceup() and c:IsSummonPlayer(tp) and c:IsSetCard(0x103d)
+	return c:IsFaceup() and c:IsSummonPlayer(tp) and c:IsSetCard(0x903d)
 end
 function c15327215.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c15327215.cfilter,1,nil,tp)
@@ -43,7 +43,7 @@ function c15327215.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c15327215.filter(c,mc)
-	return c:IsLevelBelow(4) and c:IsSetCard(0x3d) and c:IsAbleToRemoveAsCost()
+	return c:IsLevelBelow(4) and c:IsSetCard(0x103d) and c:IsAbleToRemoveAsCost()
 		and not (c:IsLevel(mc:GetLevel()) and c:IsAttribute(mc:GetAttribute()) and c:IsAttack(mc:GetAttack()) and c:IsDefense(mc:GetDefense()))
 end
 function c15327215.cost(e,tp,eg,ep,ev,re,r,rp,chk)

c1828513.lua

 --六武衆の影－紫炎
 function c1828513.initial_effect(c)
 	--xyz summon
-	aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x3d),4,2)
+	aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x103d),4,2)
 	c:EnableReviveLimit()
 	--attack up
 	local e1=Effect.CreateEffect(c)
@@ -23,7 +23,7 @@ function c1828513.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
 end
 function c1828513.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and c:IsAttackBelow(2000)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and c:IsAttackBelow(2000)
 end
 function c1828513.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c1828513.filter(chkc) end

c21007444.lua

@@ -11,7 +11,7 @@ function c21007444.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c21007444.filter(c,e,tp)
-	return c:IsSetCard(0x3d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_ATTACK)
+	return c:IsSetCard(0x103d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_ATTACK)
 end
 function c21007444.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE) and c21007444.filter(chkc,e,tp) end

c2511717.lua

@@ -20,7 +20,7 @@ function c2511717.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c2511717.filter(c,e,tp)
-	return c:IsLevelBelow(4) and c:IsSetCard(0x3d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsLevelBelow(4) and c:IsSetCard(0x103d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c2511717.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
@@ -36,7 +36,7 @@ function c2511717.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c2511717.atkfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and not c:IsCode(2511717)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and not c:IsCode(2511717)
 end
 function c2511717.atkcon(e)
 	local c=e:GetHandler()

c27178262.lua

@@ -12,7 +12,7 @@ function c27178262.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c27178262.costfilter(c,ft)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and c:IsAbleToGraveAsCost() and (ft>0 or c:GetSequence()<5)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and c:IsAbleToGraveAsCost() and (ft>0 or c:GetSequence()<5)
 end
 function c27178262.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
@@ -22,7 +22,7 @@ function c27178262.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SendtoGrave(g,REASON_COST)
 end
 function c27178262.filter(c,e,tp)
-	return c:IsSetCard(0x3d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x103d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c27178262.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and c27178262.filter(chkc,e,tp) end

c27782503.lua

@@ -21,7 +21,7 @@ function c27782503.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c27782503.cfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and not c:IsCode(27782503)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and not c:IsCode(27782503)
 end
 function c27782503.descon(e,tp,eg,ep,ev,re,r,rp)
 	local d=Duel.GetAttackTarget()
@@ -39,7 +39,7 @@ function c27782503.desop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c27782503.repfilter(c,e)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsDestructable(e) and not c:IsStatus(STATUS_DESTROY_CONFIRMED+STATUS_BATTLE_DESTROYED)
 end
 function c27782503.desreptg(e,tp,eg,ep,ev,re,r,rp,chk)

c27821104.lua

@@ -11,10 +11,10 @@ function c27821104.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c27821104.tfilter(c,atk,code,e,tp)
-	return c:IsSetCard(0x3d) and not c:IsCode(code) and c:IsAttack(atk) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x103d) and not c:IsCode(code) and c:IsAttack(atk) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c27821104.filter(c,e,tp)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and Duel.IsExistingMatchingCard(c27821104.tfilter,tp,LOCATION_DECK,0,1,nil,c:GetAttack(),c:GetCode(),e,tp)
 end
 function c27821104.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)

c27970830.lua

@@ -51,7 +51,7 @@ function c27970830.initial_effect(c)
 end
 c27970830.counter_add_list={0x3}
 function c27970830.ctfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c27970830.ctop(e,tp,eg,ep,ev,re,r,rp)
 	if eg:IsExists(c27970830.ctfilter,1,nil) then
@@ -64,7 +64,7 @@ function c27970830.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RemoveCounter(tp,1,0,0x3,2,REASON_COST)
 end
 function c27970830.filter1(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d,0x20) and c:IsType(TYPE_EFFECT)
+	return c:IsFaceup() and c:IsSetCard(0x103d,0x20) and c:IsType(TYPE_EFFECT)
 end
 function c27970830.tg1(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c27970830.filter1(chkc) end
@@ -90,7 +90,7 @@ function c27970830.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RemoveCounter(tp,1,0,0x3,4,REASON_COST)
 end
 function c27970830.filter2(c)
-	return c:IsType(TYPE_MONSTER) and c:IsSetCard(0x3d) and c:IsAbleToHand()
+	return c:IsType(TYPE_MONSTER) and c:IsSetCard(0x103d) and c:IsAbleToHand()
 end
 function c27970830.tg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingMatchingCard(c27970830.filter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end

c29981921.lua

 --真六武衆－シエン
 function c29981921.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsRace,RACE_WARRIOR),aux.NonTuner(Card.IsSetCard,0x3d),1)
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsRace,RACE_WARRIOR),aux.NonTuner(Card.IsSetCard,0x103d),1)
 	c:EnableReviveLimit()
 	--negate
 	local e1=Effect.CreateEffect(c)
@@ -43,7 +43,7 @@ function c29981921.disop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c29981921.repfilter(c,e)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsDestructable(e) and not c:IsStatus(STATUS_DESTROY_CONFIRMED+STATUS_BATTLE_DESTROYED)
 end
 function c29981921.desreptg(e,tp,eg,ep,ev,re,r,rp,chk)

c31904181.lua

@@ -18,13 +18,13 @@ function c31904181.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c31904181.cfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and not c:IsCode(31904181)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and not c:IsCode(31904181)
 end
 function c31904181.dircon(e)
 	return Duel.IsExistingMatchingCard(c31904181.cfilter,e:GetHandler():GetControler(),LOCATION_MZONE,0,1,nil)
 end
 function c31904181.repfilter(c,e)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsDestructable(e) and not c:IsStatus(STATUS_DESTROY_CONFIRMED+STATUS_BATTLE_DESTROYED)
 end
 function c31904181.desreptg(e,tp,eg,ep,ev,re,r,rp,chk)

c32543380.lua

@@ -16,6 +16,7 @@ function c32543380.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_MUST_ATTACK)
 	e2:SetRange(LOCATION_MZONE)
+	e2:SetCondition(c32543380.bpcon)
 	e2:SetTargetRange(0,LOCATION_MZONE)
 	c:RegisterEffect(e2)
 	local e3=e2:Clone()
@@ -55,6 +56,9 @@ function c32543380.spop(e,tp,eg,ep,ev,re,r,rp,c)
 	local g=e:GetLabelObject()
 	Duel.SendtoGrave(g,REASON_SPSUMMON)
 end
+function c32543380.bpcon(e)
+	return Duel.IsTurnPlayer(1-e:GetHandlerPlayer()) and Duel.IsBattlePhase()
+end
 function c32543380.atklimit(e,c)
 	return c==e:GetHandler()
 end

c32603633.lua

@@ -16,7 +16,7 @@ function c32603633.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.PayLPCost(tp,lp-100)
 end
 function c32603633.filter(c,e,tp)
-	return c:IsSetCard(0x3d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x103d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 		and not Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,c:GetCode())
 end
 function c32603633.tg(e,tp,eg,ep,ev,re,r,rp,chk)

c33883834.lua

@@ -15,7 +15,7 @@ end
 function c33883834.con(e,tp,eg,ep,ev,re,r,rp)
 	local a=Duel.GetAttacker()
 	local d=Duel.GetAttackTarget()
-	return d and ((a:IsControler(tp) and a:IsSetCard(0x3d)) or (d:IsControler(tp) and d:IsSetCard(0x3d)))
+	return d and ((a:IsControler(tp) and a:IsSetCard(0x103d)) or (d:IsControler(tp) and d:IsSetCard(0x103d)))
 		and Duel.GetFlagEffect(tp,33883834)==0
 end
 function c33883834.cost(e,tp,eg,ep,ev,re,r,rp,chk)

c33964637.lua

@@ -43,10 +43,10 @@ function c33964637.splimit(e,se,sp,st)
 	return not e:GetHandler():IsLocation(LOCATION_EXTRA)
 end
 function c33964637.ffilter(c,fc,sub,mg,sg)
-	return c:IsFusionSetCard(0x3d) and (not sg or not sg:IsExists(Card.IsFusionAttribute,1,c,c:GetFusionAttribute()))
+	return c:IsFusionSetCard(0x103d) and (not sg or not sg:IsExists(Card.IsFusionAttribute,1,c,c:GetFusionAttribute()))
 end
 function c33964637.costfilter(c,tp)
-	return c:IsSetCard(0x3d) and c:IsAbleToRemoveAsCost() and (c:IsLocation(LOCATION_HAND) or c:IsFaceup())
+	return c:IsSetCard(0x103d) and c:IsAbleToRemoveAsCost() and (c:IsLocation(LOCATION_HAND) or c:IsFaceup())
 		and Duel.IsExistingTarget(Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,c)
 end
 function c33964637.rmcost(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -70,7 +70,7 @@ function c33964637.rmop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c33964637.repfilter(c,tp)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsLocation(LOCATION_MZONE) and c:IsControler(tp) and c:IsReason(REASON_EFFECT+REASON_BATTLE) and not c:IsReason(REASON_REPLACE)
 end
 function c33964637.reptg(e,tp,eg,ep,ev,re,r,rp,chk)

c38280762.lua

@@ -32,7 +32,7 @@ function c38280762.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c38280762.spfilter(c)
-	return c:IsSetCard(0x3d) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemoveAsCost()
+	return c:IsSetCard(0x103d) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemoveAsCost()
 end
 function c38280762.spcon(e,c)
 	if c==nil then return true end

c41458579.lua

@@ -12,7 +12,7 @@ function c41458579.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c41458579.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c41458579.condition(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.IsExistingMatchingCard(c41458579.filter,tp,LOCATION_MZONE,0,1,nil) then return false end

c43618262.lua

@@ -20,9 +20,9 @@ function c43618262.cfop(e,tp,eg,ep,ev,re,r,rp)
 	if g:FilterCount(Card.IsAbleToHand,nil,tp)==0 then return end
 	Duel.ConfirmDecktop(1-p,5)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	Duel.PreserveSelectDeckSequence(true)
+	Duel.RevealSelectDeckSequence(true)
 	local tc=g:FilterSelect(tp,Card.IsAbleToHand,1,1,nil,tp):GetFirst()
-	Duel.PreserveSelectDeckSequence(false)
+	Duel.RevealSelectDeckSequence(false)
 	local num=math.floor(3000/100)
 	local t={}
 	for i=1,num do

c44686185.lua

@@ -26,7 +26,7 @@ function c44686185.filter0(c)
 	return c:IsLocation(LOCATION_MZONE) and c:GetSequence()<5
 end
 function c44686185.filter1(c)
-	return c:IsSetCard(0x3d) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemoveAsCost() and (c:IsLocation(LOCATION_GRAVE) or c:IsFaceup())
+	return c:IsSetCard(0x103d) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemoveAsCost() and (c:IsLocation(LOCATION_GRAVE) or c:IsFaceup())
 end
 function c44686185.filter3(c,e,tp)
 	return c44686185.filter1(c)
@@ -49,7 +49,7 @@ function c44686185.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Remove(g1,POS_FACEUP,REASON_COST)
 end
 function c44686185.filter2(c,e,tp)
-	return c:IsSetCard(0x3d) and not c:IsCode(44686185) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x103d) and not c:IsCode(44686185) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c44686185.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c44686185.filter2(chkc,e,tp) end
@@ -65,7 +65,7 @@ function c44686185.operation(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c44686185.repfilter(c,tp)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsLocation(LOCATION_MZONE) and c:IsControler(tp) and c:IsReason(REASON_EFFECT) and not c:IsReason(REASON_REPLACE)
 end
 function c44686185.reptg(e,tp,eg,ep,ev,re,r,rp,chk)

c46874015.lua

@@ -11,7 +11,7 @@ function c46874015.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c46874015.filter(c,e,tp)
-	return c:IsSetCard(0x3d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x103d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c46874015.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c46874015.filter(chkc,e,tp) end

c47436247.lua

@@ -29,7 +29,7 @@ function c47436247.initial_effect(c)
 end
 c47436247.counter_add_list={0x3}
 function c47436247.ctfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c47436247.ctop(e,tp,eg,ep,ev,re,r,rp)
 	if eg:IsExists(c47436247.ctfilter,1,nil) then
@@ -43,7 +43,7 @@ function c47436247.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SendtoGrave(e:GetHandler(),REASON_COST)
 end
 function c47436247.filter(c,ct,e,tp)
-	return c:IsLevelBelow(ct) and c:IsSetCard(0x3d,0x20)
+	return c:IsLevelBelow(ct) and c:IsSetCard(0x103d,0x20)
 		and c:IsType(TYPE_EFFECT) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c47436247.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

c48505422.lua

@@ -32,7 +32,7 @@ function c48505422.rlcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c48505422.filter(c)
-	return c:IsSetCard(0x3d) and not c:IsCode(48505422) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+	return c:IsSetCard(0x103d) and not c:IsCode(48505422) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function c48505422.rltg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE) and c48505422.filter(chkc) end

c49721904.lua

@@ -22,7 +22,7 @@ function c49721904.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c49721904.spfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and not c:IsCode(49721904)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and not c:IsCode(49721904)
 end
 function c49721904.spcon(e,c)
 	if c==nil then return true end
@@ -30,7 +30,7 @@ function c49721904.spcon(e,c)
 		and Duel.IsExistingMatchingCard(c49721904.spfilter,c:GetControler(),LOCATION_MZONE,0,1,nil)
 end
 function c49721904.vfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c49721904.valcon(e)
 	local c=e:GetHandler()

c53819808.lua

@@ -27,7 +27,7 @@ function c53819808.initial_effect(c)
 end
 c53819808.counter_add_list={0x3}
 function c53819808.ctfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c53819808.ctop(e,tp,eg,ep,ev,re,r,rp)
 	if eg:IsExists(c53819808.ctfilter,1,nil) then

c54031490.lua

@@ -10,7 +10,7 @@ function c54031490.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c54031490.filter(c)
-	return c:IsSetCard(0x3d) and c:IsLevelBelow(3) and c:IsAbleToHand()
+	return c:IsSetCard(0x103d) and c:IsLevelBelow(3) and c:IsAbleToHand()
 end
 function c54031490.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c54031490.filter,tp,LOCATION_DECK,0,1,nil) end

c54913680.lua

@@ -11,7 +11,7 @@ function c54913680.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c54913680.rfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c54913680.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e:SetLabel(1)

c61650133.lua

@@ -7,6 +7,7 @@ function c61650133.initial_effect(c)
 	c:RegisterEffect(e1)
 	--maintain
 	local e2=Effect.CreateEffect(c)
+	e2:SetDescription(aux.Stringid(61650133,0))
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e2:SetCode(EVENT_PHASE+PHASE_END)
@@ -17,7 +18,7 @@ function c61650133.initial_effect(c)
 	c:RegisterEffect(e2)
 	--remove
 	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(61650133,0))
+	e3:SetDescription(aux.Stringid(61650133,1))
 	e3:SetCategory(CATEGORY_REMOVE)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e3:SetCode(EVENT_SPSUMMON_SUCCESS)

c63176202.lua

@@ -44,7 +44,7 @@ function c63176202.initial_effect(c)
 	c:RegisterEffect(e5)
 end
 function c63176202.spfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c63176202.spcon(e,c)
 	if c==nil then return true end
@@ -53,7 +53,7 @@ function c63176202.spcon(e,c)
 		and Duel.IsExistingMatchingCard(c63176202.spfilter,tp,LOCATION_MZONE,0,2,nil)
 end
 function c63176202.repfilter(c,e)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsDestructable(e) and not c:IsStatus(STATUS_DESTROY_CONFIRMED+STATUS_BATTLE_DESTROYED)
 end
 function c63176202.desreptg(e,tp,eg,ep,ev,re,r,rp,chk)

c6357341.lua

@@ -10,7 +10,7 @@ function c6357341.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c6357341.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c6357341.condition(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(c6357341.filter,tp,LOCATION_MZONE,0,nil)

c64398890.lua

@@ -24,7 +24,7 @@ function c64398890.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c64398890.cfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and not c:IsCode(64398890)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and not c:IsCode(64398890)
 end
 function c64398890.descon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c64398890.cfilter,tp,LOCATION_MZONE,0,1,nil)
@@ -56,7 +56,7 @@ function c64398890.desop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c64398890.repfilter(c,e)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsDestructable(e) and not c:IsStatus(STATUS_DESTROY_CONFIRMED+STATUS_BATTLE_DESTROYED)
 end
 function c64398890.desreptg(e,tp,eg,ep,ev,re,r,rp,chk)

c65685470.lua

@@ -64,10 +64,10 @@ function c65685470.initial_effect(c)
 end
 c65685470.old_union=true
 function c65685470.eqlimit(e,c)
-	return c:IsSetCard(0x3d)
+	return c:IsSetCard(0x103d)
 end
 function c65685470.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and c:GetUnionCount()==0
+	return c:IsFaceup() and c:IsSetCard(0x103d) and c:GetUnionCount()==0
 end
 function c65685470.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c65685470.filter(chkc) end

c6579928.lua

@@ -23,7 +23,7 @@ function c6579928.filter(c,att)
 	return c:IsFaceup() and c:IsAttribute(att)
 end
 function c6579928.thfilter(c,tp)
-	return c:IsSetCard(0x3d) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+	return c:IsSetCard(0x103d) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 		and not Duel.IsExistingMatchingCard(c6579928.filter,tp,LOCATION_MZONE,0,1,nil,c:GetAttribute())
 end
 function c6579928.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -39,7 +39,7 @@ function c6579928.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c6579928.repfilter(c,tp)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsLocation(LOCATION_MZONE) and c:IsControler(tp) and c:IsReason(REASON_EFFECT) and not c:IsReason(REASON_REPLACE)
 end
 function c6579928.reptg(e,tp,eg,ep,ev,re,r,rp,chk)

c69025477.lua

@@ -17,13 +17,13 @@ function c69025477.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c69025477.cfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and not c:IsCode(69025477)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and not c:IsCode(69025477)
 end
 function c69025477.dircon(e)
 	return Duel.IsExistingMatchingCard(c69025477.cfilter,e:GetHandler():GetControler(),LOCATION_MZONE,0,1,nil)
 end
 function c69025477.repfilter(c,e)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsDestructable(e) and not c:IsStatus(STATUS_DESTROY_CONFIRMED+STATUS_BATTLE_DESTROYED)
 end
 function c69025477.desreptg(e,tp,eg,ep,ev,re,r,rp,chk)

c70180284.lua

@@ -25,13 +25,13 @@ function c70180284.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c70180284.tgcfilter(c,tp)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and c:IsControler(tp)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and c:IsControler(tp)
 end
 function c70180284.tgcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg and eg:IsExists(c70180284.tgcfilter,1,e:GetHandler(),tp)
 end
 function c70180284.tgfilter(c)
-	return c:IsSetCard(0x3d) and c:IsAbleToGrave()
+	return c:IsSetCard(0x103d) and c:IsAbleToGrave()
 end
 function c70180284.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c70180284.tgfilter,tp,LOCATION_DECK,0,1,nil) end
@@ -45,7 +45,7 @@ function c70180284.tgop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c70180284.repfilter(c,tp)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsLocation(LOCATION_MZONE) and c:IsControler(tp) and c:IsReason(REASON_EFFECT) and not c:IsReason(REASON_REPLACE)
 end
 function c70180284.reptg(e,tp,eg,ep,ev,re,r,rp,chk)

c71207871.lua

@@ -25,7 +25,7 @@ function c71207871.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return bit.band(r,REASON_EFFECT+REASON_BATTLE)~=0
 end
 function c71207871.spfilter(c,e,tp)
-	return c:IsSetCard(0x3d) and not c:IsCode(71207871) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x103d) and not c:IsCode(71207871) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c71207871.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
@@ -40,7 +40,7 @@ function c71207871.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c71207871.repfilter(c,tp)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsLocation(LOCATION_MZONE) and c:IsControler(tp) and c:IsReason(REASON_EFFECT) and not c:IsReason(REASON_REPLACE)
 end
 function c71207871.reptg(e,tp,eg,ep,ev,re,r,rp,chk)

c71934924.lua

@@ -21,7 +21,7 @@ function c71934924.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c71934924.check(c,tp)
-	return c and c:IsSetCard(0x3d) and c:IsControler(tp)
+	return c and c:IsSetCard(0x103d) and c:IsControler(tp)
 end
 function c71934924.atop(e,tp,eg,ep,ev,re,r,rp)
 	if c71934924.check(Duel.GetAttacker(),tp) or c71934924.check(Duel.GetAttackTarget(),tp) then
@@ -29,7 +29,7 @@ function c71934924.atop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c71934924.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and c:GetFlagEffect(71934924)==0
+	return c:IsFaceup() and c:IsSetCard(0x103d) and c:GetFlagEffect(71934924)==0
 end
 function c71934924.upop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

c72345736.lua

@@ -30,7 +30,7 @@ function c72345736.initial_effect(c)
 end
 c72345736.counter_add_list={0x3}
 function c72345736.ctfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c72345736.ctop(e,tp,eg,ep,ev,re,r,rp)
 	if eg:IsExists(c72345736.ctfilter,1,nil) then

c7291576.lua

@@ -21,7 +21,7 @@ function c7291576.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c7291576.thfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+	return c:IsFaceup() and c:IsSetCard(0x103d) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function c7291576.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_REMOVED) and c7291576.thfilter(chkc) end
@@ -37,7 +37,7 @@ function c7291576.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c7291576.repfilter(c,tp)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsLocation(LOCATION_MZONE) and c:IsControler(tp) and c:IsReason(REASON_EFFECT) and not c:IsReason(REASON_REPLACE)
 end
 function c7291576.reptg(e,tp,eg,ep,ev,re,r,rp,chk)

c74094021.lua

@@ -30,7 +30,7 @@ function c74094021.spcon(e,c)
 		Duel.IsExistingMatchingCard(c74094021.spfilter,c:GetControler(),LOCATION_ONFIELD,0,1,nil)
 end
 function c74094021.costfilter(c,tp)
-	return c:IsSetCard(0x3d) and (c:IsControler(tp) or c:IsFaceup())
+	return c:IsSetCard(0x103d) and (c:IsControler(tp) or c:IsFaceup())
 end
 function c74094021.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckReleaseGroup(tp,c74094021.costfilter,1,e:GetHandler(),tp) end

c74752631.lua

@@ -39,7 +39,7 @@ function c74752631.initial_effect(c)
 end
 c74752631.counter_add_list={0x3}
 function c74752631.lcheck(g,lc)
-	return g:IsExists(Card.IsLinkSetCard,1,nil,0x3d)
+	return g:IsExists(Card.IsLinkSetCard,1,nil,0x103d)
 end
 function c74752631.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK)
@@ -65,9 +65,9 @@ function c74752631.thop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c74752631.cfilter(c,ec)
 	if c:IsLocation(LOCATION_MZONE) then
-		return c:IsSetCard(0x3d) and c:IsFaceup() and ec:GetLinkedGroup():IsContains(c)
+		return c:IsSetCard(0x103d) and c:IsFaceup() and ec:GetLinkedGroup():IsContains(c)
 	else
-		return c:IsPreviousSetCard(0x3d) and c:IsPreviousPosition(POS_FACEUP)
+		return c:IsPreviousSetCard(0x103d) and c:IsPreviousPosition(POS_FACEUP)
 			and bit.extract(ec:GetLinkedZone(c:GetPreviousControler()),c:GetPreviousSequence())~=0
 	end
 end

c75116619.lua

@@ -29,13 +29,13 @@ function c75116619.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c75116619.cfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and not c:IsCode(75116619)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and not c:IsCode(75116619)
 end
 function c75116619.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c75116619.cfilter,tp,LOCATION_MZONE,0,1,nil)
 end
 function c75116619.costfilter(c)
-	return c:IsSetCard(0x3d) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemoveAsCost()
+	return c:IsSetCard(0x103d) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemoveAsCost()
 end
 function c75116619.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c75116619.costfilter,tp,LOCATION_GRAVE,0,2,nil) end
@@ -61,7 +61,7 @@ function c75116619.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c75116619.vfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and not c:IsCode(75116619)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and not c:IsCode(75116619)
 end
 function c75116619.valcon(e)
 	local c=e:GetHandler()

c75525309.lua

@@ -16,7 +16,7 @@ function c75525309.condition(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetFieldGroup(tp,LOCATION_MZONE,0)
 	local ct=g:GetCount()
 	local tg=g:GetFirst()
-	return ct==1 and tg:IsFaceup() and tg:IsAttackPos() and tg:IsSetCard(0x3d)
+	return ct==1 and tg:IsFaceup() and tg:IsAttackPos() and tg:IsSetCard(0x103d)
 end
 function c75525309.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(1-tp) and chkc:IsOnField() and chkc:IsAbleToHand() end

c77847678.lua

@@ -11,13 +11,13 @@ function c77847678.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c77847678.cfilter(c,tp)
-	return c:IsSetCard(0x3d) and c:IsPreviousControler(tp)
+	return c:IsSetCard(0x103d) and c:IsPreviousControler(tp)
 end
 function c77847678.condition(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c77847678.cfilter,1,nil,tp)
 end
 function c77847678.filter(c,e,tp)
-	return c:IsSetCard(0x3d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x103d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c77847678.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

c78792195.lua

@@ -14,14 +14,14 @@ function c78792195.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c78792195.confilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c78792195.con(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c78792195.confilter,tp,LOCATION_MZONE,0,1,e:GetHandler())
 end
 function c78792195.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.CheckReleaseGroup(tp,Card.IsSetCard,1,nil,0x3d) end
-	local sg=Duel.SelectReleaseGroup(tp,Card.IsSetCard,1,1,nil,0x3d)
+	if chk==0 then return Duel.CheckReleaseGroup(tp,Card.IsSetCard,1,nil,0x103d) end
+	local sg=Duel.SelectReleaseGroup(tp,Card.IsSetCard,1,1,nil,0x103d)
 	Duel.Release(sg,REASON_COST)
 end
 function c78792195.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)

c79968632.lua

@@ -19,7 +19,7 @@ function c79968632.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SendtoGrave(g,REASON_COST)
 end
 function c79968632.filter(c,e,tp)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c79968632.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_REMOVED) and c79968632.filter(chkc,e,tp) end

c81426505.lua

@@ -11,7 +11,7 @@ function c81426505.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c81426505.confilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c81426505.descon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c81426505.confilter,tp,LOCATION_MZONE,0,3,nil)

c83039729.lua

@@ -22,7 +22,7 @@ function c83039729.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c83039729.spfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c83039729.spcon(e,c)
 	if c==nil then return true end
@@ -34,7 +34,7 @@ function c83039729.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return not c:IsReason(REASON_BATTLE) and rp==1-tp and c:IsPreviousControler(tp)
 end
 function c83039729.filter(c)
-	return c:IsSetCard(0x3d) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+	return c:IsSetCard(0x103d) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function c83039729.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE) and c83039729.filter(chkc) end

c84613836.lua

@@ -21,7 +21,7 @@ function c84613836.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return ep==tp and Duel.GetCurrentPhase()==PHASE_DRAW
 end
 function c84613836.filter(c,e,tp)
-	return c:IsSetCard(0x3d) and c:IsType(TYPE_MONSTER) and not c:IsPublic() and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x103d) and c:IsType(TYPE_MONSTER) and not c:IsPublic() and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c84613836.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and eg:IsExists(c84613836.filter,1,nil,e,tp) end

c86676862.lua

@@ -26,6 +26,7 @@ function c86676862.initial_effect(c)
 	e4:SetType(EFFECT_TYPE_FIELD)
 	e4:SetCode(EFFECT_MUST_ATTACK)
 	e4:SetRange(LOCATION_MZONE)
+	e4:SetCondition(c86676862.poscon)
 	e4:SetTargetRange(0,LOCATION_MZONE)
 	c:RegisterEffect(e4)
 	local e5=e4:Clone()
@@ -39,9 +40,7 @@ function c86676862.ffilter(c)
 	return c:IsRace(RACE_FIEND) and c:IsLevelAbove(6)
 end
 function c86676862.poscon(e)
-	local ph=Duel.GetCurrentPhase()
-	return Duel.GetTurnPlayer()~=e:GetHandler():GetControler()
-		and ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE
+	return Duel.IsTurnPlayer(1-e:GetHandlerPlayer()) and Duel.IsBattlePhase()
 end
 function c86676862.atklimit(e,c)
 	return c==e:GetHandler()

c90397998.lua

@@ -24,7 +24,7 @@ function c90397998.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c90397998.cfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and not c:IsCode(90397998)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and not c:IsCode(90397998)
 end
 function c90397998.descon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c90397998.cfilter,tp,LOCATION_MZONE,0,1,nil)
@@ -56,7 +56,7 @@ function c90397998.desop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c90397998.repfilter(c,e)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsDestructable(e) and not c:IsStatus(STATUS_DESTROY_CONFIRMED+STATUS_BATTLE_DESTROYED)
 end
 function c90397998.desreptg(e,tp,eg,ep,ev,re,r,rp,chk)

c94392192.lua

@@ -85,9 +85,9 @@ function c94392192.rmop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.ConfirmDecktop(1-tp,ct)
 	local g=Duel.GetDecktopGroup(1-tp,ct)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	Duel.PreserveSelectDeckSequence(true)
+	Duel.RevealSelectDeckSequence(true)
 	local sg=g:FilterSelect(tp,c94392192.rmfilter,1,1,nil,tp)
-	Duel.PreserveSelectDeckSequence(false)
+	Duel.RevealSelectDeckSequence(false)
 	if #sg>0 then
 		Duel.DisableShuffleCheck(true)
 		Duel.Remove(sg,POS_FACEDOWN,REASON_EFFECT)

c95519486.lua

@@ -21,7 +21,7 @@ function c95519486.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c95519486.cfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and not c:IsCode(95519486)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and not c:IsCode(95519486)
 end
 function c95519486.descon(e,tp,eg,ep,ev,re,r,rp)
 	return aux.dsercon(e,tp,eg,ep,ev,re,r,rp) and e:GetHandler()==Duel.GetAttacker() and Duel.GetAttackTarget()
@@ -38,7 +38,7 @@ function c95519486.desop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c95519486.repfilter(c,e)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsDestructable(e) and not c:IsStatus(STATUS_DESTROY_CONFIRMED+STATUS_BATTLE_DESTROYED)
 end
 function c95519486.desreptg(e,tp,eg,ep,ev,re,r,rp,chk)

c96218085.lua

@@ -14,7 +14,7 @@ function c96218085.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()<PHASE_MAIN2
 end
 function c96218085.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c96218085.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c96218085.filter(chkc) end
@@ -35,7 +35,7 @@ function c96218085.activate(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c96218085.filter2(c)
-	return c:IsFaceup() and (c:IsSetCard(0x3d) or c:IsCode(63176202))
+	return c:IsFaceup() and (c:IsSetCard(0x103d) or c:IsCode(63176202))
 end
 function c96218085.desop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(c96218085.filter2,tp,LOCATION_MZONE,0,nil)

c98126725.lua

@@ -11,7 +11,7 @@ function c98126725.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c98126725.cfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c98126725.atcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c98126725.cfilter,tp,LOCATION_MZONE,0,1,nil)

c99675356.lua

@@ -15,7 +15,7 @@ function c99675356.condition(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsLocation(LOCATION_GRAVE) and e:GetHandler():IsReason(REASON_BATTLE)
 end
 function c99675356.filter(c,e,tp)
-	return c:IsLevelBelow(3) and c:IsSetCard(0x3d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsLevelBelow(3) and c:IsSetCard(0x103d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c99675356.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

constant.lua

@@ -868,6 +868,7 @@ DUEL_PSEUDO_SHUFFLE		=0x10		--不洗牌
 DUEL_TAG_MODE			=0x20		--双打PP
 DUEL_SIMPLE_AI			=0x40		--AI(用于残局)
 DUEL_RETURN_DECK_TOP	=0x80		--回卡组洗切的卡放到卡组最上方（不洗牌模式下曾经的默认行为）
+DUEL_REVEAL_DECK_SEQ	=0x100		--从卡组选卡显示实际顺序（曾经的默认行为）
 --Activity counter
 --global: 1-6 (binary: 5,6)
 --custom: 1-5,7 (binary: 1-5)