Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro
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-520DIY
ygopro
Commits
285caef9
Commit
285caef9
authored
Dec 16, 2014
by
VanillaSalt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
2fc92f31
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
6 deletions
+9
-6
ocgcore/libduel.cpp
ocgcore/libduel.cpp
+2
-2
ocgcore/operations.cpp
ocgcore/operations.cpp
+1
-1
script/c12670770.lua
script/c12670770.lua
+4
-1
script/c35014241.lua
script/c35014241.lua
+1
-1
script/c96594609.lua
script/c96594609.lua
+1
-1
No files found.
ocgcore/libduel.cpp
View file @
285caef9
...
@@ -3073,10 +3073,10 @@ int32 scriptlib::duel_get_activity_count(lua_State *L) {
...
@@ -3073,10 +3073,10 @@ int32 scriptlib::duel_get_activity_count(lua_State *L) {
lua_pushinteger
(
L
,
pduel
->
game_field
->
core
.
normalsummon_state_count
[
playerid
]);
lua_pushinteger
(
L
,
pduel
->
game_field
->
core
.
normalsummon_state_count
[
playerid
]);
break
;
break
;
case
3
:
case
3
:
lua_pushinteger
(
L
,
pduel
->
game_field
->
core
.
fli
psummon_state_count
[
playerid
]);
lua_pushinteger
(
L
,
pduel
->
game_field
->
core
.
s
psummon_state_count
[
playerid
]);
break
;
break
;
case
4
:
case
4
:
lua_pushinteger
(
L
,
pduel
->
game_field
->
core
.
s
psummon_state_count
[
playerid
]);
lua_pushinteger
(
L
,
pduel
->
game_field
->
core
.
fli
psummon_state_count
[
playerid
]);
break
;
break
;
case
5
:
case
5
:
lua_pushinteger
(
L
,
pduel
->
game_field
->
core
.
attack_state_count
[
playerid
]);
lua_pushinteger
(
L
,
pduel
->
game_field
->
core
.
attack_state_count
[
playerid
]);
...
...
ocgcore/operations.cpp
View file @
285caef9
...
@@ -3590,7 +3590,7 @@ int32 field::change_position(uint16 step, group * targets, effect * reason_effec
...
@@ -3590,7 +3590,7 @@ int32 field::change_position(uint16 step, group * targets, effect * reason_effec
pcard
->
refresh_disable_status
();
pcard
->
refresh_disable_status
();
}
}
if
(
pcard
->
current
.
location
==
LOCATION_MZONE
)
{
if
(
pcard
->
current
.
location
==
LOCATION_MZONE
)
{
raise_single_event
(
*
cvit
,
0
,
EVENT_CHANGE_POS
,
reason_effect
,
0
,
reason_player
,
0
,
0
);
raise_single_event
(
pcard
,
0
,
EVENT_CHANGE_POS
,
reason_effect
,
0
,
reason_player
,
0
,
0
);
pos_changed
.
insert
(
pcard
);
pos_changed
.
insert
(
pcard
);
}
}
bool
trapmonster
=
false
;
bool
trapmonster
=
false
;
...
...
script/c12670770.lua
View file @
285caef9
...
@@ -48,6 +48,7 @@ function c12670770.target1(e,tp,eg,ep,ev,re,r,rp,chk)
...
@@ -48,6 +48,7 @@ function c12670770.target1(e,tp,eg,ep,ev,re,r,rp,chk)
e1
:
SetRange
(
LOCATION_SZONE
)
e1
:
SetRange
(
LOCATION_SZONE
)
e1
:
SetCode
(
EVENT_PHASE
+
PHASE_STANDBY
)
e1
:
SetCode
(
EVENT_PHASE
+
PHASE_STANDBY
)
e1
:
SetCountLimit
(
1
)
e1
:
SetCountLimit
(
1
)
e1
:
SetCondition
(
c12670770
.
sdescon
)
e1
:
SetOperation
(
c12670770
.
sdesop
)
e1
:
SetOperation
(
c12670770
.
sdesop
)
e1
:
SetReset
(
RESET_EVENT
+
0x1fe0000
+
RESET_PHASE
+
PHASE_STANDBY
+
RESET_SELF_TURN
,
3
)
e1
:
SetReset
(
RESET_EVENT
+
0x1fe0000
+
RESET_PHASE
+
PHASE_STANDBY
+
RESET_SELF_TURN
,
3
)
c
:
RegisterEffect
(
e1
)
c
:
RegisterEffect
(
e1
)
...
@@ -74,8 +75,10 @@ function c12670770.operation(e,tp,eg,ep,ev,re,r,rp)
...
@@ -74,8 +75,10 @@ function c12670770.operation(e,tp,eg,ep,ev,re,r,rp)
Duel
.
Remove
(
g
,
POS_FACEUP
,
REASON_EFFECT
)
Duel
.
Remove
(
g
,
POS_FACEUP
,
REASON_EFFECT
)
end
end
end
end
function
c12670770
.
sdescon
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
return
tp
==
Duel
.
GetTurnPlayer
()
end
function
c12670770
.
sdesop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
function
c12670770
.
sdesop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
if
tp
~=
Duel
.
GetTurnPlayer
()
then
return
end
local
c
=
e
:
GetHandler
()
local
c
=
e
:
GetHandler
()
local
ct
=
c
:
GetTurnCounter
()
local
ct
=
c
:
GetTurnCounter
()
ct
=
ct
+
1
ct
=
ct
+
1
...
...
script/c35014241.lua
View file @
285caef9
...
@@ -29,8 +29,8 @@ function c35014241.cost(e,tp,eg,ep,ev,re,r,rp,chk)
...
@@ -29,8 +29,8 @@ function c35014241.cost(e,tp,eg,ep,ev,re,r,rp,chk)
local
g1
=
Duel
.
SelectMatchingCard
(
tp
,
c35014241
.
cfilter1
,
tp
,
LOCATION_MZONE
,
0
,
1
,
1
,
nil
,
e
,
tp
)
local
g1
=
Duel
.
SelectMatchingCard
(
tp
,
c35014241
.
cfilter1
,
tp
,
LOCATION_MZONE
,
0
,
1
,
1
,
nil
,
e
,
tp
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_TODECK
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_TODECK
)
local
g2
=
Duel
.
SelectMatchingCard
(
tp
,
c35014241
.
cfilter2
,
tp
,
LOCATION_MZONE
,
0
,
1
,
1
,
nil
,
e
,
tp
,
g1
:
GetFirst
())
local
g2
=
Duel
.
SelectMatchingCard
(
tp
,
c35014241
.
cfilter2
,
tp
,
LOCATION_MZONE
,
0
,
1
,
1
,
nil
,
e
,
tp
,
g1
:
GetFirst
())
g1
:
Merge
(
g2
)
e
:
SetLabel
(
g1
:
GetFirst
():
GetLevel
()
+
g2
:
GetFirst
():
GetLevel
())
e
:
SetLabel
(
g1
:
GetFirst
():
GetLevel
()
+
g2
:
GetFirst
():
GetLevel
())
g1
:
Merge
(
g2
)
Duel
.
SendtoDeck
(
g1
,
nil
,
0
,
REASON_COST
)
Duel
.
SendtoDeck
(
g1
,
nil
,
0
,
REASON_COST
)
end
end
function
c35014241
.
target
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
function
c35014241
.
target
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
...
...
script/c96594609.lua
View file @
285caef9
...
@@ -17,7 +17,7 @@ function c96594609.initial_effect(c)
...
@@ -17,7 +17,7 @@ function c96594609.initial_effect(c)
e2
:
SetDescription
(
aux
.
Stringid
(
96594609
,
1
))
e2
:
SetDescription
(
aux
.
Stringid
(
96594609
,
1
))
e2
:
SetCategory
(
CATEGORY_TOGRAVE
)
e2
:
SetCategory
(
CATEGORY_TOGRAVE
)
e2
:
SetType
(
EFFECT_TYPE_SINGLE
+
EFFECT_TYPE_TRIGGER_O
)
e2
:
SetType
(
EFFECT_TYPE_SINGLE
+
EFFECT_TYPE_TRIGGER_O
)
e2
:
SetProperty
(
EFFECT_FLAG_DAMAGE_STEP
)
e2
:
SetProperty
(
EFFECT_FLAG_DAMAGE_STEP
+
EFFECT_FLAG_DELAY
)
e2
:
SetCode
(
EVENT_TO_GRAVE
)
e2
:
SetCode
(
EVENT_TO_GRAVE
)
e2
:
SetCondition
(
c96594609
.
tgcon
)
e2
:
SetCondition
(
c96594609
.
tgcon
)
e2
:
SetTarget
(
c96594609
.
tgtg
)
e2
:
SetTarget
(
c96594609
.
tgtg
)
...
...
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