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
1
Merge Requests
1
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
365c15ce
Commit
365c15ce
authored
Sep 05, 2015
by
mercury233
Browse files
Options
Browse Files
Download
Plain Diff
Merge
https://github.com/Fluorohydride/ygopro
into server
parents
3286ce2a
3935b2d5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
ocgcore/card.cpp
ocgcore/card.cpp
+1
-1
ocgcore/operations.cpp
ocgcore/operations.cpp
+1
-1
script/c74506079.lua
script/c74506079.lua
+1
-1
No files found.
ocgcore/card.cpp
View file @
365c15ce
...
...
@@ -1023,7 +1023,7 @@ int32 card::add_effect(effect* peffect) {
remove_effect
(
rm
->
second
);
}
}
if
(
peffect
->
code
==
EFFECT_SET_DEFENCE
&&
!
(
peffect
->
flag
&
EFFECT_FLAG_SINGLE_RANGE
))
{
if
(
(
peffect
->
code
==
EFFECT_SET_DEFENCE
||
peffect
->
code
==
EFFECT_SET_BASE_DEFENCE
)
&&
!
(
peffect
->
flag
&
EFFECT_FLAG_SINGLE_RANGE
))
{
for
(
it
=
single_effect
.
begin
();
it
!=
single_effect
.
end
();)
{
rm
=
it
++
;
if
((
rm
->
second
->
code
==
EFFECT_SET_DEFENCE
||
rm
->
second
->
code
==
EFFECT_SET_DEFENCE_FINAL
)
...
...
ocgcore/operations.cpp
View file @
365c15ce
...
...
@@ -2773,6 +2773,7 @@ int32 field::destroy(uint16 step, group * targets, effect * reason_effect, uint3
}
returns
.
ivalue
[
0
]
=
core
.
operated_set
.
size
();
pduel
->
delete_group
(
targets
);
adjust_all
();
return
TRUE
;
}
case
10
:
{
...
...
@@ -3452,7 +3453,6 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
core
.
operated_set
=
targets
->
container
;
returns
.
ivalue
[
0
]
=
targets
->
container
.
size
();
pduel
->
delete_group
(
targets
);
adjust_all
();
return
TRUE
;
}
}
...
...
script/c74506079.lua
View file @
365c15ce
...
...
@@ -47,7 +47,7 @@ function c74506079.regop(e,tp,eg,ep,ev,re,r,rp)
local
c
=
e
:
GetHandler
()
local
ae
=
Effect
.
CreateEffect
(
c
)
ae
:
SetType
(
EFFECT_TYPE_SINGLE
)
ae
:
SetCode
(
EFFECT_
UPDATE
_ATTACK
)
ae
:
SetCode
(
EFFECT_
SET
_ATTACK
)
ae
:
SetValue
(
ct
*
500
)
ae
:
SetReset
(
RESET_EVENT
+
0x1ff0000
)
c
:
RegisterEffect
(
ae
)
...
...
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