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
3c81ab61
Commit
3c81ab61
authored
May 30, 2015
by
salix5
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1368 from Tianchenglipu/patch-2
Fix for "Always treated as a 'Utopia' card" etc.
parents
ebb0f479
7f79d3c1
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
47 additions
and
4 deletions
+47
-4
ocgcore/card.cpp
ocgcore/card.cpp
+9
-3
ocgcore/effect.h
ocgcore/effect.h
+1
-1
script/c21521304.lua
script/c21521304.lua
+7
-0
script/c23204029.lua
script/c23204029.lua
+7
-0
script/c34566435.lua
script/c34566435.lua
+7
-0
script/c36953371.lua
script/c36953371.lua
+7
-0
script/c494922.lua
script/c494922.lua
+7
-0
script/constant.lua
script/constant.lua
+2
-0
No files found.
ocgcore/card.cpp
View file @
3c81ab61
...
...
@@ -270,6 +270,14 @@ int32 card::is_set_card(uint32 set_code) {
return
TRUE
;
setcode
=
setcode
>>
16
;
}
//add set code
effect_set
eset
;
filter_effect
(
EFFECT_ADD_SET_CODE
,
&
eset
);
for
(
int32
i
=
0
;
i
<
eset
.
size
();
++
i
)
{
uint32
value
=
eset
[
i
]
->
get_value
(
this
);
if
((
value
&
0xfff
)
==
settype
&&
(
value
&
0xf000
&
setsubtype
)
==
setsubtype
)
return
TRUE
;
}
//another code
uint32
code2
=
get_another_code
();
uint64
setcode2
;
...
...
@@ -280,10 +288,8 @@ int32 card::is_set_card(uint32 set_code) {
}
else
{
return
FALSE
;
}
uint32
settype2
=
setcode2
&
0xfff
;
uint32
setsubtype2
=
setcode2
&
0xf000
;
while
(
setcode2
)
{
if
((
setcode2
&
0xfff
)
==
settype
2
&&
(
setcode2
&
0xf000
&
setsubtype2
)
==
setsubtype2
)
if
((
setcode2
&
0xfff
)
==
settype
&&
(
setcode2
&
0xf000
&
setsubtype
)
==
setsubtype
)
return
TRUE
;
setcode2
=
setcode2
>>
16
;
}
...
...
ocgcore/effect.h
View file @
3c81ab61
...
...
@@ -377,7 +377,7 @@ public:
#define EFFECT_LEFT_SPSUMMON_COUNT 331
#define EFFECT_CANNOT_SELECT_BATTLE_TARGET 332
#define EFFECT_CANNOT_SELECT_EFFECT_TARGET 333
#define EFFECT_ADD_SET_CODE 340
#define EVENT_STARTUP 1000
#define EVENT_FLIP 1001
#define EVENT_FREE_CHAIN 1002
...
...
script/c21521304.lua
View file @
3c81ab61
...
...
@@ -25,6 +25,13 @@ function c21521304.initial_effect(c)
e2
:
SetTarget
(
c21521304
.
sptg
)
e2
:
SetOperation
(
c21521304
.
spop
)
c
:
RegisterEffect
(
e2
)
--treat as utopia
local
e3
=
Effect
.
CreateEffect
(
c
)
e3
:
SetType
(
EFFECT_TYPE_SINGLE
)
e3
:
SetProperty
(
EFFECT_FLAG_CANNOT_DISABLE
+
EFFECT_FLAG_UNCOPYABLE
)
e3
:
SetCode
(
EFFECT_ADD_SET_CODE
)
e3
:
SetValue
(
0x7f
)
c
:
RegisterEffect
(
e3
)
end
c21521304
.
xyz_number
=
39
function
c21521304
.
atkcon
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
...
...
script/c23204029.lua
View file @
3c81ab61
...
...
@@ -31,6 +31,13 @@ function c23204029.initial_effect(c)
e3
:
SetTarget
(
c23204029
.
target
)
e3
:
SetOperation
(
c23204029
.
operation
)
c
:
RegisterEffect
(
e3
)
--treat as EHERO
local
e4
=
Effect
.
CreateEffect
(
c
)
e4
:
SetType
(
EFFECT_TYPE_SINGLE
)
e4
:
SetProperty
(
EFFECT_FLAG_CANNOT_DISABLE
+
EFFECT_FLAG_UNCOPYABLE
)
e4
:
SetCode
(
EFFECT_ADD_SET_CODE
)
e4
:
SetValue
(
0x3008
)
c
:
RegisterEffect
(
e4
)
end
function
c23204029
.
splimit
(
e
,
se
,
sp
,
st
)
return
bit
.
band
(
st
,
SUMMON_TYPE_FUSION
)
==
SUMMON_TYPE_FUSION
...
...
script/c34566435.lua
View file @
3c81ab61
...
...
@@ -11,6 +11,13 @@ function c34566435.initial_effect(c)
e1
:
SetTarget
(
c34566435
.
target
)
e1
:
SetOperation
(
c34566435
.
operation
)
c
:
RegisterEffect
(
e1
)
--treat as fightfur
local
e2
=
Effect
.
CreateEffect
(
c
)
e2
:
SetType
(
EFFECT_TYPE_SINGLE
)
e2
:
SetProperty
(
EFFECT_FLAG_CANNOT_DISABLE
+
EFFECT_FLAG_UNCOPYABLE
)
e2
:
SetCode
(
EFFECT_ADD_SET_CODE
)
e2
:
SetValue
(
0xad
)
c
:
RegisterEffect
(
e2
)
end
function
c34566435
.
filter
(
c
)
return
(
c
:
IsLocation
(
LOCATION_GRAVE
)
or
c
:
IsFaceup
())
and
c
:
IsType
(
TYPE_FUSION
)
and
c
:
IsSetCard
(
0xad
)
...
...
script/c36953371.lua
View file @
3c81ab61
...
...
@@ -18,6 +18,13 @@ function c36953371.initial_effect(c)
e2
:
SetTarget
(
c36953371
.
destg
)
e2
:
SetOperation
(
c36953371
.
desop
)
c
:
RegisterEffect
(
e2
)
--treat as choujuubusha
local
e3
=
Effect
.
CreateEffect
(
c
)
e3
:
SetType
(
EFFECT_TYPE_SINGLE
)
e3
:
SetProperty
(
EFFECT_FLAG_CANNOT_DISABLE
+
EFFECT_FLAG_UNCOPYABLE
)
e3
:
SetCode
(
EFFECT_ADD_SET_CODE
)
e3
:
SetValue
(
0x9a
)
c
:
RegisterEffect
(
e3
)
end
function
c36953371
.
descon
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
return
e
:
GetHandler
():
GetSummonType
()
==
SUMMON_TYPE_SYNCHRO
...
...
script/c494922.lua
View file @
3c81ab61
...
...
@@ -21,6 +21,13 @@ function c494922.initial_effect(c)
e2
:
SetTarget
(
c494922
.
settg
)
e2
:
SetOperation
(
c494922
.
setop
)
c
:
RegisterEffect
(
e2
)
--treat as choujuubusha
local
e3
=
Effect
.
CreateEffect
(
c
)
e3
:
SetType
(
EFFECT_TYPE_SINGLE
)
e3
:
SetProperty
(
EFFECT_FLAG_CANNOT_DISABLE
+
EFFECT_FLAG_UNCOPYABLE
)
e3
:
SetCode
(
EFFECT_ADD_SET_CODE
)
e3
:
SetValue
(
0x9a
)
c
:
RegisterEffect
(
e3
)
end
function
c494922
.
filter
(
c
)
return
c
:
IsType
(
TYPE_SPELL
+
TYPE_TRAP
)
...
...
script/constant.lua
View file @
3c81ab61
...
...
@@ -474,6 +474,8 @@ EFFECT_LEFT_SPSUMMON_COUNT =331 --剩餘召喚次數(召喚限制網)
EFFECT_CANNOT_SELECT_BATTLE_TARGET
=
332
--對手不能選擇為攻擊對象
EFFECT_CANNOT_SELECT_EFFECT_TARGET
=
333
--對手不能選擇為效果對象
EFFECT_ADD_SET_CODE
=
340
--追加SetCode(规则上视具「XX」字段等用)
--下面是诱发效果的诱发事件、时点 (如果是TYPE_SINGLE则自己发生以下事件后触发,如果TYPE_FIELD则场上任何卡发生以下事件都触发)
EVENT_STARTUP
=
1000
--游戏开始时
EVENT_FLIP
=
1001
--翻转时
...
...
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