Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-scripts
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
八宫一月
ygopro-scripts
Commits
35bd216d
Commit
35bd216d
authored
Mar 12, 2020
by
DailyShana
Committed by
GitHub
Mar 12, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shuffle extra deck after confirming (#1362)
parent
3fddb730
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
17 additions
and
0 deletions
+17
-0
c15661378.lua
c15661378.lua
+1
-0
c21088856.lua
c21088856.lua
+1
-0
c30539496.lua
c30539496.lua
+1
-0
c32476603.lua
c32476603.lua
+1
-0
c50179591.lua
c50179591.lua
+1
-0
c62015408.lua
c62015408.lua
+2
-0
c73988674.lua
c73988674.lua
+2
-0
c77565204.lua
c77565204.lua
+1
-0
c80159717.lua
c80159717.lua
+1
-0
c87602890.lua
c87602890.lua
+3
-0
c94431029.lua
c94431029.lua
+2
-0
c95474755.lua
c95474755.lua
+1
-0
No files found.
c15661378.lua
View file @
35bd216d
...
@@ -83,5 +83,6 @@ function c15661378.remop(e,tp,eg,ep,ev,re,r,rp)
...
@@ -83,5 +83,6 @@ function c15661378.remop(e,tp,eg,ep,ev,re,r,rp)
sg1
:
Merge
(
g2
)
sg1
:
Merge
(
g2
)
sg1
:
Merge
(
sg3
)
sg1
:
Merge
(
sg3
)
Duel
.
Remove
(
sg1
,
POS_FACEUP
,
REASON_EFFECT
)
Duel
.
Remove
(
sg1
,
POS_FACEUP
,
REASON_EFFECT
)
Duel
.
ShuffleExtra
(
1
-
tp
)
end
end
end
end
c21088856.lua
View file @
35bd216d
...
@@ -27,4 +27,5 @@ function c21088856.operation(e,tp,eg,ep,ev,re,r,rp)
...
@@ -27,4 +27,5 @@ function c21088856.operation(e,tp,eg,ep,ev,re,r,rp)
else
else
Duel
.
Recover
(
tp
,
atk
,
REASON_EFFECT
)
Duel
.
Recover
(
tp
,
atk
,
REASON_EFFECT
)
end
end
Duel
.
ShuffleExtra
(
1
-
tp
)
end
end
c30539496.lua
View file @
35bd216d
...
@@ -79,6 +79,7 @@ function c30539496.spop(e,tp,eg,ep,ev,re,r,rp)
...
@@ -79,6 +79,7 @@ function c30539496.spop(e,tp,eg,ep,ev,re,r,rp)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_REMOVE
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_REMOVE
)
local
tg
=
rg
:
SelectSubGroup
(
tp
,
aux
.
dncheck
,
false
,
1
,
3
)
local
tg
=
rg
:
SelectSubGroup
(
tp
,
aux
.
dncheck
,
false
,
1
,
3
)
Duel
.
Remove
(
tg
,
POS_FACEUP
,
REASON_EFFECT
)
Duel
.
Remove
(
tg
,
POS_FACEUP
,
REASON_EFFECT
)
Duel
.
ShuffleExtra
(
1
-
tp
)
end
end
end
end
end
end
...
...
c32476603.lua
View file @
35bd216d
...
@@ -43,6 +43,7 @@ function c32476603.desop(e,tp,eg,ep,ev,re,r,rp)
...
@@ -43,6 +43,7 @@ function c32476603.desop(e,tp,eg,ep,ev,re,r,rp)
if
tg
:
GetCount
()
>
0
then
if
tg
:
GetCount
()
>
0
then
Duel
.
Remove
(
tg
,
POS_FACEUP
,
REASON_EFFECT
)
Duel
.
Remove
(
tg
,
POS_FACEUP
,
REASON_EFFECT
)
end
end
Duel
.
ShuffleExtra
(
1
-
tp
)
end
end
end
end
function
c32476603
.
regop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
function
c32476603
.
regop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
...
...
c50179591.lua
View file @
35bd216d
...
@@ -78,4 +78,5 @@ function c50179591.rmop2(e,tp,eg,ep,ev,re,r,rp)
...
@@ -78,4 +78,5 @@ function c50179591.rmop2(e,tp,eg,ep,ev,re,r,rp)
if
mg
:
GetCount
()
>
0
then
if
mg
:
GetCount
()
>
0
then
Duel
.
Remove
(
mg
,
POS_FACEUP
,
REASON_EFFECT
)
Duel
.
Remove
(
mg
,
POS_FACEUP
,
REASON_EFFECT
)
end
end
Duel
.
ShuffleExtra
(
1
-
tp
)
end
end
c62015408.lua
View file @
35bd216d
...
@@ -40,5 +40,7 @@ function c62015408.operation(e,tp,eg,ep,ev,re,r,rp)
...
@@ -40,5 +40,7 @@ function c62015408.operation(e,tp,eg,ep,ev,re,r,rp)
if
tg
:
GetCount
()
>
0
then
if
tg
:
GetCount
()
>
0
then
Duel
.
Remove
(
tg
,
POS_FACEUP
,
REASON_EFFECT
)
Duel
.
Remove
(
tg
,
POS_FACEUP
,
REASON_EFFECT
)
end
end
Duel
.
ShuffleExtra
(
tp
)
Duel
.
ShuffleExtra
(
1
-
tp
)
end
end
end
end
c73988674.lua
View file @
35bd216d
...
@@ -29,4 +29,6 @@ function c73988674.operation(e,tp,eg,ep,ev,re,r,rp)
...
@@ -29,4 +29,6 @@ function c73988674.operation(e,tp,eg,ep,ev,re,r,rp)
elseif
ct1
<
ct2
then
elseif
ct1
<
ct2
then
Duel
.
Recover
(
1
-
tp
,
3000
,
REASON_EFFECT
)
Duel
.
Recover
(
1
-
tp
,
3000
,
REASON_EFFECT
)
end
end
Duel
.
ShuffleExtra
(
tp
)
Duel
.
ShuffleExtra
(
1
-
tp
)
end
end
c77565204.lua
View file @
35bd216d
...
@@ -91,6 +91,7 @@ function c77565204.tgop(e,tp,eg,ep,ev,re,r,rp)
...
@@ -91,6 +91,7 @@ function c77565204.tgop(e,tp,eg,ep,ev,re,r,rp)
Duel
.
SendtoGrave
(
mat
,
REASON_EFFECT
)
Duel
.
SendtoGrave
(
mat
,
REASON_EFFECT
)
e
:
SetLabel
(
code
)
e
:
SetLabel
(
code
)
e
:
SetLabelObject
(
mat
)
e
:
SetLabelObject
(
mat
)
Duel
.
ShuffleExtra
(
tp
)
end
end
end
end
function
c77565204
.
proccon
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
function
c77565204
.
proccon
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
...
...
c80159717.lua
View file @
35bd216d
...
@@ -31,4 +31,5 @@ function c80159717.exop(e,tp,eg,ep,ev,re,r,rp)
...
@@ -31,4 +31,5 @@ function c80159717.exop(e,tp,eg,ep,ev,re,r,rp)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_TOGRAVE
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_TOGRAVE
)
local
sg
=
Duel
.
SelectMatchingCard
(
tp
,
Card
.
IsAbleToGrave
,
tp
,
0
,
LOCATION_EXTRA
,
ct
,
ct
,
nil
)
local
sg
=
Duel
.
SelectMatchingCard
(
tp
,
Card
.
IsAbleToGrave
,
tp
,
0
,
LOCATION_EXTRA
,
ct
,
ct
,
nil
)
Duel
.
SendtoGrave
(
sg
,
REASON_EFFECT
)
Duel
.
SendtoGrave
(
sg
,
REASON_EFFECT
)
Duel
.
ShuffleExtra
(
1
-
tp
)
end
end
c87602890.lua
View file @
35bd216d
...
@@ -80,6 +80,9 @@ function c87602890.operation(e,tp,eg,ep,ev,re,r,rp)
...
@@ -80,6 +80,9 @@ function c87602890.operation(e,tp,eg,ep,ev,re,r,rp)
Duel
.
BreakEffect
()
Duel
.
BreakEffect
()
Duel
.
SendtoGrave
(
g1
,
REASON_EFFECT
)
Duel
.
SendtoGrave
(
g1
,
REASON_EFFECT
)
end
end
if
e
:
GetLabel
()
==
1
then
Duel
.
ShuffleExtra
(
1
-
tp
)
end
end
end
end
end
function
c87602890
.
valcheck
(
e
,
c
)
function
c87602890
.
valcheck
(
e
,
c
)
...
...
c94431029.lua
View file @
35bd216d
...
@@ -51,4 +51,6 @@ function c94431029.activate(e,tp,eg,ep,ev,re,r,rp)
...
@@ -51,4 +51,6 @@ function c94431029.activate(e,tp,eg,ep,ev,re,r,rp)
end
end
end
end
end
end
Duel
.
ShuffleExtra
(
tp
)
Duel
.
ShuffleExtra
(
1
-
tp
)
end
end
c95474755.lua
View file @
35bd216d
...
@@ -62,6 +62,7 @@ function c95474755.exop(e,tp,eg,ep,ev,re,r,rp)
...
@@ -62,6 +62,7 @@ function c95474755.exop(e,tp,eg,ep,ev,re,r,rp)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_REMOVE
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_REMOVE
)
local
sg
=
g
:
FilterSelect
(
tp
,
Card
.
IsAbleToRemove
,
1
,
1
,
nil
,
tp
,
POS_FACEDOWN
)
local
sg
=
g
:
FilterSelect
(
tp
,
Card
.
IsAbleToRemove
,
1
,
1
,
nil
,
tp
,
POS_FACEDOWN
)
Duel
.
Remove
(
sg
,
POS_FACEDOWN
,
REASON_EFFECT
)
Duel
.
Remove
(
sg
,
POS_FACEDOWN
,
REASON_EFFECT
)
Duel
.
ShuffleExtra
(
1
-
tp
)
end
end
function
c95474755
.
regop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
function
c95474755
.
regop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
e
:
GetHandler
():
RegisterFlagEffect
(
95474755
,
RESET_EVENT
+
RESETS_STANDARD
+
RESET_PHASE
+
PHASE_BATTLE
,
0
,
1
)
e
:
GetHandler
():
RegisterFlagEffect
(
95474755
,
RESET_EVENT
+
RESETS_STANDARD
+
RESET_PHASE
+
PHASE_BATTLE
,
0
,
1
)
...
...
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