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
52f4efa0
Commit
52f4efa0
authored
Jul 11, 2022
by
mercury233
Committed by
GitHub
Jul 11, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add Effect.IsCostChecked (#454)
parent
0799fec5
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
13 deletions
+30
-13
effect.cpp
effect.cpp
+19
-12
effect.h
effect.h
+1
-0
libeffect.cpp
libeffect.cpp
+9
-1
scriptlib.h
scriptlib.h
+1
-0
No files found.
effect.cpp
View file @
52f4efa0
...
...
@@ -63,6 +63,7 @@ effect::effect(duel* pd) {
target
=
0
;
value
=
0
;
operation
=
0
;
cost_checked
=
FALSE
;
}
int32
effect
::
is_disable_related
()
{
if
(
code
==
EFFECT_IMMUNE_EFFECT
||
code
==
EFFECT_DISABLE
||
code
==
EFFECT_CANNOT_DISABLE
||
code
==
EFFECT_FORBIDDEN
)
...
...
@@ -410,7 +411,9 @@ int32 effect::is_activate_ready(effect* reason_effect, uint8 playerid, const tev
return
FALSE
;
}
}
if
(
!
neglect_cost
&&
cost
&&
!
(
type
&
EFFECT_TYPE_CONTINUOUS
))
{
if
(
!
neglect_cost
&&
!
(
type
&
EFFECT_TYPE_CONTINUOUS
))
{
cost_checked
=
TRUE
;
if
(
cost
)
{
pduel
->
lua
->
add_param
(
reason_effect
,
PARAM_TYPE_EFFECT
);
pduel
->
lua
->
add_param
(
playerid
,
PARAM_TYPE_INT
);
pduel
->
lua
->
add_param
(
e
.
event_cards
,
PARAM_TYPE_GROUP
);
...
...
@@ -421,9 +424,11 @@ int32 effect::is_activate_ready(effect* reason_effect, uint8 playerid, const tev
pduel
->
lua
->
add_param
(
e
.
reason_player
,
PARAM_TYPE_INT
);
pduel
->
lua
->
add_param
((
ptr
)
0
,
PARAM_TYPE_INT
);
if
(
!
pduel
->
lua
->
check_condition
(
cost
,
9
))
{
cost_checked
=
FALSE
;
return
FALSE
;
}
}
}
if
(
!
neglect_target
&&
target
)
{
pduel
->
lua
->
add_param
(
reason_effect
,
PARAM_TYPE_EFFECT
);
pduel
->
lua
->
add_param
(
playerid
,
PARAM_TYPE_INT
);
...
...
@@ -435,9 +440,11 @@ int32 effect::is_activate_ready(effect* reason_effect, uint8 playerid, const tev
pduel
->
lua
->
add_param
(
e
.
reason_player
,
PARAM_TYPE_INT
);
pduel
->
lua
->
add_param
((
ptr
)
0
,
PARAM_TYPE_INT
);
if
(
!
pduel
->
lua
->
check_condition
(
target
,
9
))
{
cost_checked
=
FALSE
;
return
FALSE
;
}
}
cost_checked
=
FALSE
;
return
TRUE
;
}
int32
effect
::
is_activate_ready
(
uint8
playerid
,
const
tevent
&
e
,
int32
neglect_cond
,
int32
neglect_cost
,
int32
neglect_target
)
{
...
...
effect.h
View file @
52f4efa0
...
...
@@ -61,6 +61,7 @@ public:
int32
target
;
int32
value
;
int32
operation
;
uint8
cost_checked
;
explicit
effect
(
duel
*
pd
);
~
effect
()
=
default
;
...
...
libeffect.cpp
View file @
52f4efa0
...
...
@@ -512,13 +512,20 @@ int32 scriptlib::effect_is_activatable(lua_State *L) {
lua_pushboolean
(
L
,
peffect
->
is_activateable
(
playerid
,
peffect
->
pduel
->
game_field
->
nil_event
,
0
,
0
,
neglect_target
,
neglect_loc
));
return
1
;
}
int32
scriptlib
::
effect_is_activated
(
lua_State
*
L
)
{
int32
scriptlib
::
effect_is_activated
(
lua_State
*
L
)
{
check_param_count
(
L
,
1
);
check_param
(
L
,
PARAM_TYPE_EFFECT
,
1
);
effect
*
peffect
=
*
(
effect
**
)
lua_touserdata
(
L
,
1
);
lua_pushboolean
(
L
,
(
peffect
->
type
&
0x7f0
));
return
1
;
}
int32
scriptlib
::
effect_is_cost_checked
(
lua_State
*
L
)
{
check_param_count
(
L
,
1
);
check_param
(
L
,
PARAM_TYPE_EFFECT
,
1
);
effect
*
peffect
=
*
(
effect
**
)
lua_touserdata
(
L
,
1
);
lua_pushboolean
(
L
,
peffect
->
cost_checked
);
return
1
;
}
int32
scriptlib
::
effect_get_activate_location
(
lua_State
*
L
)
{
check_param_count
(
L
,
1
);
check_param
(
L
,
PARAM_TYPE_EFFECT
,
1
);
...
...
@@ -610,6 +617,7 @@ static const struct luaL_Reg effectlib[] = {
{
"IsHasType"
,
scriptlib
::
effect_is_has_type
},
{
"IsActivatable"
,
scriptlib
::
effect_is_activatable
},
{
"IsActivated"
,
scriptlib
::
effect_is_activated
},
{
"IsCostChecked"
,
scriptlib
::
effect_is_cost_checked
},
{
"GetActivateLocation"
,
scriptlib
::
effect_get_activate_location
},
{
"GetActivateSequence"
,
scriptlib
::
effect_get_activate_sequence
},
{
"CheckCountLimit"
,
scriptlib
::
effect_check_count_limit
},
...
...
scriptlib.h
View file @
52f4efa0
...
...
@@ -329,6 +329,7 @@ public:
static
int32
effect_is_has_type
(
lua_State
*
L
);
static
int32
effect_is_activatable
(
lua_State
*
L
);
static
int32
effect_is_activated
(
lua_State
*
L
);
static
int32
effect_is_cost_checked
(
lua_State
*
L
);
static
int32
effect_get_activate_location
(
lua_State
*
L
);
static
int32
effect_get_activate_sequence
(
lua_State
*
L
);
static
int32
effect_check_count_limit
(
lua_State
*
L
);
...
...
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