Skip to content

Y
ygopro-core
Commit 6166128f authored by Chen Bill's avatar Chen Bill Committed by GitHub
Browse files
Options

fix field::recover(), field::damage() (#502) 

* fix field::recover(), field::damage()

Now the amount is int32.

* add recover cap

* update recover cap
parent b419ee8e
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 22 deletions
field.h
View file @ 6166128f
...@@ -576,8 +576,8 @@ public: ...@@ -576,8 +576,8 @@ public:
void swap_control(effect* reason_effect, uint32 reason_player, card* pcard1, card* pcard2, uint32 reset_phase, uint32 reset_count); void swap_control(effect* reason_effect, uint32 reason_player, card* pcard1, card* pcard2, uint32 reset_phase, uint32 reset_count);
void equip(uint32 equip_player, card* equip_card, card* target, uint32 up, uint32 is_step); void equip(uint32 equip_player, card* equip_card, card* target, uint32 up, uint32 is_step);
void draw(effect* reason_effect, uint32 reason, uint32 reason_player, uint32 playerid, uint32 count); void draw(effect* reason_effect, uint32 reason, uint32 reason_player, uint32 playerid, uint32 count);
void damage(effect* reason_effect, uint32 reason, uint32 reason_player, card* reason_card, uint32 playerid, uint32 amount, uint32 is_step = FALSE); void damage(effect* reason_effect, uint32 reason, uint32 reason_player, card* reason_card, uint32 playerid, int32 amount, uint32 is_step = FALSE);
void recover(effect* reason_effect, uint32 reason, uint32 reason_player, uint32 playerid, uint32 amount, uint32 is_step = FALSE); void recover(effect* reason_effect, uint32 reason, uint32 reason_player, uint32 playerid, int32 amount, uint32 is_step = FALSE);
void summon(uint32 sumplayer, card* target, effect* proc, uint32 ignore_count, uint32 min_tribute, uint32 zone = 0x1f); void summon(uint32 sumplayer, card* target, effect* proc, uint32 ignore_count, uint32 min_tribute, uint32 zone = 0x1f);
void mset(uint32 setplayer, card* target, effect* proc, uint32 ignore_count, uint32 min_tribute, uint32 zone = 0x1f); void mset(uint32 setplayer, card* target, effect* proc, uint32 ignore_count, uint32 min_tribute, uint32 zone = 0x1f);
void special_summon_rule(uint32 sumplayer, card* target, uint32 summon_type); void special_summon_rule(uint32 sumplayer, card* target, uint32 summon_type);
...@@ -604,8 +604,8 @@ public: ...@@ -604,8 +604,8 @@ public:
int32 trap_monster_adjust(uint16 step); int32 trap_monster_adjust(uint16 step);
int32 equip(uint16 step, uint8 equip_player, card* equip_card, card* target, uint32 up, uint32 is_step); int32 equip(uint16 step, uint8 equip_player, card* equip_card, card* target, uint32 up, uint32 is_step);
int32 draw(uint16 step, effect* reason_effect, uint32 reason, uint8 reason_player, uint8 playerid, uint32 count); int32 draw(uint16 step, effect* reason_effect, uint32 reason, uint8 reason_player, uint8 playerid, uint32 count);
int32 damage(uint16 step, effect* reason_effect, uint32 reason, uint8 reason_player, card* reason_card, uint8 playerid, uint32 amount, uint32 is_step); int32 damage(uint16 step, effect* reason_effect, uint32 reason, uint8 reason_player, card* reason_card, uint8 playerid, int32 amount, uint32 is_step);
int32 recover(uint16 step, effect* reason_effect, uint32 reason, uint8 reason_player, uint8 playerid, uint32 amount, uint32 is_step); int32 recover(uint16 step, effect* reason_effect, uint32 reason, uint8 reason_player, uint8 playerid, int32 amount, uint32 is_step);
int32 summon(uint16 step, uint8 sumplayer, card* target, effect* proc, uint8 ignore_count, uint8 min_tribute, uint32 zone); int32 summon(uint16 step, uint8 sumplayer, card* target, effect* proc, uint8 ignore_count, uint8 min_tribute, uint32 zone);
int32 flip_summon(uint16 step, uint8 sumplayer, card* target); int32 flip_summon(uint16 step, uint8 sumplayer, card* target);
int32 mset(uint16 step, uint8 setplayer, card* ptarget, effect* proc, uint8 ignore_count, uint8 min_tribute, uint32 zone); int32 mset(uint16 step, uint8 setplayer, card* ptarget, effect* proc, uint8 ignore_count, uint8 min_tribute, uint32 zone);
......
operations.cpp
View file @ 6166128f
...@@ -142,15 +142,15 @@ void field::equip(uint32 equip_player, card* equip_card, card* target, uint32 up ...@@ -142,15 +142,15 @@ void field::equip(uint32 equip_player, card* equip_card, card* target, uint32 up
void field::draw(effect* reason_effect, uint32 reason, uint32 reason_player, uint32 playerid, uint32 count) { void field::draw(effect* reason_effect, uint32 reason, uint32 reason_player, uint32 playerid, uint32 count) {
add_process(PROCESSOR_DRAW, 0, reason_effect, 0, reason, (reason_player << 28) + (playerid << 24) + (count & 0xffffff)); add_process(PROCESSOR_DRAW, 0, reason_effect, 0, reason, (reason_player << 28) + (playerid << 24) + (count & 0xffffff));
} }
void field::damage(effect* reason_effect, uint32 reason, uint32 reason_player, card* reason_card, uint32 playerid, uint32 amount, uint32 is_step) { void field::damage(effect* reason_effect, uint32 reason, uint32 reason_player, card* reason_card, uint32 playerid, int32 amount, uint32 is_step) {
uint32 arg2 = (is_step << 28) + (reason_player << 26) + (playerid << 24) + (amount & 0xffffff); uint32 arg2 = (is_step << 4) + (reason_player << 2) + (playerid);
if(reason & REASON_BATTLE) if (reason & REASON_BATTLE)
add_process(PROCESSOR_DAMAGE, 0, (effect*)reason_card, 0, reason, arg2); add_process(PROCESSOR_DAMAGE, 0, (effect*)reason_card, 0, reason, arg2, amount);
else else
add_process(PROCESSOR_DAMAGE, 0, reason_effect, 0, reason, arg2); add_process(PROCESSOR_DAMAGE, 0, reason_effect, 0, reason, arg2, amount);
} }
void field::recover(effect* reason_effect, uint32 reason, uint32 reason_player, uint32 playerid, uint32 amount, uint32 is_step) { void field::recover(effect* reason_effect, uint32 reason, uint32 reason_player, uint32 playerid, int32 amount, uint32 is_step) {
add_process(PROCESSOR_RECOVER, 0, reason_effect, 0, reason, (is_step << 28) + (reason_player << 26) + (playerid << 24) + (amount & 0xffffff)); add_process(PROCESSOR_RECOVER, 0, reason_effect, 0, reason, (is_step << 4) + (reason_player << 2) + (playerid), amount);
} }
void field::summon(uint32 sumplayer, card* target, effect* proc, uint32 ignore_count, uint32 min_tribute, uint32 zone) { void field::summon(uint32 sumplayer, card* target, effect* proc, uint32 ignore_count, uint32 min_tribute, uint32 zone) {
add_process(PROCESSOR_SUMMON_RULE, 0, proc, (group*)target, sumplayer + (ignore_count << 8) + (min_tribute << 16) + (zone << 24), 0); add_process(PROCESSOR_SUMMON_RULE, 0, proc, (group*)target, sumplayer + (ignore_count << 8) + (min_tribute << 16) + (zone << 24), 0);
...@@ -451,7 +451,7 @@ int32 field::draw(uint16 step, effect* reason_effect, uint32 reason, uint8 reaso ...@@ -451,7 +451,7 @@ int32 field::draw(uint16 step, effect* reason_effect, uint32 reason, uint8 reaso
} }
return TRUE; return TRUE;
} }
int32 field::damage(uint16 step, effect* reason_effect, uint32 reason, uint8 reason_player, card* reason_card, uint8 playerid, uint32 amount, uint32 is_step) { int32 field::damage(uint16 step, effect* reason_effect, uint32 reason, uint8 reason_player, card* reason_card, uint8 playerid, int32 amount, uint32 is_step) {
switch(step) { switch(step) {
case 0: { case 0: {
effect_set eset; effect_set eset;
...@@ -482,11 +482,11 @@ int32 field::damage(uint16 step, effect* reason_effect, uint32 reason, uint8 rea ...@@ -482,11 +482,11 @@ int32 field::damage(uint16 step, effect* reason_effect, uint32 reason, uint8 rea
pduel->lua->add_param(reason_card, PARAM_TYPE_CARD); pduel->lua->add_param(reason_card, PARAM_TYPE_CARD);
if (eset[i]->check_value_condition(5)) { if (eset[i]->check_value_condition(5)) {
playerid = 1 - playerid; playerid = 1 - playerid;
core.units.begin()->arg2 |= 1 << 29; core.units.begin()->arg2 |= 1 << 5;
break; break;
} }
} }
uint32 val = amount; int32 val = amount;
eset.clear(); eset.clear();
filter_player_effect(playerid, EFFECT_CHANGE_DAMAGE, &eset); filter_player_effect(playerid, EFFECT_CHANGE_DAMAGE, &eset);
for(int32 i = 0; i < eset.size(); ++i) { for(int32 i = 0; i < eset.size(); ++i) {
...@@ -500,7 +500,7 @@ int32 field::damage(uint16 step, effect* reason_effect, uint32 reason, uint8 rea ...@@ -500,7 +500,7 @@ int32 field::damage(uint16 step, effect* reason_effect, uint32 reason, uint8 rea
if(val == 0) if(val == 0)
return TRUE; return TRUE;
} }
core.units.begin()->arg2 = (core.units.begin()->arg2 & 0xff000000) | (val & 0xffffff); core.units.begin()->arg3 = val;
if(is_step) { if(is_step) {
core.units.begin()->step = 9; core.units.begin()->step = 9;
return TRUE; return TRUE;
...@@ -508,7 +508,7 @@ int32 field::damage(uint16 step, effect* reason_effect, uint32 reason, uint8 rea ...@@ -508,7 +508,7 @@ int32 field::damage(uint16 step, effect* reason_effect, uint32 reason, uint8 rea
return FALSE; return FALSE;
} }
case 1: { case 1: {
uint32 is_reflect = (core.units.begin()->arg2 >> 29) & 1; uint32 is_reflect = (core.units.begin()->arg2 >> 5) & 1;
if(is_reflect) if(is_reflect)
playerid = 1 - playerid; playerid = 1 - playerid;
if(is_reflect || (reason & REASON_RRECOVER)) if(is_reflect || (reason & REASON_RRECOVER))
...@@ -546,7 +546,7 @@ int32 field::damage(uint16 step, effect* reason_effect, uint32 reason, uint8 rea ...@@ -546,7 +546,7 @@ int32 field::damage(uint16 step, effect* reason_effect, uint32 reason, uint8 rea
} }
return TRUE; return TRUE;
} }
int32 field::recover(uint16 step, effect* reason_effect, uint32 reason, uint8 reason_player, uint8 playerid, uint32 amount, uint32 is_step) { int32 field::recover(uint16 step, effect* reason_effect, uint32 reason, uint8 reason_player, uint8 playerid, int32 amount, uint32 is_step) {
switch(step) { switch(step) {
case 0: { case 0: {
effect_set eset; effect_set eset;
...@@ -576,10 +576,15 @@ int32 field::recover(uint16 step, effect* reason_effect, uint32 reason, uint8 re ...@@ -576,10 +576,15 @@ int32 field::recover(uint16 step, effect* reason_effect, uint32 reason, uint8 re
if(reason & REASON_RDAMAGE) if(reason & REASON_RDAMAGE)
core.units.begin()->step = 2; core.units.begin()->step = 2;
core.hint_timing[playerid] |= TIMING_RECOVER; core.hint_timing[playerid] |= TIMING_RECOVER;
player[playerid].lp += amount; int32 limit = INT32_MAX - player[playerid].lp;
int32 val = amount;
if (val > limit) {
val = limit;
}
player[playerid].lp += val;
pduel->write_buffer8(MSG_RECOVER); pduel->write_buffer8(MSG_RECOVER);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
pduel->write_buffer32(amount); pduel->write_buffer32(val);
raise_event((card*)0, EVENT_RECOVER, reason_effect, reason, reason_player, playerid, amount); raise_event((card*)0, EVENT_RECOVER, reason_effect, reason, reason_player, playerid, amount);
process_instant_event(); process_instant_event();
return FALSE; return FALSE;
......
processor.cpp
View file @ 6166128f
...@@ -434,7 +434,7 @@ int32 field::process() { ...@@ -434,7 +434,7 @@ int32 field::process() {
reason_card = (card*)it->peffect; reason_card = (card*)it->peffect;
else else
reason_effect = it->peffect; reason_effect = it->peffect;
if (damage(it->step, reason_effect, reason, (it->arg2 >> 26) & 0x3, reason_card, (it->arg2 >> 24) & 0x3, it->arg2 & 0xffffff, (it->arg2 >> 28) & 0x1)) { if (damage(it->step, reason_effect, reason, (it->arg2 >> 2) & 0x3, reason_card, (it->arg2) & 0x3, it->arg3, (it->arg2 >> 4) & 0x1)) {
if(it->step == 9) { if(it->step == 9) {
it->step = 1; it->step = 1;
core.recover_damage_reserve.splice(core.recover_damage_reserve.end(), core.units, it); core.recover_damage_reserve.splice(core.recover_damage_reserve.end(), core.units, it);
...@@ -445,7 +445,7 @@ int32 field::process() { ...@@ -445,7 +445,7 @@ int32 field::process() {
return pduel->bufferlen; return pduel->bufferlen;
} }
case PROCESSOR_RECOVER: { case PROCESSOR_RECOVER: {
if (recover(it->step, it->peffect, it->arg1, (it->arg2 >> 26) & 0x3, (it->arg2 >> 24) & 0x3, it->arg2 & 0xffffff, (it->arg2 >> 28) & 0x1)) { if (recover(it->step, it->peffect, it->arg1, (it->arg2 >> 2) & 0x3, (it->arg2) & 0x3, it->arg3, (it->arg2 >> 4) & 0x1)) {
if(it->step == 9) { if(it->step == 9) {
it->step = 1; it->step = 1;
core.recover_damage_reserve.splice(core.recover_damage_reserve.end(), core.units, it); core.recover_damage_reserve.splice(core.recover_damage_reserve.end(), core.units, it);
...@@ -2866,7 +2866,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -2866,7 +2866,7 @@ int32 field::process_battle_command(uint16 step) {
} }
case 24: { case 24: {
// PHASE_DAMAGE_CAL; // PHASE_DAMAGE_CAL;
calculate_battle_damage(0, 0, 0); calculate_battle_damage(nullptr, nullptr, nullptr);
raise_single_event(core.attacker, 0, EVENT_PRE_DAMAGE_CALCULATE, 0, 0, 0, 0, 0); raise_single_event(core.attacker, 0, EVENT_PRE_DAMAGE_CALCULATE, 0, 0, 0, 0, 0);
if(core.attack_target) if(core.attack_target)
raise_single_event(core.attack_target, 0, EVENT_PRE_DAMAGE_CALCULATE, 0, 0, 0, 0, 1); raise_single_event(core.attack_target, 0, EVENT_PRE_DAMAGE_CALCULATE, 0, 0, 0, 0, 1);
......
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