Skip to content

Y
ygopro-core
Commit 5844a137 authored by nanahira's avatar nanahira
Browse files
Options

revert

parent 992cd238
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
effect.h
View file @ 5844a137
...@@ -216,7 +216,6 @@ enum effect_flag2 : uint32 { ...@@ -216,7 +216,6 @@ enum effect_flag2 : uint32 {
EFFECT_FLAG2_COF = 0x0002, EFFECT_FLAG2_COF = 0x0002,
EFFECT_FLAG2_SPOSITCH = 0x0100, // flag2 from 0x0100 are koishipro use EFFECT_FLAG2_SPOSITCH = 0x0100, // flag2 from 0x0100 are koishipro use
EFFECT_FLAG2_AVAILABLE_BD = 0x0200, EFFECT_FLAG2_AVAILABLE_BD = 0x0200,
EFFECT_FLAG2_CONTINUOUS_OPPOTURN = 0x0400,
}; };
inline effect_flag operator|(effect_flag flag1, effect_flag flag2) inline effect_flag operator|(effect_flag flag1, effect_flag flag2)
{ {
......
interpreter.cpp
View file @ 5844a137
...@@ -81,8 +81,6 @@ interpreter::interpreter(duel* pd): coroutines(256) { ...@@ -81,8 +81,6 @@ interpreter::interpreter(duel* pd): coroutines(256) {
lua_setglobal(lua_state, "EFFECT_FLAG2_SPOSITCH"); lua_setglobal(lua_state, "EFFECT_FLAG2_SPOSITCH");
lua_pushinteger(lua_state, EFFECT_FLAG2_AVAILABLE_BD); lua_pushinteger(lua_state, EFFECT_FLAG2_AVAILABLE_BD);
lua_setglobal(lua_state, "EFFECT_FLAG2_AVAILABLE_BD"); lua_setglobal(lua_state, "EFFECT_FLAG2_AVAILABLE_BD");
lua_pushinteger(lua_state, EFFECT_FLAG2_CONTINUOUS_OPPOTURN);
lua_setglobal(lua_state, "EFFECT_FLAG2_CONTINUOUS_OPPOTURN");
//effects //effects
lua_pushinteger(lua_state, EFFECT_CHANGE_LINK_MARKER_KOISHI); lua_pushinteger(lua_state, EFFECT_CHANGE_LINK_MARKER_KOISHI);
lua_setglobal(lua_state, "EFFECT_CHANGE_LINK_MARKER_KOISHI"); lua_setglobal(lua_state, "EFFECT_CHANGE_LINK_MARKER_KOISHI");
......
processor.cpp
View file @ 5844a137
...@@ -1505,7 +1505,7 @@ int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_free ...@@ -1505,7 +1505,7 @@ int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_free
effect* peffect = eit->second; effect* peffect = eit->second;
++eit; ++eit;
newchain.triggering_effect = peffect; newchain.triggering_effect = peffect;
if((peffect->is_flag(EFFECT_FLAG2_CONTINUOUS_OPPOTURN) || peffect->get_handler_player() == infos.turn_player) && peffect->is_activateable(check_player, nil_event)) { if(peffect->get_handler_player() == check_player && peffect->is_activateable(check_player, nil_event)) {
core.select_chains.push_back(newchain); core.select_chains.push_back(newchain);
core.spe_effect[check_player]++; core.spe_effect[check_player]++;
} }
...@@ -2096,7 +2096,7 @@ int32 field::process_idle_command(uint16 step) { ...@@ -2096,7 +2096,7 @@ int32 field::process_idle_command(uint16 step) {
effect* peffect = eit->second; effect* peffect = eit->second;
++eit; ++eit;
newchain.triggering_effect = peffect; newchain.triggering_effect = peffect;
if((peffect->is_flag(EFFECT_FLAG2_CONTINUOUS_OPPOTURN) || peffect->get_handler_player() == infos.turn_player) && peffect->is_activateable(infos.turn_player, nil_event)) if(peffect->get_handler_player() == infos.turn_player && peffect->is_activateable(infos.turn_player, nil_event))
core.select_chains.push_back(newchain); core.select_chains.push_back(newchain);
} }
for(auto eit = effects.ignition_effect.begin(); eit != effects.ignition_effect.end();) { for(auto eit = effects.ignition_effect.begin(); eit != effects.ignition_effect.end();) {
...@@ -2407,7 +2407,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -2407,7 +2407,7 @@ int32 field::process_battle_command(uint16 step) {
effect* peffect = eit->second; effect* peffect = eit->second;
++eit; ++eit;
newchain.triggering_effect = peffect; newchain.triggering_effect = peffect;
if((peffect->is_flag(EFFECT_FLAG2_CONTINUOUS_OPPOTURN) || peffect->get_handler_player() == infos.turn_player) && peffect->is_activateable(infos.turn_player, nil_event)) if(peffect->get_handler_player() == infos.turn_player && peffect->is_activateable(infos.turn_player, nil_event))
core.select_chains.push_back(newchain); core.select_chains.push_back(newchain);
} }
core.attackable_cards.clear(); core.attackable_cards.clear();
......
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