Skip to content

Y
ygopro
Commit 57bdb864 authored by salix5's avatar salix5
Browse files
Options

fix

parent b6cd0b77
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
ocgcore/processor.cpp
View file @ 57bdb864
...@@ -3009,7 +3009,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3009,7 +3009,7 @@ int32 field::process_battle_command(uint16 step) {
} }
case 6: { case 6: {
if(returns.ivalue[0] == -1) { if(returns.ivalue[0] == -1) {
//roolback //rollback
if(core.units.begin()->arg1) { if(core.units.begin()->arg1) {
core.attacker->announce_count++; core.attacker->announce_count++;
if(core.attack_target) if(core.attack_target)
...@@ -3749,7 +3749,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3749,7 +3749,7 @@ int32 field::process_battle_command(uint16 step) {
return FALSE; return FALSE;
} }
case 30: { case 30: {
raise_single_event(core.attacker, 0, EVENT_BATTLE_END, 0, 0, PLAYER_NONE, 0, 0); /*raise_single_event(core.attacker, 0, EVENT_BATTLE_END, 0, 0, PLAYER_NONE, 0, 0);
if(core.attack_target) if(core.attack_target)
raise_single_event(core.attack_target, 0, EVENT_BATTLE_END, 0, 0, PLAYER_NONE, 0, 1); raise_single_event(core.attack_target, 0, EVENT_BATTLE_END, 0, 0, PLAYER_NONE, 0, 1);
raise_event((card*)0, EVENT_BATTLE_END, 0, 0, PLAYER_NONE, 0, 0); raise_event((card*)0, EVENT_BATTLE_END, 0, 0, PLAYER_NONE, 0, 0);
...@@ -3760,21 +3760,21 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3760,21 +3760,21 @@ int32 field::process_battle_command(uint16 step) {
core.units.begin()->arg1 = 1; core.units.begin()->arg1 = 1;
} else { } else {
break_effect(); break_effect();
} }*/
return FALSE; return FALSE;
} }
case 31: { case 31: {
core.flip_delayed = FALSE; core.flip_delayed = FALSE;
core.new_fchain.splice(core.new_fchain.begin(), core.new_fchain_b); core.new_fchain.splice(core.new_fchain.begin(), core.new_fchain_b);
core.new_ochain.splice(core.new_ochain.begin(), core.new_ochain_b); core.new_ochain.splice(core.new_ochain.begin(), core.new_ochain_b);
if(core.units.begin()->arg1) { //if(core.units.begin()->arg1) {
raise_single_event(core.attacker, 0, EVENT_BATTLED, 0, 0, PLAYER_NONE, 0, 0); raise_single_event(core.attacker, 0, EVENT_BATTLED, 0, 0, PLAYER_NONE, 0, 0);
if(core.attack_target) if(core.attack_target)
raise_single_event(core.attack_target, 0, EVENT_BATTLED, 0, 0, PLAYER_NONE, 0, 1); raise_single_event(core.attack_target, 0, EVENT_BATTLED, 0, 0, PLAYER_NONE, 0, 1);
raise_event((card*)0, EVENT_BATTLED, 0, 0, PLAYER_NONE, 0, 0); raise_event((card*)0, EVENT_BATTLED, 0, 0, PLAYER_NONE, 0, 0);
process_single_event(); process_single_event();
process_instant_event(); process_instant_event();
} //}
if(!core.effect_damage_step || ((core.effect_damage_step != 3) && (core.current_chain.size() <= 1))) { if(!core.effect_damage_step || ((core.effect_damage_step != 3) && (core.current_chain.size() <= 1))) {
if(core.new_fchain.size() || core.new_ochain.size()) if(core.new_fchain.size() || core.new_ochain.size())
add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, FALSE, FALSE); add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, FALSE, FALSE);
......
script/constant.lua
View file @ 57bdb864
...@@ -506,10 +506,10 @@ EVENT_CONTROL_CHANGED =1120 --控制权变更 ...@@ -506,10 +506,10 @@ EVENT_CONTROL_CHANGED =1120 --控制权变更
EVENT_EQUIP =1121 --装备卡装备时 EVENT_EQUIP =1121 --装备卡装备时
EVENT_ATTACK_ANNOUNCE =1130 --攻击宣言时 EVENT_ATTACK_ANNOUNCE =1130 --攻击宣言时
EVENT_BE_BATTLE_TARGET =1131 --被选为攻击对象时 EVENT_BE_BATTLE_TARGET =1131 --被选为攻击对象时
EVENT_BATTLE_START =1132 --战斗阶段开始时 EVENT_BATTLE_START =1132 --伤害步骤开始时（反转前）
EVENT_BATTLE_CONFIRM =1133 --选完攻击对象时 EVENT_BATTLE_CONFIRM =1133 --伤害计算前（反转後）
EVENT_PRE_DAMAGE_CALCULATE =1134 --伤害计算前 EVENT_PRE_DAMAGE_CALCULATE =1134 --伤害计算时（單一連鎖串）
EVENT_DAMAGE_CALCULATING =1135 --伤害计算时 EVENT_DAMAGE_CALCULATING =1135 --伤害计算时（不入連鎖效果）
EVENT_PRE_BATTLE_DAMAGE =1136 --即将产生战斗伤害 EVENT_PRE_BATTLE_DAMAGE =1136 --即将产生战斗伤害
EVENT_BATTLE_END =1137 --战斗结束（开辟） EVENT_BATTLE_END =1137 --战斗结束（开辟）
EVENT_BATTLED =1138 --伤害计算后（异女、同反转效果时点） EVENT_BATTLED =1138 --伤害计算后（异女、同反转效果时点）
......
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