PHASE_BATTLE_STEP

c15894048.lua

@@ -28,7 +28,7 @@ function c15894048.initial_effect(c)
 		Duel.RegisterEffect(ge1,0)
 		local ge2=Effect.CreateEffect(c)
 		ge2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		ge2:SetCode(EVENT_PHASE_START+PHASE_BATTLE)
+		ge2:SetCode(EVENT_PHASE_START+PHASE_BATTLE_START)
 		ge2:SetOperation(c15894048.clear)
 		Duel.RegisterEffect(ge2,0)
 	end

c27769400.lua

@@ -29,7 +29,7 @@ function c27769400.initial_effect(c)
 		c27769400[1]=0
 		local ge1=Effect.GlobalEffect()
 		ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		ge1:SetCode(EVENT_PHASE_START+PHASE_BATTLE)
+		ge1:SetCode(EVENT_PHASE_START+PHASE_BATTLE_START)
 		ge1:SetOperation(c27769400.checkop1)
 		Duel.RegisterEffect(ge1,0)
 		local ge2=Effect.GlobalEffect()

c41160533.lua

@@ -8,7 +8,7 @@ function c41160533.initial_effect(c)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_PHASE_START+PHASE_BATTLE)
+	e2:SetCode(EVENT_PHASE_START+PHASE_BATTLE_START)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetOperation(c41160533.maop)
 	c:RegisterEffect(e2)

c41382147.lua

@@ -40,7 +40,7 @@ function c41382147.rmop(e,tp,eg,ep,ev,re,r,rp)
 	if c:IsRelateToEffect(e) and c:IsFaceup() and Duel.Remove(c,POS_FACEUP,REASON_EFFECT+REASON_TEMPORARY)==1 then
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		e1:SetCode(EVENT_PHASE_START+PHASE_BATTLE)
+		e1:SetCode(EVENT_PHASE+PHASE_BATTLE_START)
 		e1:SetReset(RESET_PHASE+PHASE_END+RESET_SELF_TURN,2)
 		e1:SetLabelObject(c)
 		e1:SetCountLimit(1)

c59546797.lua

@@ -6,6 +6,7 @@ function c59546797.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_RECOVER)
 	e1:SetType(EFFECT_TYPE_QUICK_O)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetHintTiming(0,TIMING_BATTLE_STEP_END)
 	e1:SetRange(LOCATION_HAND)
 	e1:SetCountLimit(1,59546797)
 	e1:SetCondition(c59546797.spcon)
@@ -28,7 +29,7 @@ function c59546797.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c59546797.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE) and not Duel.CheckTiming(TIMING_BATTLE_START+TIMING_BATTLE_END)
+	return Duel.GetCurrentPhase()==PHASE_BATTLE_STEP
 end
 function c59546797.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return not e:GetHandler():IsStatus(STATUS_CHAINING) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
@@ -42,7 +43,7 @@ function c59546797.spop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
 		Duel.Recover(tp,1000,REASON_EFFECT)
 	elseif Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then
-		Duel.SendtoGrave(c,REASON_EFFECT)
+		Duel.SendtoGrave(c,REASON_RULE)
 	end
 end
 function c59546797.atkcon(e,tp,eg,ep,ev,re,r,rp)

c60399954.lua

@@ -33,7 +33,7 @@ function c60399954.operation(e,tp,eg,ep,ev,re,r,rp)
 	if tc:IsFaceup() and tc:IsRelateToEffect(e) then
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		e1:SetCode(EVENT_PHASE_START+PHASE_BATTLE)
+		e1:SetCode(EVENT_PHASE+PHASE_BATTLE_START)
 		e1:SetRange(LOCATION_MZONE)
 		e1:SetCountLimit(1)
 		e1:SetOperation(c60399954.atkop)

c62023839.lua

@@ -33,7 +33,7 @@ function c62023839.spop(e,tp,eg,ep,ev,re,r,rp)
 	if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)>0 then
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		e1:SetCode(EVENT_PHASE_START+PHASE_BATTLE)
+		e1:SetCode(EVENT_PHASE+PHASE_BATTLE_START)
 		e1:SetCountLimit(1)
 		e1:SetOperation(c62023839.desop)
 		e1:SetReset(RESET_PHASE+PHASE_END)

constant.lua

@@ -31,7 +31,7 @@ NO_FLIP_EFFECT			=0x10000--不发动反转效果
 TYPE_MONSTER		=0x1		--怪兽卡
 TYPE_SPELL			=0x2		--魔法卡
 TYPE_TRAP			=0x4		--陷阱卡
-TYPE_NORMAL			=0x10		--通常
+TYPE_NORMAL			=0x10		--通常怪兽
 TYPE_EFFECT			=0x20		--效果
 TYPE_FUSION			=0x40		--融合
 TYPE_RITUAL			=0x80		--仪式
@@ -664,6 +664,7 @@ TIMING_TODECK				=0x400000   	--回卡组时点
 TIMING_TOGRAVE				=0x800000   	--进墓地时点
 TIMING_BATTLE_PHASE			=0x1000000  	--战斗阶段时点
 TIMING_EQUIP				=0x2000000  	--装备时点
+TIMING_BATTLE_STEP_END		=0x4000000  	--
 --Global flag	--特殊标记
 GLOBALFLAG_DECK_REVERSE_CHECK	=0x1		--卡组翻转标记
 GLOBALFLAG_BRAINWASHING_CHECK	=0x2		--洗脑解除标记