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
d7c5bec5
Commit
d7c5bec5
authored
Jun 21, 2017
by
VanillaSalt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
e1324596
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
libduel.cpp
libduel.cpp
+2
-1
operations.cpp
operations.cpp
+8
-0
No files found.
libduel.cpp
View file @
d7c5bec5
...
@@ -2229,12 +2229,13 @@ int32 scriptlib::duel_select_tribute(lua_State *L) {
...
@@ -2229,12 +2229,13 @@ int32 scriptlib::duel_select_tribute(lua_State *L) {
uint32
ex
=
0
;
uint32
ex
=
0
;
if
(
lua_gettop
(
L
)
>=
6
)
if
(
lua_gettop
(
L
)
>=
6
)
ex
=
lua_toboolean
(
L
,
6
);
ex
=
lua_toboolean
(
L
,
6
);
uint32
zone
=
0x1f
;
duel
*
pduel
=
interpreter
::
get_duel_info
(
L
);
duel
*
pduel
=
interpreter
::
get_duel_info
(
L
);
pduel
->
game_field
->
core
.
release_cards
.
clear
();
pduel
->
game_field
->
core
.
release_cards
.
clear
();
pduel
->
game_field
->
core
.
release_cards_ex
.
clear
();
pduel
->
game_field
->
core
.
release_cards_ex
.
clear
();
pduel
->
game_field
->
core
.
release_cards_ex_sum
.
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
,
ex
);
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
);
pduel
->
game_field
->
add_process
(
PROCESSOR_SELECT_TRIBUTE_S
,
0
,
0
,
0
,
playerid
,
(
max
<<
16
)
+
min
,
zone
);
return
lua_yield
(
L
,
0
);
return
lua_yield
(
L
,
0
);
}
}
/**
/**
...
...
operations.cpp
View file @
d7c5bec5
...
@@ -1531,6 +1531,10 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
...
@@ -1531,6 +1531,10 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
zone
&=
new_zone
;
zone
&=
new_zone
;
core
.
units
.
begin
()
->
arg1
=
sumplayer
+
(
ignore_count
<<
8
)
+
(
min_tribute
<<
16
)
+
(
zone
<<
24
);
core
.
units
.
begin
()
->
arg1
=
sumplayer
+
(
ignore_count
<<
8
)
+
(
min_tribute
<<
16
)
+
(
zone
<<
24
);
}
}
if
(
proc
)
{
core
.
units
.
begin
()
->
step
=
3
;
return
FALSE
;
}
core
.
select_cards
.
clear
();
core
.
select_cards
.
clear
();
int32
required
=
target
->
get_summon_tribute_count
();
int32
required
=
target
->
get_summon_tribute_count
();
int32
min
=
required
&
0xffff
;
int32
min
=
required
&
0xffff
;
...
@@ -2076,6 +2080,10 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint
...
@@ -2076,6 +2080,10 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint
zone
&=
new_zone
;
zone
&=
new_zone
;
core
.
units
.
begin
()
->
arg1
=
setplayer
+
(
ignore_count
<<
8
)
+
(
min_tribute
<<
16
)
+
(
zone
<<
24
);
core
.
units
.
begin
()
->
arg1
=
setplayer
+
(
ignore_count
<<
8
)
+
(
min_tribute
<<
16
)
+
(
zone
<<
24
);
}
}
if
(
proc
)
{
core
.
units
.
begin
()
->
step
=
3
;
return
FALSE
;
}
core
.
select_cards
.
clear
();
core
.
select_cards
.
clear
();
int32
required
=
target
->
get_set_tribute_count
();
int32
required
=
target
->
get_set_tribute_count
();
int32
min
=
required
&
0xffff
;
int32
min
=
required
&
0xffff
;
...
...
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