Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
YGOMobile-Cn-Ko-En
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
fallenstardust
YGOMobile-Cn-Ko-En
Commits
d2d00690
Commit
d2d00690
authored
Jul 28, 2019
by
fallenstardust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sync string & ocgcore
parent
3eea1e05
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
Classes/ocgcore/field.cpp
Classes/ocgcore/field.cpp
+2
-2
mobile/assets/data/conf/strings.conf
mobile/assets/data/conf/strings.conf
+7
-0
No files found.
Classes/ocgcore/field.cpp
View file @
d2d00690
...
...
@@ -2332,7 +2332,7 @@ int32 field::get_attack_target(card* pcard, card_vector* v, uint8 chain_attack,
continue
;
if
(
atype
>=
2
&&
atarget
->
is_affected_by_effect
(
EFFECT_IGNORE_BATTLE_TARGET
))
continue
;
if
(
select_target
&&
atype
==
4
)
{
if
(
select_target
&&
(
atype
==
2
||
atype
==
4
)
)
{
if
(
atarget
->
is_affected_by_effect
(
EFFECT_CANNOT_BE_BATTLE_TARGET
,
pcard
))
continue
;
if
(
pcard
->
is_affected_by_effect
(
EFFECT_CANNOT_SELECT_BATTLE_TARGET
,
atarget
))
...
...
@@ -2353,7 +2353,7 @@ int32 field::get_attack_target(card* pcard, card_vector* v, uint8 chain_attack,
mcount
++
;
if
(
chain_attack
&&
core
.
chain_attack_target
&&
atarget
!=
core
.
chain_attack_target
)
continue
;
if
(
select_target
&&
atype
==
4
)
{
if
(
select_target
&&
(
atype
==
2
||
atype
==
4
)
)
{
if
(
atarget
->
is_affected_by_effect
(
EFFECT_CANNOT_BE_BATTLE_TARGET
,
pcard
))
continue
;
if
(
pcard
->
is_affected_by_effect
(
EFFECT_CANNOT_SELECT_BATTLE_TARGET
,
atarget
))
...
...
mobile/assets/data/conf/strings.conf
View file @
d2d00690
...
...
@@ -599,6 +599,10 @@
!
counter
0
x104f
蛊指示物
!
counter
0
x50
指示物(娱乐伙伴 掉头跑骑兵)
!
counter
0
x51
指示物(蜂军巢)
!
counter
0
x52
指示物(防火龙·暗流体)
!
counter
0
x53
指示物(炽天蝶)
!
counter
0
x54
指示物(星遗物引导的前路)
!
counter
0
x55
指示物(隐居者的大釜)
#setnames, using tab for comment
!
setname
0
x1
正义盟军
A
・
O
・
J
!
setname
0
x2
次世代 ジェネクス
...
...
@@ -987,3 +991,6 @@
!
setname
0
x12d
斯摩夫 シムルグ
!
setname
0
x12e
占卜魔女 占い魔女
!
setname
0
x12f
蜂军
B
・
F
(ビー・フォース)
!
setname
0
x130
破械
!
setname
0
x1130
破械神
!
setname
0
x131
梦镜
Dream
Mirror
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