timing

a4e59873 · woodee · b3ea79ff · a4e59873 · a4e59873 · a4e59873
Commit a4e59873 authored Feb 16, 2016 by woodee
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

c59822133.lua c59822133.lua +1 -1

c96864811.lua c96864811.lua +1 -0

constant.lua constant.lua +3 -0

No files found.
--- a/c59822133.lua
+++ b/c59822133.lua
@@ -29,7 +29,7 @@ function c59822133.initial_effect(c)
 	e3:SetDescription(aux.Stringid(59822133,1))
 	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
-	e3:SetHintTiming(0,TIMING_END_PHASE)
+	e3:SetHintTiming(0,TIMINGS_CHECK_MONSTER_E)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCode(EVENT_FREE_CHAIN)
 	e3:SetCondition(c59822133.spcon)

--- a/c96864811.lua
+++ b/c96864811.lua
@@ -7,6 +7,7 @@ function c96864811.initial_effect(c)
 	e1:SetHintTiming(TIMING_DAMAGE_STEP)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER_E)
 	e1:SetCondition(c96864811.condition)
 	e1:SetTarget(c96864811.target)
 	e1:SetOperation(c96864811.activate)

--- a/constant.lua
+++ b/constant.lua
@@ -665,6 +665,9 @@ TIMING_TOGRAVE				=0x800000   	--进墓地时点
 TIMING_BATTLE_PHASE			=0x1000000  	--战斗阶段时点
 TIMING_EQUIP				=0x2000000  	--装备时点
 TIMING_BATTLE_STEP_END		=0x4000000  	--
+----组合时点
+TIMINGS_CHECK_MONSTER       =0x1c0 -- 怪兽正面上场
+TIMINGS_CHECK_MONSTER_E     =0x1e0 -- 怪兽正面上场 + EP
 --Global flag	--特殊标记
 GLOBALFLAG_DECK_REVERSE_CHECK	=0x1		--卡组翻转标记
 GLOBALFLAG_BRAINWASHING_CHECK	=0x2		--洗脑解除标记