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
8d9f0195
Commit
8d9f0195
authored
Jul 31, 2012
by
argon.sun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
f18d117a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
27 deletions
+15
-27
ocgcore/operations.cpp
ocgcore/operations.cpp
+1
-1
script/c34149830.lua
script/c34149830.lua
+1
-1
script/c59509952.lua
script/c59509952.lua
+2
-2
script/c61314842.lua
script/c61314842.lua
+9
-21
script/c7935043.lua
script/c7935043.lua
+1
-1
script/c86016245.lua
script/c86016245.lua
+1
-1
No files found.
ocgcore/operations.cpp
View file @
8d9f0195
...
@@ -2001,7 +2001,7 @@ int32 field::special_summon(uint16 step, effect * reason_effect, uint8 reason_pl
...
@@ -2001,7 +2001,7 @@ int32 field::special_summon(uint16 step, effect * reason_effect, uint8 reason_pl
raise_single_event
(
*
cit
,
0
,
EVENT_SPSUMMON_SUCCESS
,
(
*
cit
)
->
current
.
reason_effect
,
0
,
(
*
cit
)
->
current
.
reason_player
,
(
*
cit
)
->
summon_player
,
0
);
raise_single_event
(
*
cit
,
0
,
EVENT_SPSUMMON_SUCCESS
,
(
*
cit
)
->
current
.
reason_effect
,
0
,
(
*
cit
)
->
current
.
reason_player
,
(
*
cit
)
->
summon_player
,
0
);
int32
summontype
=
(
*
cit
)
->
summon_type
&
0xff000000
;
int32
summontype
=
(
*
cit
)
->
summon_type
&
0xff000000
;
if
(
summontype
&&
(
*
cit
)
->
material_cards
.
size
())
{
if
(
summontype
&&
(
*
cit
)
->
material_cards
.
size
())
{
int32
matreason
=
(
summontype
==
SUMMON_TYPE_FUSION
)
?
REASON_FUSION
:
(
summontype
==
SUMMON_TYPE_RITUAL
)
?
REASON_RITUAL
:
0
;
int32
matreason
=
(
summontype
==
SUMMON_TYPE_FUSION
)
?
REASON_FUSION
:
(
summontype
==
SUMMON_TYPE_RITUAL
)
?
REASON_RITUAL
:
(
summontype
==
SUMMON_TYPE_XYZ
)
?
REASON_XYZ
:
0
;
for
(
auto
mit
=
(
*
cit
)
->
material_cards
.
begin
();
mit
!=
(
*
cit
)
->
material_cards
.
end
();
++
mit
)
for
(
auto
mit
=
(
*
cit
)
->
material_cards
.
begin
();
mit
!=
(
*
cit
)
->
material_cards
.
end
();
++
mit
)
raise_single_event
(
*
mit
,
0
,
EVENT_BE_MATERIAL
,
core
.
reason_effect
,
matreason
,
core
.
reason_player
,
(
*
cit
)
->
summon_player
,
0
);
raise_single_event
(
*
mit
,
0
,
EVENT_BE_MATERIAL
,
core
.
reason_effect
,
matreason
,
core
.
reason_player
,
(
*
cit
)
->
summon_player
,
0
);
raise_event
(
&
((
*
cit
)
->
material_cards
),
EVENT_BE_MATERIAL
,
core
.
reason_effect
,
matreason
,
core
.
reason_player
,
(
*
cit
)
->
summon_player
,
0
);
raise_event
(
&
((
*
cit
)
->
material_cards
),
EVENT_BE_MATERIAL
,
core
.
reason_effect
,
matreason
,
core
.
reason_player
,
(
*
cit
)
->
summon_player
,
0
);
...
...
script/c34149830.lua
View file @
8d9f0195
...
@@ -27,7 +27,7 @@ function c34149830.condition(e,tp,eg,ep,ev,re,r,rp)
...
@@ -27,7 +27,7 @@ function c34149830.condition(e,tp,eg,ep,ev,re,r,rp)
and
((
tc
:
IsDefencePos
()
and
tc
:
GetDefence
()
<
bc
:
GetAttack
())
or
(
tc
:
IsAttackPos
()
and
tc
:
GetAttack
()
<=
bc
:
GetAttack
()))
and
((
tc
:
IsDefencePos
()
and
tc
:
GetDefence
()
<
bc
:
GetAttack
())
or
(
tc
:
IsAttackPos
()
and
tc
:
GetAttack
()
<=
bc
:
GetAttack
()))
end
end
function
c34149830
.
spfilter
(
c
,
e
,
tp
)
function
c34149830
.
spfilter
(
c
,
e
,
tp
)
return
c
:
GetLevel
()
==
4
and
c
:
IsRace
(
RACE_WARRIOR
)
and
c
:
IsCanBeSpecialSummoned
(
e
,
0
,
tp
,
false
,
false
)
return
c
:
IsLevelBelow
(
4
)
and
c
:
IsRace
(
RACE_WARRIOR
)
and
c
:
IsCanBeSpecialSummoned
(
e
,
0
,
tp
,
false
,
false
)
end
end
function
c34149830
.
target
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
function
c34149830
.
target
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
if
chk
==
0
then
return
not
e
:
GetHandler
():
IsStatus
(
STATUS_CHAINING
)
if
chk
==
0
then
return
not
e
:
GetHandler
():
IsStatus
(
STATUS_CHAINING
)
...
...
script/c59509952.lua
View file @
8d9f0195
...
@@ -21,7 +21,7 @@ function c59509952.initial_effect(c)
...
@@ -21,7 +21,7 @@ function c59509952.initial_effect(c)
--redirect
--redirect
local
e3
=
Effect
.
CreateEffect
(
c
)
local
e3
=
Effect
.
CreateEffect
(
c
)
e3
:
SetType
(
EFFECT_TYPE_SINGLE
)
e3
:
SetType
(
EFFECT_TYPE_SINGLE
)
e3
:
SetCode
(
EFFECT_
TO_GRAVE
_REDIRECT
)
e3
:
SetCode
(
EFFECT_
LEAVE_FIELD
_REDIRECT
)
e3
:
SetCondition
(
c59509952
.
recon
)
e3
:
SetCondition
(
c59509952
.
recon
)
e3
:
SetValue
(
LOCATION_DECK
)
e3
:
SetValue
(
LOCATION_DECK
)
c
:
RegisterEffect
(
e3
)
c
:
RegisterEffect
(
e3
)
...
@@ -45,7 +45,7 @@ function c59509952.spcon(e,c)
...
@@ -45,7 +45,7 @@ function c59509952.spcon(e,c)
end
end
function
c59509952
.
recon
(
e
)
function
c59509952
.
recon
(
e
)
local
c
=
e
:
GetHandler
()
local
c
=
e
:
GetHandler
()
return
c
:
Is
OnField
()
and
c
:
IsFaceup
()
return
c
:
Is
Faceup
()
and
c
:
GetDestination
()
==
LOCATION_GRAVE
end
end
function
c59509952
.
condition
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
function
c59509952
.
condition
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
return
e
:
GetHandler
():
GetSummonType
()
==
SUMMON_TYPE_SPECIAL
+
1
return
e
:
GetHandler
():
GetSummonType
()
==
SUMMON_TYPE_SPECIAL
+
1
...
...
script/c61314842.lua
View file @
8d9f0195
...
@@ -17,28 +17,14 @@ function c61314842.xyzfilter(c,mg)
...
@@ -17,28 +17,14 @@ function c61314842.xyzfilter(c,mg)
if
c
.
xyz_count
~=
2
then
return
false
end
if
c
.
xyz_count
~=
2
then
return
false
end
return
c
:
IsXyzSummonable
(
mg
)
return
c
:
IsXyzSummonable
(
mg
)
end
end
function
c61314842
.
mfilter1
(
c
,
exg
)
return
exg
:
IsExists
(
c61314842
.
mfilter2
,
1
,
nil
,
c
)
end
function
c61314842
.
mfilter2
(
c
,
mc
)
return
c
.
xyz_filter
(
mc
)
end
function
c61314842
.
target
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
,
chkc
)
function
c61314842
.
target
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
,
chkc
)
if
chkc
then
return
false
end
if
chkc
then
return
false
end
local
mg
=
Duel
.
GetMatchingGroup
(
c61314842
.
filter
,
tp
,
LOCATION_GRAVE
,
0
,
nil
,
e
,
tp
)
if
chk
==
0
then
return
(
not
Duel
.
IsPlayerAffectedByEffect
(
tp
,
23516703
)
or
c23516703
[
tp
]
==
0
)
if
chk
==
0
then
return
(
not
Duel
.
IsPlayerAffectedByEffect
(
tp
,
23516703
)
or
c23516703
[
tp
]
==
0
)
and
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
>
1
and
mg
:
GetCount
()
>
1
and
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
>
1
and
Duel
.
IsExistingMatchingCard
(
c61314842
.
xyzfilter
,
tp
,
LOCATION_EXTRA
,
0
,
1
,
nil
,
mg
)
end
and
Duel
.
IsExistingTarget
(
c61314842
.
filter
,
tp
,
LOCATION_GRAVE
,
0
,
2
,
nil
,
e
,
tp
)
end
local
exg
=
Duel
.
GetMatchingGroup
(
c61314842
.
xyzfilter
,
tp
,
LOCATION_EXTRA
,
0
,
nil
,
mg
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_SPSUMMON
)
local
sg1
=
mg
:
FilterSelect
(
tp
,
c61314842
.
mfilter1
,
1
,
1
,
nil
,
exg
)
local
tc1
=
sg1
:
GetFirst
()
local
exg2
=
exg
:
Filter
(
c61314842
.
mfilter2
,
nil
,
tc1
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_SPSUMMON
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_SPSUMMON
)
local
sg2
=
mg
:
FilterSelect
(
tp
,
c61314842
.
mfilter1
,
1
,
1
,
tc1
,
exg2
)
local
g
=
Duel
.
SelectTarget
(
tp
,
c61314842
.
filter
,
tp
,
LOCATION_GRAVE
,
0
,
2
,
2
,
nil
,
e
,
tp
)
sg1
:
Merge
(
sg2
)
Duel
.
SetOperationInfo
(
0
,
CATEGORY_SPECIAL_SUMMON
,
g
,
2
,
0
,
0
)
Duel
.
SetTargetCard
(
sg1
)
Duel
.
SetOperationInfo
(
0
,
CATEGORY_SPECIAL_SUMMON
,
sg1
,
2
,
0
,
0
)
end
end
function
c61314842
.
filter2
(
c
,
e
,
tp
)
function
c61314842
.
filter2
(
c
,
e
,
tp
)
return
c
:
IsRelateToEffect
(
e
)
and
c
:
IsCanBeSpecialSummoned
(
e
,
0
,
tp
,
false
,
false
)
return
c
:
IsRelateToEffect
(
e
)
and
c
:
IsCanBeSpecialSummoned
(
e
,
0
,
tp
,
false
,
false
)
...
@@ -48,12 +34,14 @@ function c61314842.activate(e,tp,eg,ep,ev,re,r,rp)
...
@@ -48,12 +34,14 @@ function c61314842.activate(e,tp,eg,ep,ev,re,r,rp)
if
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
<
2
then
return
end
if
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
<
2
then
return
end
local
g
=
Duel
.
GetChainInfo
(
0
,
CHAININFO_TARGET_CARDS
):
Filter
(
c61314842
.
filter2
,
nil
,
e
,
tp
)
local
g
=
Duel
.
GetChainInfo
(
0
,
CHAININFO_TARGET_CARDS
):
Filter
(
c61314842
.
filter2
,
nil
,
e
,
tp
)
if
g
:
GetCount
()
<
2
then
return
end
if
g
:
GetCount
()
<
2
then
return
end
Duel
.
SpecialSummon
(
g
,
0
,
tp
,
tp
,
false
,
false
,
POS_FACEUP
)
Duel
.
BreakEffect
()
local
xyzg
=
Duel
.
GetMatchingGroup
(
c61314842
.
xyzfilter
,
tp
,
LOCATION_EXTRA
,
0
,
nil
,
g
)
local
xyzg
=
Duel
.
GetMatchingGroup
(
c61314842
.
xyzfilter
,
tp
,
LOCATION_EXTRA
,
0
,
nil
,
g
)
if
xyzg
:
GetCount
()
>
0
then
if
xyzg
:
GetCount
()
>
0
then
Duel
.
SpecialSummon
(
g
,
0
,
tp
,
tp
,
false
,
false
,
POS_FACEUP
)
Duel
.
BreakEffect
()
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_SPSUMMON
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_SPSUMMON
)
local
xyz
=
xyzg
:
Select
(
tp
,
1
,
1
,
nil
):
GetFirst
()
local
xyz
=
xyzg
:
Select
(
tp
,
1
,
1
,
nil
):
GetFirst
()
Duel
.
XyzSummon
(
tp
,
xyz
,
g
)
xyz
:
SetMaterial
(
g
)
Duel
.
Overlay
(
xyz
,
g
)
Duel
.
SpecialSummon
(
xyz
,
SUMMON_TYPE_XYZ
,
tp
,
tp
,
false
,
false
,
POS_FACEUP
)
end
end
end
end
script/c7935043.lua
View file @
8d9f0195
...
@@ -26,5 +26,5 @@ function c7935043.activate(e,tp,eg,ep,ev,re,r,rp)
...
@@ -26,5 +26,5 @@ function c7935043.activate(e,tp,eg,ep,ev,re,r,rp)
Duel
.
RegisterEffect
(
e1
,
tp
)
Duel
.
RegisterEffect
(
e1
,
tp
)
end
end
function
c7935043
.
tg
(
e
,
c
)
function
c7935043
.
tg
(
e
,
c
)
return
c
:
GetLevel
()
<=
3
and
c
:
IsAttribute
(
ATTRIBUTE_WATER
)
return
c
:
IsLevelBelow
(
3
)
and
c
:
IsAttribute
(
ATTRIBUTE_WATER
)
end
end
script/c86016245.lua
View file @
8d9f0195
...
@@ -23,7 +23,7 @@ function c86016245.drcon(e,tp,eg,ep,ev,re,r,rp)
...
@@ -23,7 +23,7 @@ function c86016245.drcon(e,tp,eg,ep,ev,re,r,rp)
local
bc
=
tc
:
GetBattleTarget
()
local
bc
=
tc
:
GetBattleTarget
()
return
Duel
.
GetFieldGroupCount
(
tp
,
LOCATION_HAND
,
0
)
==
0
and
eg
:
GetCount
()
==
1
return
Duel
.
GetFieldGroupCount
(
tp
,
LOCATION_HAND
,
0
)
==
0
and
eg
:
GetCount
()
==
1
and
tc
:
IsLocation
(
LOCATION_GRAVE
)
and
tc
:
IsReason
(
REASON_BATTLE
)
and
tc
:
IsLocation
(
LOCATION_GRAVE
)
and
tc
:
IsReason
(
REASON_BATTLE
)
and
bc
:
IsRelateToBattle
()
and
bc
:
Is
Type
(
TYPE_NORMAL
)
and
bc
:
Is
LevelBelow
(
2
)
and
bc
:
IsRelateToBattle
()
and
bc
:
IsLevelBelow
(
2
)
end
end
function
c86016245
.
drtg
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
function
c86016245
.
drtg
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
if
chk
==
0
then
return
Duel
.
IsPlayerCanDraw
(
tp
,
2
)
end
if
chk
==
0
then
return
Duel
.
IsPlayerCanDraw
(
tp
,
2
)
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