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
97ce3d55
Commit
97ce3d55
authored
Jul 20, 2018
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add EFFECT_MINIATURE_GARDEN_GIRL
parent
3dd03918
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
2 deletions
+13
-2
card.cpp
card.cpp
+8
-0
effect.h
effect.h
+1
-0
field.cpp
field.cpp
+2
-2
interpreter.cpp
interpreter.cpp
+2
-0
No files found.
card.cpp
View file @
97ce3d55
...
@@ -1009,6 +1009,14 @@ uint32 card::get_synchro_level(card* pcard) {
...
@@ -1009,6 +1009,14 @@ uint32 card::get_synchro_level(card* pcard) {
return
lev
;
return
lev
;
}
}
uint32
card
::
get_ritual_level
(
card
*
pcard
)
{
uint32
card
::
get_ritual_level
(
card
*
pcard
)
{
effect_set
eset_g
;
filter_effect
(
EFFECT_MINIATURE_GARDEN_GIRL
,
&
eset_g
);
for
(
int32
i
=
0
;
i
<
eset_g
.
size
();
++
i
)
{
pduel
->
lua
->
add_param
(
eset_g
[
i
],
PARAM_TYPE_EFFECT
);
pduel
->
lua
->
add_param
(
pcard
,
PARAM_TYPE_CARD
);
if
(
pduel
->
lua
->
check_condition
(
eset_g
[
i
]
->
target
,
2
))
return
pcard
->
get_level
();
}
if
((
data
.
type
&
(
TYPE_XYZ
|
TYPE_LINK
))
||
(
status
&
STATUS_NO_LEVEL
))
if
((
data
.
type
&
(
TYPE_XYZ
|
TYPE_LINK
))
||
(
status
&
STATUS_NO_LEVEL
))
return
0
;
return
0
;
uint32
lev
;
uint32
lev
;
...
...
effect.h
View file @
97ce3d55
...
@@ -116,6 +116,7 @@ public:
...
@@ -116,6 +116,7 @@ public:
#define EFFECT_EXTRA_TOMAIN_KOISHI 37564154
#define EFFECT_EXTRA_TOMAIN_KOISHI 37564154
#define EFFECT_OVERLAY_REMOVE_COST_CHANGE_KOISHI 37564155
#define EFFECT_OVERLAY_REMOVE_COST_CHANGE_KOISHI 37564155
#define EFFECT_ALLOW_SYNCHRO_KOISHI 37564156
#define EFFECT_ALLOW_SYNCHRO_KOISHI 37564156
#define EFFECT_MINIATURE_GARDEN_GIRL 37564157
//status
//status
#define EFFECT_STATUS_AVAILABLE 0x0001
#define EFFECT_STATUS_AVAILABLE 0x0001
...
...
field.cpp
View file @
97ce3d55
...
@@ -1781,13 +1781,13 @@ int32 field::get_draw_count(uint8 playerid) {
...
@@ -1781,13 +1781,13 @@ int32 field::get_draw_count(uint8 playerid) {
void
field
::
get_ritual_material
(
uint8
playerid
,
effect
*
peffect
,
card_set
*
material
)
{
void
field
::
get_ritual_material
(
uint8
playerid
,
effect
*
peffect
,
card_set
*
material
)
{
for
(
auto
cit
=
player
[
playerid
].
list_mzone
.
begin
();
cit
!=
player
[
playerid
].
list_mzone
.
end
();
++
cit
)
{
for
(
auto
cit
=
player
[
playerid
].
list_mzone
.
begin
();
cit
!=
player
[
playerid
].
list_mzone
.
end
();
++
cit
)
{
card
*
pcard
=
*
cit
;
card
*
pcard
=
*
cit
;
if
(
pcard
&&
pcard
->
get_level
(
)
&&
pcard
->
is_affect_by_effect
(
peffect
)
if
(
pcard
&&
(
pcard
->
get_level
()
||
pcard
->
is_affected_by_effect
(
EFFECT_MINIATURE_GARDEN_GIRL
)
)
&&
pcard
->
is_affect_by_effect
(
peffect
)
&&
pcard
->
is_releasable_by_nonsummon
(
playerid
)
&&
pcard
->
is_releasable_by_effect
(
playerid
,
peffect
))
&&
pcard
->
is_releasable_by_nonsummon
(
playerid
)
&&
pcard
->
is_releasable_by_effect
(
playerid
,
peffect
))
material
->
insert
(
pcard
);
material
->
insert
(
pcard
);
}
}
for
(
auto
cit
=
player
[
1
-
playerid
].
list_mzone
.
begin
();
cit
!=
player
[
1
-
playerid
].
list_mzone
.
end
();
++
cit
)
{
for
(
auto
cit
=
player
[
1
-
playerid
].
list_mzone
.
begin
();
cit
!=
player
[
1
-
playerid
].
list_mzone
.
end
();
++
cit
)
{
card
*
pcard
=
*
cit
;
card
*
pcard
=
*
cit
;
if
(
pcard
&&
pcard
->
get_level
(
)
&&
pcard
->
is_affect_by_effect
(
peffect
)
if
(
pcard
&&
(
pcard
->
get_level
()
||
pcard
->
is_affected_by_effect
(
EFFECT_MINIATURE_GARDEN_GIRL
)
)
&&
pcard
->
is_affect_by_effect
(
peffect
)
&&
pcard
->
is_affected_by_effect
(
EFFECT_EXTRA_RELEASE
)
&&
pcard
->
is_affected_by_effect
(
EFFECT_EXTRA_RELEASE
)
&&
pcard
->
is_releasable_by_nonsummon
(
playerid
)
&&
pcard
->
is_releasable_by_effect
(
playerid
,
peffect
))
&&
pcard
->
is_releasable_by_nonsummon
(
playerid
)
&&
pcard
->
is_releasable_by_effect
(
playerid
,
peffect
))
material
->
insert
(
pcard
);
material
->
insert
(
pcard
);
...
...
interpreter.cpp
View file @
97ce3d55
...
@@ -707,6 +707,8 @@ interpreter::interpreter(duel* pd): coroutines(256) {
...
@@ -707,6 +707,8 @@ interpreter::interpreter(duel* pd): coroutines(256) {
lua_setglobal
(
lua_state
,
"EFFECT_OVERLAY_REMOVE_COST_CHANGE_KOISHI"
);
lua_setglobal
(
lua_state
,
"EFFECT_OVERLAY_REMOVE_COST_CHANGE_KOISHI"
);
lua_pushinteger
(
lua_state
,
EFFECT_ALLOW_SYNCHRO_KOISHI
);
lua_pushinteger
(
lua_state
,
EFFECT_ALLOW_SYNCHRO_KOISHI
);
lua_setglobal
(
lua_state
,
"EFFECT_ALLOW_SYNCHRO_KOISHI"
);
lua_setglobal
(
lua_state
,
"EFFECT_ALLOW_SYNCHRO_KOISHI"
);
lua_pushinteger
(
lua_state
,
EFFECT_MINIATURE_GARDEN_GIRL
);
lua_setglobal
(
lua_state
,
"EFFECT_MINIATURE_GARDEN_GIRL"
);
//music hints
//music hints
lua_pushinteger
(
lua_state
,
HINT_MUSIC
);
lua_pushinteger
(
lua_state
,
HINT_MUSIC
);
lua_setglobal
(
lua_state
,
"HINT_MUSIC"
);
lua_setglobal
(
lua_state
,
"HINT_MUSIC"
);
...
...
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