Skip to content

Y
YGOMobile
Commit 0ce57a4e authored by fallenstardust's avatar fallenstardust
Browse files
Options

sync ocgcore

parent 5b7777e3
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 34 deletions
Classes/ocgcore/field.h
View file @ 0ce57a4e
...@@ -230,8 +230,8 @@ struct processor { ...@@ -230,8 +230,8 @@ struct processor {
card_set set_group_pre_set; card_set set_group_pre_set;
card_set set_group_set; card_set set_group_set;
effect_set_v disfield_effects; effect_set_v disfield_effects;
effect_set_v extram_effects; effect_set_v extra_mzone_effects;
effect_set_v extras_effects; effect_set_v extra_szone_effects;
std::set<effect*> reseted_effects; std::set<effect*> reseted_effects;
std::unordered_map<card*, uint32> readjust_map; std::unordered_map<card*, uint32> readjust_map;
std::unordered_set<card*> unique_cards[2]; std::unordered_set<card*> unique_cards[2];
......
Classes/ocgcore/operations.cpp
View file @ 0ce57a4e
...@@ -195,9 +195,6 @@ void field::special_summon_complete(effect* reason_effect, uint8 reason_player) ...@@ -195,9 +195,6 @@ void field::special_summon_complete(effect* reason_effect, uint8 reason_player)
//core.special_summoning.clear(); //core.special_summoning.clear();
add_process(PROCESSOR_SPSUMMON_COMP_S, 0, reason_effect, ng, reason_player, 0); add_process(PROCESSOR_SPSUMMON_COMP_S, 0, reason_effect, ng, reason_player, 0);
} }
// destroy: 1st arg is card or card_set=>card version, otherwise=>step version
// destroy in script: here->PROCESSOR_DESTROY, step 0
// set current.reason
void field::destroy(card_set* targets, effect* reason_effect, uint32 reason, uint32 reason_player, uint32 playerid, uint32 destination, uint32 sequence) { void field::destroy(card_set* targets, effect* reason_effect, uint32 reason, uint32 reason_player, uint32 playerid, uint32 destination, uint32 sequence) {
for(auto cit = targets->begin(); cit != targets->end();) { for(auto cit = targets->begin(); cit != targets->end();) {
card* pcard = *cit; card* pcard = *cit;
...@@ -253,8 +250,6 @@ void field::release(card* target, effect* reason_effect, uint32 reason, uint32 r ...@@ -253,8 +250,6 @@ void field::release(card* target, effect* reason_effect, uint32 reason, uint32 r
tset.insert(target); tset.insert(target);
release(&tset, reason_effect, reason, reason_player); release(&tset, reason_effect, reason, reason_player);
} }
// set current.reason, sendto_param
// send-to in scripts: here->PROCESSOR_SENDTO, step 0
void field::send_to(card_set* targets, effect* reason_effect, uint32 reason, uint32 reason_player, uint32 playerid, uint32 destination, uint32 sequence, uint32 position) { void field::send_to(card_set* targets, effect* reason_effect, uint32 reason, uint32 reason_player, uint32 playerid, uint32 destination, uint32 sequence, uint32 position) {
if(destination & LOCATION_ONFIELD) if(destination & LOCATION_ONFIELD)
return; return;
......
Classes/ocgcore/processor.cpp
View file @ 0ce57a4e
...@@ -1250,7 +1250,6 @@ int32 field::execute_target(uint16 step, effect * triggering_effect, uint8 trigg ...@@ -1250,7 +1250,6 @@ int32 field::execute_target(uint16 step, effect * triggering_effect, uint8 trigg
} }
return FALSE; return FALSE;
} }
// add events to core.queue_event
void field::raise_event(card* event_card, uint32 event_code, effect* reason_effect, uint32 reason, uint8 reason_player, uint8 event_player, uint32 event_value) { void field::raise_event(card* event_card, uint32 event_code, effect* reason_effect, uint32 reason, uint8 reason_player, uint8 event_player, uint32 event_value) {
tevent new_event; tevent new_event;
new_event.trigger_card = 0; new_event.trigger_card = 0;
...@@ -1285,7 +1284,6 @@ void field::raise_event(card_set* event_cards, uint32 event_code, effect* reason ...@@ -1285,7 +1284,6 @@ void field::raise_event(card_set* event_cards, uint32 event_code, effect* reason
new_event.event_value = event_value; new_event.event_value = event_value;
core.queue_event.push_back(new_event); core.queue_event.push_back(new_event);
} }
// add events to core.single_event
void field::raise_single_event(card* trigger_card, card_set* event_cards, uint32 event_code, effect * reason_effect, uint32 reason, uint8 reason_player, uint8 event_player, uint32 event_value) { void field::raise_single_event(card* trigger_card, card_set* event_cards, uint32 event_code, effect * reason_effect, uint32 reason, uint8 reason_player, uint8 event_player, uint32 event_value) {
tevent new_event; tevent new_event;
new_event.trigger_card = trigger_card; new_event.trigger_card = trigger_card;
...@@ -1303,7 +1301,6 @@ void field::raise_single_event(card* trigger_card, card_set* event_cards, uint32 ...@@ -1303,7 +1301,6 @@ void field::raise_single_event(card* trigger_card, card_set* event_cards, uint32
new_event.event_value = event_value; new_event.event_value = event_value;
core.single_event.push_back(new_event); core.single_event.push_back(new_event);
} }
// called by Duel.CheckEvent()
int32 field::check_event(uint32 code, tevent * pe) { int32 field::check_event(uint32 code, tevent * pe) {
for(const auto& ev : core.point_event) { for(const auto& ev : core.point_event) {
if(ev.event_code == code) { if(ev.event_code == code) {
...@@ -1321,7 +1318,6 @@ int32 field::check_event(uint32 code, tevent * pe) { ...@@ -1321,7 +1318,6 @@ int32 field::check_event(uint32 code, tevent * pe) {
} }
return FALSE; return FALSE;
} }
// called by Duel.CheckActivateEffect()
int32 field::check_event_c(effect* peffect, uint8 playerid, int32 neglect_con, int32 neglect_cost, int32 copy_info, tevent* pe) { int32 field::check_event_c(effect* peffect, uint8 playerid, int32 neglect_con, int32 neglect_cost, int32 copy_info, tevent* pe) {
if(peffect->code == EVENT_FREE_CHAIN) { if(peffect->code == EVENT_FREE_CHAIN) {
return peffect->is_activate_ready(playerid, nil_event, neglect_con, neglect_cost, FALSE); return peffect->is_activate_ready(playerid, nil_event, neglect_con, neglect_cost, FALSE);
...@@ -1650,8 +1646,6 @@ int32 field::process_phase_event(int16 step, int32 phase) { ...@@ -1650,8 +1646,6 @@ int32 field::process_phase_event(int16 step, int32 phase) {
} }
return TRUE; return TRUE;
} }
// move the events from core.instant_event to core.point_event
// skip_trigger = lower byte of arg1, skip_freechain = higher byte of arg1, skip_new = arg2
int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_freechain, int32 skip_new) { int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_freechain, int32 skip_new) {
switch(step) { switch(step) {
case 0: { case 0: {
...@@ -2215,7 +2209,6 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori ...@@ -2215,7 +2209,6 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori
} }
return TRUE; return TRUE;
} }
// classify core.queue_event, process continuous effects, and move them to core.instant_event
int32 field::process_instant_event() { int32 field::process_instant_event() {
if (core.queue_event.size() == 0) if (core.queue_event.size() == 0)
return TRUE; return TRUE;
...@@ -3638,10 +3631,11 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3638,10 +3631,11 @@ int32 field::process_battle_command(uint16 step) {
} }
return TRUE; return TRUE;
} }
// perform damage calculation by an effect
int32 field::process_damage_step(uint16 step, uint32 new_attack) { int32 field::process_damage_step(uint16 step, uint32 new_attack) {
switch(step) { switch(step) {
case 0: { case 0: {
if(core.effect_damage_step && !new_attack)
return TRUE;
core.effect_damage_step = 1; core.effect_damage_step = 1;
card* tmp = core.attacker; card* tmp = core.attacker;
core.attacker = (card*)core.units.begin()->peffect; core.attacker = (card*)core.units.begin()->peffect;
...@@ -3677,8 +3671,7 @@ int32 field::process_damage_step(uint16 step, uint32 new_attack) { ...@@ -3677,8 +3671,7 @@ int32 field::process_damage_step(uint16 step, uint32 new_attack) {
change_position(core.attack_target, 0, PLAYER_NONE, core.attack_target->current.position >> 1, 0, TRUE); change_position(core.attack_target, 0, PLAYER_NONE, core.attack_target->current.position >> 1, 0, TRUE);
adjust_all(); adjust_all();
} }
} } else
else
core.pre_field[1] = 0; core.pre_field[1] = 0;
return FALSE; return FALSE;
} }
...@@ -4823,14 +4816,10 @@ int32 field::break_effect() { ...@@ -4823,14 +4816,10 @@ int32 field::break_effect() {
adjust_instant(); adjust_instant();
return 0; return 0;
} }
// adjust, type 1
// adjust disable, self_destroy
void field::adjust_instant() { void field::adjust_instant() {
adjust_disable_check_list(); adjust_disable_check_list();
adjust_self_destroy_set(); adjust_self_destroy_set();
} }
// adjust, type 2 (including adjust_instant())
// adjust win, disable, control, self_destroy, equip, position, trap_monster
void field::adjust_all() { void field::adjust_all() {
core.readjust_map.clear(); core.readjust_map.clear();
add_process(PROCESSOR_ADJUST, 0, 0, 0, 0, 0); add_process(PROCESSOR_ADJUST, 0, 0, 0, 0, 0);
...@@ -4876,8 +4865,8 @@ int32 field::refresh_location_info(uint16 step) { ...@@ -4876,8 +4865,8 @@ int32 field::refresh_location_info(uint16 step) {
player[0].disabled_location = 0; player[0].disabled_location = 0;
player[1].disabled_location = 0; player[1].disabled_location = 0;
core.disfield_effects.clear(); core.disfield_effects.clear();
core.extram_effects.clear(); core.extra_mzone_effects.clear();
core.extras_effects.clear(); core.extra_szone_effects.clear();
filter_field_effect(EFFECT_DISABLE_FIELD, &eset); filter_field_effect(EFFECT_DISABLE_FIELD, &eset);
for (int32 i = 0; i < eset.size(); ++i) { for (int32 i = 0; i < eset.size(); ++i) {
uint32 value = eset[i]->get_value(); uint32 value = eset[i]->get_value();
...@@ -4894,7 +4883,7 @@ int32 field::refresh_location_info(uint16 step) { ...@@ -4894,7 +4883,7 @@ int32 field::refresh_location_info(uint16 step) {
uint32 value = eset[i]->get_value(); uint32 value = eset[i]->get_value();
player[p].disabled_location |= (value >> 16) & 0x1f; player[p].disabled_location |= (value >> 16) & 0x1f;
if((uint32)field_used_count[(value >> 16) & 0x1f] < (value & 0xffff)) if((uint32)field_used_count[(value >> 16) & 0x1f] < (value & 0xffff))
core.extram_effects.add_item(eset[i]); core.extra_mzone_effects.add_item(eset[i]);
} }
eset.clear(); eset.clear();
filter_field_effect(EFFECT_USE_EXTRA_SZONE, &eset); filter_field_effect(EFFECT_USE_EXTRA_SZONE, &eset);
...@@ -4903,7 +4892,7 @@ int32 field::refresh_location_info(uint16 step) { ...@@ -4903,7 +4892,7 @@ int32 field::refresh_location_info(uint16 step) {
uint32 value = eset[i]->get_value(); uint32 value = eset[i]->get_value();
player[p].disabled_location |= (value >> 8) & 0x1f00; player[p].disabled_location |= (value >> 8) & 0x1f00;
if((uint32)field_used_count[(value >> 16) & 0x1f] < (value & 0xffff)) if((uint32)field_used_count[(value >> 16) & 0x1f] < (value & 0xffff))
core.extras_effects.add_item(eset[i]); core.extra_szone_effects.add_item(eset[i]);
} }
return FALSE; return FALSE;
} }
...@@ -4941,14 +4930,13 @@ int32 field::refresh_location_info(uint16 step) { ...@@ -4941,14 +4930,13 @@ int32 field::refresh_location_info(uint16 step) {
return FALSE; return FALSE;
} }
case 3: { case 3: {
// If the blocking number is not reached, we should block more slots. if(core.extra_mzone_effects.size() == 0) {
if(core.extram_effects.size() == 0) {
core.units.begin()->step = 4; core.units.begin()->step = 4;
return FALSE; return FALSE;
} }
effect* peffect = core.extram_effects[0]; effect* peffect = core.extra_mzone_effects[0];
core.units.begin()->peffect = peffect; core.units.begin()->peffect = peffect;
core.extram_effects.remove_item(0); core.extra_mzone_effects.remove_item(0);
uint32 p = peffect->get_handler_player(); uint32 p = peffect->get_handler_player();
uint32 mzone_flag = (player[p].disabled_location | player[p].used_location) & 0x1f; uint32 mzone_flag = (player[p].disabled_location | player[p].used_location) & 0x1f;
if(mzone_flag == 0x1f) { if(mzone_flag == 0x1f) {
...@@ -4981,14 +4969,13 @@ int32 field::refresh_location_info(uint16 step) { ...@@ -4981,14 +4969,13 @@ int32 field::refresh_location_info(uint16 step) {
return FALSE; return FALSE;
} }
case 5: { case 5: {
// EFFECT_USE_EXTRA_SZONE version if(core.extra_szone_effects.size() == 0) {
if(core.extras_effects.size() == 0) {
core.units.begin()->step = 6; core.units.begin()->step = 6;
return FALSE; return FALSE;
} }
effect* peffect = core.extras_effects[0]; effect* peffect = core.extra_szone_effects[0];
core.units.begin()->peffect = peffect; core.units.begin()->peffect = peffect;
core.extras_effects.remove_item(0); core.extra_szone_effects.remove_item(0);
uint32 p = peffect->get_handler_player(); uint32 p = peffect->get_handler_player();
uint32 szone_flag = ((player[p].disabled_location | player[p].used_location) >> 8) & 0x1f; uint32 szone_flag = ((player[p].disabled_location | player[p].used_location) >> 8) & 0x1f;
if(szone_flag == 0x1f) { if(szone_flag == 0x1f) {
...@@ -5033,7 +5020,6 @@ int32 field::refresh_location_info(uint16 step) { ...@@ -5033,7 +5020,6 @@ int32 field::refresh_location_info(uint16 step) {
} }
return TRUE; return TRUE;
} }
// adjust_all() goes here
int32 field::adjust_step(uint16 step) { int32 field::adjust_step(uint16 step) {
switch(step) { switch(step) {
case 0: { case 0: {
......
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