Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
ygopro
Commits
c57933cb
Commit
c57933cb
authored
Dec 18, 2014
by
salix5
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1041 from salix5/patch1
fix: processor
parents
4f1543b8
88905136
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
ocgcore/processor.cpp
ocgcore/processor.cpp
+8
-8
script/constant.lua
script/constant.lua
+4
-4
No files found.
ocgcore/processor.cpp
View file @
c57933cb
...
@@ -3043,7 +3043,7 @@ int32 field::process_battle_command(uint16 step) {
...
@@ -3043,7 +3043,7 @@ int32 field::process_battle_command(uint16 step) {
}
}
case 6: {
case 6: {
if(returns.ivalue[0] == -1) {
if(returns.ivalue[0] == -1) {
//ro
o
lback
//ro
l
lback
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)
...
@@ -3783,14 +3783,14 @@ int32 field::process_battle_command(uint16 step) {
...
@@ -3783,14 +3783,14 @@ 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);
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))) {
add_process
(
PROCESSOR_POINT_EVENT
,
0
,
0
,
0
,
FALSE
,
TRUE
);
//
add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, FALSE, TRUE);
core.units.begin()->arg1 = 1;
core.units.begin()->arg1 = 1;
} else {
} else {
break_effect();
break_effect();
...
...
script/constant.lua
View file @
c57933cb
...
@@ -505,10 +505,10 @@ EVENT_CONTROL_CHANGED =1120 --控制权变更
...
@@ -505,10 +505,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
--伤害计算后(异女、同反转效果时点)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment