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
e9376985
Commit
e9376985
authored
Feb 06, 2018
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix rose xuz
parent
f8389194
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
4 deletions
+12
-4
ocgcore/card.cpp
ocgcore/card.cpp
+3
-2
ocgcore/duel.cpp
ocgcore/duel.cpp
+3
-1
ocgcore/field.h
ocgcore/field.h
+1
-0
ocgcore/libcard.cpp
ocgcore/libcard.cpp
+2
-0
ocgcore/libduel.cpp
ocgcore/libduel.cpp
+2
-1
ocgcore/operations.cpp
ocgcore/operations.cpp
+1
-0
No files found.
ocgcore/card.cpp
View file @
e9376985
...
@@ -1009,8 +1009,9 @@ uint32 card::check_xyz_level(card* pcard, uint32 lv) {
...
@@ -1009,8 +1009,9 @@ uint32 card::check_xyz_level(card* pcard, uint32 lv) {
return
0
;
return
0
;
//modded - rose xyz summon
//modded - rose xyz summon
card
*
rcard
=
pduel
->
game_field
->
rose_card
;
card
*
rcard
=
pduel
->
game_field
->
rose_card
;
if
(
rcard
&&
rcard
==
this
)
uint32
rlv
=
pduel
->
game_field
->
rose_level
;
return
lv
;
if
(
rcard
==
this
&&
rlv
==
lv
)
return
rlv
;
uint32
lev
;
uint32
lev
;
effect_set
eset
;
effect_set
eset
;
filter_effect
(
EFFECT_XYZ_LEVEL
,
&
eset
);
filter_effect
(
EFFECT_XYZ_LEVEL
,
&
eset
);
...
...
ocgcore/duel.cpp
View file @
e9376985
...
@@ -19,7 +19,8 @@ duel::duel() {
...
@@ -19,7 +19,8 @@ duel::duel() {
game_field
=
new
field
(
this
);
game_field
=
new
field
(
this
);
game_field
->
temp_card
=
new_card
(
0
);
game_field
->
temp_card
=
new_card
(
0
);
//modded - for rose xyz summon
//modded - for rose xyz summon
game_field
->
rose_card
=
0
;
game_field
->
rose_card
=
0
;
game_field
->
rose_level
=
0
;
clear_buffer
();
clear_buffer
();
}
}
duel
::~
duel
()
{
duel
::~
duel
()
{
...
@@ -47,6 +48,7 @@ void duel::clear() {
...
@@ -47,6 +48,7 @@ void duel::clear() {
game_field
->
temp_card
=
new_card
(
0
);
game_field
->
temp_card
=
new_card
(
0
);
//modded - for rose xyz summon
//modded - for rose xyz summon
game_field
->
rose_card
=
0
;
game_field
->
rose_card
=
0
;
game_field
->
rose_level
=
0
;
}
}
card
*
duel
::
new_card
(
uint32
code
)
{
card
*
duel
::
new_card
(
uint32
code
)
{
card
*
pcard
=
new
card
(
this
);
card
*
pcard
=
new
card
(
this
);
...
...
ocgcore/field.h
View file @
e9376985
...
@@ -343,6 +343,7 @@ public:
...
@@ -343,6 +343,7 @@ public:
tevent
nil_event
;
tevent
nil_event
;
//modded - for rose xyz summon
//modded - for rose xyz summon
card
*
rose_card
;
card
*
rose_card
;
uint32
rose_level
;
static
int32
field_used_count
[
32
];
static
int32
field_used_count
[
32
];
explicit
field
(
duel
*
pduel
);
explicit
field
(
duel
*
pduel
);
...
...
ocgcore/libcard.cpp
View file @
e9376985
...
@@ -117,8 +117,10 @@ int32 scriptlib::card_is_xyz_summonable_by_rose(lua_State *L) {
...
@@ -117,8 +117,10 @@ int32 scriptlib::card_is_xyz_summonable_by_rose(lua_State *L) {
pcard
->
pduel
->
game_field
->
core
.
limit_xyz_minc
=
2
;
pcard
->
pduel
->
game_field
->
core
.
limit_xyz_minc
=
2
;
pcard
->
pduel
->
game_field
->
core
.
limit_xyz_maxc
=
2
;
pcard
->
pduel
->
game_field
->
core
.
limit_xyz_maxc
=
2
;
pcard
->
pduel
->
game_field
->
rose_card
=
rcard
;
pcard
->
pduel
->
game_field
->
rose_card
=
rcard
;
pcard
->
pduel
->
game_field
->
rose_level
=
mcard
->
get_level
();
int32
result
=
pcard
->
is_special_summonable
(
p
,
SUMMON_TYPE_XYZ
);
int32
result
=
pcard
->
is_special_summonable
(
p
,
SUMMON_TYPE_XYZ
);
pcard
->
pduel
->
game_field
->
rose_card
=
0
;
pcard
->
pduel
->
game_field
->
rose_card
=
0
;
pcard
->
pduel
->
game_field
->
rose_level
=
0
;
lua_pushboolean
(
L
,
result
);
lua_pushboolean
(
L
,
result
);
return
1
;
return
1
;
}
}
...
...
ocgcore/libduel.cpp
View file @
e9376985
...
@@ -188,7 +188,8 @@ int32 scriptlib::duel_xyz_summon_by_rose(lua_State *L) {
...
@@ -188,7 +188,8 @@ int32 scriptlib::duel_xyz_summon_by_rose(lua_State *L) {
pduel
->
game_field
->
core
.
limit_xyz_minc
=
0
;
pduel
->
game_field
->
core
.
limit_xyz_minc
=
0
;
pduel
->
game_field
->
core
.
limit_xyz_maxc
=
0
;
pduel
->
game_field
->
core
.
limit_xyz_maxc
=
0
;
pduel
->
game_field
->
core
.
summon_cancelable
=
FALSE
;
pduel
->
game_field
->
core
.
summon_cancelable
=
FALSE
;
pcard
->
pduel
->
game_field
->
rose_card
=
rcard
;
pduel
->
game_field
->
rose_card
=
rcard
;
pduel
->
game_field
->
rose_level
=
mcard
->
get_level
();
pduel
->
game_field
->
special_summon_rule
(
playerid
,
pcard
,
SUMMON_TYPE_XYZ
);
pduel
->
game_field
->
special_summon_rule
(
playerid
,
pcard
,
SUMMON_TYPE_XYZ
);
return
lua_yield
(
L
,
0
);
return
lua_yield
(
L
,
0
);
}
}
...
...
ocgcore/operations.cpp
View file @
e9376985
...
@@ -2574,6 +2574,7 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card* target, uin
...
@@ -2574,6 +2574,7 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card* target, uin
matreason
=
REASON_XYZ
;
matreason
=
REASON_XYZ
;
//modded - rose xyz summon
//modded - rose xyz summon
pduel
->
game_field
->
rose_card
=
0
;
pduel
->
game_field
->
rose_card
=
0
;
pduel
->
game_field
->
rose_level
=
0
;
}
}
else
if
(
proc
->
value
==
SUMMON_TYPE_LINK
)
else
if
(
proc
->
value
==
SUMMON_TYPE_LINK
)
matreason
=
REASON_LINK
;
matreason
=
REASON_LINK
;
...
...
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