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
REIKAI
ygopro
Commits
5fb06614
Commit
5fb06614
authored
Aug 20, 2012
by
argon.sun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
8d9733f9
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
11 deletions
+17
-11
ocgcore/libduel.cpp
ocgcore/libduel.cpp
+2
-2
ocgcore/operations.cpp
ocgcore/operations.cpp
+10
-6
script/c22959079.lua
script/c22959079.lua
+1
-0
script/c41753322.lua
script/c41753322.lua
+2
-2
script/c73445448.lua
script/c73445448.lua
+1
-1
script/c90502999.lua
script/c90502999.lua
+1
-0
No files found.
ocgcore/libduel.cpp
View file @
5fb06614
...
...
@@ -553,8 +553,8 @@ int32 scriptlib::duel_return_to_field(lua_State *L) {
duel
*
pduel
=
pcard
->
pduel
;
pcard
->
enable_field_effect
(
FALSE
);
pduel
->
game_field
->
adjust_instant
();
pduel
->
game_field
->
move_to_field
(
pcard
,
pcard
->
previous
.
controler
,
pcard
->
previous
.
controler
,
pcard
->
previous
.
location
,
pos
,
TRUE
,
TRUE
);
pduel
->
game_field
->
refresh_location_info_instant
();
pduel
->
game_field
->
move_to_field
(
pcard
,
pcard
->
previous
.
controler
,
pcard
->
previous
.
controler
,
pcard
->
previous
.
location
,
pos
,
TRUE
,
1
);
pduel
->
game_field
->
core
.
subunits
.
begin
()
->
type
=
PROCESSOR_MOVETOFIELD_S
;
return
lua_yield
(
L
,
0
);
}
...
...
ocgcore/operations.cpp
View file @
5fb06614
...
...
@@ -2891,19 +2891,23 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret
switch
(
step
)
{
case
0
:
{
returns
.
ivalue
[
0
]
=
FALSE
;
if
(
ret
&&
(
!
(
target
->
current
.
reason
&
REASON_TEMPORARY
)
||
(
target
->
current
.
reason_effect
->
owner
!=
core
.
reason_effect
->
owner
)))
if
(
(
ret
==
1
)
&&
(
!
(
target
->
current
.
reason
&
REASON_TEMPORARY
)
||
(
target
->
current
.
reason_effect
->
owner
!=
core
.
reason_effect
->
owner
)))
return
TRUE
;
if
(
!
(
location
==
LOCATION_SZONE
&&
(
target
->
data
.
type
&
TYPE_FIELD
)
&&
(
target
->
data
.
type
&
TYPE_SPELL
)))
{
uint32
flag
;
uint32
lreason
=
(
target
->
current
.
location
==
LOCATION_MZONE
)
?
LOCATION_REASON_CONTROL
:
LOCATION_REASON_TOFIELD
;
uint32
ct
=
get_useable_count
(
playerid
,
location
,
move_player
,
lreason
,
&
flag
);
if
(
ret
&&
(
ct
<=
0
||
!
(
target
->
data
.
type
&
TYPE_MONSTER
)))
{
if
(
(
ret
==
1
)
&&
(
ct
<=
0
||
!
(
target
->
data
.
type
&
TYPE_MONSTER
)))
{
core
.
units
.
begin
()
->
step
=
3
;
send_to
(
target
,
core
.
reason_effect
,
REASON_EFFECT
,
core
.
reason_player
,
PLAYER_NONE
,
LOCATION_GRAVE
,
0
,
0
);
return
FALSE
;
}
if
(
!
ct
)
return
TRUE
;
if
(
ret
&&
is_location_useable
(
playerid
,
location
,
target
->
previous
.
sequence
))
{
returns
.
bvalue
[
2
]
=
target
->
previous
.
sequence
;
return
FALSE
;
}
if
(
move_player
==
playerid
)
{
if
(
location
==
LOCATION_SZONE
)
flag
=
((
flag
<<
8
)
&
0xff00
)
|
0xffff00ff
;
...
...
@@ -2929,7 +2933,7 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret
uint32
seq
=
returns
.
bvalue
[
2
];
if
(
location
==
LOCATION_SZONE
&&
(
target
->
data
.
type
&
TYPE_FIELD
)
&&
(
target
->
data
.
type
&
TYPE_SPELL
))
seq
=
5
;
if
(
!
ret
)
{
if
(
ret
!=
1
)
{
if
(
location
!=
target
->
current
.
location
)
{
uint32
resetflag
=
0
;
if
(
location
&
LOCATION_ONFIELD
)
...
...
@@ -3016,7 +3020,7 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret
}
if
((
target
->
previous
.
location
==
LOCATION_SZONE
)
&&
target
->
equiping_target
)
target
->
unequip
();
if
(
enable
||
ret
)
if
(
enable
||
((
ret
==
1
)
&&
target
->
is_position
(
POS_FACEUP
))
)
target
->
enable_field_effect
(
TRUE
);
adjust_instant
();
return
FALSE
;
...
...
@@ -3087,7 +3091,7 @@ int32 field::change_position(uint16 step, group * targets, effect * reason_effec
}
bool
trapmonster
=
false
;
if
((
opos
&
POS_FACEUP
)
&&
(
npos
&
POS_FACEDOWN
))
{
if
(
pcard
->
get_type
()
&
TYPE_TRAPMONSTER
)
if
(
pcard
->
get_type
()
&
TYPE_TRAPMONSTER
)
trapmonster
=
true
;
pcard
->
reset
(
RESET_TURN_SET
,
RESET_EVENT
);
pcard
->
set_status
(
STATUS_SET_TURN
,
TRUE
);
...
...
@@ -3105,7 +3109,7 @@ int32 field::change_position(uint16 step, group * targets, effect * reason_effec
pcard
->
unequip
();
if
(
trapmonster
)
{
refresh_location_info_instant
();
move_to_field
(
pcard
,
pcard
->
current
.
controler
,
pcard
->
current
.
controler
,
LOCATION_SZONE
,
POS_FACEDOWN
);
move_to_field
(
pcard
,
pcard
->
current
.
controler
,
pcard
->
current
.
controler
,
LOCATION_SZONE
,
POS_FACEDOWN
,
FALSE
,
2
);
}
}
}
...
...
script/c22959079.lua
View file @
5fb06614
...
...
@@ -23,6 +23,7 @@ end
function
c22959079
.
operation
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
local
tc
=
Duel
.
GetFirstTarget
()
local
seq
=
tc
:
GetSequence
()
if
tc
:
IsControler
(
1
-
tp
)
then
seq
=
seq
+
16
end
if
tc
:
IsRelateToEffect
(
e
)
and
Duel
.
Remove
(
tc
,
0
,
REASON_EFFECT
+
REASON_TEMPORARY
)
~=
0
then
local
e1
=
Effect
.
CreateEffect
(
e
:
GetHandler
())
e1
:
SetType
(
EFFECT_TYPE_FIELD
+
EFFECT_TYPE_CONTINUOUS
)
...
...
script/c41753322.lua
View file @
5fb06614
...
...
@@ -48,12 +48,12 @@ function c41753322.otcon(e,c)
if
c
==
nil
then
return
true
end
local
g
=
Duel
.
GetTributeGroup
(
c
)
return
c
:
GetLevel
()
>
6
and
Duel
.
GetLocationCount
(
c
:
GetControler
(),
LOCATION_MZONE
)
>-
1
and
g
:
IsExists
(
Card
.
IsRace
,
1
,
nil
,
RACE_
PLANT
)
and
g
:
IsExists
(
Card
.
IsRace
,
1
,
nil
,
RACE_
DINOSAUR
)
end
function
c41753322
.
otop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
c
)
local
g
=
Duel
.
GetTributeGroup
(
c
)
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_RELEASE
)
local
sg
=
g
:
FilterSelect
(
tp
,
Card
.
IsRace
,
1
,
1
,
nil
,
RACE_
PLANT
)
local
sg
=
g
:
FilterSelect
(
tp
,
Card
.
IsRace
,
1
,
1
,
nil
,
RACE_
DINOSAUR
)
c
:
SetMaterial
(
sg
)
Duel
.
Release
(
sg
,
REASON_SUMMON
+
REASON_MATERIAL
)
end
...
...
script/c73445448.lua
View file @
5fb06614
...
...
@@ -37,7 +37,7 @@ function c73445448.filter(c)
return
c
:
IsFaceup
()
and
not
c
:
IsDisabled
()
and
not
c
:
IsType
(
TYPE_NORMAL
)
end
function
c73445448
.
target
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
,
chkc
)
if
chkc
then
return
chkc
:
IsControler
(
1
-
tp
)
and
chkc
:
Is
Location
(
LOCATION_MZONE
)
and
c73445448
.
filter
(
chkc
)
end
if
chkc
then
return
chkc
:
IsControler
(
1
-
tp
)
and
chkc
:
Is
OnField
(
)
and
c73445448
.
filter
(
chkc
)
end
if
chk
==
0
then
return
e
:
GetHandler
():
IsAttackPos
()
and
Duel
.
IsExistingTarget
(
c73445448
.
filter
,
tp
,
0
,
LOCATION_ONFIELD
,
1
,
nil
)
end
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
HINTMSG_FACEUP
)
...
...
script/c90502999.lua
View file @
5fb06614
...
...
@@ -18,6 +18,7 @@ end
function
c90502999
.
target
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
if
chk
==
0
then
return
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
+
Duel
.
GetLocationCount
(
1
-
tp
,
LOCATION_MZONE
)
>
1
end
local
dis
=
Duel
.
SelectDisableField
(
tp
,
2
,
LOCATION_MZONE
,
LOCATION_MZONE
,
0
)
Debug
.
Message
(
dis
)
e
:
SetLabel
(
dis
)
end
function
c90502999
.
disop
(
e
,
tp
)
...
...
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