Skip to content

Y
ygopro-core
Commit 4115d5be authored by salix5's avatar salix5
Browse files
Options

Merge branch 'patch-flip-summoning' of https://github.com/salix5/ygopro-core... 

Merge branch 'patch-flip-summoning' of https://github.com/salix5/ygopro-core into salix5-patch-flip-summoning
parents b88b9708 3b29e94c
Show whitespace changes
Inline Side-by-side
Showing with 143 additions and 60 deletions
card.cpp
View file @ 4115d5be
......@@ -3395,6 +3395,28 @@ int32 card::is_can_be_summoned(uint8 playerid, uint8 ignore_count, effect* peffe
pduel->game_field->restore_lp_cost();
return TRUE;
}
int32 card::is_summon_negatable(uint32 sumtype, effect* reason_effect) {
uint32 code = 0;
if (sumtype & SUMMON_TYPE_NORMAL)
code = EFFECT_CANNOT_DISABLE_SUMMON;
else if (sumtype & SUMMON_TYPE_FLIP)
code = EFFECT_CANNOT_DISABLE_FLIP_SUMMON;
else if (sumtype & SUMMON_TYPE_SPECIAL)
code = EFFECT_CANNOT_DISABLE_SPSUMMON;
else
return FALSE;
if (is_affected_by_effect(code))
return FALSE;
if (sumtype == SUMMON_TYPE_DUAL || sumtype & SUMMON_TYPE_FLIP) {
if (!is_status(STATUS_FLIP_SUMMONING))
return FALSE;
if (!is_affect_by_effect(reason_effect))
return FALSE;
if (sumtype == SUMMON_TYPE_DUAL && (!is_affected_by_effect(EFFECT_DUAL_SUMMONABLE) || is_affected_by_effect(EFFECT_DUAL_STATUS)))
return FALSE;
}
return TRUE;
}
int32 card::get_summon_tribute_count() {
int32 min = 0, max = 0;
int32 level = get_level();
......
card.h
View file @ 4115d5be
......@@ -342,6 +342,7 @@ public:
int32 is_spsummonable(effect* proc, material_info info = null_info);
int32 is_summonable(effect* proc, uint8 min_tribute, uint32 zone = 0x1f, uint32 releasable = 0xff00ff);
int32 is_can_be_summoned(uint8 playerid, uint8 ingore_count, effect* peffect, uint8 min_tribute, uint32 zone = 0x1f);
int32 is_summon_negatable(uint32 sumtype, effect* reason_effect);
int32 get_summon_tribute_count();
int32 get_set_tribute_count();
int32 is_can_be_flip_summoned(uint8 playerid);
......@@ -408,6 +409,8 @@ public:
#define SUMMON_VALUE_CUSTOM_TYPE 0x0000ffff
constexpr uint32 DEFAULT_SUMMON_TYPE = SUMMON_VALUE_MAIN_TYPE | SUMMON_VALUE_SUB_TYPE | SUMMON_VALUE_CUSTOM_TYPE;
#define SUMMON_VALUE_FUTURE_FUSION 0x18
//Counter
#define COUNTER_WITHOUT_PERMIT 0x1000
//#define COUNTER_NEED_ENABLE 0x2000
......
common.h
View file @ 4115d5be
......@@ -180,27 +180,27 @@ struct card_sort {
#define REASONS_PROCEDURE (REASON_SYNCHRO | REASON_XYZ | REASON_LINK)
//Status
#define STATUS_DISABLED 0x0001 //
#define STATUS_TO_ENABLE 0x0002 //
#define STATUS_TO_DISABLE 0x0004 //
#define STATUS_PROC_COMPLETE 0x0008 //
#define STATUS_SET_TURN 0x0010 //
#define STATUS_NO_LEVEL 0x0020 //
#define STATUS_BATTLE_RESULT 0x0040 //
#define STATUS_SPSUMMON_STEP 0x0080 //
#define STATUS_FORM_CHANGED 0x0100 //
#define STATUS_SUMMONING 0x0200 //
#define STATUS_EFFECT_ENABLED 0x0400 //
#define STATUS_SUMMON_TURN 0x0800 //
#define STATUS_DESTROY_CONFIRMED 0x1000 //
#define STATUS_LEAVE_CONFIRMED 0x2000 //
#define STATUS_BATTLE_DESTROYED 0x4000 //
#define STATUS_COPYING_EFFECT 0x8000 //
#define STATUS_CHAINING 0x10000 //
#define STATUS_SUMMON_DISABLED 0x20000 //
#define STATUS_ACTIVATE_DISABLED 0x40000 //
#define STATUS_DISABLED 0x0001
#define STATUS_TO_ENABLE 0x0002
#define STATUS_TO_DISABLE 0x0004
#define STATUS_PROC_COMPLETE 0x0008
#define STATUS_SET_TURN 0x0010
#define STATUS_NO_LEVEL 0x0020
#define STATUS_BATTLE_RESULT 0x0040
#define STATUS_SPSUMMON_STEP 0x0080
#define STATUS_FORM_CHANGED 0x0100
#define STATUS_SUMMONING 0x0200
#define STATUS_EFFECT_ENABLED 0x0400
#define STATUS_SUMMON_TURN 0x0800
#define STATUS_DESTROY_CONFIRMED 0x1000
#define STATUS_LEAVE_CONFIRMED 0x2000
#define STATUS_BATTLE_DESTROYED 0x4000
#define STATUS_COPYING_EFFECT 0x8000
#define STATUS_CHAINING 0x10000
#define STATUS_SUMMON_DISABLED 0x20000
#define STATUS_ACTIVATE_DISABLED 0x40000
#define STATUS_EFFECT_REPLACED 0x80000
#define STATUS_FUTURE_FUSION 0x100000
#define STATUS_FLIP_SUMMONING 0x100000
#define STATUS_ATTACK_CANCELED 0x200000
#define STATUS_INITIALIZING 0x400000
#define STATUS_TO_HAND_WITHOUT_CONFIRM 0x800000
......
field.h
View file @ 4115d5be
......@@ -308,6 +308,8 @@ struct processor {
uint8 coin_result[MAX_COIN_COUNT]{};
int32 coin_count{ 0 };
bool is_target_ready{ false };
bool is_gemini_summoning{ false };
bool is_summon_negated{ false };
uint8 to_bp{ FALSE };
uint8 to_m2{ FALSE };
......
libduel.cpp
View file @ 4115d5be
......@@ -1833,30 +1833,66 @@ int32 scriptlib::duel_disable_summon(lua_State *L) {
pduel = pgroup->pduel;
} else
return luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 1);
uint32 sumtype = 0;
if (pduel->game_field->check_event(EVENT_SUMMON)) {
if (pduel->game_field->core.is_gemini_summoning)
sumtype = SUMMON_TYPE_DUAL;
else
sumtype = SUMMON_TYPE_NORMAL;
}
else if (pduel->game_field->check_event(EVENT_FLIP_SUMMON))
sumtype = SUMMON_TYPE_FLIP;
else if (pduel->game_field->check_event(EVENT_SPSUMMON))
sumtype = SUMMON_TYPE_SPECIAL;
else
return 0;
if (sumtype & SUMMON_TYPE_NORMAL || sumtype & SUMMON_TYPE_FLIP) {
if (pgroup && pgroup->container.size() != 1)
return 0;
if (!pcard)
pcard = *pgroup->container.begin();
}
uint8 sumplayer = PLAYER_NONE;
if(pcard) {
effect* reason_effect = pduel->game_field->core.reason_effect;
field::card_set negated_cards;
if (sumtype == SUMMON_TYPE_DUAL || sumtype & SUMMON_TYPE_FLIP) {
if (!pcard->is_summon_negatable(sumtype, reason_effect))
return 0;
sumplayer = pcard->summon_player;
pcard->set_status(STATUS_FLIP_SUMMONING, FALSE);
pcard->set_status(STATUS_SUMMON_DISABLED, TRUE);
}
else {
if (pcard) {
if (!pcard->is_summon_negatable(sumtype, reason_effect))
return 0;
sumplayer = pcard->summon_player;
pcard->set_status(STATUS_SUMMONING, FALSE);
pcard->set_status(STATUS_SUMMON_DISABLED, TRUE);
if (!match_all(pcard->summon_info, SUMMON_TYPE_FLIP) && !match_all(pcard->summon_info, SUMMON_TYPE_DUAL))
pcard->set_status(STATUS_PROC_COMPLETE, FALSE);
} else {
for(auto& pcard : pgroup->container) {
}
else {
for (auto& pcard : pgroup->container) {
if (!pcard->is_summon_negatable(sumtype, reason_effect))
continue;
sumplayer = pcard->summon_player;
pcard->set_status(STATUS_SUMMONING, FALSE);
pcard->set_status(STATUS_SUMMON_DISABLED, TRUE);
if (!match_all(pcard->summon_info, SUMMON_TYPE_FLIP) && !match_all(pcard->summon_info, SUMMON_TYPE_DUAL))
pcard->set_status(STATUS_PROC_COMPLETE, FALSE);
negated_cards.insert(pcard);
}
if (!negated_cards.size())
return 0;
}
}
pduel->game_field->core.is_summon_negated = true;
uint32 event_code = 0;
if(pduel->game_field->check_event(EVENT_SUMMON))
if(sumtype & SUMMON_TYPE_NORMAL)
event_code = EVENT_SUMMON_NEGATED;
else if(pduel->game_field->check_event(EVENT_FLIP_SUMMON))
else if(sumtype & SUMMON_TYPE_FLIP)
event_code = EVENT_FLIP_SUMMON_NEGATED;
else if(pduel->game_field->check_event(EVENT_SPSUMMON))
else if(sumtype & SUMMON_TYPE_SPECIAL)
event_code = EVENT_SPSUMMON_NEGATED;
effect* reason_effect = pduel->game_field->core.reason_effect;
uint8 reason_player = pduel->game_field->core.reason_player;
if(pcard)
pduel->game_field->raise_event(pcard, event_code, reason_effect, REASON_EFFECT, reason_player, sumplayer, 0);
......
operations.cpp
View file @ 4115d5be
......@@ -1830,6 +1830,7 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
target->summon_info |= SUMMON_TYPE_NORMAL;
target->current.reason_effect = 0;
target->current.reason_player = sumplayer;
core.is_gemini_summoning = true;
effect* deffect = pduel->new_effect();
deffect->owner = target;
deffect->code = EFFECT_DUAL_STATUS;
......@@ -1889,7 +1890,14 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
return FALSE;
}
case 13: {
if (core.is_gemini_summoning) {
target->set_status(STATUS_SUMMONING, FALSE);
target->set_status(STATUS_FLIP_SUMMONING, TRUE);
}
else {
target->set_status(STATUS_SUMMONING, TRUE);
target->set_status(STATUS_FLIP_SUMMONING, FALSE);
}
target->set_status(STATUS_SUMMON_DISABLED, FALSE);
raise_event(target, EVENT_SUMMON, proc, 0, sumplayer, sumplayer, 0);
process_instant_event();
......@@ -1897,29 +1905,34 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
return FALSE;
}
case 14: {
if(target->is_status(STATUS_SUMMONING)) {
if (core.is_gemini_summoning && target->is_status(STATUS_FLIP_SUMMONING) || !core.is_gemini_summoning && target->is_status(STATUS_SUMMONING)) {
core.units.begin()->step = 14;
return FALSE;
}
if(proc) {
if (core.is_summon_negated) {
if (proc) {
remove_oath_effect(proc);
if(proc->is_flag(EFFECT_FLAG_COUNT_LIMIT) && (proc->count_code & EFFECT_COUNT_CODE_OATH)) {
if (proc->is_flag(EFFECT_FLAG_COUNT_LIMIT) && (proc->count_code & EFFECT_COUNT_CODE_OATH)) {
dec_effect_code(proc->count_code, sumplayer);
}
}
if(effect_set* peset = (effect_set*)core.units.begin()->ptr2) {
for(int32 i = 0; i < peset->size(); ++i)
if (effect_set* peset = (effect_set*)core.units.begin()->ptr2) {
for (int32 i = 0; i < peset->size(); ++i)
remove_oath_effect(peset->at(i));
delete peset;
core.units.begin()->ptr2 = 0;
}
if(target->current.location == LOCATION_MZONE)
if (target->is_status(STATUS_SUMMON_DISABLED) && target->current.location == LOCATION_MZONE)
send_to(target, 0, REASON_RULE, PLAYER_NONE, sumplayer, LOCATION_GRAVE, 0, 0);
adjust_instant();
}
core.is_gemini_summoning = false;
core.is_summon_negated = false;
add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, FALSE, 0);
return TRUE;
}
case 15: {
core.is_gemini_summoning = false;
if(proc) {
release_oath_relation(proc);
}
......@@ -1930,6 +1943,7 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
core.units.begin()->ptr2 = 0;
}
target->set_status(STATUS_SUMMONING, FALSE);
target->set_status(STATUS_FLIP_SUMMONING, FALSE);
target->set_status(STATUS_SUMMON_TURN, TRUE);
target->enable_field_effect(true);
if(target->is_status(STATUS_DISABLED))
......@@ -2004,7 +2018,7 @@ int32 field::flip_summon(uint16 step, uint8 sumplayer, card * target, uint32 act
if(target->is_affected_by_effect(EFFECT_CANNOT_DISABLE_FLIP_SUMMON))
core.units.begin()->step = 2;
else {
target->set_status(STATUS_SUMMONING, TRUE);
target->set_status(STATUS_FLIP_SUMMONING, TRUE);
target->set_status(STATUS_SUMMON_DISABLED, FALSE);
raise_event(target, EVENT_FLIP_SUMMON, 0, 0, sumplayer, sumplayer, 0);
process_instant_event();
......@@ -2013,16 +2027,19 @@ int32 field::flip_summon(uint16 step, uint8 sumplayer, card * target, uint32 act
return FALSE;
}
case 2: {
if(target->is_status(STATUS_SUMMONING))
if(target->is_status(STATUS_FLIP_SUMMONING))
return FALSE;
if(effect_set* peset = (effect_set*)core.units.begin()->ptr1) {
for(int32 i = 0; i < peset->size(); ++i)
if (core.is_summon_negated) {
if (effect_set* peset = (effect_set*)core.units.begin()->ptr1) {
for (int32 i = 0; i < peset->size(); ++i)
remove_oath_effect(peset->at(i));
delete peset;
core.units.begin()->ptr1 = 0;
}
if(target->current.location == LOCATION_MZONE)
if (target->is_status(STATUS_SUMMON_DISABLED) && target->current.location == LOCATION_MZONE)
send_to(target, 0, REASON_RULE, PLAYER_NONE, sumplayer, LOCATION_GRAVE, 0, 0);
}
core.is_summon_negated = false;
add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, FALSE, 0);
return TRUE;
}
......@@ -2033,7 +2050,7 @@ int32 field::flip_summon(uint16 step, uint8 sumplayer, card * target, uint32 act
delete peset;
core.units.begin()->ptr1 = 0;
}
target->set_status(STATUS_SUMMONING, FALSE);
target->set_status(STATUS_FLIP_SUMMONING, FALSE);
target->enable_field_effect(true);
if(target->is_status(STATUS_DISABLED))
target->reset(RESET_DISABLE, RESET_EVENT);
......@@ -2903,7 +2920,7 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card* target, uin
delete peset;
core.units.begin()->ptr1 = 0;
}
if(target->current.location == LOCATION_MZONE)
if (target->is_status(STATUS_SUMMON_DISABLED) && target->current.location == LOCATION_MZONE)
send_to(target, 0, REASON_RULE, PLAYER_NONE, sumplayer, LOCATION_GRAVE, 0, 0);
adjust_instant();
add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, FALSE, 0);
......@@ -3087,7 +3104,7 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card* target, uin
card* pcard = *cit;
if (!pcard->is_status(STATUS_SUMMONING)) {
cit = pgroup->container.erase(cit);
if (pcard->current.location == LOCATION_MZONE)
if (pcard->is_status(STATUS_SUMMON_DISABLED) && pcard->current.location == LOCATION_MZONE)
cset.insert(pcard);
}
else
......@@ -3355,7 +3372,8 @@ int32 field::special_summon(uint16 step, effect* reason_effect, uint8 reason_pla
if(!(pcard->current.position & POS_FACEDOWN))
raise_single_event(pcard, 0, EVENT_SPSUMMON_SUCCESS, pcard->current.reason_effect, 0, pcard->current.reason_player, pcard->summon_player, 0);
int32 summontype = pcard->summon_info & (SUMMON_VALUE_MAIN_TYPE | SUMMON_VALUE_SUB_TYPE);
if(summontype && pcard->material_cards.size() && !pcard->is_status(STATUS_FUTURE_FUSION)) {
int32 custom_type = pcard->summon_info & SUMMON_VALUE_CUSTOM_TYPE;
if(summontype && pcard->material_cards.size() && custom_type != SUMMON_VALUE_FUTURE_FUSION) {
int32 matreason = 0;
if(summontype == SUMMON_TYPE_FUSION)
matreason = REASON_FUSION;
......@@ -3369,7 +3387,6 @@ int32 field::special_summon(uint16 step, effect* reason_effect, uint8 reason_pla
raise_single_event(mcard, &targets->container, EVENT_BE_MATERIAL, pcard->current.reason_effect, matreason, pcard->current.reason_player, pcard->summon_player, 0);
raise_event(&(pcard->material_cards), EVENT_BE_MATERIAL, reason_effect, matreason, reason_player, pcard->summon_player, 0);
}
pcard->set_status(STATUS_FUTURE_FUSION, FALSE);
}
process_single_event();
process_instant_event();
......@@ -4142,6 +4159,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
if((core.deck_reversed && pcard->current.location == LOCATION_DECK) || (pcard->current.position == POS_FACEUP_DEFENSE))
param->show_decktop[pcard->current.controler] = true;
pcard->set_status(STATUS_LEAVE_CONFIRMED, FALSE);
pcard->set_status(STATUS_FLIP_SUMMONING, FALSE);
if(pcard->status & (STATUS_SUMMON_DISABLED | STATUS_ACTIVATE_DISABLED)) {
pcard->set_status(STATUS_SUMMON_DISABLED | STATUS_ACTIVATE_DISABLED, FALSE);
pcard->previous.location = 0;
......@@ -4190,6 +4208,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
pduel->write_buffer32(pcard->get_info_location());
pduel->write_buffer32(pcard->current.reason);
pcard->set_status(STATUS_LEAVE_CONFIRMED, FALSE);
pcard->set_status(STATUS_FLIP_SUMMONING, FALSE);
if(pcard->status & (STATUS_SUMMON_DISABLED | STATUS_ACTIVATE_DISABLED)) {
pcard->set_status(STATUS_SUMMON_DISABLED | STATUS_ACTIVATE_DISABLED, FALSE);
pcard->previous.location = 0;
......@@ -4903,6 +4922,7 @@ int32 field::change_position(uint16 step, group * targets, effect * reason_effec
trapmonster = true;
if(pcard->status & (STATUS_SUMMON_DISABLED | STATUS_ACTIVATE_DISABLED))
pcard->set_status(STATUS_SUMMON_DISABLED | STATUS_ACTIVATE_DISABLED, FALSE);
pcard->set_status(STATUS_FLIP_SUMMONING, FALSE);
pcard->reset(RESET_TURN_SET, RESET_EVENT);
pcard->clear_card_target();
pcard->set_status(STATUS_SET_TURN, TRUE);
......
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