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
nanahira
ygopro
Commits
fd5d5bf7
Commit
fd5d5bf7
authored
Aug 24, 2015
by
salix5
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
REASON_BATTLE
parent
4c9f4146
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
7 deletions
+14
-7
ocgcore/operations.cpp
ocgcore/operations.cpp
+3
-1
ocgcore/processor.cpp
ocgcore/processor.cpp
+2
-0
script/c53334471.lua
script/c53334471.lua
+1
-1
script/c81907872.lua
script/c81907872.lua
+7
-4
script/c90846359.lua
script/c90846359.lua
+1
-1
No files found.
ocgcore/operations.cpp
View file @
fd5d5bf7
...
...
@@ -3028,7 +3028,9 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
card_set
leave_p
,
destroying
;
for
(
auto
cit
=
targets
->
container
.
begin
();
cit
!=
targets
->
container
.
end
();
++
cit
)
{
card
*
pcard
=
*
cit
;
if
((
pcard
->
current
.
location
==
LOCATION_MZONE
)
&&
pcard
->
is_status
(
STATUS_BATTLE_DESTROYED
)
&&
!
(
pcard
->
current
.
reason
&
(
REASON_DESTROY
|
REASON_EFFECT
)))
{
if
((
pcard
->
current
.
location
==
LOCATION_MZONE
)
&&
pcard
->
is_status
(
STATUS_BATTLE_DESTROYED
)
&&
!
(
pcard
->
current
.
reason
&
REASON_RULE
)
&&
(
pcard
->
current
.
reason
&
(
REASON_DESTROY
|
REASON_EFFECT
))
!=
(
REASON_DESTROY
|
REASON_EFFECT
))
{
pcard
->
current
.
reason
|=
REASON_DESTROY
|
REASON_BATTLE
;
raise_single_event
(
pcard
,
0
,
EVENT_DESTROY
,
pcard
->
current
.
reason_effect
,
pcard
->
current
.
reason
,
pcard
->
current
.
reason_player
,
0
,
0
);
destroying
.
insert
(
pcard
);
...
...
ocgcore/processor.cpp
View file @
fd5d5bf7
...
...
@@ -3705,6 +3705,7 @@ int32 field::process_battle_command(uint16 step) {
card_set
ing
;
card_set
ed
;
if
(
core
.
attacker
->
is_status
(
STATUS_BATTLE_DESTROYED
)
&&
!
(
core
.
attacker
->
current
.
reason
&
REASON_RULE
)
&&
!
((
core
.
attacker
->
current
.
reason
&
REASON_EFFECT
+
REASON_DESTROY
)
==
REASON_EFFECT
+
REASON_DESTROY
))
{
raise_single_event
(
core
.
attack_target
,
0
,
EVENT_BATTLE_DESTROYING
,
0
,
core
.
attacker
->
current
.
reason
,
core
.
attack_target
->
current
.
controler
,
0
,
1
);
raise_single_event
(
core
.
attacker
,
0
,
EVENT_BATTLE_DESTROYED
,
0
,
core
.
attacker
->
current
.
reason
,
core
.
attack_target
->
current
.
controler
,
0
,
0
);
...
...
@@ -3712,6 +3713,7 @@ int32 field::process_battle_command(uint16 step) {
ed
.
insert
(
core
.
attacker
);
}
if
(
core
.
attack_target
&&
core
.
attack_target
->
is_status
(
STATUS_BATTLE_DESTROYED
)
&&
!
(
core
.
attack_target
->
current
.
reason
&
REASON_RULE
)
&&
!
((
core
.
attack_target
->
current
.
reason
&
REASON_EFFECT
+
REASON_DESTROY
)
==
REASON_EFFECT
+
REASON_DESTROY
))
{
raise_single_event
(
core
.
attacker
,
0
,
EVENT_BATTLE_DESTROYING
,
0
,
core
.
attack_target
->
current
.
reason
,
core
.
attacker
->
current
.
controler
,
0
,
0
);
raise_single_event
(
core
.
attack_target
,
0
,
EVENT_BATTLE_DESTROYED
,
0
,
core
.
attack_target
->
current
.
reason
,
core
.
attacker
->
current
.
controler
,
0
,
1
);
...
...
script/c53334471.lua
View file @
fd5d5bf7
...
...
@@ -99,7 +99,7 @@ function c53334471.adjustop(e,tp,eg,ep,ev,re,r,rp)
end
g1
:
Merge
(
g2
)
if
g1
:
GetCount
()
>
0
then
Duel
.
SendtoGrave
(
g1
,
REASON_
EFFECT
)
Duel
.
SendtoGrave
(
g1
,
REASON_
RULE
)
Duel
.
Readjust
()
end
end
script/c81907872.lua
View file @
fd5d5bf7
...
...
@@ -46,12 +46,15 @@ function c81907872.posop(e,tp,eg,ep,ev,re,r,rp)
Duel
.
ChangePosition
(
c
,
POS_FACEDOWN_DEFENCE
)
end
end
function
c81907872
.
cfilter
(
c
,
tp
)
return
c
:
IsControler
(
tp
)
and
c
:
GetPreviousControler
()
==
tp
and
c
:
IsSetCard
(
0x8d
)
and
c
:
IsReason
(
REASON_DESTROY
)
and
c
:
IsType
(
TYPE_MONSTER
)
and
(
not
c
:
IsReason
(
REASON_BATTLE
)
or
c
==
Duel
.
GetAttackTarget
())
and
not
c
:
IsPreviousLocation
(
LOCATION_SZONE
)
function
c81907872
.
cfilter1
(
c
,
tp
)
return
c
:
IsControler
(
tp
)
and
c
:
GetPreviousControler
()
==
tp
and
c
:
IsReason
(
REASON_DESTROY
+
REASON_EFFECT
)
and
c
:
IsSetCard
(
0x8d
)
and
c
:
IsType
(
TYPE_MONSTER
)
and
not
c
:
IsPreviousLocation
(
LOCATION_SZONE
)
end
function
c81907872
.
cfilter2
(
c
)
return
c
:
IsReason
(
REASON_BATTLE
)
and
c
:
IsStatus
(
STATUS_OPPO_BATTLE
)
and
c
==
Duel
.
GetAttackTarget
()
end
function
c81907872
.
spcon
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
return
rp
~=
tp
and
eg
:
IsExists
(
c81907872
.
cfilter
,
1
,
nil
,
tp
)
return
(
rp
~=
tp
and
eg
:
IsExists
(
c81907872
.
cfilter1
,
1
,
nil
,
tp
))
or
eg
:
IsExists
(
c81907872
.
cfilter2
,
1
,
nil
)
end
function
c81907872
.
sptg
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
if
chk
==
0
then
return
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
>
0
...
...
script/c90846359.lua
View file @
fd5d5bf7
...
...
@@ -99,7 +99,7 @@ function c90846359.adjustop(e,tp,eg,ep,ev,re,r,rp)
end
g1
:
Merge
(
g2
)
if
g1
:
GetCount
()
>
0
then
Duel
.
SendtoGrave
(
g1
,
REASON_
EFFECT
)
Duel
.
SendtoGrave
(
g1
,
REASON_
RULE
)
Duel
.
Readjust
()
end
end
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