Commit 7a84ffdd authored by mercury233's avatar mercury233
parents b1f9ca97 ee510208
...@@ -478,6 +478,7 @@ inline effect_flag operator|(effect_flag flag1, effect_flag flag2) ...@@ -478,6 +478,7 @@ inline effect_flag operator|(effect_flag flag1, effect_flag flag2)
#define EVENT_DESTROYED 1029 #define EVENT_DESTROYED 1029
#define EVENT_MOVE 1030 #define EVENT_MOVE 1030
#define EVENT_ADJUST 1040 #define EVENT_ADJUST 1040
#define EVENT_BREAK_EFFECT 1050
#define EVENT_SUMMON_SUCCESS 1100 #define EVENT_SUMMON_SUCCESS 1100
#define EVENT_FLIP_SUMMON_SUCCESS 1101 #define EVENT_FLIP_SUMMON_SUCCESS 1101
#define EVENT_SPSUMMON_SUCCESS 1102 #define EVENT_SPSUMMON_SUCCESS 1102
......
...@@ -1711,6 +1711,8 @@ int32 scriptlib::duel_break_effect(lua_State *L) { ...@@ -1711,6 +1711,8 @@ int32 scriptlib::duel_break_effect(lua_State *L) {
check_action_permission(L); check_action_permission(L);
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
pduel->game_field->break_effect(); pduel->game_field->break_effect();
pduel->game_field->raise_event((card*)0, EVENT_BREAK_EFFECT, 0, 0, PLAYER_NONE, PLAYER_NONE, 0);
pduel->game_field->process_instant_event();
return lua_yield(L, 0); return lua_yield(L, 0);
} }
int32 scriptlib::duel_change_effect(lua_State *L) { int32 scriptlib::duel_change_effect(lua_State *L) {
......
...@@ -1820,7 +1820,7 @@ int32 field::process_instant_event() { ...@@ -1820,7 +1820,7 @@ int32 field::process_instant_event() {
} }
} }
} }
if(ev.event_code == EVENT_ADJUST || ((ev.event_code & 0xf000) == EVENT_PHASE_START)) if(ev.event_code == EVENT_ADJUST || ev.event_code == EVENT_BREAK_EFFECT || ((ev.event_code & 0xf000) == EVENT_PHASE_START))
continue; continue;
//triggers //triggers
pr = effects.trigger_f_effect.equal_range(ev.event_code); pr = effects.trigger_f_effect.equal_range(ev.event_code);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment