Commit f3cfdd59 authored by mercury233's avatar mercury233

fix SelectPlace field zone

parent 155bd87f
...@@ -3313,9 +3313,9 @@ public class Ocgcore : ServantWithCardDescription ...@@ -3313,9 +3313,9 @@ public class Ocgcore : ServantWithCardDescription
binaryMaster.writer.Write(positions); binaryMaster.writer.Write(positions);
sendReturn(binaryMaster.get()); sendReturn(binaryMaster.get());
} }
if (positions == (0x1 | 0x4 | 0x8)) if (positions == (0x1 | 0x4 | 0x8))
{ {
RMSshow_position3("return", code); RMSshow_position3("return", code);
} }
else else
{ {
...@@ -3536,7 +3536,13 @@ public class Ocgcore : ServantWithCardDescription ...@@ -3536,7 +3536,13 @@ public class Ocgcore : ServantWithCardDescription
createPlaceSelector(resp); createPlaceSelector(resp);
} }
} }
if ((field & 0x2000) != 0)
{
resp[1] = (byte)CardLocation.SpellZone;
filter = (field >> 8) & 0x20;
resp[2] = 5;
createPlaceSelector(resp);
}
if ((field & 0xc000) != 0) if ((field & 0xc000) != 0)
{ {
resp[1] = (byte) CardLocation.SpellZone; resp[1] = (byte) CardLocation.SpellZone;
...@@ -3616,6 +3622,12 @@ public class Ocgcore : ServantWithCardDescription ...@@ -3616,6 +3622,12 @@ public class Ocgcore : ServantWithCardDescription
resp[1] = (byte) CardLocation.SpellZone; resp[1] = (byte) CardLocation.SpellZone;
filter = (field >> 8) & 0x1f; filter = (field >> 8) & 0x1f;
} }
else if ((field & 0x2000) != 0)
{
resp[0] = (byte)player;
resp[1] = (byte)CardLocation.SpellZone;
filter = (field >> 8) & 0x20;
}
else else
{ {
resp[0] = (byte) player; resp[0] = (byte) player;
...@@ -3653,6 +3665,10 @@ public class Ocgcore : ServantWithCardDescription ...@@ -3653,6 +3665,10 @@ public class Ocgcore : ServantWithCardDescription
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;
} }
else
{
if ((filter & 0x20) != 0) resp[2] = 5;
}
} }
} }
else else
......
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