Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-core
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-core
Commits
7a84ffdd
Commit
7a84ffdd
authored
Aug 24, 2020
by
mercury233
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/Fluorohydride/ygopro-core
parents
b1f9ca97
ee510208
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
effect.h
effect.h
+2
-1
libduel.cpp
libduel.cpp
+2
-0
processor.cpp
processor.cpp
+1
-1
No files found.
effect.h
View file @
7a84ffdd
...
...
@@ -476,8 +476,9 @@ inline effect_flag operator|(effect_flag flag1, effect_flag flag2)
#define EVENT_CHAINING 1027
#define EVENT_BECOME_TARGET 1028
#define EVENT_DESTROYED 1029
#define EVENT_MOVE 1030
#define EVENT_MOVE
1030
#define EVENT_ADJUST 1040
#define EVENT_BREAK_EFFECT 1050
#define EVENT_SUMMON_SUCCESS 1100
#define EVENT_FLIP_SUMMON_SUCCESS 1101
#define EVENT_SPSUMMON_SUCCESS 1102
...
...
libduel.cpp
View file @
7a84ffdd
...
...
@@ -1711,6 +1711,8 @@ int32 scriptlib::duel_break_effect(lua_State *L) {
check_action_permission
(
L
);
duel
*
pduel
=
interpreter
::
get_duel_info
(
L
);
pduel
->
game_field
->
break_effect
();
pduel
->
game_field
->
raise_event
((
card
*
)
0
,
EVENT_BREAK_EFFECT
,
0
,
0
,
PLAYER_NONE
,
PLAYER_NONE
,
0
);
pduel
->
game_field
->
process_instant_event
();
return
lua_yield
(
L
,
0
);
}
int32
scriptlib
::
duel_change_effect
(
lua_State
*
L
)
{
...
...
processor.cpp
View file @
7a84ffdd
...
...
@@ -1820,7 +1820,7 @@ int32 field::process_instant_event() {
}
}
}
if
(
ev
.
event_code
==
EVENT_ADJUST
||
((
ev
.
event_code
&
0xf000
)
==
EVENT_PHASE_START
))
if
(
ev
.
event_code
==
EVENT_ADJUST
||
ev
.
event_code
==
EVENT_BREAK_EFFECT
||
((
ev
.
event_code
&
0xf000
)
==
EVENT_PHASE_START
))
continue
;
//triggers
pr
=
effects
.
trigger_f_effect
.
equal_range
(
ev
.
event_code
);
...
...
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