Skip to content

Y
ygopro-core
Commit 66d4d060 authored by DailyShana's avatar DailyShana
Browse files
Options

Revert "remove cancelable" 

This reverts commit 07a74fc1.
parent ddf4428f
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 18 deletions
field.cpp
View file @ 66d4d060
...@@ -65,6 +65,7 @@ field::field(duel* pduel) { ...@@ -65,6 +65,7 @@ field::field(duel* pduel) {
core.opp_mzone[i] = 0; core.opp_mzone[i] = 0;
core.summoning_card = 0; core.summoning_card = 0;
core.summon_depth = 0; core.summon_depth = 0;
core.summon_cancelable = FALSE;
core.chain_limit = 0; core.chain_limit = 0;
core.chain_limit_p = 0; core.chain_limit_p = 0;
core.chain_solving = FALSE; core.chain_solving = FALSE;
......
field.h
View file @ 66d4d060
...@@ -243,6 +243,7 @@ struct processor { ...@@ -243,6 +243,7 @@ struct processor {
uint8 reason_player; uint8 reason_player;
card* summoning_card; card* summoning_card;
uint8 summon_depth; uint8 summon_depth;
uint8 summon_cancelable;
card* attacker; card* attacker;
card* attack_target; card* attack_target;
card* limit_tuner; card* limit_tuner;
......
libduel.cpp
View file @ 66d4d060
...@@ -228,6 +228,7 @@ int32 scriptlib::duel_summon(lua_State *L) { ...@@ -228,6 +228,7 @@ int32 scriptlib::duel_summon(lua_State *L) {
if(lua_gettop(L) > 4) if(lua_gettop(L) > 4)
min_tribute = lua_tointeger(L, 5); min_tribute = lua_tointeger(L, 5);
duel * pduel = pcard->pduel; duel * pduel = pcard->pduel;
pduel->game_field->core.summon_cancelable = FALSE;
pduel->game_field->summon(playerid, pcard, peffect, ignore_count, min_tribute); pduel->game_field->summon(playerid, pcard, peffect, ignore_count, min_tribute);
return lua_yield(L, 0); return lua_yield(L, 0);
} }
...@@ -240,6 +241,7 @@ int32 scriptlib::duel_special_summon_rule(lua_State *L) { ...@@ -240,6 +241,7 @@ int32 scriptlib::duel_special_summon_rule(lua_State *L) {
return 0; return 0;
card* pcard = *(card**)lua_touserdata(L, 2); card* pcard = *(card**)lua_touserdata(L, 2);
duel * pduel = pcard->pduel; duel * pduel = pcard->pduel;
pduel->game_field->core.summon_cancelable = FALSE;
pduel->game_field->special_summon_rule(playerid, pcard, 0); pduel->game_field->special_summon_rule(playerid, pcard, 0);
return lua_yield(L, 0); return lua_yield(L, 0);
} }
...@@ -266,6 +268,7 @@ int32 scriptlib::duel_synchro_summon(lua_State *L) { ...@@ -266,6 +268,7 @@ int32 scriptlib::duel_synchro_summon(lua_State *L) {
duel * pduel = pcard->pduel; duel * pduel = pcard->pduel;
pduel->game_field->core.limit_tuner = tuner; pduel->game_field->core.limit_tuner = tuner;
pduel->game_field->core.limit_syn = mg; pduel->game_field->core.limit_syn = mg;
pduel->game_field->core.summon_cancelable = FALSE;
pduel->game_field->special_summon_rule(playerid, pcard, SUMMON_TYPE_SYNCHRO); pduel->game_field->special_summon_rule(playerid, pcard, SUMMON_TYPE_SYNCHRO);
return lua_yield(L, 0); return lua_yield(L, 0);
} }
...@@ -292,6 +295,7 @@ int32 scriptlib::duel_xyz_summon(lua_State *L) { ...@@ -292,6 +295,7 @@ int32 scriptlib::duel_xyz_summon(lua_State *L) {
pduel->game_field->core.limit_xyz = materials; pduel->game_field->core.limit_xyz = materials;
pduel->game_field->core.limit_xyz_minc = minc; pduel->game_field->core.limit_xyz_minc = minc;
pduel->game_field->core.limit_xyz_maxc = maxc; pduel->game_field->core.limit_xyz_maxc = maxc;
pduel->game_field->core.summon_cancelable = FALSE;
pduel->game_field->special_summon_rule(playerid, pcard, SUMMON_TYPE_XYZ); pduel->game_field->special_summon_rule(playerid, pcard, SUMMON_TYPE_XYZ);
return lua_yield(L, 0); return lua_yield(L, 0);
} }
...@@ -313,6 +317,7 @@ int32 scriptlib::duel_setm(lua_State *L) { ...@@ -313,6 +317,7 @@ int32 scriptlib::duel_setm(lua_State *L) {
if(lua_gettop(L) > 4) if(lua_gettop(L) > 4)
min_tribute = lua_tointeger(L, 5); min_tribute = lua_tointeger(L, 5);
duel * pduel = pcard->pduel; duel * pduel = pcard->pduel;
pduel->game_field->core.summon_cancelable = FALSE;
pduel->game_field->add_process(PROCESSOR_MSET, 0, peffect, (group*)pcard, playerid + (ignore_count << 8) + (min_tribute << 16), 0); pduel->game_field->add_process(PROCESSOR_MSET, 0, peffect, (group*)pcard, playerid + (ignore_count << 8) + (min_tribute << 16), 0);
return lua_yield(L, 0); return lua_yield(L, 0);
} }
......
operations.cpp
View file @ 66d4d060
...@@ -1336,6 +1336,8 @@ int32 field::summon(uint16 step, uint8 sumplayer, card * target, effect * proc, ...@@ -1336,6 +1336,8 @@ int32 field::summon(uint16 step, uint8 sumplayer, card * target, effect * proc,
return TRUE; return TRUE;
if(target->is_affected_by_effect(EFFECT_CANNOT_SUMMON)) if(target->is_affected_by_effect(EFFECT_CANNOT_SUMMON))
return TRUE; return TRUE;
if(core.summon_depth)
core.summon_cancelable = FALSE;
core.summon_depth++; core.summon_depth++;
target->material_cards.clear(); target->material_cards.clear();
if(target->current.location == LOCATION_MZONE) if(target->current.location == LOCATION_MZONE)
...@@ -1402,7 +1404,7 @@ int32 field::summon(uint16 step, uint8 sumplayer, card * target, effect * proc, ...@@ -1402,7 +1404,7 @@ int32 field::summon(uint16 step, uint8 sumplayer, card * target, effect * proc,
min = -fcount + 1; min = -fcount + 1;
required = min + (max << 16); required = min + (max << 16);
} }
add_process(PROCESSOR_SELECT_TRIBUTE, 0, 0, 0, sumplayer, required); add_process(PROCESSOR_SELECT_TRIBUTE, 0, 0, 0, sumplayer + ((uint32)core.summon_cancelable << 16), required);
core.units.begin()->step = 3; core.units.begin()->step = 3;
} }
} }
...@@ -1414,7 +1416,7 @@ int32 field::summon(uint16 step, uint8 sumplayer, card * target, effect * proc, ...@@ -1414,7 +1416,7 @@ int32 field::summon(uint16 step, uint8 sumplayer, card * target, effect * proc,
returns.bvalue[0] = 0; returns.bvalue[0] = 0;
else { else {
int32 required = 1 + core.units.begin()->arg2; int32 required = 1 + core.units.begin()->arg2;
add_process(PROCESSOR_SELECT_TRIBUTE, 0, 0, 0, sumplayer, required); add_process(PROCESSOR_SELECT_TRIBUTE, 0, 0, 0, sumplayer + ((uint32)core.summon_cancelable << 16), required);
} }
return FALSE; return FALSE;
} }
...@@ -1900,7 +1902,7 @@ int32 field::mset(uint16 step, uint8 setplayer, card * target, effect * proc, ui ...@@ -1900,7 +1902,7 @@ int32 field::mset(uint16 step, uint8 setplayer, card * target, effect * proc, ui
min = -fcount + 1; min = -fcount + 1;
required = min + (max << 16); required = min + (max << 16);
} }
add_process(PROCESSOR_SELECT_TRIBUTE, 0, 0, 0, setplayer, required); add_process(PROCESSOR_SELECT_TRIBUTE, 0, 0, 0, setplayer + ((uint32)core.summon_cancelable << 16), required);
core.units.begin()->step = 3; core.units.begin()->step = 3;
} }
} }
...@@ -1912,7 +1914,7 @@ int32 field::mset(uint16 step, uint8 setplayer, card * target, effect * proc, ui ...@@ -1912,7 +1914,7 @@ int32 field::mset(uint16 step, uint8 setplayer, card * target, effect * proc, ui
returns.bvalue[0] = 0; returns.bvalue[0] = 0;
else { else {
int32 required = 1 + core.units.begin()->arg2; int32 required = 1 + core.units.begin()->arg2;
add_process(PROCESSOR_SELECT_TRIBUTE, 0, 0, 0, setplayer, required); add_process(PROCESSOR_SELECT_TRIBUTE, 0, 0, 0, setplayer + ((uint32)core.summon_cancelable << 16), required);
} }
return FALSE; return FALSE;
} }
...@@ -4345,7 +4347,7 @@ int32 field::select_synchro_material(int16 step, uint8 playerid, card* pcard, in ...@@ -4345,7 +4347,7 @@ int32 field::select_synchro_material(int16 step, uint8 playerid, card* pcard, in
pduel->write_buffer8(HINT_SELECTMSG); pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
pduel->write_buffer32(512); pduel->write_buffer32(512);
add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, playerid, 0x10001); add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, playerid + ((uint32)core.summon_cancelable << 16), 0x10001);
return FALSE; return FALSE;
} }
} }
...@@ -4369,7 +4371,7 @@ int32 field::select_synchro_material(int16 step, uint8 playerid, card* pcard, in ...@@ -4369,7 +4371,7 @@ int32 field::select_synchro_material(int16 step, uint8 playerid, card* pcard, in
pduel->write_buffer8(HINT_SELECTMSG); pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
pduel->write_buffer32(512); pduel->write_buffer32(512);
add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, playerid, 0x10001); add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, playerid + ((uint32)core.summon_cancelable << 16), 0x10001);
return FALSE; return FALSE;
} }
case 1: { case 1: {
...@@ -4598,7 +4600,7 @@ int32 field::select_xyz_material(int16 step, uint8 playerid, uint32 lv, card* sc ...@@ -4598,7 +4600,7 @@ int32 field::select_xyz_material(int16 step, uint8 playerid, uint32 lv, card* sc
pduel->write_buffer8(HINT_SELECTMSG); pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
pduel->write_buffer32(513); pduel->write_buffer32(513);
add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, playerid, min + (max << 16)); add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, playerid + ((uint32)core.summon_cancelable << 16), min + (max << 16));
} else } else
core.units.begin()->step = 1; core.units.begin()->step = 1;
return FALSE; return FALSE;
...@@ -4625,7 +4627,7 @@ int32 field::select_xyz_material(int16 step, uint8 playerid, uint32 lv, card* sc ...@@ -4625,7 +4627,7 @@ int32 field::select_xyz_material(int16 step, uint8 playerid, uint32 lv, card* sc
pduel->write_buffer8(HINT_SELECTMSG); pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
pduel->write_buffer32(513); pduel->write_buffer32(513);
add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, playerid, min + (min << 16)); add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, playerid + ((uint32)core.summon_cancelable << 16), min + (min << 16));
return FALSE; return FALSE;
} }
case 3: { case 3: {
...@@ -4710,7 +4712,7 @@ int32 field::select_release_cards(int16 step, uint8 playerid, uint8 check_field, ...@@ -4710,7 +4712,7 @@ int32 field::select_release_cards(int16 step, uint8 playerid, uint8 check_field,
pduel->write_buffer8(HINT_SELECTMSG); pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
pduel->write_buffer32(500); pduel->write_buffer32(500);
add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, playerid, (max << 16) + min); add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, ((uint32)cancelable << 16) + playerid, (max << 16) + min);
return TRUE; return TRUE;
} }
if(core.release_cards_ex.size() >= (uint32)min) { if(core.release_cards_ex.size() >= (uint32)min) {
...@@ -4721,7 +4723,7 @@ int32 field::select_release_cards(int16 step, uint8 playerid, uint8 check_field, ...@@ -4721,7 +4723,7 @@ int32 field::select_release_cards(int16 step, uint8 playerid, uint8 check_field,
pduel->write_buffer8(HINT_SELECTMSG); pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
pduel->write_buffer32(500); pduel->write_buffer32(500);
add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, playerid, (max << 16) + min); add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, ((uint32)cancelable << 16) + playerid, (max << 16) + min);
return TRUE; return TRUE;
} }
core.operated_set.clear(); core.operated_set.clear();
...@@ -4732,7 +4734,7 @@ int32 field::select_release_cards(int16 step, uint8 playerid, uint8 check_field, ...@@ -4732,7 +4734,7 @@ int32 field::select_release_cards(int16 step, uint8 playerid, uint8 check_field,
pduel->write_buffer8(HINT_SELECTMSG); pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
pduel->write_buffer32(500); pduel->write_buffer32(500);
add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, playerid, (core.release_cards_ex.size() << 16) + core.release_cards_ex.size()); add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, ((uint32)cancelable << 16) + playerid, (core.release_cards_ex.size() << 16) + core.release_cards_ex.size());
min -= core.release_cards_ex.size(); min -= core.release_cards_ex.size();
max -= core.release_cards_ex.size(); max -= core.release_cards_ex.size();
core.units.begin()->arg2 = (max << 16) + min; core.units.begin()->arg2 = (max << 16) + min;
...@@ -4748,7 +4750,7 @@ int32 field::select_release_cards(int16 step, uint8 playerid, uint8 check_field, ...@@ -4748,7 +4750,7 @@ int32 field::select_release_cards(int16 step, uint8 playerid, uint8 check_field,
pduel->write_buffer8(HINT_SELECTMSG); pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
pduel->write_buffer32(500); pduel->write_buffer32(500);
add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, playerid, (max << 16) + min); add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, ((uint32)cancelable << 16) + playerid, (max << 16) + min);
return FALSE; return FALSE;
} }
case 2: { case 2: {
...@@ -4778,7 +4780,7 @@ int32 field::select_tribute_cards(int16 step, uint8 playerid, uint8 cancelable, ...@@ -4778,7 +4780,7 @@ int32 field::select_tribute_cards(int16 step, uint8 playerid, uint8 cancelable,
pduel->write_buffer8(HINT_SELECTMSG); pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
pduel->write_buffer32(500); pduel->write_buffer32(500);
add_process(PROCESSOR_SELECT_TRIBUTE_P, 0, 0, 0, playerid, (max << 16) + min); add_process(PROCESSOR_SELECT_TRIBUTE_P, 0, 0, 0, ((uint32)cancelable << 16) + playerid, (max << 16) + min);
return TRUE; return TRUE;
} }
if(core.release_cards_ex.size() >= (uint32)max) { if(core.release_cards_ex.size() >= (uint32)max) {
...@@ -4789,7 +4791,7 @@ int32 field::select_tribute_cards(int16 step, uint8 playerid, uint8 cancelable, ...@@ -4789,7 +4791,7 @@ int32 field::select_tribute_cards(int16 step, uint8 playerid, uint8 cancelable,
pduel->write_buffer8(HINT_SELECTMSG); pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
pduel->write_buffer32(500); pduel->write_buffer32(500);
add_process(PROCESSOR_SELECT_TRIBUTE_P, 0, 0, 0, playerid, (max << 16) + min); add_process(PROCESSOR_SELECT_TRIBUTE_P, 0, 0, 0, ((uint32)cancelable << 16) + playerid, (max << 16) + min);
return TRUE; return TRUE;
} }
core.operated_set.clear(); core.operated_set.clear();
...@@ -4826,7 +4828,7 @@ int32 field::select_tribute_cards(int16 step, uint8 playerid, uint8 cancelable, ...@@ -4826,7 +4828,7 @@ int32 field::select_tribute_cards(int16 step, uint8 playerid, uint8 cancelable,
pduel->write_buffer8(HINT_SELECTMSG); pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
pduel->write_buffer32(500); pduel->write_buffer32(500);
add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, playerid, 0x10001); add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, ((uint32)cancelable << 16) + playerid, 0x10001);
return FALSE; return FALSE;
} }
case 2: { case 2: {
...@@ -4846,7 +4848,7 @@ int32 field::select_tribute_cards(int16 step, uint8 playerid, uint8 cancelable, ...@@ -4846,7 +4848,7 @@ int32 field::select_tribute_cards(int16 step, uint8 playerid, uint8 cancelable,
pduel->write_buffer8(HINT_SELECTMSG); pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
pduel->write_buffer32(500); pduel->write_buffer32(500);
add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, playerid, (core.release_cards_ex.size() << 16) + core.release_cards_ex.size()); add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, ((uint32)cancelable << 16) + playerid, (core.release_cards_ex.size() << 16) + core.release_cards_ex.size());
return FALSE; return FALSE;
} }
case 4: { case 4: {
...@@ -4882,7 +4884,7 @@ int32 field::select_tribute_cards(int16 step, uint8 playerid, uint8 cancelable, ...@@ -4882,7 +4884,7 @@ int32 field::select_tribute_cards(int16 step, uint8 playerid, uint8 cancelable,
pduel->write_buffer8(HINT_SELECTMSG); pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
pduel->write_buffer32(500); pduel->write_buffer32(500);
add_process(PROCESSOR_SELECT_TRIBUTE_P, 0, 0, 0, playerid, (max << 16) + min); add_process(PROCESSOR_SELECT_TRIBUTE_P, 0, 0, 0, ((uint32)cancelable << 16) + playerid, (max << 16) + min);
return FALSE; return FALSE;
} }
case 6: { case 6: {
......
processor.cpp
View file @ 66d4d060
...@@ -2686,12 +2686,14 @@ int32 field::process_idle_command(uint16 step) { ...@@ -2686,12 +2686,14 @@ int32 field::process_idle_command(uint16 step) {
} }
case 5: { case 5: {
card* target = core.summonable_cards[returns.ivalue[0] >> 16]; card* target = core.summonable_cards[returns.ivalue[0] >> 16];
core.summon_cancelable = TRUE;
summon(infos.turn_player, target, 0, FALSE, 0); summon(infos.turn_player, target, 0, FALSE, 0);
core.units.begin()->step = -1; core.units.begin()->step = -1;
return FALSE; return FALSE;
} }
case 6: { case 6: {
card* target = core.spsummonable_cards[returns.ivalue[0] >> 16]; card* target = core.spsummonable_cards[returns.ivalue[0] >> 16];
core.summon_cancelable = TRUE;
special_summon_rule(infos.turn_player, target, 0); special_summon_rule(infos.turn_player, target, 0);
core.units.begin()->step = -1; core.units.begin()->step = -1;
return FALSE; return FALSE;
...@@ -2726,6 +2728,7 @@ int32 field::process_idle_command(uint16 step) { ...@@ -2726,6 +2728,7 @@ int32 field::process_idle_command(uint16 step) {
} }
case 8: { case 8: {
card* target = core.msetable_cards[returns.ivalue[0] >> 16]; card* target = core.msetable_cards[returns.ivalue[0] >> 16];
core.summon_cancelable = TRUE;
add_process(PROCESSOR_MSET, 0, 0, (group*)target, target->current.controler, 0); add_process(PROCESSOR_MSET, 0, 0, (group*)target, target->current.controler, 0);
core.units.begin()->step = -1; core.units.begin()->step = -1;
return FALSE; return FALSE;
...@@ -3007,7 +3010,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3007,7 +3010,7 @@ int32 field::process_battle_command(uint16 step) {
pduel->write_buffer8(HINT_SELECTMSG); pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(infos.turn_player); pduel->write_buffer8(infos.turn_player);
pduel->write_buffer32(549); pduel->write_buffer32(549);
add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, infos.turn_player, 0x10001); add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, infos.turn_player + (core.units.begin()->arg1 ? 0x20000 : 0), 0x10001);
} }
core.units.begin()->step = 5; core.units.begin()->step = 5;
return FALSE; return FALSE;
......
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