Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-2pick
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-2pick
Commits
c72f48cd
Commit
c72f48cd
authored
Jun 09, 2015
by
DailyShana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tribute opponent's monsters
parent
aa1d5bb5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
ocgcore/field.cpp
ocgcore/field.cpp
+2
-2
ocgcore/field.h
ocgcore/field.h
+1
-1
ocgcore/libduel.cpp
ocgcore/libduel.cpp
+8
-2
No files found.
ocgcore/field.cpp
View file @
c72f48cd
...
...
@@ -1189,7 +1189,7 @@ int32 field::check_release_list(uint8 playerid, int32 count, int32 use_con, int3
}
return
FALSE
;
}
int32
field
::
get_summon_release_list
(
card
*
target
,
card_set
*
release_list
,
card_set
*
ex_list
,
card_set
*
ex_list_sum
,
group
*
mg
)
{
int32
field
::
get_summon_release_list
(
card
*
target
,
card_set
*
release_list
,
card_set
*
ex_list
,
card_set
*
ex_list_sum
,
group
*
mg
,
uint32
ex
)
{
uint8
p
=
target
->
current
.
controler
;
card
*
pcard
;
uint32
rcount
=
0
;
...
...
@@ -1214,7 +1214,7 @@ int32 field::get_summon_release_list(card* target, card_set* release_list, card_
continue
;
if
(
mg
&&
!
mg
->
has_card
(
pcard
))
continue
;
if
(
pcard
->
is_affected_by_effect
(
EFFECT_EXTRA_RELEASE
))
{
if
(
ex
||
pcard
->
is_affected_by_effect
(
EFFECT_EXTRA_RELEASE
))
{
if
(
ex_list
)
ex_list
->
insert
(
pcard
);
if
(
pcard
->
is_affected_by_effect
(
EFFECT_DOUBLE_TRIBUTE
,
target
))
...
...
ocgcore/field.h
View file @
c72f48cd
...
...
@@ -350,7 +350,7 @@ public:
int32
get_release_list
(
uint8
playerid
,
card_set
*
release_list
,
card_set
*
ex_list
,
int32
use_con
,
int32
use_hand
,
int32
fun
,
int32
exarg
,
card
*
exp
);
int32
check_release_list
(
uint8
playerid
,
int32
count
,
int32
use_con
,
int32
use_hand
,
int32
fun
,
int32
exarg
,
card
*
exp
);
int32
get_summon_release_list
(
card
*
target
,
card_set
*
release_list
,
card_set
*
ex_list
,
card_set
*
ex_list_sum
,
group
*
mg
=
0
);
int32
get_summon_release_list
(
card
*
target
,
card_set
*
release_list
,
card_set
*
ex_list
,
card_set
*
ex_list_sum
,
group
*
mg
=
0
,
uint32
ex
=
0
);
int32
get_summon_count_limit
(
uint8
playerid
);
int32
get_draw_count
(
uint8
playerid
);
void
get_ritual_material
(
uint8
playerid
,
effect
*
peffect
,
card_set
*
material
);
...
...
ocgcore/libduel.cpp
View file @
c72f48cd
...
...
@@ -1894,8 +1894,11 @@ int32 scriptlib::duel_get_tribute_count(lua_State *L) {
check_param
(
L
,
PARAM_TYPE_GROUP
,
2
);
mg
=
*
(
group
**
)
lua_touserdata
(
L
,
2
);
}
uint32
ex
=
0
;
if
(
lua_gettop
(
L
)
>=
3
)
ex
=
lua_toboolean
(
L
,
3
);
duel
*
pduel
=
interpreter
::
get_duel_info
(
L
);
lua_pushinteger
(
L
,
pduel
->
game_field
->
get_summon_release_list
(
target
,
0
,
0
,
0
,
mg
));
lua_pushinteger
(
L
,
pduel
->
game_field
->
get_summon_release_list
(
target
,
0
,
0
,
0
,
mg
,
ex
));
return
1
;
}
int32
scriptlib
::
duel_select_tribute
(
lua_State
*
L
)
{
...
...
@@ -1913,11 +1916,14 @@ int32 scriptlib::duel_select_tribute(lua_State *L) {
check_param
(
L
,
PARAM_TYPE_GROUP
,
5
);
mg
=
*
(
group
**
)
lua_touserdata
(
L
,
5
);
}
uint32
ex
=
0
;
if
(
lua_gettop
(
L
)
>=
6
)
ex
=
lua_toboolean
(
L
,
6
);
duel
*
pduel
=
interpreter
::
get_duel_info
(
L
);
pduel
->
game_field
->
core
.
release_cards
.
clear
();
pduel
->
game_field
->
core
.
release_cards_ex
.
clear
();
pduel
->
game_field
->
core
.
release_cards_ex_sum
.
clear
();
pduel
->
game_field
->
get_summon_release_list
(
target
,
&
pduel
->
game_field
->
core
.
release_cards
,
&
pduel
->
game_field
->
core
.
release_cards_ex
,
&
pduel
->
game_field
->
core
.
release_cards_ex_sum
,
mg
);
pduel
->
game_field
->
get_summon_release_list
(
target
,
&
pduel
->
game_field
->
core
.
release_cards
,
&
pduel
->
game_field
->
core
.
release_cards_ex
,
&
pduel
->
game_field
->
core
.
release_cards_ex_sum
,
mg
,
ex
);
pduel
->
game_field
->
add_process
(
PROCESSOR_SELECT_TRIBUTE_S
,
0
,
0
,
0
,
playerid
,
(
max
<<
16
)
+
min
);
return
lua_yield
(
L
,
0
);
}
...
...
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