Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-222DIY-cards
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
List
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
alstroemeria-silentlove
ygopro-222DIY-cards
Commits
b7158828
Commit
b7158828
authored
Oct 30, 2023
by
REIKAI
💬
Browse files
Options
Browse Files
Download
Plain Diff
fix equit
parents
7985153a
e8817f10
Pipeline
#23925
canceled with stages
in 1 minute and 12 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
4 deletions
+20
-4
expansions/script/c77765002.lua
expansions/script/c77765002.lua
+7
-3
expansions/script/c77765004.lua
expansions/script/c77765004.lua
+5
-1
expansions/script/c77765007.lua
expansions/script/c77765007.lua
+8
-0
No files found.
expansions/script/c77765002.lua
View file @
b7158828
...
@@ -58,7 +58,11 @@ function c77765002.initial_effect(c)
...
@@ -58,7 +58,11 @@ function c77765002.initial_effect(c)
local
tc
=
Duel
.
CreateToken
(
tp
,
code
)
local
tc
=
Duel
.
CreateToken
(
tp
,
code
)
Duel
.
DisableActionCheck
(
false
)
Duel
.
DisableActionCheck
(
false
)
if
tc
then
if
tc
then
<<<<<<<
HEAD
return
c
:
IsFaceup
()
and
c
:
IsCode
(
77765001
)
and
Duel
.
GetLocationCount
(
p
,
LOCATION_SZONE
,
tp
)
>
0
--and tc:CheckEquipTarget(c)
return
c
:
IsFaceup
()
and
c
:
IsCode
(
77765001
)
and
Duel
.
GetLocationCount
(
p
,
LOCATION_SZONE
,
tp
)
>
0
--and tc:CheckEquipTarget(c)
=======
return
c
:
IsFaceup
()
and
c
:
IsCode
(
77765001
)
and
Duel
.
GetLocationCount
(
p
,
LOCATION_SZONE
,
tp
)
>
0
and
tc
:
CheckEquipTarget
(
c
)
>>>>>>>
e8817f1011ef690e10f70938650b5ef260ef8722
else
else
return
false
return
false
end
end
...
...
expansions/script/c77765004.lua
View file @
b7158828
...
@@ -75,7 +75,11 @@ function cm.initial_effect(c)
...
@@ -75,7 +75,11 @@ function cm.initial_effect(c)
local
tc
=
Duel
.
CreateToken
(
tp
,
code
)
local
tc
=
Duel
.
CreateToken
(
tp
,
code
)
Duel
.
DisableActionCheck
(
false
)
Duel
.
DisableActionCheck
(
false
)
if
tc
then
if
tc
then
<<<<<<<
HEAD
return
c
:
IsFaceup
()
and
c
:
IsCode
(
77765001
)
and
Duel
.
GetLocationCount
(
p
,
LOCATION_SZONE
,
tp
)
>
0
--and tc:CheckEquipTarget(c)
return
c
:
IsFaceup
()
and
c
:
IsCode
(
77765001
)
and
Duel
.
GetLocationCount
(
p
,
LOCATION_SZONE
,
tp
)
>
0
--and tc:CheckEquipTarget(c)
=======
return
c
:
IsFaceup
()
and
c
:
IsCode
(
77765001
)
and
Duel
.
GetLocationCount
(
p
,
LOCATION_SZONE
,
tp
)
>
0
and
tc
:
CheckEquipTarget
(
c
)
>>>>>>>
e8817f1011ef690e10f70938650b5ef260ef8722
else
else
return
false
return
false
end
end
...
...
expansions/script/c77765007.lua
View file @
b7158828
...
@@ -13,10 +13,18 @@ function cm.initial_effect(c)
...
@@ -13,10 +13,18 @@ function cm.initial_effect(c)
local
tc
=
Duel
.
CreateToken
(
tp
,
code
)
local
tc
=
Duel
.
CreateToken
(
tp
,
code
)
Duel
.
DisableActionCheck
(
false
)
Duel
.
DisableActionCheck
(
false
)
if
tc
then
if
tc
then
<<<<<<<
HEAD
return
c
:
IsFaceup
()
and
c
:
IsCode
(
77765001
)
and
Duel
.
GetLocationCount
(
p
,
LOCATION_SZONE
,
tp
)
>
0
--and tc:CheckEquipTarget(c)
return
c
:
IsFaceup
()
and
c
:
IsCode
(
77765001
)
and
Duel
.
GetLocationCount
(
p
,
LOCATION_SZONE
,
tp
)
>
0
--and tc:CheckEquipTarget(c)
else
else
return
false
return
false
end
end
=======
return
c
:
IsFaceup
()
and
c
:
IsCode
(
77765001
)
and
Duel
.
GetLocationCount
(
p
,
LOCATION_SZONE
,
tp
)
>
0
and
tc
:
CheckEquipTarget
(
c
)
else
return
false
end
return
c
:
IsFaceup
()
and
c
:
IsCode
(
77765001
)
and
Duel
.
GetLocationCount
(
p
,
LOCATION_SZONE
,
tp
)
>
0
and
tc
:
CheckEquipTarget
(
c
)
and
(
cc
:
IsControler
(
c
:
GetControler
())
or
c
:
IsAbleToChangeControler
())
>>>>>>>
e8817f1011ef690e10f70938650b5ef260ef8722
end
end
local
function
DifficultyFilter
(
c
,
e
,
tp
)
local
function
DifficultyFilter
(
c
,
e
,
tp
)
return
Kaguya
.
IsDifficulty
(
c
)
and
c
:
IsFaceup
()
and
c
and
Duel
.
IsExistingMatchingCard
(
KaguyaFilter
,
tp
,
LOCATION_MZONE
,
LOCATION_MZONE
,
1
,
nil
,
e
,
tp
,
c
)
return
Kaguya
.
IsDifficulty
(
c
)
and
c
:
IsFaceup
()
and
c
and
Duel
.
IsExistingMatchingCard
(
KaguyaFilter
,
tp
,
LOCATION_MZONE
,
LOCATION_MZONE
,
1
,
nil
,
e
,
tp
,
c
)
...
...
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