Commit 8956aa07 authored by mercury233's avatar mercury233

Merge branch 'master' of https://github.com/Fluorohydride/ygopro

parents 9fa8006d d530ec2f
......@@ -1096,7 +1096,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
pcard->chain_code = code;
mainGame->dField.conti_cards.push_back(pcard);
mainGame->dField.conti_act = true;
pcard->cmdFlag |= COMMAND_OPERATION;
} else {
pcard->cmdFlag |= COMMAND_ACTIVATE;
if (pcard->location == LOCATION_GRAVE)
......@@ -1226,7 +1225,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
pcard->chain_code = code;
mainGame->dField.conti_cards.push_back(pcard);
mainGame->dField.conti_act = true;
pcard->cmdFlag |= COMMAND_OPERATION;
} else {
pcard->cmdFlag |= COMMAND_ACTIVATE;
if (pcard->location == LOCATION_GRAVE)
......
This diff is collapsed.
Subproject commit 9f397160791cf787edaa880835345c8f7ce6babd
Subproject commit 6a95742d22d570d40db3a2d2e8bcea44baede328
Subproject commit 0501fd7fb3250eb2f567a0eb157a1da9a508ee73
Subproject commit 95f03c0bb5ce45fee32ca157dd63d4f6c22e0e9c
......@@ -521,6 +521,7 @@
!counter 0x44 指示物(弹带城壁龙)
!counter 0x1045 鳞粉指示物
!counter 0x46 指示物(刚鬼死斗)
!counter 0x47 指示物(限制代码)
#setnames, using tab for comment
!setname 0x1 正义盟军 AOJ
!setname 0x2 次世代 ジェネクス
......@@ -545,6 +546,7 @@
!setname 0xd 剑士 セイバー
!setname 0x100d X-剑士 X-セイバー
#setname 0x300d XX-剑士 XX-セイバー
!setname 0x400d 元素灵剑士 エレメントセイバー
!setname 0xe 电气 エレキ
!setname 0xf 扰乱 おジャマ
!setname 0x10 薰风 ガスタ
......@@ -875,3 +877,5 @@
!setname 0x10f 枪管 ヴァレル
!setname 0x110 眼纳祭神 アイズ・サクリファイス
!setname 0x111 武装龙 アームド・ドラゴン
!setname 0x112 幻崩 トロイメア
!setname 0x113 灵神 霊神
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