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
703095c2
Commit
703095c2
authored
Jul 05, 2014
by
VanillaSalt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
94b7be80
Changes
9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
369 additions
and
24 deletions
+369
-24
lflist.conf
lflist.conf
+334
-1
ocgcore/processor.cpp
ocgcore/processor.cpp
+1
-1
script/c402568.lua
script/c402568.lua
+4
-1
script/c46897277.lua
script/c46897277.lua
+4
-1
script/c52665542.lua
script/c52665542.lua
+1
-1
script/c67985943.lua
script/c67985943.lua
+4
-1
script/c69155991.lua
script/c69155991.lua
+7
-5
script/c88033975.lua
script/c88033975.lua
+4
-1
script/c9287078.lua
script/c9287078.lua
+10
-12
No files found.
lflist.conf
View file @
703095c2
This diff is collapsed.
Click to expand it.
ocgcore/processor.cpp
View file @
703095c2
...
@@ -3397,7 +3397,7 @@ int32 field::process_battle_command(uint16 step) {
...
@@ -3397,7 +3397,7 @@ int32 field::process_battle_command(uint16 step) {
core
.
attacker
->
set_status
(
STATUS_BATTLE_DESTROYED
,
FALSE
);
core
.
attacker
->
set_status
(
STATUS_BATTLE_DESTROYED
,
FALSE
);
if
(
core
.
attacker
->
is_position
(
POS_FACEUP_DEFENCE
))
{
if
(
core
.
attacker
->
is_position
(
POS_FACEUP_DEFENCE
))
{
effect
*
defattack
=
core
.
attacker
->
is_affected_by_effect
(
EFFECT_DEFENCE_ATTACK
);
effect
*
defattack
=
core
.
attacker
->
is_affected_by_effect
(
EFFECT_DEFENCE_ATTACK
);
if
(
defattack
&&
defattack
->
get_value
(
core
.
attacker
)
==
1
)
if
(
defattack
&&
defattack
->
get_value
(
core
.
attacker
))
a
=
ad
;
a
=
ad
;
}
}
if
(
core
.
attack_target
)
{
if
(
core
.
attack_target
)
{
...
...
script/c402568.lua
View file @
703095c2
...
@@ -23,7 +23,10 @@ function c402568.operation(e,tp,eg,ep,ev,re,r,rp)
...
@@ -23,7 +23,10 @@ function c402568.operation(e,tp,eg,ep,ev,re,r,rp)
e1
:
SetProperty
(
EFFECT_FLAG_PLAYER_TARGET
)
e1
:
SetProperty
(
EFFECT_FLAG_PLAYER_TARGET
)
e1
:
SetCode
(
EFFECT_CANNOT_ACTIVATE
)
e1
:
SetCode
(
EFFECT_CANNOT_ACTIVATE
)
e1
:
SetTargetRange
(
0
,
1
)
e1
:
SetTargetRange
(
0
,
1
)
e1
:
SetValue
(
1
)
e1
:
SetValue
(
c402568
.
aclimit
)
e1
:
SetReset
(
RESET_PHASE
+
PHASE_END
)
e1
:
SetReset
(
RESET_PHASE
+
PHASE_END
)
Duel
.
RegisterEffect
(
e1
,
tp
)
Duel
.
RegisterEffect
(
e1
,
tp
)
end
end
function
c402568
.
aclimit
(
e
,
re
,
tp
)
return
not
re
:
GetHandler
():
IsImmuneToEffect
(
e
)
end
script/c46897277.lua
View file @
703095c2
...
@@ -18,7 +18,7 @@ function c46897277.operation(e,tp,eg,ep,ev,re,r,rp)
...
@@ -18,7 +18,7 @@ function c46897277.operation(e,tp,eg,ep,ev,re,r,rp)
e1
:
SetProperty
(
EFFECT_FLAG_PLAYER_TARGET
)
e1
:
SetProperty
(
EFFECT_FLAG_PLAYER_TARGET
)
e1
:
SetCode
(
EFFECT_CANNOT_ACTIVATE
)
e1
:
SetCode
(
EFFECT_CANNOT_ACTIVATE
)
e1
:
SetTargetRange
(
0
,
1
)
e1
:
SetTargetRange
(
0
,
1
)
e1
:
SetValue
(
1
)
e1
:
SetValue
(
c46897277
.
aclimit
)
e1
:
SetReset
(
RESET_PHASE
+
PHASE_END
)
e1
:
SetReset
(
RESET_PHASE
+
PHASE_END
)
Duel
.
RegisterEffect
(
e1
,
tp
)
Duel
.
RegisterEffect
(
e1
,
tp
)
local
e2
=
Effect
.
CreateEffect
(
e
:
GetHandler
())
local
e2
=
Effect
.
CreateEffect
(
e
:
GetHandler
())
...
@@ -29,3 +29,6 @@ function c46897277.operation(e,tp,eg,ep,ev,re,r,rp)
...
@@ -29,3 +29,6 @@ function c46897277.operation(e,tp,eg,ep,ev,re,r,rp)
e2
:
SetTargetRange
(
0
,
1
)
e2
:
SetTargetRange
(
0
,
1
)
Duel
.
RegisterEffect
(
e2
,
tp
)
Duel
.
RegisterEffect
(
e2
,
tp
)
end
end
function
c46897277
.
aclimit
(
e
,
re
,
tp
)
return
not
re
:
GetHandler
():
IsImmuneToEffect
(
e
)
end
script/c52665542.lua
View file @
703095c2
...
@@ -53,7 +53,7 @@ end
...
@@ -53,7 +53,7 @@ end
function
c52665542
.
target
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
,
chkc
)
function
c52665542
.
target
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
,
chkc
)
local
cc
=
e
:
GetLabelObject
()
local
cc
=
e
:
GetLabelObject
()
if
chkc
then
return
chkc
:
IsLocation
(
LOCATION_GRAVE
)
and
chkc
:
IsControler
(
tp
)
and
c52665542
.
tgfilter
(
chkc
)
and
chkc
~=
cc
end
if
chkc
then
return
chkc
:
IsLocation
(
LOCATION_GRAVE
)
and
chkc
:
IsControler
(
tp
)
and
c52665542
.
tgfilter
(
chkc
)
and
chkc
~=
cc
end
if
chk
==
0
then
return
Duel
.
IsExistingTarget
(
c52665542
.
tgfilter
,
tp
,
LOCATION_GRAVE
,
0
,
1
,
cc
)
end
if
chk
==
0
then
return
Duel
.
IsExistingTarget
(
c52665542
.
tgfilter
,
tp
,
LOCATION_GRAVE
,
0
,
1
,
nil
)
end
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_ATOHAND
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_ATOHAND
)
local
sg
=
Duel
.
SelectTarget
(
tp
,
c52665542
.
tgfilter
,
tp
,
LOCATION_GRAVE
,
0
,
1
,
1
,
cc
)
local
sg
=
Duel
.
SelectTarget
(
tp
,
c52665542
.
tgfilter
,
tp
,
LOCATION_GRAVE
,
0
,
1
,
1
,
cc
)
Duel
.
SetOperationInfo
(
0
,
CATEGORY_TOHAND
,
sg
,
sg
:
GetCount
(),
0
,
0
)
Duel
.
SetOperationInfo
(
0
,
CATEGORY_TOHAND
,
sg
,
sg
:
GetCount
(),
0
,
0
)
...
...
script/c67985943.lua
View file @
703095c2
...
@@ -17,13 +17,16 @@ function c67985943.initial_effect(c)
...
@@ -17,13 +17,16 @@ function c67985943.initial_effect(c)
e3
:
SetCode
(
EFFECT_CANNOT_ACTIVATE
)
e3
:
SetCode
(
EFFECT_CANNOT_ACTIVATE
)
e3
:
SetRange
(
LOCATION_MZONE
)
e3
:
SetRange
(
LOCATION_MZONE
)
e3
:
SetTargetRange
(
0
,
1
)
e3
:
SetTargetRange
(
0
,
1
)
e3
:
SetValue
(
1
)
e3
:
SetValue
(
c67985943
.
aclimit
)
e3
:
SetCondition
(
c67985943
.
actcon
)
e3
:
SetCondition
(
c67985943
.
actcon
)
c
:
RegisterEffect
(
e3
)
c
:
RegisterEffect
(
e3
)
end
end
function
c67985943
.
splimit
(
e
,
se
,
sp
,
st
)
function
c67985943
.
splimit
(
e
,
se
,
sp
,
st
)
return
not
e
:
GetHandler
():
IsLocation
(
LOCATION_EXTRA
)
or
bit
.
band
(
st
,
SUMMON_TYPE_FUSION
)
==
SUMMON_TYPE_FUSION
return
not
e
:
GetHandler
():
IsLocation
(
LOCATION_EXTRA
)
or
bit
.
band
(
st
,
SUMMON_TYPE_FUSION
)
==
SUMMON_TYPE_FUSION
end
end
function
c67985943
.
aclimit
(
e
,
re
,
tp
)
return
not
re
:
GetHandler
():
IsImmuneToEffect
(
e
)
end
function
c67985943
.
actcon
(
e
)
function
c67985943
.
actcon
(
e
)
return
Duel
.
GetAttacker
()
==
e
:
GetHandler
()
or
Duel
.
GetAttackTarget
()
==
e
:
GetHandler
()
return
Duel
.
GetAttacker
()
==
e
:
GetHandler
()
or
Duel
.
GetAttackTarget
()
==
e
:
GetHandler
()
end
end
script/c69155991.lua
View file @
703095c2
...
@@ -11,7 +11,7 @@ function c69155991.initial_effect(c)
...
@@ -11,7 +11,7 @@ function c69155991.initial_effect(c)
local
e2
=
Effect
.
CreateEffect
(
c
)
local
e2
=
Effect
.
CreateEffect
(
c
)
e2
:
SetType
(
EFFECT_TYPE_FIELD
+
EFFECT_TYPE_CONTINUOUS
)
e2
:
SetType
(
EFFECT_TYPE_FIELD
+
EFFECT_TYPE_CONTINUOUS
)
e2
:
SetRange
(
LOCATION_MZONE
)
e2
:
SetRange
(
LOCATION_MZONE
)
e2
:
SetCode
(
EVENT_CHAIN_
SOLVE
D
)
e2
:
SetCode
(
EVENT_CHAIN_
EN
D
)
e2
:
SetOperation
(
c69155991
.
desop1
)
e2
:
SetOperation
(
c69155991
.
desop1
)
c
:
RegisterEffect
(
e2
)
c
:
RegisterEffect
(
e2
)
local
e3
=
Effect
.
CreateEffect
(
c
)
local
e3
=
Effect
.
CreateEffect
(
c
)
...
@@ -36,16 +36,18 @@ function c69155991.initial_effect(c)
...
@@ -36,16 +36,18 @@ function c69155991.initial_effect(c)
end
end
function
c69155991
.
chop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
function
c69155991
.
chop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
if
re
:
IsHasType
(
EFFECT_TYPE_ACTIVATE
)
or
re
:
GetHandler
():
IsType
(
TYPE_MONSTER
)
then
if
re
:
IsHasType
(
EFFECT_TYPE_ACTIVATE
)
or
re
:
GetHandler
():
IsType
(
TYPE_MONSTER
)
then
e
:
GetHandler
():
RegisterFlagEffect
(
69155991
,
RESET_EVENT
+
0x1f
e0000
+
RESET_CHAIN
,
0
,
1
)
e
:
GetHandler
():
RegisterFlagEffect
(
69155991
,
RESET_EVENT
+
0x1f
f0000
+
RESET_PHASE
+
RESET_END
,
0
,
1
)
end
end
end
end
function
c69155991
.
desop1
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
function
c69155991
.
desop1
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
if
ev
>
1
or
e
:
GetHandler
():
GetFlagEffect
(
69155991
)
==
0
then
return
end
local
c
=
e
:
GetHandler
()
if
c
:
GetFlagEffect
(
69155991
)
==
0
then
return
end
c
:
ResetFlagEffect
(
69155991
)
local
ph
=
Duel
.
GetCurrentPhase
()
local
ph
=
Duel
.
GetCurrentPhase
()
if
(
ph
==
PHASE_DAMAGE
or
ph
==
PHASE_DAMAGE_CAL
)
and
not
Duel
.
IsDamageCalculated
()
then
if
(
ph
==
PHASE_DAMAGE
or
ph
==
PHASE_DAMAGE_CAL
)
and
not
Duel
.
IsDamageCalculated
()
then
e
:
GetHandler
()
:
RegisterFlagEffect
(
69155992
,
RESET_EVENT
+
0x1fe0000
+
RESET_PHASE
+
RESET_DAMAGE
,
0
,
1
)
c
:
RegisterFlagEffect
(
69155992
,
RESET_EVENT
+
0x1fe0000
+
RESET_PHASE
+
RESET_DAMAGE
,
0
,
1
)
else
else
Duel
.
Destroy
(
e
:
GetHandler
()
,
REASON_EFFECT
)
Duel
.
Destroy
(
c
,
REASON_EFFECT
)
end
end
end
end
function
c69155991
.
desop2
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
function
c69155991
.
desop2
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
...
...
script/c88033975.lua
View file @
703095c2
...
@@ -10,10 +10,13 @@ function c88033975.initial_effect(c)
...
@@ -10,10 +10,13 @@ function c88033975.initial_effect(c)
e1
:
SetCode
(
EFFECT_CANNOT_ACTIVATE
)
e1
:
SetCode
(
EFFECT_CANNOT_ACTIVATE
)
e1
:
SetRange
(
LOCATION_MZONE
)
e1
:
SetRange
(
LOCATION_MZONE
)
e1
:
SetTargetRange
(
0
,
1
)
e1
:
SetTargetRange
(
0
,
1
)
e1
:
SetValue
(
1
)
e1
:
SetValue
(
c88033975
.
aclimit
)
e1
:
SetCondition
(
c88033975
.
actcon
)
e1
:
SetCondition
(
c88033975
.
actcon
)
c
:
RegisterEffect
(
e1
)
c
:
RegisterEffect
(
e1
)
end
end
function
c88033975
.
aclimit
(
e
,
re
,
tp
)
return
not
re
:
GetHandler
():
IsImmuneToEffect
(
e
)
end
function
c88033975
.
actcon
(
e
)
function
c88033975
.
actcon
(
e
)
return
Duel
.
GetAttacker
()
==
e
:
GetHandler
()
or
Duel
.
GetAttackTarget
()
==
e
:
GetHandler
()
return
Duel
.
GetAttacker
()
==
e
:
GetHandler
()
or
Duel
.
GetAttackTarget
()
==
e
:
GetHandler
()
end
end
script/c9287078.lua
View file @
703095c2
...
@@ -13,21 +13,21 @@ function c9287078.initial_effect(c)
...
@@ -13,21 +13,21 @@ function c9287078.initial_effect(c)
e2
:
SetCode
(
EVENT_SPSUMMON_SUCCESS
)
e2
:
SetCode
(
EVENT_SPSUMMON_SUCCESS
)
c
:
RegisterEffect
(
e2
)
c
:
RegisterEffect
(
e2
)
end
end
function
c9287078
.
filter1
(
c
,
e
,
tp
)
function
c9287078
.
filter
(
c
)
return
c
:
GetSummonPlayer
()
==
1
-
tp
and
c
:
IsCanBeEffectTarget
(
e
)
and
Duel
.
IsExistingTarget
(
c9287078
.
filter2
,
tp
,
LOCATION_MZONE
,
0
,
1
,
c
)
end
function
c9287078
.
filter2
(
c
)
return
c
:
IsFaceup
()
and
c
:
IsRace
(
RACE_SPELLCASTER
)
return
c
:
IsFaceup
()
and
c
:
IsRace
(
RACE_SPELLCASTER
)
end
end
function
c9287078
.
target
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
,
chkc
)
function
c9287078
.
target
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
,
chkc
)
if
chkc
then
return
false
end
if
chkc
then
return
false
end
if
chk
==
0
then
return
eg
:
IsExists
(
c9287078
.
filter1
,
1
,
nil
,
e
,
tp
)
end
if
chk
==
0
then
local
ec
=
eg
:
GetFirst
()
return
eg
:
GetCount
()
==
1
and
ec
:
GetSummonPlayer
()
==
1
-
tp
and
ec
:
IsCanBeEffectTarget
(
e
)
and
Duel
.
IsExistingTarget
(
c9287078
.
filter
,
tp
,
LOCATION_MZONE
,
0
,
1
,
ec
)
end
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_TOGRAVE
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_TOGRAVE
)
local
g1
=
eg
:
FilterSelect
(
tp
,
c9287078
.
filter1
,
1
,
1
,
nil
,
e
,
tp
)
local
g1
=
eg
:
Select
(
tp
,
1
,
1
,
nil
)
Duel
.
SetTargetCard
(
g1
)
Duel
.
SetTargetCard
(
g1
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_TOGRAVE
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_TOGRAVE
)
local
g2
=
Duel
.
SelectTarget
(
tp
,
c9287078
.
filter
2
,
tp
,
LOCATION_MZONE
,
0
,
1
,
1
,
g1
:
GetFirst
())
local
g2
=
Duel
.
SelectTarget
(
tp
,
c9287078
.
filter
,
tp
,
LOCATION_MZONE
,
0
,
1
,
1
,
g1
:
GetFirst
())
g1
:
Merge
(
g2
)
g1
:
Merge
(
g2
)
Duel
.
SetOperationInfo
(
0
,
CATEGORY_TOGRAVE
,
g1
,
2
,
0
,
0
)
Duel
.
SetOperationInfo
(
0
,
CATEGORY_TOGRAVE
,
g1
,
2
,
0
,
0
)
end
end
...
@@ -36,10 +36,8 @@ function c9287078.spfilter(c,e,tp)
...
@@ -36,10 +36,8 @@ function c9287078.spfilter(c,e,tp)
and
not
c
:
IsHasEffect
(
EFFECT_NECRO_VALLEY
)
and
not
c
:
IsHasEffect
(
EFFECT_NECRO_VALLEY
)
end
end
function
c9287078
.
activate
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
function
c9287078
.
activate
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
local
g
=
Duel
.
GetChainInfo
(
0
,
CHAININFO_TARGET_CARDS
)
local
g
=
Duel
.
GetChainInfo
(
0
,
CHAININFO_TARGET_CARDS
):
Filter
(
Card
.
IsRelateToEffect
,
nil
,
e
)
local
tc1
=
g
:
GetFirst
()
if
Duel
.
SendtoGrave
(
g
,
REASON_EFFECT
)
==
2
and
g
:
IsExists
(
Card
.
IsLocation
,
2
,
nil
,
LOCATION_GRAVE
)
then
local
tc2
=
g
:
GetNext
()
if
tc1
:
IsRelateToEffect
(
e
)
and
tc2
:
IsRelateToEffect
(
e
)
and
Duel
.
SendtoGrave
(
g
,
REASON_EFFECT
)
==
2
then
if
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
<=
0
then
return
end
if
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
<=
0
then
return
end
local
sg
=
Duel
.
GetMatchingGroup
(
c9287078
.
spfilter
,
tp
,
LOCATION_DECK
+
LOCATION_GRAVE
,
0
,
nil
,
e
,
tp
)
local
sg
=
Duel
.
GetMatchingGroup
(
c9287078
.
spfilter
,
tp
,
LOCATION_DECK
+
LOCATION_GRAVE
,
0
,
nil
,
e
,
tp
)
if
sg
:
GetCount
()
>
0
and
Duel
.
SelectYesNo
(
tp
,
aux
.
Stringid
(
9287078
,
0
))
then
if
sg
:
GetCount
()
>
0
and
Duel
.
SelectYesNo
(
tp
,
aux
.
Stringid
(
9287078
,
0
))
then
...
...
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