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
wyykak
ygopro
Commits
e295b84d
Commit
e295b84d
authored
Dec 21, 2014
by
VanillaSalt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
480bcbf9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
9 deletions
+24
-9
ocgcore/processor.cpp
ocgcore/processor.cpp
+4
-1
script/c1516510.lua
script/c1516510.lua
+19
-7
script/c30757396.lua
script/c30757396.lua
+1
-1
No files found.
ocgcore/processor.cpp
View file @
e295b84d
...
@@ -2384,7 +2384,10 @@ int32 field::process_instant_event() {
...
@@ -2384,7 +2384,10 @@ int32 field::process_instant_event() {
peffect
=
pr
.
first
->
second
;
peffect
=
pr
.
first
->
second
;
if
(
!
peffect
->
is_condition_check
(
peffect
->
handler
->
current
.
controler
,
*
elit
))
if
(
!
peffect
->
is_condition_check
(
peffect
->
handler
->
current
.
controler
,
*
elit
))
continue
;
continue
;
peffect
->
handler
->
create_relation
(
peffect
);
if
((
peffect
->
flag
&
EFFECT_FLAG_FIELD_ONLY
)
||
((
peffect
->
type
&
EFFECT_TYPE_SINGLE
)
&&
!
(
peffect
->
flag
&
EFFECT_FLAG_SINGLE_RANGE
))
||
!
(
peffect
->
range
&
LOCATION_HAND
)
||
(
peffect
->
range
&
peffect
->
handler
->
current
.
location
))
peffect
->
handler
->
create_relation
(
peffect
);
peffect
->
s_range
=
peffect
->
handler
->
current
.
location
;
peffect
->
s_range
=
peffect
->
handler
->
current
.
location
;
peffect
->
o_range
=
peffect
->
handler
->
current
.
sequence
;
peffect
->
o_range
=
peffect
->
handler
->
current
.
sequence
;
newchain
.
flag
=
0
;
newchain
.
flag
=
0
;
...
...
script/c1516510.lua
View file @
e295b84d
...
@@ -68,7 +68,7 @@ function c1516510.efilter(e,re)
...
@@ -68,7 +68,7 @@ function c1516510.efilter(e,re)
return
e
:
GetOwnerPlayer
()
~=
re
:
GetOwnerPlayer
()
return
e
:
GetOwnerPlayer
()
~=
re
:
GetOwnerPlayer
()
end
end
function
c1516510
.
lvfilter
(
c
)
function
c1516510
.
lvfilter
(
c
)
return
not
c
:
IsCode
(
16178681
)
return
c
:
IsCode
(
16178681
)
or
c
:
IsHasEffect
(
EFFECT_FUSION_SUBSTITUTE
)
end
end
function
c1516510
.
imfilter
(
c
)
function
c1516510
.
imfilter
(
c
)
return
c
:
IsLocation
(
LOCATION_MZONE
)
and
c
:
GetSummonType
()
==
SUMMON_TYPE_PENDULUM
return
c
:
IsLocation
(
LOCATION_MZONE
)
and
c
:
GetSummonType
()
==
SUMMON_TYPE_PENDULUM
...
@@ -76,12 +76,24 @@ end
...
@@ -76,12 +76,24 @@ end
function
c1516510
.
valcheck
(
e
,
c
)
function
c1516510
.
valcheck
(
e
,
c
)
local
g
=
c
:
GetMaterial
()
local
g
=
c
:
GetMaterial
()
local
flag
=
0
local
flag
=
0
local
lg
=
g
:
Filter
(
c1516510
.
lvfilter
,
nil
)
if
g
:
GetCount
()
==
2
then
local
lv
=
lg
:
GetFirst
():
GetOriginalLevel
()
local
lv
=
0
if
lv
>
0
and
lv
<
5
then
local
lg1
=
g
:
Filter
(
c1516510
.
lvfilter
,
nil
)
flag
=
0x1
local
lg2
=
g
:
Filter
(
Card
.
IsRace
,
nil
,
RACE_SPELLCASTER
)
elseif
lv
>
4
then
if
lg1
:
GetCount
()
==
2
then
flag
=
0x2
lv
=
lg2
:
GetFirst
():
GetOriginalLevel
()
local
lc
=
lg2
:
GetNext
()
if
lc
then
lv
=
math.max
(
lv
,
lc
:
GetOriginalLevel
())
end
else
local
lc
=
g
:
GetFirst
()
if
lc
==
lg1
:
GetFirst
()
then
lc
=
g
:
GetNext
()
end
lv
=
lc
:
GetOriginalLevel
()
end
if
lv
>
4
then
flag
=
0x2
elseif
lv
>
0
then
flag
=
0x1
end
end
end
if
g
:
IsExists
(
c1516510
.
imfilter
,
1
,
nil
)
then
if
g
:
IsExists
(
c1516510
.
imfilter
,
1
,
nil
)
then
flag
=
flag
+
0x4
flag
=
flag
+
0x4
...
...
script/c30757396.lua
View file @
e295b84d
...
@@ -44,7 +44,7 @@ function c30757396.damop(e,tp,eg,ep,ev,re,r,rp)
...
@@ -44,7 +44,7 @@ function c30757396.damop(e,tp,eg,ep,ev,re,r,rp)
Duel
.
Damage
(
p
,
ct
*
300
,
REASON_EFFECT
)
Duel
.
Damage
(
p
,
ct
*
300
,
REASON_EFFECT
)
end
end
function
c30757396
.
damcon2
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
function
c30757396
.
damcon2
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
return
rp
~=
tp
return
eg
:
IsExists
(
Card
.
IsControler
,
1
,
nil
,
1
-
tp
)
end
end
function
c30757396
.
damtg2
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
function
c30757396
.
damtg2
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
if
chk
==
0
then
return
true
end
if
chk
==
0
then
return
true
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