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
List
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
nanahira
ygopro-core
Commits
2c30d33f
Commit
2c30d33f
authored
Jan 17, 2024
by
Chen Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "trigger EVENT_SSET when equiping face-down cards"
This reverts commit
e3cd5e2f
.
parent
8287c520
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
7 deletions
+1
-7
libduel.cpp
libduel.cpp
+1
-5
operations.cpp
operations.cpp
+0
-2
No files found.
libduel.cpp
View file @
2c30d33f
...
@@ -1343,12 +1343,9 @@ int32 scriptlib::duel_equip(lua_State *L) {
...
@@ -1343,12 +1343,9 @@ int32 scriptlib::duel_equip(lua_State *L) {
int32
scriptlib
::
duel_equip_complete
(
lua_State
*
L
)
{
int32
scriptlib
::
duel_equip_complete
(
lua_State
*
L
)
{
duel
*
pduel
=
interpreter
::
get_duel_info
(
L
);
duel
*
pduel
=
interpreter
::
get_duel_info
(
L
);
field
::
card_set
etargets
;
field
::
card_set
etargets
;
field
::
card_set
set_cards
;
for
(
auto
&
equip_card
:
pduel
->
game_field
->
core
.
equiping_cards
)
{
for
(
auto
&
equip_card
:
pduel
->
game_field
->
core
.
equiping_cards
)
{
if
(
equip_card
->
is_position
(
POS_FACEUP
))
if
(
equip_card
->
is_position
(
POS_FACEUP
))
equip_card
->
enable_field_effect
(
true
);
equip_card
->
enable_field_effect
(
true
);
if
(
equip_card
->
is_position
(
POS_FACEDOWN
))
set_cards
.
insert
(
equip_card
);
etargets
.
insert
(
equip_card
->
equiping_target
);
etargets
.
insert
(
equip_card
->
equiping_target
);
}
}
pduel
->
game_field
->
adjust_instant
();
pduel
->
game_field
->
adjust_instant
();
...
@@ -1357,7 +1354,6 @@ int32 scriptlib::duel_equip_complete(lua_State *L) {
...
@@ -1357,7 +1354,6 @@ int32 scriptlib::duel_equip_complete(lua_State *L) {
pduel
->
game_field
->
core
.
reason_effect
,
0
,
pduel
->
game_field
->
core
.
reason_player
,
PLAYER_NONE
,
0
);
pduel
->
game_field
->
core
.
reason_effect
,
0
,
pduel
->
game_field
->
core
.
reason_player
,
PLAYER_NONE
,
0
);
pduel
->
game_field
->
raise_event
(
&
pduel
->
game_field
->
core
.
equiping_cards
,
EVENT_EQUIP
,
pduel
->
game_field
->
raise_event
(
&
pduel
->
game_field
->
core
.
equiping_cards
,
EVENT_EQUIP
,
pduel
->
game_field
->
core
.
reason_effect
,
0
,
pduel
->
game_field
->
core
.
reason_player
,
PLAYER_NONE
,
0
);
pduel
->
game_field
->
core
.
reason_effect
,
0
,
pduel
->
game_field
->
core
.
reason_player
,
PLAYER_NONE
,
0
);
pduel
->
game_field
->
raise_event
(
&
set_cards
,
EVENT_SSET
,
pduel
->
game_field
->
core
.
reason_effect
,
0
,
pduel
->
game_field
->
core
.
reason_player
,
0
,
0
);
pduel
->
game_field
->
core
.
hint_timing
[
0
]
|=
TIMING_EQUIP
;
pduel
->
game_field
->
core
.
hint_timing
[
0
]
|=
TIMING_EQUIP
;
pduel
->
game_field
->
core
.
hint_timing
[
1
]
|=
TIMING_EQUIP
;
pduel
->
game_field
->
core
.
hint_timing
[
1
]
|=
TIMING_EQUIP
;
pduel
->
game_field
->
process_single_event
();
pduel
->
game_field
->
process_single_event
();
...
...
operations.cpp
View file @
2c30d33f
...
@@ -1433,8 +1433,6 @@ int32 field::equip(uint16 step, uint8 equip_player, card * equip_card, card * ta
...
@@ -1433,8 +1433,6 @@ int32 field::equip(uint16 step, uint8 equip_player, card * equip_card, card * ta
cset
.
insert
(
equip_card
);
cset
.
insert
(
equip_card
);
raise_single_event
(
target
,
&
cset
,
EVENT_EQUIP
,
core
.
reason_effect
,
0
,
core
.
reason_player
,
PLAYER_NONE
,
0
);
raise_single_event
(
target
,
&
cset
,
EVENT_EQUIP
,
core
.
reason_effect
,
0
,
core
.
reason_player
,
PLAYER_NONE
,
0
);
raise_event
(
&
cset
,
EVENT_EQUIP
,
core
.
reason_effect
,
0
,
core
.
reason_player
,
PLAYER_NONE
,
0
);
raise_event
(
&
cset
,
EVENT_EQUIP
,
core
.
reason_effect
,
0
,
core
.
reason_player
,
PLAYER_NONE
,
0
);
if
(
equip_card
->
is_position
(
POS_FACEDOWN
))
raise_event
(
&
cset
,
EVENT_SSET
,
core
.
reason_effect
,
0
,
core
.
reason_player
,
0
,
0
);
core
.
hint_timing
[
target
->
current
.
controler
]
|=
TIMING_EQUIP
;
core
.
hint_timing
[
target
->
current
.
controler
]
|=
TIMING_EQUIP
;
process_single_event
();
process_single_event
();
process_instant_event
();
process_instant_event
();
...
...
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