Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-THC-cards
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
1
Issues
1
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
HiiragiGuardians
ygopro-THC-cards
Commits
d8e6b226
Commit
d8e6b226
authored
Jul 26, 2022
by
伊蕾娜
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:咕咕元素融合修复+金卡罔两『违背常识的另一侧』bug修复
parent
f2922b55
Pipeline
#14961
passed with stage
in 49 seconds
Changes
9
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
265 additions
and
409 deletions
+265
-409
script/c22234.lua
script/c22234.lua
+6
-2
script/c22236.lua
script/c22236.lua
+6
-2
script/c22238.lua
script/c22238.lua
+9
-3
script/c22240.lua
script/c22240.lua
+9
-3
script/c22249.lua
script/c22249.lua
+55
-101
script/c22250.lua
script/c22250.lua
+64
-100
script/c22251.lua
script/c22251.lua
+61
-98
script/c22252.lua
script/c22252.lua
+53
-98
script/c86379748.lua
script/c86379748.lua
+2
-2
No files found.
script/c22234.lua
View file @
d8e6b226
...
...
@@ -46,10 +46,14 @@ function c22234.mfilter1(c)
return
c
:
IsRace
(
RACE_SPELLCASTER
)
end
function
c22234
.
mfilter2
(
c
)
return
c
:
IsAttribute
(
ATTRIBUTE_LIGHT
)
or
((
c
:
IsFusionSetCard
(
0x183
)
or
(
c
:
IsFusionCode
(
22200
)
and
not
c
:
IsLocation
(
LOCATION_DECK
)))
and
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22248
))
or
(
c
:
IsFusionCode
(
22200
)
and
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22251
))
local
deck_check
=
1
if
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22161
)
then
deck_check
=
0
end
return
c
:
IsAttribute
(
ATTRIBUTE_LIGHT
)
or
(
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22249
)
and
((
c
:
IsSetCard
(
0x183
)
or
c
:
IsCode
(
22200
))
and
(
deck_check
==
1
or
not
c
:
IsLocation
(
LOCATION_DECK
))))
end
function
c22234
.
mfilter3
(
c
)
return
c
:
IsAttribute
(
ATTRIBUTE_EARTH
)
or
((
c
:
IsFusionSetCard
(
0x182
)
or
(
c
:
IsFusionCode
(
22200
)
and
not
c
:
IsLocation
(
LOCATION_DECK
)))
and
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22248
))
or
(
c
:
IsFusionCode
(
22200
)
and
(
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22250
)
or
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22252
)))
local
deck_check
=
1
if
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22135
)
then
deck_check
=
0
end
return
c
:
IsAttribute
(
ATTRIBUTE_EARTH
)
or
(
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22249
)
and
((
c
:
IsSetCard
(
0x182
)
or
c
:
IsCode
(
22200
))
and
(
deck_check
==
1
or
not
c
:
IsLocation
(
LOCATION_DECK
))))
end
function
c22234
.
filter
(
c
)
return
c
:
IsSetCard
(
0xb046
)
and
c
:
IsAbleToHand
()
...
...
script/c22236.lua
View file @
d8e6b226
...
...
@@ -44,10 +44,14 @@ function c22236.mfilter1(c)
return
c
:
IsRace
(
RACE_SPELLCASTER
)
end
function
c22236
.
mfilter2
(
c
)
return
c
:
IsAttribute
(
ATTRIBUTE_DARK
)
or
((
c
:
IsFusionSetCard
(
0x184
)
or
(
c
:
IsFusionCode
(
22200
)
and
not
c
:
IsLocation
(
LOCATION_DECK
)))
and
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22248
))
or
(
c
:
IsFusionCode
(
22200
)
and
(
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22249
)
or
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22251
)))
local
deck_check
=
1
if
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22162
)
then
deck_check
=
0
end
return
c
:
IsAttribute
(
ATTRIBUTE_DARK
)
or
(
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22249
)
and
((
c
:
IsSetCard
(
0x184
)
or
c
:
IsCode
(
22200
))
and
(
deck_check
==
1
or
not
c
:
IsLocation
(
LOCATION_DECK
))))
end
function
c22236
.
mfilter3
(
c
)
return
c
:
IsAttribute
(
ATTRIBUTE_EARTH
)
or
((
c
:
IsFusionSetCard
(
0x182
)
or
(
c
:
IsFusionCode
(
22200
)
and
not
c
:
IsLocation
(
LOCATION_DECK
)))
and
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22248
))
or
(
c
:
IsFusionCode
(
22200
)
and
(
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22250
)
or
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22252
)))
local
deck_check
=
1
if
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22135
)
then
deck_check
=
0
end
return
c
:
IsAttribute
(
ATTRIBUTE_EARTH
)
or
(
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22249
)
and
((
c
:
IsSetCard
(
0x182
)
or
c
:
IsCode
(
22200
))
and
(
deck_check
==
1
or
not
c
:
IsLocation
(
LOCATION_DECK
))))
end
function
c22236
.
thfilter1
(
c
)
return
c
:
IsSetCard
(
0xb046
)
and
c
:
IsAbleToHand
()
...
...
script/c22238.lua
View file @
d8e6b226
...
...
@@ -39,13 +39,19 @@ function c22238.initial_effect(c)
end
--
function
c22238
.
mfilter1
(
c
)
return
c
:
IsAttribute
(
ATTRIBUTE_WIND
)
or
((
c
:
IsFusionSetCard
(
0x180
)
or
(
c
:
IsFusionCode
(
22200
)
and
not
c
:
IsLocation
(
LOCATION_DECK
)))
and
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22248
))
or
(
c
:
IsFusionCode
(
22200
)
and
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22252
))
local
deck_check
=
1
if
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22133
)
then
deck_check
=
0
end
return
c
:
IsAttribute
(
ATTRIBUTE_WIND
)
or
(
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22249
)
and
((
c
:
IsSetCard
(
0x180
)
or
c
:
IsCode
(
22200
))
and
(
deck_check
==
1
or
not
c
:
IsLocation
(
LOCATION_DECK
))))
end
function
c22238
.
mfilter2
(
c
)
return
c
:
IsAttribute
(
ATTRIBUTE_WATER
)
or
((
c
:
IsFusionSetCard
(
0x179
)
or
(
c
:
IsFusionCode
(
22200
)
and
not
c
:
IsLocation
(
LOCATION_DECK
)))
and
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22248
))
or
(
c
:
IsFusionCode
(
22200
)
and
(
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22249
)
or
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22252
)))
local
deck_check
=
1
if
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22132
)
then
deck_check
=
0
end
return
c
:
IsAttribute
(
ATTRIBUTE_WATER
)
or
(
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22249
)
and
((
c
:
IsSetCard
(
0x179
)
or
c
:
IsCode
(
22200
))
and
(
deck_check
==
1
or
not
c
:
IsLocation
(
LOCATION_DECK
))))
end
function
c22238
.
mfilter3
(
c
)
return
c
:
IsAttribute
(
ATTRIBUTE_FIRE
)
or
((
c
:
IsFusionSetCard
(
0x178
)
or
(
c
:
IsFusionCode
(
22200
)
and
not
c
:
IsLocation
(
LOCATION_DECK
)))
and
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22248
))
or
(
c
:
IsFusionCode
(
22200
)
and
(
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22249
)
or
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22250
)))
local
deck_check
=
1
if
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22131
)
then
deck_check
=
0
end
return
c
:
IsAttribute
(
ATTRIBUTE_FIRE
)
or
(
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22249
)
and
((
c
:
IsSetCard
(
0x178
)
or
c
:
IsCode
(
22200
))
and
(
deck_check
==
1
or
not
c
:
IsLocation
(
LOCATION_DECK
))))
end
--
function
c22238
.
filters
(
c
)
...
...
script/c22240.lua
View file @
d8e6b226
...
...
@@ -39,13 +39,19 @@ function c22240.initial_effect(c)
end
--
function
c22240
.
mfilter1
(
c
)
return
c
:
IsAttribute
(
ATTRIBUTE_DARK
)
or
((
c
:
IsFusionSetCard
(
0x184
)
or
(
c
:
IsFusionCode
(
22200
)
and
not
c
:
IsLocation
(
LOCATION_DECK
)))
and
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22248
))
or
(
c
:
IsFusionCode
(
22200
)
and
(
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22249
)
or
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22251
)))
local
deck_check
=
1
if
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22162
)
then
deck_check
=
0
end
return
c
:
IsAttribute
(
ATTRIBUTE_DARK
)
or
(
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22249
)
and
((
c
:
IsSetCard
(
0x184
)
or
c
:
IsCode
(
22200
))
and
(
deck_check
==
1
or
not
c
:
IsLocation
(
LOCATION_DECK
))))
end
function
c22240
.
mfilter2
(
c
)
return
c
:
IsAttribute
(
ATTRIBUTE_LIGHT
)
or
((
c
:
IsFusionSetCard
(
0x183
)
or
(
c
:
IsFusionCode
(
22200
)
and
not
c
:
IsLocation
(
LOCATION_DECK
)))
and
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22248
))
or
(
c
:
IsFusionCode
(
22200
)
and
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22251
))
local
deck_check
=
1
if
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22161
)
then
deck_check
=
0
end
return
c
:
IsAttribute
(
ATTRIBUTE_LIGHT
)
or
(
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22249
)
and
((
c
:
IsSetCard
(
0x183
)
or
c
:
IsCode
(
22200
))
and
(
deck_check
==
1
or
not
c
:
IsLocation
(
LOCATION_DECK
))))
end
function
c22240
.
mfilter3
(
c
)
return
c
:
IsAttribute
(
ATTRIBUTE_WIND
)
or
((
c
:
IsFusionSetCard
(
0x180
)
or
(
c
:
IsFusionCode
(
22200
)
and
not
c
:
IsLocation
(
LOCATION_DECK
)))
and
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22248
))
or
(
c
:
IsFusionCode
(
22200
)
and
Duel
.
IsPlayerAffectedByEffect
(
c
:
GetControler
(),
22252
))
local
deck_check
=
1
if
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22133
)
then
deck_check
=
0
end
return
c
:
IsAttribute
(
ATTRIBUTE_WIND
)
or
(
Duel
.
IsPlayerAffectedByEffect
(
tp
,
22249
)
and
((
c
:
IsSetCard
(
0x180
)
or
c
:
IsCode
(
22200
))
and
(
deck_check
==
1
or
not
c
:
IsLocation
(
LOCATION_DECK
))))
end
--
function
c22240
.
filter
(
c
)
...
...
script/c22249.lua
View file @
d8e6b226
This diff is collapsed.
Click to expand it.
script/c22250.lua
View file @
d8e6b226
This diff is collapsed.
Click to expand it.
script/c22251.lua
View file @
d8e6b226
This diff is collapsed.
Click to expand it.
script/c22252.lua
View file @
d8e6b226
This diff is collapsed.
Click to expand it.
script/c86379748.lua
View file @
d8e6b226
...
...
@@ -40,7 +40,7 @@ function c86379748.activate(e,tp,eg,ep,ev,re,r,rp)
if
g
:
GetCount
()
>
0
and
Duel
.
Remove
(
g
,
POS_FACEUP
,
REASON_EFFECT
)
~=
0
then
local
tg
=
Duel
.
GetOperatedGroup
():
Filter
(
Card
.
IsLocation
,
nil
,
LOCATION_REMOVED
)
local
e1
=
Effect
.
CreateEffect
(
c
)
e1
:
SetDescription
(
aux
.
Stringid
(
86379748
,
1
)
e1
:
SetDescription
(
aux
.
Stringid
(
86379748
,
1
)
)
e1
:
SetType
(
EFFECT_TYPE_FIELD
+
EFFECT_TYPE_CONTINUOUS
)
e1
:
SetCode
(
EVENT_PHASE
+
PHASE_STANDBY
)
e1
:
SetCountLimit
(
1
)
...
...
@@ -56,7 +56,7 @@ function c86379748.activate(e,tp,eg,ep,ev,re,r,rp)
end
tg
:
KeepAlive
()
local
e2
=
Effect
.
CreateEffect
(
c
)
e2
:
SetDescription
(
aux
.
Stringid
(
86379748
,
0
)
e2
:
SetDescription
(
aux
.
Stringid
(
86379748
,
0
)
)
e2
:
SetType
(
EFFECT_TYPE_FIELD
+
EFFECT_TYPE_CONTINUOUS
)
e2
:
SetCode
(
EVENT_PHASE
+
PHASE_STANDBY
)
e2
:
SetCountLimit
(
1
)
...
...
wyykak
@wyykak
mentioned in issue
#1 (closed)
·
Jul 26, 2022
mentioned in issue
#1 (closed)
mentioned in issue #1
Toggle commit list
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