Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-2pick
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
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
MyCard
ygopro-2pick
Commits
a19af99f
Commit
a19af99f
authored
Jan 17, 2018
by
nanahira
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/purerosefallen/ygopro-7210srv
parents
7e25d1c7
34d8638a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
1 deletion
+5
-1
cards.cdb
cards.cdb
+0
-0
ocgcore/card.cpp
ocgcore/card.cpp
+1
-1
strings.conf
strings.conf
+4
-0
No files found.
cards.cdb
View file @
a19af99f
No preview for this file type
ocgcore/card.cpp
View file @
a19af99f
...
...
@@ -2838,7 +2838,7 @@ void card::get_unique_target(card_set* cset, int32 controler, card* icard) {
if
(
unique_location
&
LOCATION_MZONE
)
{
for
(
auto
cit
=
player
.
list_mzone
.
begin
();
cit
!=
player
.
list_mzone
.
end
();
++
cit
)
{
card
*
pcard
=
*
cit
;
if
(
pcard
&&
(
pcard
!=
icard
)
&&
pcard
->
is_position
(
POS_FACEUP
)
&&
!
pcard
->
is_status
(
STATUS_BATTLE_DESTROYED
)
if
(
pcard
&&
(
pcard
!=
icard
)
&&
pcard
->
is_position
(
POS_FACEUP
)
&&
!
pcard
->
get_status
(
STATUS_BATTLE_DESTROYED
|
STATUS_SPSUMMON_STEP
)
&&
check_unique_code
(
pcard
))
cset
->
insert
(
pcard
);
}
...
...
strings.conf
View file @
a19af99f
...
...
@@ -524,6 +524,7 @@
!
counter
0
x44
指示物(弹带城壁龙)
!
counter
0
x1045
鳞粉指示物
!
counter
0
x46
指示物(刚鬼死斗)
!
counter
0
x47
指示物(限制代码)
#setnames, using tab for comment
!
setname
0
x1
正义盟军
A
・
O
・
J
!
setname
0
x2
次世代 ジェネクス
...
...
@@ -548,6 +549,7 @@
!
setname
0
xd
剑士 セイバー
!
setname
0
x100d
X
-剑士
X
-セイバー
#setname 0x300d XX-剑士 XX-セイバー
!
setname
0
x400d
元素灵剑士 エレメントセイバー
!
setname
0
xe
电气 エレキ
!
setname
0
xf
扰乱 おジャマ
!
setname
0
x10
薰风 ガスタ
...
...
@@ -878,3 +880,5 @@
!
setname
0
x10f
枪管 ヴァレル
!
setname
0
x110
眼纳祭神 アイズ・サクリファイス
!
setname
0
x111
武装龙 アームド・ドラゴン
!
setname
0
x112
灵神 霊神
!
setname
0
x113
幻崩 トロイメア
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