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
fae7551d
Commit
fae7551d
authored
Jun 05, 2016
by
DailyShana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update immune effect
parent
27e0668f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
card.cpp
card.cpp
+1
-1
effect.cpp
effect.cpp
+6
-4
effect.h
effect.h
+1
-1
No files found.
card.cpp
View file @
fae7551d
...
...
@@ -2560,7 +2560,7 @@ int32 card::is_affect_by_effect(effect* peffect) {
return
FALSE
;
if
(
!
peffect
||
peffect
->
is_flag
(
EFFECT_FLAG_IGNORE_IMMUNE
))
return
TRUE
;
if
(
peffect
->
is_immuned
(
&
immune_effect
))
if
(
peffect
->
is_immuned
(
this
))
return
FALSE
;
return
TRUE
;
}
...
...
effect.cpp
View file @
fae7551d
...
...
@@ -472,13 +472,15 @@ int32 effect::is_player_effect_target(card* pcard) {
}
return
TRUE
;
}
int32
effect
::
is_immuned
(
effect_set_v
*
effects
)
{
int32
effect
::
is_immuned
(
card
*
pcard
)
{
effect_set_v
effects
=
pcard
->
immune_effect
;
effect
*
peffect
;
for
(
int
i
=
0
;
i
<
effects
->
count
;
++
i
)
{
peffect
=
effects
->
at
(
i
);
for
(
int
i
=
0
;
i
<
effects
.
count
;
++
i
)
{
peffect
=
effects
.
at
(
i
);
if
(
peffect
->
value
)
{
pduel
->
lua
->
add_param
(
this
,
PARAM_TYPE_EFFECT
);
if
(
peffect
->
check_value_condition
(
1
))
pduel
->
lua
->
add_param
(
pcard
,
PARAM_TYPE_CARD
);
if
(
peffect
->
check_value_condition
(
2
))
return
TRUE
;
}
}
...
...
effect.h
View file @
fae7551d
...
...
@@ -74,7 +74,7 @@ public:
int32
is_target
(
card
*
pcard
);
int32
is_target_player
(
uint8
playerid
);
int32
is_player_effect_target
(
card
*
pcard
);
int32
is_immuned
(
effect_set_v
*
effects
);
int32
is_immuned
(
card
*
pcard
);
int32
is_chainable
(
uint8
tp
);
int32
reset
(
uint32
reset_level
,
uint32
reset_type
);
void
dec_count
(
uint32
playerid
=
2
);
...
...
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