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
ca2ff8fd
Commit
ca2ff8fd
authored
Jun 20, 2015
by
VanillaSalt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
66e4a88f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
16 deletions
+17
-16
script/c16691074.lua
script/c16691074.lua
+3
-1
script/c40318957.lua
script/c40318957.lua
+2
-2
script/c53208660.lua
script/c53208660.lua
+3
-3
script/c80696379.lua
script/c80696379.lua
+8
-6
script/c88935103.lua
script/c88935103.lua
+1
-4
No files found.
script/c16691074.lua
View file @
ca2ff8fd
...
@@ -21,6 +21,7 @@ function c16691074.initial_effect(c)
...
@@ -21,6 +21,7 @@ function c16691074.initial_effect(c)
e2
:
SetType
(
EFFECT_TYPE_SINGLE
+
EFFECT_TYPE_TRIGGER_O
)
e2
:
SetType
(
EFFECT_TYPE_SINGLE
+
EFFECT_TYPE_TRIGGER_O
)
e2
:
SetCode
(
EVENT_TO_GRAVE
)
e2
:
SetCode
(
EVENT_TO_GRAVE
)
e2
:
SetProperty
(
EFFECT_FLAG_DAMAGE_STEP
+
EFFECT_FLAG_DELAY
)
e2
:
SetProperty
(
EFFECT_FLAG_DAMAGE_STEP
+
EFFECT_FLAG_DELAY
)
e2
:
SetCountLimit
(
1
,
16691075
)
e2
:
SetCondition
(
c16691074
.
spcon
)
e2
:
SetCondition
(
c16691074
.
spcon
)
e2
:
SetTarget
(
c16691074
.
sptg
)
e2
:
SetTarget
(
c16691074
.
sptg
)
e2
:
SetOperation
(
c16691074
.
spop
)
e2
:
SetOperation
(
c16691074
.
spop
)
...
@@ -39,6 +40,7 @@ function c16691074.atkop(e,tp,eg,ep,ev,re,r,rp)
...
@@ -39,6 +40,7 @@ function c16691074.atkop(e,tp,eg,ep,ev,re,r,rp)
local
g1
=
Duel
.
GetMatchingGroup
(
c16691074
.
spfilter1
,
tp
,
LOCATION_HAND
+
LOCATION_GRAVE
,
0
,
nil
,
e
,
tp
)
local
g1
=
Duel
.
GetMatchingGroup
(
c16691074
.
spfilter1
,
tp
,
LOCATION_HAND
+
LOCATION_GRAVE
,
0
,
nil
,
e
,
tp
)
if
g1
:
GetCount
()
>
0
and
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
>
0
and
Duel
.
SelectYesNo
(
tp
,
aux
.
Stringid
(
16691074
,
0
))
then
if
g1
:
GetCount
()
>
0
and
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
>
0
and
Duel
.
SelectYesNo
(
tp
,
aux
.
Stringid
(
16691074
,
0
))
then
Duel
.
BreakEffect
()
Duel
.
BreakEffect
()
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_SPSUMMON
)
local
g2
=
g1
:
Select
(
tp
,
1
,
1
,
nil
)
local
g2
=
g1
:
Select
(
tp
,
1
,
1
,
nil
)
Duel
.
SpecialSummon
(
g2
,
0
,
tp
,
tp
,
false
,
false
,
POS_FACEUP
)
Duel
.
SpecialSummon
(
g2
,
0
,
tp
,
tp
,
false
,
false
,
POS_FACEUP
)
end
end
...
@@ -46,7 +48,7 @@ function c16691074.atkop(e,tp,eg,ep,ev,re,r,rp)
...
@@ -46,7 +48,7 @@ function c16691074.atkop(e,tp,eg,ep,ev,re,r,rp)
end
end
function
c16691074
.
spcon
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
function
c16691074
.
spcon
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
local
c
=
e
:
GetHandler
()
local
c
=
e
:
GetHandler
()
return
not
c
:
IsReason
(
REASON_RETURN
)
and
c
:
IsPreviousLocation
(
LOCATION_ONFIELD
)
and
bit
.
band
(
c
:
GetSummonType
(),
SUMMON_TYPE_XYZ
)
==
SUMMON_TYPE_XYZ
return
c
:
IsPreviousLocation
(
LOCATION_ONFIELD
)
and
bit
.
band
(
c
:
GetSummonType
(),
SUMMON_TYPE_XYZ
)
==
SUMMON_TYPE_XYZ
end
end
function
c16691074
.
spfilter2
(
c
,
e
,
tp
)
function
c16691074
.
spfilter2
(
c
,
e
,
tp
)
return
c
:
IsSetCard
(
0x99
)
and
not
c
:
IsCode
(
16691074
)
and
c
:
IsCanBeSpecialSummoned
(
e
,
0
,
tp
,
false
,
false
)
return
c
:
IsSetCard
(
0x99
)
and
not
c
:
IsCode
(
16691074
)
and
c
:
IsCanBeSpecialSummoned
(
e
,
0
,
tp
,
false
,
false
)
...
...
script/c40318957.lua
View file @
ca2ff8fd
--
EM
ドクロバット・ジョーカー
--
EM
ドクロバット・ジョーカー
function
c40318957
.
initial_effect
(
c
)
function
c40318957
.
initial_effect
(
c
)
--pendulum summon
--pendulum summon
aux
.
AddPendulumProcedure
(
c
)
aux
.
AddPendulumProcedure
(
c
)
...
@@ -37,7 +37,7 @@ function c40318957.splimit(e,c,tp,sumtp,sumpos)
...
@@ -37,7 +37,7 @@ function c40318957.splimit(e,c,tp,sumtp,sumpos)
return
not
c40318957
.
filter
(
c
)
and
bit
.
band
(
sumtp
,
SUMMON_TYPE_PENDULUM
)
==
SUMMON_TYPE_PENDULUM
return
not
c40318957
.
filter
(
c
)
and
bit
.
band
(
sumtp
,
SUMMON_TYPE_PENDULUM
)
==
SUMMON_TYPE_PENDULUM
end
end
function
c40318957
.
thfilter
(
c
)
function
c40318957
.
thfilter
(
c
)
return
c
5806
.
filter
(
c
)
and
not
c
:
IsCode
(
40318957
)
and
c
:
IsType
(
TYPE_MONSTER
)
and
c
:
IsAbleToHand
()
return
c
40318957
.
filter
(
c
)
and
not
c
:
IsCode
(
40318957
)
and
c
:
IsType
(
TYPE_MONSTER
)
and
c
:
IsAbleToHand
()
end
end
function
c40318957
.
thtg
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
function
c40318957
.
thtg
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
if
chk
==
0
then
return
Duel
.
IsExistingMatchingCard
(
c40318957
.
thfilter
,
tp
,
LOCATION_DECK
,
0
,
1
,
nil
)
end
if
chk
==
0
then
return
Duel
.
IsExistingMatchingCard
(
c40318957
.
thfilter
,
tp
,
LOCATION_DECK
,
0
,
1
,
nil
)
end
...
...
script/c53208660.lua
View file @
ca2ff8fd
...
@@ -15,8 +15,9 @@ function c53208660.initial_effect(c)
...
@@ -15,8 +15,9 @@ function c53208660.initial_effect(c)
end
end
function
c53208660
.
chainfilter
(
re
,
tp
,
cid
)
function
c53208660
.
chainfilter
(
re
,
tp
,
cid
)
local
rc
=
re
:
GetHandler
()
local
rc
=
re
:
GetHandler
()
local
loc
,
seq
=
Duel
.
GetChainInfo
(
cid
,
CHAININFO_TRIGGERING_LOCATION
,
CHAININFO_TRIGGERING_SEQUENCE
)
return
not
(
re
:
IsActiveType
(
TYPE_SPELL
)
and
not
re
:
IsHasType
(
EFFECT_TYPE_ACTIVATE
)
return
not
(
re
:
IsActiveType
(
TYPE_SPELL
)
and
not
re
:
IsHasType
(
EFFECT_TYPE_ACTIVATE
)
and
(
rc
:
GetSequence
()
==
6
or
rc
:
GetSequence
()
==
7
)
and
rc
:
IsSetCard
(
0x98
))
and
loc
==
LOCATION_SZONE
and
(
seq
==
6
or
seq
==
7
)
and
rc
:
IsSetCard
(
0x98
))
end
end
function
c53208660
.
condition
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
function
c53208660
.
condition
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
return
Duel
.
GetCustomActivityCount
(
53208660
,
tp
,
ACTIVITY_CHAIN
)
==
0
return
Duel
.
GetCustomActivityCount
(
53208660
,
tp
,
ACTIVITY_CHAIN
)
==
0
...
@@ -37,13 +38,12 @@ function c53208660.target(e,tp,eg,ep,ev,re,r,rp,chk)
...
@@ -37,13 +38,12 @@ function c53208660.target(e,tp,eg,ep,ev,re,r,rp,chk)
end
end
function
c53208660
.
activate
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
function
c53208660
.
activate
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
local
g
=
Duel
.
GetMatchingGroup
(
c53208660
.
thfilter
,
tp
,
LOCATION_DECK
,
0
,
nil
)
local
g
=
Duel
.
GetMatchingGroup
(
c53208660
.
thfilter
,
tp
,
LOCATION_DECK
,
0
,
nil
)
if
g
:
GetC
ount
(
)
>=
2
then
if
g
:
GetC
lassCount
(
Card
.
GetCode
)
>=
2
then
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_ATOHAND
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_ATOHAND
)
local
g1
=
g
:
Select
(
tp
,
1
,
1
,
nil
)
local
g1
=
g
:
Select
(
tp
,
1
,
1
,
nil
)
g
:
Remove
(
Card
.
IsCode
,
nil
,
g1
:
GetFirst
():
GetCode
())
g
:
Remove
(
Card
.
IsCode
,
nil
,
g1
:
GetFirst
():
GetCode
())
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_ATOHAND
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_ATOHAND
)
local
g2
=
g
:
Select
(
tp
,
1
,
1
,
nil
)
local
g2
=
g
:
Select
(
tp
,
1
,
1
,
nil
)
g
:
Remove
(
Card
.
IsCode
,
nil
,
g2
:
GetFirst
():
GetCode
())
g1
:
Merge
(
g2
)
g1
:
Merge
(
g2
)
Duel
.
SendtoHand
(
g1
,
nil
,
REASON_EFFECT
)
Duel
.
SendtoHand
(
g1
,
nil
,
REASON_EFFECT
)
Duel
.
ConfirmCards
(
1
-
tp
,
g1
)
Duel
.
ConfirmCards
(
1
-
tp
,
g1
)
...
...
script/c80696379.lua
View file @
ca2ff8fd
...
@@ -42,12 +42,14 @@ function c80696379.spop(e,tp,eg,ep,ev,re,r,rp)
...
@@ -42,12 +42,14 @@ function c80696379.spop(e,tp,eg,ep,ev,re,r,rp)
if
tc
:
IsRelateToEffect
(
e
)
then
if
tc
:
IsRelateToEffect
(
e
)
then
Duel
.
SpecialSummon
(
tc
,
0
,
tp
,
tp
,
false
,
false
,
POS_FACEUP
)
Duel
.
SpecialSummon
(
tc
,
0
,
tp
,
tp
,
false
,
false
,
POS_FACEUP
)
end
end
local
e1
=
Effect
.
CreateEffect
(
c
)
if
c
:
IsRelateToEffect
(
e
)
then
e1
:
SetType
(
EFFECT_TYPE_SINGLE
)
local
e1
=
Effect
.
CreateEffect
(
c
)
e1
:
SetProperty
(
EFFECT_FLAG_CANNOT_DISABLE
)
e1
:
SetType
(
EFFECT_TYPE_SINGLE
)
e1
:
SetCode
(
EFFECT_CANNOT_ATTACK
)
e1
:
SetProperty
(
EFFECT_FLAG_CANNOT_DISABLE
)
e1
:
SetReset
(
RESET_EVENT
+
0x1fe0000
+
RESET_PHASE
+
PHASE_END
)
e1
:
SetCode
(
EFFECT_CANNOT_ATTACK
)
c
:
RegisterEffect
(
e1
)
e1
:
SetReset
(
RESET_EVENT
+
0x1fe0000
+
RESET_PHASE
+
PHASE_END
)
c
:
RegisterEffect
(
e1
)
end
end
end
function
c80696379
.
condition
(
e
)
function
c80696379
.
condition
(
e
)
local
ph
=
Duel
.
GetCurrentPhase
()
local
ph
=
Duel
.
GetCurrentPhase
()
...
...
script/c88935103.lua
View file @
ca2ff8fd
...
@@ -51,9 +51,6 @@ function c88935103.synlimit(e,c)
...
@@ -51,9 +51,6 @@ function c88935103.synlimit(e,c)
if
not
c
then
return
false
end
if
not
c
then
return
false
end
return
not
c
:
IsRace
(
RACE_DRAGON
)
return
not
c
:
IsRace
(
RACE_DRAGON
)
end
end
function
c88935103
.
synfilter
(
c
,
syncard
,
tuner
,
f
)
return
c
:
IsFaceup
()
and
c
:
IsNotTuner
()
and
c
:
IsCanBeSynchroMaterial
(
syncard
,
tuner
)
and
(
f
==
nil
or
f
(
c
))
end
function
c88935103
.
sfilter
(
c
)
function
c88935103
.
sfilter
(
c
)
return
not
c
:
IsSetCard
(
0x99
)
return
not
c
:
IsSetCard
(
0x99
)
end
end
...
@@ -66,7 +63,7 @@ function c88935103.cfilter(c)
...
@@ -66,7 +63,7 @@ function c88935103.cfilter(c)
return
c
:
IsFaceup
()
and
c
:
GetLevel
()
>=
7
and
c
:
IsSetCard
(
0x99
)
return
c
:
IsFaceup
()
and
c
:
GetLevel
()
>=
7
and
c
:
IsSetCard
(
0x99
)
end
end
function
c88935103
.
sptg
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
,
chkc
)
function
c88935103
.
sptg
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
,
chkc
)
if
chkc
then
return
chkc
:
IsLocation
(
LOCATION_MZONE
)
and
chkc
:
IsControler
(
tp
)
and
c
572
3
.
cfilter
(
chkc
)
end
if
chkc
then
return
chkc
:
IsLocation
(
LOCATION_MZONE
)
and
chkc
:
IsControler
(
tp
)
and
c
8893510
3
.
cfilter
(
chkc
)
end
local
c
=
e
:
GetHandler
()
local
c
=
e
:
GetHandler
()
if
chk
==
0
then
return
Duel
.
IsExistingTarget
(
c88935103
.
cfilter
,
tp
,
LOCATION_MZONE
,
0
,
1
,
nil
)
if
chk
==
0
then
return
Duel
.
IsExistingTarget
(
c88935103
.
cfilter
,
tp
,
LOCATION_MZONE
,
0
,
1
,
nil
)
and
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
>
0
and
c
:
IsCanBeSpecialSummoned
(
e
,
0
,
tp
,
false
,
false
)
end
and
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
>
0
and
c
:
IsCanBeSpecialSummoned
(
e
,
0
,
tp
,
false
,
false
)
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