Skip to content

Commit b073bcd

Browse files
author
IceYGO
committed
Merge branch 'patch-1' of https://github.com/mercury233/ygosharp into mercury233-patch-1
2 parents 2e686a0 + 7f2c80a commit b073bcd

File tree

5 files changed

+25
-3
lines changed

5 files changed

+25
-3
lines changed

YGOSharp.OCGWrapper.Enums/CardRace.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ public enum CardRace
2323
SeaSerpent = 0x40000,
2424
Reptile = 0x80000,
2525
Psycho = 0x100000,
26-
DivineBeast = 0x200000
26+
DivineBeast = 0x200000,
27+
Wyrm = 0x800000,
28+
Cyberse = 0x1000000
2729
}
2830
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
namespace YGOSharp.OCGWrapper.Enums
2+
{
3+
public enum LinkMarker
4+
{
5+
BottomLeft = 0x01,
6+
Bottom = 0x02,
7+
BottomRight = 0x04,
8+
Left = 0x08,
9+
10+
Right = 0x20,
11+
TopLeft = 0x40,
12+
Top = 0x80,
13+
TopRight = 0x100
14+
}
15+
}

YGOSharp.OCGWrapper.Enums/YGOSharp.OCGWrapper.Enums.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<Compile Include="CardType.cs" />
4242
<Compile Include="DuelPhase.cs" />
4343
<Compile Include="GameMessage.cs" />
44+
<Compile Include="LinkMarker.cs" />
4445
<Compile Include="Query.cs" />
4546
<Compile Include="Properties\AssemblyInfo.cs" />
4647
</ItemGroup>

YGOSharp.OCGWrapper/Card.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,13 @@ public struct CardData
3030
public int Level { get; private set; }
3131
public int LScale { get; private set; }
3232
public int RScale { get; private set; }
33+
public int LinkMarker { get; private set; }
3334

3435
public int Attribute { get; private set; }
3536
public int Race { get; private set; }
3637
public int Attack { get; private set; }
3738
public int Defense { get; private set; }
3839

39-
public int LinkMarker { get; private set; }
40-
4140
internal CardData Data { get; private set; }
4241

4342
public static Card Get(int id)

YGOSharp/ClientCard.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@ public void Update(BinaryReader reader)
100100
reader.ReadInt32();
101101
if ((flag & (int)Query.RScale) != 0)
102102
reader.ReadInt32();
103+
if ((flag & (int)Query.Link) != 0)
104+
{
105+
reader.ReadInt32();
106+
reader.ReadInt32();
107+
}
103108
}
104109
}
105110
}

0 commit comments

Comments
 (0)