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
e1bf58a5
Commit
e1bf58a5
authored
Aug 08, 2017
by
mercury233
Committed by
GitHub
Aug 08, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update (#108)
parent
04362c80
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
card.h
card.h
+1
-1
operations.cpp
operations.cpp
+2
-1
No files found.
card.h
View file @
e1bf58a5
...
...
@@ -485,7 +485,7 @@ public:
#define STATUS_SUMMON_DISABLED 0x20000 //
#define STATUS_ACTIVATE_DISABLED 0x40000 //
#define STATUS_EFFECT_REPLACED 0x80000
#define STATUS_
UNION
0x100000
#define STATUS_
FUTURE_FUSION
0x100000
#define STATUS_ATTACK_CANCELED 0x200000
#define STATUS_INITIALIZING 0x400000
#define STATUS_ACTIVATED 0x800000
...
...
operations.cpp
View file @
e1bf58a5
...
...
@@ -2946,7 +2946,7 @@ int32 field::special_summon(uint16 step, effect* reason_effect, uint8 reason_pla
if(!((*cit)->current.position & POS_FACEDOWN))
raise_single_event(*cit, 0, EVENT_SPSUMMON_SUCCESS, (*cit)->current.reason_effect, 0, (*cit)->current.reason_player, (*cit)->summon_player, 0);
int32 summontype = (*cit)->summon_info & 0xff000000;
if
(
summontype
&&
(
*
cit
)
->
material_cards
.
size
())
{
if(summontype && (*cit)->material_cards.size()
&& !(*cit)->is_status(STATUS_FUTURE_FUSION)
) {
int32 matreason = 0;
if(summontype == SUMMON_TYPE_FUSION)
matreason = REASON_FUSION;
...
...
@@ -2960,6 +2960,7 @@ int32 field::special_summon(uint16 step, effect* reason_effect, uint8 reason_pla
raise_single_event(*mit, &targets->container, EVENT_BE_MATERIAL, (*cit)->current.reason_effect, matreason, (*cit)->current.reason_player, (*cit)->summon_player, 0);
raise_event(&((*cit)->material_cards), EVENT_BE_MATERIAL, reason_effect, matreason, reason_player, (*cit)->summon_player, 0);
}
(*cit)->set_status(STATUS_FUTURE_FUSION, FALSE);
}
process_single_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