Skip to content

Y
ygopro-core
Commit 2c30d33f authored by Chen Bill's avatar Chen Bill
Browse files
Options

Revert "trigger EVENT_SSET when equiping face-down cards" 

This reverts commit e3cd5e2f.
parent 8287c520
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 7 deletions
libduel.cpp
View file @ 2c30d33f
...@@ -1343,12 +1343,9 @@ int32 scriptlib::duel_equip(lua_State *L) { ...@@ -1343,12 +1343,9 @@ int32 scriptlib::duel_equip(lua_State *L) {
int32 scriptlib::duel_equip_complete(lua_State *L) { int32 scriptlib::duel_equip_complete(lua_State *L) {
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
field::card_set etargets; field::card_set etargets;
field::card_set set_cards;
for(auto& equip_card : pduel->game_field->core.equiping_cards) { for(auto& equip_card : pduel->game_field->core.equiping_cards) {
if(equip_card->is_position(POS_FACEUP)) if(equip_card->is_position(POS_FACEUP))
equip_card->enable_field_effect(true); equip_card->enable_field_effect(true);
if(equip_card->is_position(POS_FACEDOWN))
set_cards.insert(equip_card);
etargets.insert(equip_card->equiping_target); etargets.insert(equip_card->equiping_target);
} }
pduel->game_field->adjust_instant(); pduel->game_field->adjust_instant();
...@@ -1356,8 +1353,7 @@ int32 scriptlib::duel_equip_complete(lua_State *L) { ...@@ -1356,8 +1353,7 @@ int32 scriptlib::duel_equip_complete(lua_State *L) {
pduel->game_field->raise_single_event(equip_target, &pduel->game_field->core.equiping_cards, EVENT_EQUIP, pduel->game_field->raise_single_event(equip_target, &pduel->game_field->core.equiping_cards, EVENT_EQUIP,
pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, PLAYER_NONE, 0); pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, PLAYER_NONE, 0);
pduel->game_field->raise_event(&pduel->game_field->core.equiping_cards, EVENT_EQUIP, pduel->game_field->raise_event(&pduel->game_field->core.equiping_cards, EVENT_EQUIP,
pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, PLAYER_NONE, 0); pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, PLAYER_NONE, 0);
pduel->game_field->raise_event(&set_cards, EVENT_SSET, pduel->game_field->core.reason_effect, 0, pduel->game_field->core.reason_player, 0, 0);
pduel->game_field->core.hint_timing[0] |= TIMING_EQUIP; pduel->game_field->core.hint_timing[0] |= TIMING_EQUIP;
pduel->game_field->core.hint_timing[1] |= TIMING_EQUIP; pduel->game_field->core.hint_timing[1] |= TIMING_EQUIP;
pduel->game_field->process_single_event(); pduel->game_field->process_single_event();
......
operations.cpp
View file @ 2c30d33f
...@@ -1433,8 +1433,6 @@ int32 field::equip(uint16 step, uint8 equip_player, card * equip_card, card * ta ...@@ -1433,8 +1433,6 @@ int32 field::equip(uint16 step, uint8 equip_player, card * equip_card, card * ta
cset.insert(equip_card); cset.insert(equip_card);
raise_single_event(target, &cset, EVENT_EQUIP, core.reason_effect, 0, core.reason_player, PLAYER_NONE, 0); raise_single_event(target, &cset, EVENT_EQUIP, core.reason_effect, 0, core.reason_player, PLAYER_NONE, 0);
raise_event(&cset, EVENT_EQUIP, core.reason_effect, 0, core.reason_player, PLAYER_NONE, 0); raise_event(&cset, EVENT_EQUIP, core.reason_effect, 0, core.reason_player, PLAYER_NONE, 0);
if (equip_card->is_position(POS_FACEDOWN))
raise_event(&cset, EVENT_SSET, core.reason_effect, 0, core.reason_player, 0, 0);
core.hint_timing[target->current.controler] |= TIMING_EQUIP; core.hint_timing[target->current.controler] |= TIMING_EQUIP;
process_single_event(); process_single_event();
process_instant_event(); process_instant_event();
......
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