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
39cd4000
Commit
39cd4000
authored
May 16, 2015
by
VanillaSalt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
83bfe169
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
7 deletions
+13
-7
ocgcore/card.cpp
ocgcore/card.cpp
+5
-2
ocgcore/libcard.cpp
ocgcore/libcard.cpp
+6
-3
script/c1845204.lua
script/c1845204.lua
+1
-1
script/c9236985.lua
script/c9236985.lua
+1
-1
No files found.
ocgcore/card.cpp
View file @
39cd4000
...
...
@@ -1383,9 +1383,12 @@ int32 card::get_counter(uint16 countertype) {
return
cmit
->
second
;
}
void
card
::
set_material
(
card_set
*
materials
)
{
if
(
!
materials
)
{
material_cards
.
clear
();
return
;
}
material_cards
=
*
materials
;
card_set
::
iterator
cit
;
for
(
cit
=
material_cards
.
begin
();
cit
!=
material_cards
.
end
();
++
cit
)
for
(
auto
cit
=
material_cards
.
begin
();
cit
!=
material_cards
.
end
();
++
cit
)
(
*
cit
)
->
current
.
reason_card
=
this
;
effect_set
eset
;
filter_effect
(
EFFECT_MATERIAL_CHECK
,
&
eset
);
...
...
ocgcore/libcard.cpp
View file @
39cd4000
...
...
@@ -571,10 +571,13 @@ int32 scriptlib::card_get_turn_counter(lua_State *L) {
int32
scriptlib
::
card_set_material
(
lua_State
*
L
)
{
check_param_count
(
L
,
2
);
check_param
(
L
,
PARAM_TYPE_CARD
,
1
);
check_param
(
L
,
PARAM_TYPE_GROUP
,
2
);
card
*
pcard
=
*
(
card
**
)
lua_touserdata
(
L
,
1
);
group
*
pgroup
=
*
(
group
**
)
lua_touserdata
(
L
,
2
);
pcard
->
set_material
(
&
pgroup
->
container
);
if
(
!
lua_isnil
(
L
,
2
))
{
check_param
(
L
,
PARAM_TYPE_GROUP
,
2
);
group
*
pgroup
=
*
(
group
**
)
lua_touserdata
(
L
,
2
);
pcard
->
set_material
(
&
pgroup
->
container
);
}
else
pcard
->
set_material
(
0
);
return
0
;
}
int32
scriptlib
::
card_get_material
(
lua_State
*
L
)
{
...
...
script/c1845204.lua
View file @
39cd4000
...
...
@@ -30,7 +30,7 @@ function c1845204.activate(e,tp,eg,ep,ev,re,r,rp)
local
g
=
Duel
.
SelectMatchingCard
(
tp
,
c1845204
.
filter
,
tp
,
LOCATION_EXTRA
,
0
,
1
,
1
,
nil
,
e
,
tp
)
local
tc
=
g
:
GetFirst
()
if
not
tc
then
return
end
tc
:
SetMaterial
(
Group
.
CreateGroup
()
)
tc
:
SetMaterial
(
nil
)
if
Duel
.
SpecialSummon
(
tc
,
SUMMON_TYPE_FUSION
,
tp
,
tp
,
false
,
false
,
POS_FACEUP
)
~=
0
then
local
e1
=
Effect
.
CreateEffect
(
e
:
GetHandler
())
e1
:
SetType
(
EFFECT_TYPE_SINGLE
)
...
...
script/c9236985.lua
View file @
39cd4000
...
...
@@ -30,7 +30,7 @@ function c9236985.activate(e,tp,eg,ep,ev,re,r,rp)
local
tc
=
tg
:
GetFirst
()
if
tc
then
Duel
.
PayLPCost
(
tp
,
tc
:
GetLevel
()
*
500
)
tc
:
SetMaterial
(
Group
.
CreateGroup
()
)
tc
:
SetMaterial
(
nil
)
Duel
.
SpecialSummon
(
tc
,
SUMMON_TYPE_RITUAL
,
tp
,
tp
,
true
,
false
,
POS_FACEUP
)
tc
:
CompleteProcedure
()
end
...
...
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