Skip to content

Commit 6f0090d

Browse files
marcosvf132marcosvf132
authored
Cyclopedia character info 13.02 int declarations
1 parent beef05c commit 6f0090d

1 file changed

Lines changed: 59 additions & 60 deletions

File tree

‎TibiaAPI/Network/ServerPackets/CyclopediaCharacterInfo.cs‎

Lines changed: 59 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ public class CyclopediaCharacterInfo : ServerPacket
7979
public uint RemainingDailyRewardXpBoostTime { get; set; }
8080
public uint RemainingStoreXpBoostTime { get; set; }
8181
public uint TournamentFactor { get; set; }
82+
public uint HealthCurrent { get; set; }
83+
public uint HealthMax { get; set; }
84+
public uint ManaCurrent { get; set; }
85+
public uint ManaMax { get; set; }
8286

8387
public ushort AchievementPoints { get; set; }
8488
public ushort Armor { get; set; }
@@ -91,17 +95,13 @@ public class CyclopediaCharacterInfo : ServerPacket
9195
public ushort Defense { get; set; }
9296
public ushort Food { get; set; }
9397
public ushort GrindingAddend { get; set; }
94-
public ushort HealthCurrent { get; set; }
95-
public ushort HealthMax { get; set; }
9698
public ushort HuntingBoostFactor { get; set; }
9799
public ushort Level { get; set; }
98100
public ushort LevelDisplay { get; set; }
99101
public ushort LifeLeechAmountPercentBase { get; set; }
100102
public ushort LifeLeechAmountPercentBonus { get; set; }
101103
public ushort LifeLeechChancePercentBase { get; set; }
102104
public ushort LifeLeechChancePercentBonus { get; set; }
103-
public ushort ManaCurrent { get; set; }
104-
public ushort ManaMax { get; set; }
105105
public ushort ManaLeechAmountPercentBase { get; set; }
106106
public ushort ManaLeechAmountPercentBonus { get; set; }
107107
public ushort ManaLeechChancePercentBase { get; set; }
@@ -205,10 +205,10 @@ public override void ParseFromNetworkMessage(NetworkMessage message)
205205
HuntingBoostFactor = message.ReadUInt16();
206206
StoreXpBoostTime = message.ReadUInt16();
207207
ShowStoreXpBoostButton = message.ReadBool();
208-
HealthCurrent = message.ReadUInt16();
209-
HealthMax = message.ReadUInt16();
210-
ManaCurrent = message.ReadUInt16();
211-
ManaMax = message.ReadUInt16();
208+
HealthCurrent = message.ReadUInt32();
209+
HealthMax = message.ReadUInt32();
210+
ManaCurrent = message.ReadUInt32();
211+
ManaMax = message.ReadUInt32();
212212
Soul = message.ReadByte();
213213
Stamina = message.ReadUInt16();
214214
Food = message.ReadUInt16();
@@ -248,21 +248,21 @@ public override void ParseFromNetworkMessage(NetworkMessage message)
248248
ManaLeechAmountPercentBase = message.ReadUInt16();
249249
ManaLeechAmountPercentBonus = message.ReadUInt16();
250250

251-
UnknownU16One = message.ReadUInt16();
252-
UnknownU16Two = message.ReadUInt16();
253-
UnknownU16Three = message.ReadUInt16();
254-
UnknownU16Four = message.ReadUInt16();
255-
UnknownU16Five = message.ReadUInt16();
256-
UnknownU16Six = message.ReadUInt16();
251+
UnknownU16One = message.ReadUInt16();
252+
UnknownU16Two = message.ReadUInt16();
253+
UnknownU16Three = message.ReadUInt16();
254+
UnknownU16Four = message.ReadUInt16();
255+
UnknownU16Five = message.ReadUInt16();
256+
UnknownU16Six = message.ReadUInt16();
257257

258258
Cleave = message.ReadUInt16();
259259
MagicShieldBonus = message.ReadUInt16();
260260
MagicShieldPercentage = message.ReadUInt16();
261261

262-
for (int i = 1; i <= 5; i++) {
263-
var range = message.ReadUInt16();
264-
PerfectShot.Add(range);
265-
}
262+
for (int i = 1; i <= 5; i++) {
263+
var range = message.ReadUInt16();
264+
PerfectShot.Add(range);
265+
}
266266

267267
Reflection = message.ReadUInt16();
268268
BlessingsCurrent = message.ReadByte();
@@ -277,9 +277,8 @@ public override void ParseFromNetworkMessage(NetworkMessage message)
277277
DamageReductions.Capacity = message.ReadByte();
278278
for (var i = 0; i < DamageReductions.Capacity; ++i)
279279
DamageReductions.Add((message.ReadByte(), message.ReadByte()));
280-
281-
Concotions.Capacity = message.ReadByte();
282-
for (var i = 0; i < Concotions.Capacity; ++i)
280+
Concotions.Capacity = message.ReadByte();
281+
for (var i = 0; i < Concotions.Capacity; ++i)
283282
Concotions.Add((message.ReadUInt16(), message.ReadUInt16()));
284283

285284
} else if (Type == (byte)CharacterInfoPage.Deaths) {
@@ -347,12 +346,12 @@ void ParseItems(List<(ushort, uint)> items)
347346
Outfits.Add((id, name, addons, category, unknown));
348347
}
349348

350-
if (Outfits.Capacity > 0) {
351-
HeadColor = message.ReadByte();
352-
TorsoColor = message.ReadByte();
353-
LegsColor = message.ReadByte();
354-
DetailColor = message.ReadByte();
355-
}
349+
if (Outfits.Capacity > 0) {
350+
HeadColor = message.ReadByte();
351+
TorsoColor = message.ReadByte();
352+
LegsColor = message.ReadByte();
353+
DetailColor = message.ReadByte();
354+
}
356355

357356
Mounts.Clear();
358357
Mounts.Capacity = message.ReadUInt16();
@@ -366,14 +365,14 @@ void ParseItems(List<(ushort, uint)> items)
366365
Mounts.Add((id, name, category, unknown));
367366
}
368367

369-
if (Mounts.Capacity > 0) {
370-
MountHeadColor = message.ReadByte();
371-
MountTorsoColor = message.ReadByte();
372-
MountLegsColor = message.ReadByte();
373-
MountDetailColor = message.ReadByte();
374-
}
368+
if (Mounts.Capacity > 0) {
369+
MountHeadColor = message.ReadByte();
370+
MountTorsoColor = message.ReadByte();
371+
MountLegsColor = message.ReadByte();
372+
MountDetailColor = message.ReadByte();
373+
}
375374

376-
Familiars.Capacity = message.ReadUInt16();
375+
Familiars.Capacity = message.ReadUInt16();
377376
for (var i = 0; i < Familiars.Capacity; ++i) {
378377
var id = message.ReadUInt16();
379378
var name = message.ReadString();
@@ -526,11 +525,11 @@ public override void AppendToNetworkMessage(NetworkMessage message)
526525
message.Write(Skills[i].Progress);
527526
}
528527

529-
message.Write(MagicBoost);
530-
if (MagicBoost) {
531-
message.Write((byte)MagicBoostElement);
532-
message.Write(MagicBoostValue);
533-
}
528+
message.Write(MagicBoost);
529+
if (MagicBoost) {
530+
message.Write((byte)MagicBoostElement);
531+
message.Write(MagicBoostValue);
532+
}
534533
} else if (Type == (byte)CharacterInfoPage.Combat) {
535534
message.Write(CriticalHitChancePercentBase);
536535
message.Write(CriticalHitChancePercentBonus);
@@ -545,19 +544,19 @@ public override void AppendToNetworkMessage(NetworkMessage message)
545544
message.Write(LifeLeechAmountPercentBase);
546545
message.Write(LifeLeechAmountPercentBonus);
547546

548-
message.Write(UnknownU16One);
549-
message.Write(UnknownU16Two);
550-
message.Write(UnknownU16Three);
551-
message.Write(UnknownU16Four);
552-
message.Write(UnknownU16Five);
553-
message.Write(UnknownU16Six);
547+
message.Write(UnknownU16One);
548+
message.Write(UnknownU16Two);
549+
message.Write(UnknownU16Three);
550+
message.Write(UnknownU16Four);
551+
message.Write(UnknownU16Five);
552+
message.Write(UnknownU16Six);
554553

555554
message.Write(Cleave);
556555
message.Write(MagicShieldBonus);
557556
message.Write(MagicShieldPercentage);
558557

559-
foreach (var shot in PerfectShot)
560-
message.Write(shot);
558+
foreach (var shot in PerfectShot)
559+
message.Write(shot);
561560

562561
message.Write(Reflection);
563562
message.Write(BlessingsCurrent);
@@ -578,7 +577,7 @@ public override void AppendToNetworkMessage(NetworkMessage message)
578577

579578
count = Math.Min(Concotions.Count, byte.MaxValue);
580579
message.Write((byte)count);
581-
for (var i = 0; i < count; ++i) {
580+
for (var i = 0; i < count; ++i) {
582581
message.Write(Concotions[i].Id);
583582
message.Write(Concotions[i].Time);
584583
}
@@ -650,12 +649,12 @@ void AppendItems(List<(ushort id, uint amount)> items)
650649
message.Write(Unknown);
651650
}
652651

653-
if (count > 0) {
654-
message.Write(HeadColor);
655-
message.Write(TorsoColor);
656-
message.Write(LegsColor);
657-
message.Write(DetailColor);
658-
}
652+
if (count > 0) {
653+
message.Write(HeadColor);
654+
message.Write(TorsoColor);
655+
message.Write(LegsColor);
656+
message.Write(DetailColor);
657+
}
659658

660659
count = Math.Min(Mounts.Count, ushort.MaxValue);
661660
message.Write((ushort)count);
@@ -667,12 +666,12 @@ void AppendItems(List<(ushort id, uint amount)> items)
667666
message.Write(Unknown);
668667
}
669668

670-
if (count > 0) {
671-
message.Write(MountHeadColor);
672-
message.Write(MountTorsoColor);
673-
message.Write(MountLegsColor);
674-
message.Write(MountDetailColor);
675-
}
669+
if (count > 0) {
670+
message.Write(MountHeadColor);
671+
message.Write(MountTorsoColor);
672+
message.Write(MountLegsColor);
673+
message.Write(MountDetailColor);
674+
}
676675

677676
count = Math.Min(Familiars.Count, ushort.MaxValue);
678677
message.Write((ushort)count);

0 commit comments

Comments
 (0)