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
78dea945
Commit
78dea945
authored
May 18, 2014
by
VanillaSalt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
71794635
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
19 additions
and
21 deletions
+19
-21
ocgcore/card.cpp
ocgcore/card.cpp
+2
-5
ocgcore/operations.cpp
ocgcore/operations.cpp
+10
-12
ocgcore/processor.cpp
ocgcore/processor.cpp
+1
-0
script/c22900598.lua
script/c22900598.lua
+1
-0
script/c55742055.lua
script/c55742055.lua
+2
-2
script/c56574543.lua
script/c56574543.lua
+1
-1
script/c82962242.lua
script/c82962242.lua
+1
-1
script/constant.lua
script/constant.lua
+1
-0
No files found.
ocgcore/card.cpp
View file @
78dea945
...
...
@@ -352,8 +352,7 @@ int32 card::get_attack(uint8 swap) {
}
}
up
+=
eset
[
i
]
->
get_value
(
this
);
}
else
}
else
upc
+=
eset
[
i
]
->
get_value
(
this
);
break
;
case
EFFECT_SET_ATTACK
:
...
...
@@ -448,10 +447,8 @@ int32 card::get_defence(uint8 swap) {
temp
.
defence
=
base
;
}
}
}
if
(
eset
[
i
]
->
type
&
EFFECT_TYPE_SINGLE
)
up
+=
eset
[
i
]
->
get_value
(
this
);
else
}
else
upc
+=
eset
[
i
]
->
get_value
(
this
);
break
;
case
EFFECT_SET_DEFENCE
:
...
...
ocgcore/operations.cpp
View file @
78dea945
...
...
@@ -1396,7 +1396,6 @@ int32 field::summon(uint16 step, uint8 sumplayer, card * target, effect * proc,
core
.
normalsummon_state
[
sumplayer
]
=
TRUE
;
core
.
summoned_cards_pt
[
sumplayer
].
insert
(
target
);
core
.
normalsummoned_cards_pt
[
sumplayer
].
insert
(
target
);
if
(
target
->
material_cards
.
size
())
{
for
(
auto
mit
=
target
->
material_cards
.
begin
();
mit
!=
target
->
material_cards
.
end
();
++
mit
)
raise_single_event
(
*
mit
,
0
,
EVENT_BE_PRE_MATERIAL
,
proc
,
REASON_SUMMON
,
sumplayer
,
sumplayer
,
0
);
...
...
@@ -1404,7 +1403,9 @@ int32 field::summon(uint16 step, uint8 sumplayer, card * target, effect * proc,
}
process_single_event
();
process_instant_event
();
return
FALSE
;
}
case
10
:
{
if
(
core
.
current_chain
.
size
()
==
0
)
{
if
(
target
->
is_affected_by_effect
(
EFFECT_CANNOT_DISABLE_SUMMON
))
core
.
units
.
begin
()
->
step
=
14
;
...
...
@@ -1416,13 +1417,13 @@ int32 field::summon(uint16 step, uint8 sumplayer, card * target, effect * proc,
if
(
target
->
is_affected_by_effect
(
EFFECT_CANNOT_DISABLE_SUMMON
))
core
.
units
.
begin
()
->
step
=
15
;
else
core
.
units
.
begin
()
->
step
=
1
0
;
core
.
units
.
begin
()
->
step
=
1
1
;
core
.
reserved
=
core
.
units
.
front
();
return
TRUE
;
}
return
FALSE
;
}
case
1
0
:
{
case
1
1
:
{
target
->
set_status
(
STATUS_SUMMONING
,
TRUE
);
target
->
set_status
(
STATUS_SUMMON_DISABLED
,
FALSE
);
core
.
summoning_card
=
0
;
...
...
@@ -1431,7 +1432,7 @@ int32 field::summon(uint16 step, uint8 sumplayer, card * target, effect * proc,
add_process
(
PROCESSOR_POINT_EVENT
,
0
,
0
,
0
,
TRUE
,
TRUE
);
return
FALSE
;
}
case
1
1
:
{
case
1
2
:
{
if
(
target
->
is_status
(
STATUS_SUMMONING
))
{
core
.
units
.
begin
()
->
step
=
14
;
return
FALSE
;
...
...
@@ -2025,11 +2026,9 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card * target) {
pduel
->
write_buffer8
(
target
->
current
.
position
);
core
.
spsummon_state
[
sumplayer
]
=
TRUE
;
core
.
spsummoned_cards_pt
[
sumplayer
].
insert
(
target
);
return
FALSE
;
}
case
5
:{
case
5
:
{
effect
*
proc
=
core
.
units
.
begin
()
->
peffect
;
int32
matreason
=
proc
->
value
==
SUMMON_TYPE_SYNCHRO
?
REASON_SYNCHRO
:
proc
->
value
==
SUMMON_TYPE_XYZ
?
REASON_XYZ
:
REASON_SPSUMMON
;
if
(
target
->
material_cards
.
size
())
{
...
...
@@ -2048,12 +2047,10 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card * target) {
else
core
.
units
.
begin
()
->
step
=
9
;
return
FALSE
;
}
else
if
(
core
.
current_chain
.
size
()
>
1
)
{
}
else
if
(
core
.
current_chain
.
size
()
>
1
)
{
core
.
units
.
begin
()
->
step
=
14
;
return
FALSE
;
}
else
{
}
else
{
if
(
target
->
is_affected_by_effect
(
EFFECT_CANNOT_DISABLE_SPSUMMON
))
core
.
units
.
begin
()
->
step
=
15
;
else
...
...
@@ -2061,6 +2058,7 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card * target) {
core
.
reserved
=
core
.
units
.
front
();
return
TRUE
;
}
return
FALSE
;
}
case
10
:
{
core
.
summoning_card
=
0
;
...
...
ocgcore/processor.cpp
View file @
78dea945
...
...
@@ -480,6 +480,7 @@ int32 field::process() {
card
*
attacker
=
core
.
attacker
;
if
(
!
attacker
||
(
attacker
->
fieldid_r
!=
core
.
pre_field
[
0
])
||
(
attacker
->
current
.
location
!=
LOCATION_MZONE
)
||
(
attacker
->
current
.
position
&
POS_FACEDOWN
)
||
((
attacker
->
current
.
position
&
POS_DEFENCE
)
&&
!
(
attacker
->
is_affected_by_effect
(
EFFECT_DEFENCE_ATTACK
)))
||
attacker
->
is_affected_by_effect
(
EFFECT_ATTACK_DISABLED
)
...
...
script/c22900598.lua
View file @
78dea945
...
...
@@ -34,6 +34,7 @@ function c22900598.activate(e,tp,eg,ep,ev,re,r,rp)
local
cost
=
te
:
GetCost
()
if
cost
then
cost
(
te
,
tep
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
1
)
end
Duel
.
RaiseEvent
(
tc
,
EVENT_CHAIN_SOLVED
,
tc
:
GetActivateEffect
(),
0
,
tp
,
tp
,
Duel
.
GetCurrentChain
())
if
Duel
.
GetLocationCount
(
tp
,
LOCATION_MZONE
)
<=
0
then
return
end
local
sg
=
Duel
.
GetMatchingGroup
(
c22900598
.
spfilter
,
tp
,
LOCATION_GRAVE
,
0
,
nil
,
e
,
tp
)
if
sg
:
GetCount
()
>
0
and
Duel
.
SelectYesNo
(
tp
,
aux
.
Stringid
(
22900598
,
0
))
then
Duel
.
BreakEffect
()
...
...
script/c55742055.lua
View file @
78dea945
...
...
@@ -63,7 +63,7 @@ function c55742055.confilter(c)
end
function
c55742055
.
effcon
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
if
Duel
.
GetTurnPlayer
()
~=
tp
then
return
false
end
local
g
=
Duel
.
GetMatchingGroup
(
c55742055
.
confilter
,
e
:
GetHandlerPlayer
()
,
LOCATION_GRAVE
+
LOCATION_MZONE
,
0
,
nil
)
local
g
=
Duel
.
GetMatchingGroup
(
c55742055
.
confilter
,
tp
,
LOCATION_GRAVE
+
LOCATION_MZONE
,
0
,
nil
)
return
g
:
GetClassCount
(
Card
.
GetCode
)
>=
e
:
GetLabel
()
end
function
c55742055
.
filter1
(
c
)
...
...
@@ -124,7 +124,7 @@ function c55742055.operation3(e,tp,eg,ep,ev,re,r,rp)
end
function
c55742055
.
condition4
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
if
Duel
.
GetTurnPlayer
()
~=
tp
then
return
false
end
local
g
=
Duel
.
GetMatchingGroup
(
c55742055
.
confilter
,
e
:
GetHandlerPlayer
()
,
LOCATION_GRAVE
+
LOCATION_MZONE
,
0
,
nil
)
local
g
=
Duel
.
GetMatchingGroup
(
c55742055
.
confilter
,
tp
,
LOCATION_GRAVE
+
LOCATION_MZONE
,
0
,
nil
)
return
g
:
GetClassCount
(
Card
.
GetCode
)
==
12
end
function
c55742055
.
target4
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
...
...
script/c56574543.lua
View file @
78dea945
...
...
@@ -31,7 +31,7 @@ end
function
c56574543
.
atkop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
local
a
=
Duel
.
GetAttacker
()
local
d
=
Duel
.
GetAttackTarget
()
if
not
a
:
IsRelateToBattle
()
or
a
:
IsFacedown
()
or
not
d
:
IsRelateToBattle
()
or
a
:
IsFacedown
()
then
return
end
if
not
a
:
IsRelateToBattle
()
or
a
:
IsFacedown
()
or
not
d
:
IsRelateToBattle
()
or
d
:
IsFacedown
()
then
return
end
if
a
:
GetControler
()
~=
tp
then
a
,
d
=
d
,
a
end
if
not
a
:
IsImmuneToEffect
(
e
)
then
return
end
local
e1
=
Effect
.
CreateEffect
(
e
:
GetHandler
())
...
...
script/c82962242.lua
View file @
78dea945
...
...
@@ -39,7 +39,7 @@ function c82962242.initial_effect(c)
e4
:
SetCondition
(
c82962242
.
spcon
)
e4
:
SetTarget
(
c82962242
.
sptg
)
e4
:
SetOperation
(
c82962242
.
spop
)
e4
:
SetLabelObject
(
e
4
)
e4
:
SetLabelObject
(
e
3
)
c
:
RegisterEffect
(
e4
)
end
function
c82962242
.
cfilter
(
c
,
tp
)
...
...
script/constant.lua
View file @
78dea945
...
...
@@ -490,6 +490,7 @@ EVENT_SPSUMMON =1105
EVENT_MSET
=
1106
EVENT_SSET
=
1107
EVENT_BE_MATERIAL
=
1108
EVENT_BE_PRE_MATERIAL
=
1109
EVENT_DRAW
=
1110
EVENT_DAMAGE
=
1111
EVENT_RECOVER
=
1112
...
...
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