Skip to content

Y
ygopro2
Commit ed4e08c0 authored by mercury233's avatar mercury233 Committed by nanahira
Browse files
Options

fix select monster and spell zone at same time

parent 04681fcc
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 84 deletions
Assets/SibylSystem/Ocgcore/Ocgcore.cs
View file @ ed4e08c0
...@@ -3994,7 +3994,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -3994,7 +3994,7 @@ public class Ocgcore : ServantWithCardDescription
min = r.ReadByte(); min = r.ReadByte();
//TODO: can cancel //TODO: can cancel
if (min == 0) min = 1; if (min == 0) min = 1;
int _field = ~r.ReadInt32(); uint _field = ~r.ReadUInt32();
if (Program.I().setting.setting.hand.value == true || Program.I().setting.setting.handm.value == true) if (Program.I().setting.setting.hand.value == true || Program.I().setting.setting.handm.value == true)
{ {
...@@ -4002,34 +4002,13 @@ public class Ocgcore : ServantWithCardDescription ...@@ -4002,34 +4002,13 @@ public class Ocgcore : ServantWithCardDescription
for (int i = 0; i < min; i++) for (int i = 0; i < min; i++)
{ {
byte[] resp = new byte[3]; byte[] resp = new byte[3];
bool pendulumZone = false; uint filter;
int filter;
/*if ((field & 0x7f0000) != 0)
{
resp[0] = (byte)(1 - player);
resp[1] = 0x4;
filter = (field >> 16) & 0x7f;
}
else if ((field & 0x1f000000) != 0)
{
resp[0] = (byte)(1 - player);
resp[1] = 0x8;
filter = (field >> 24) & 0x1f;
}
else if ((field & 0xc0000000) != 0)
{
resp[0] = (byte)(1 - player);
resp[1] = 0x8;
filter = (field >> 30) & 0x3;
pendulumZone = true;
}*/
for (int j=0; j<2; j++) for (int j=0; j<2; j++)
{ {
resp = new byte[3]; resp = new byte[3];
pendulumZone = false;
filter = 0; filter = 0;
int field; uint field;
if (j==0) if (j==0)
{ {
...@@ -4044,67 +4023,34 @@ public class Ocgcore : ServantWithCardDescription ...@@ -4044,67 +4023,34 @@ public class Ocgcore : ServantWithCardDescription
if ((field & 0x7f) != 0) if ((field & 0x7f) != 0)
{ {
resp[1] = 0x4; resp[1] = (byte)CardLocation.MonsterZone;
filter = field & 0x7f; filter = field & 0x7f;
} for (int k = 0; k < 6; k++)
else if ((field & 0x1f00) != 0)
{
resp[1] = 0x8;
filter = (field >> 8) & 0x1f;
}
else if ((field & 0xc000) != 0)
{
resp[1] = 0x8;
filter = (field >> 14) & 0x3;
pendulumZone = true;
}
if (filter == 0)
continue;
if (!pendulumZone)
{
if ((filter & 0x4) != 0)
{
resp[2] = 2;
createPlaceSelector(resp);
}
if ((filter & 0x2) != 0)
{
resp[2] = 1;
createPlaceSelector(resp);
}
if ((filter & 0x8) != 0)
{ {
resp[2] = 3; if ((filter & (1u << k)) != 0)
createPlaceSelector(resp);
}
if ((filter & 0x1) != 0)
{
resp[2] = 0;
createPlaceSelector(resp);
}
if ((filter & 0x10) != 0)
{
resp[2] = 4;
createPlaceSelector(resp);
}
if (resp[1] == 0x4)
{
if ((filter & 0x20) != 0)
{ {
resp[2] = 5; resp[2] = (byte)k;
createPlaceSelector(resp); createPlaceSelector(resp);
} }
if ((filter & 0x40) != 0) }
}
if ((field & 0x1f00) != 0)
{
resp[1] = (byte)CardLocation.SpellZone;
filter = (field >> 8) & 0x1f;
for (int k = 0; k < 5; k++)
{
if ((filter & (1u << k)) != 0)
{ {
resp[2] = 6; resp[2] = (byte)k;
createPlaceSelector(resp); createPlaceSelector(resp);
} }
} }
} }
else if ((field & 0xc000) != 0)
{ {
resp[1] = (byte)CardLocation.SpellZone;
filter = (field >> 14) & 0x3;
if ((filter & 0x2) != 0) if ((filter & 0x2) != 0)
{ {
resp[2] = 7; resp[2] = 7;
...@@ -4116,7 +4062,6 @@ public class Ocgcore : ServantWithCardDescription ...@@ -4116,7 +4062,6 @@ public class Ocgcore : ServantWithCardDescription
createPlaceSelector(resp); createPlaceSelector(resp);
} }
} }
} }
} }
...@@ -4134,48 +4079,48 @@ public class Ocgcore : ServantWithCardDescription ...@@ -4134,48 +4079,48 @@ public class Ocgcore : ServantWithCardDescription
} }
else else
{ {
int field = _field; uint field = _field;
for (int i = 0; i < min; i++) for (int i = 0; i < min; i++)
{ {
byte[] resp = new byte[3]; byte[] resp = new byte[3];
bool pendulumZone = false; bool pendulumZone = false;
int filter; uint filter;
if ((field & 0x7f0000) != 0) if ((field & 0x7f0000) != 0)
{ {
resp[0] = (byte)(1 - player); resp[0] = (byte)(1 - player);
resp[1] = 0x4; resp[1] = (byte)CardLocation.MonsterZone;
filter = (field >> 16) & 0x7f; filter = (field >> 16) & 0x7f;
} }
else if ((field & 0x1f000000) != 0) else if ((field & 0x1f000000) != 0)
{ {
resp[0] = (byte)(1 - player); resp[0] = (byte)(1 - player);
resp[1] = 0x8; resp[1] = (byte)CardLocation.SpellZone;
filter = (field >> 24) & 0x1f; filter = (field >> 24) & 0x1f;
} }
else if ((field & 0xc0000000) != 0) else if ((field & 0xc0000000) != 0)
{ {
resp[0] = (byte)(1 - player); resp[0] = (byte)(1 - player);
resp[1] = 0x8; resp[1] = (byte)CardLocation.SpellZone;
filter = (field >> 30) & 0x3; filter = (field >> 30) & 0x3;
pendulumZone = true; pendulumZone = true;
} }
else if ((field & 0x7f) != 0) else if ((field & 0x7f) != 0)
{ {
resp[0] = (byte)player; resp[0] = (byte)player;
resp[1] = 0x4; resp[1] = (byte)CardLocation.MonsterZone;
filter = field & 0x7f; filter = field & 0x7f;
} }
else if ((field & 0x1f00) != 0) else if ((field & 0x1f00) != 0)
{ {
resp[0] = (byte)player; resp[0] = (byte)player;
resp[1] = 0x8; resp[1] = (byte)CardLocation.SpellZone;
filter = (field >> 8) & 0x1f; filter = (field >> 8) & 0x1f;
} }
else else
{ {
resp[0] = (byte)player; resp[0] = (byte)player;
resp[1] = 0x8; resp[1] = (byte)CardLocation.SpellZone;
filter = (field >> 14) & 0x3; filter = (field >> 14) & 0x3;
pendulumZone = true; pendulumZone = true;
} }
...@@ -4189,7 +4134,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -4189,7 +4134,7 @@ public class Ocgcore : ServantWithCardDescription
else if ((filter & 0x10) != 0) resp[2] = 4; else if ((filter & 0x10) != 0) resp[2] = 4;
else else
{ {
if (resp[1] == 0x4) if (resp[1] == (byte)CardLocation.MonsterZone)
{ {
if ((filter & 0x20) != 0) resp[2] = 5; if ((filter & 0x20) != 0) resp[2] = 5;
else if ((filter & 0x40) != 0) resp[2] = 6; else if ((filter & 0x40) != 0) resp[2] = 6;
......
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