Skip to content

Y
YGOMobile
Commit d2d00690 authored by fallenstardust's avatar fallenstardust
Browse files
Options

sync string & ocgcore

parent 3eea1e05
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
Classes/ocgcore/field.cpp
View file @ d2d00690
...@@ -2332,7 +2332,7 @@ int32 field::get_attack_target(card* pcard, card_vector* v, uint8 chain_attack, ...@@ -2332,7 +2332,7 @@ int32 field::get_attack_target(card* pcard, card_vector* v, uint8 chain_attack,
continue; continue;
if(atype >= 2 && atarget->is_affected_by_effect(EFFECT_IGNORE_BATTLE_TARGET)) if(atype >= 2 && atarget->is_affected_by_effect(EFFECT_IGNORE_BATTLE_TARGET))
continue; 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)) if(atarget->is_affected_by_effect(EFFECT_CANNOT_BE_BATTLE_TARGET, pcard))
continue; continue;
if(pcard->is_affected_by_effect(EFFECT_CANNOT_SELECT_BATTLE_TARGET, atarget)) 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, ...@@ -2353,7 +2353,7 @@ int32 field::get_attack_target(card* pcard, card_vector* v, uint8 chain_attack,
mcount++; mcount++;
if(chain_attack && core.chain_attack_target && atarget != core.chain_attack_target) if(chain_attack && core.chain_attack_target && atarget != core.chain_attack_target)
continue; 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)) if(atarget->is_affected_by_effect(EFFECT_CANNOT_BE_BATTLE_TARGET, pcard))
continue; continue;
if(pcard->is_affected_by_effect(EFFECT_CANNOT_SELECT_BATTLE_TARGET, atarget)) 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 @@ ...@@ -599,6 +599,10 @@
!counter 0x104f 蛊指示物 !counter 0x104f 蛊指示物
!counter 0x50 指示物（娱乐伙伴 掉头跑骑兵） !counter 0x50 指示物（娱乐伙伴 掉头跑骑兵）
!counter 0x51 指示物（蜂军巢） !counter 0x51 指示物（蜂军巢）
!counter 0x52 指示物（防火龙·暗流体）
!counter 0x53 指示物（炽天蝶）
!counter 0x54 指示物（星遗物引导的前路）
!counter 0x55 指示物（隐居者的大釜）
#setnames, using tab for comment #setnames, using tab for comment
!setname 0x1 正义盟军 A・O・J !setname 0x1 正义盟军 A・O・J
!setname 0x2 次世代 ジェネクス !setname 0x2 次世代 ジェネクス
...@@ -987,3 +991,6 @@ ...@@ -987,3 +991,6 @@
!setname 0x12d 斯摩夫 シムルグ !setname 0x12d 斯摩夫 シムルグ
!setname 0x12e 占卜魔女 占い魔女 !setname 0x12e 占卜魔女 占い魔女
!setname 0x12f 蜂军 B・F（ビー・フォース） !setname 0x12f 蜂军 B・F（ビー・フォース）
!setname 0x130 破械
!setname 0x1130 破械神
!setname 0x131 梦镜 Dream Mirror
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment