From 171e350e348afadb55967b9c13d5eadc7f7d2cf4 Mon Sep 17 00:00:00 2001 From: Arda Serdar Pektezol <1669855+pektezol@users.noreply.github.com> Date: Thu, 21 Sep 2023 01:53:59 +0300 Subject: add strings builder, customize ALL outputs (#6) --- pkg/messages/messages.go | 5 +++-- pkg/messages/types/netDisconnect.go | 9 +++++++-- pkg/messages/types/netFile.go | 7 ++++++- pkg/messages/types/netNop.go | 6 +++++- pkg/messages/types/netSetConVar.go | 7 ++++++- pkg/messages/types/netSignOnState.go | 6 ++++++ pkg/messages/types/netSplitScreenUser.go | 13 +++++++++---- pkg/messages/types/netStringCmd.go | 11 +++++++++-- pkg/messages/types/netTick.go | 11 +++++++++-- pkg/messages/types/svcBspDecal.go | 6 ++++++ pkg/messages/types/svcClassInfo.go | 6 ++++++ pkg/messages/types/svcCmdKeyValues.go | 6 +++++- pkg/messages/types/svcCreateStringTable.go | 8 ++++++++ pkg/messages/types/svcCrosshairAngle.go | 11 +++++++++-- pkg/messages/types/svcEntityMessage.go | 8 +++++++- pkg/messages/types/svcFixAngle.go | 12 ++++++++++-- pkg/messages/types/svcGameEvent.go | 6 +++++- pkg/messages/types/svcGameEventList.go | 6 +++++- pkg/messages/types/svcGetCvarValue.go | 7 ++++++- pkg/messages/types/svcMenu.go | 7 ++++++- pkg/messages/types/svcPacketEntities.go | 8 ++++++++ pkg/messages/types/svcPaintmapData.go | 6 +++++- pkg/messages/types/svcPrefetch.go | 9 +++++++-- pkg/messages/types/svcPrint.go | 12 ++++++++++-- pkg/messages/types/svcSendTable.go | 8 +++++++- pkg/messages/types/svcServerInfo.go | 24 ++++++++++++++++++++++-- pkg/messages/types/svcSetPause.go | 9 +++++++-- pkg/messages/types/svcSetView.go | 9 +++++++-- pkg/messages/types/svcSounds.go | 8 +++++++- pkg/messages/types/svcSplitScreen.go | 7 ++++++- pkg/messages/types/svcTempEntities.go | 7 ++++++- pkg/messages/types/svcUpdateStringTable.go | 7 ++++++- pkg/messages/types/svcUserMessage.go | 7 ++++++- pkg/messages/types/svcVoiceData.go | 8 +++++++- pkg/messages/types/svcVoiceInit.go | 8 +++++++- 35 files changed, 251 insertions(+), 44 deletions(-) (limited to 'pkg/messages') diff --git a/pkg/messages/messages.go b/pkg/messages/messages.go index 9e7dfae..efa9460 100644 --- a/pkg/messages/messages.go +++ b/pkg/messages/messages.go @@ -1,11 +1,11 @@ package messages import ( - "fmt" "reflect" "github.com/pektezol/bitreader" messages "github.com/pektezol/demoparser/pkg/messages/types" + "github.com/pektezol/demoparser/pkg/writer" ) func ParseMessages(messageType int, reader *bitreader.Reader) any { @@ -82,6 +82,7 @@ func ParseMessages(messageType int, reader *bitreader.Reader) any { default: return nil } - fmt.Printf("\t\t(%d) %s:\n\t\t\t%+v\n", messageType, reflect.ValueOf(messageData).Type(), messageData) + writer.AppendLine("\tMessage: %s (%d):", reflect.ValueOf(messageData).Type(), messageType) + writer.AppendOutputFromTemp() return messageData } diff --git a/pkg/messages/types/netDisconnect.go b/pkg/messages/types/netDisconnect.go index 3ecf8e1..c2e22c1 100644 --- a/pkg/messages/types/netDisconnect.go +++ b/pkg/messages/types/netDisconnect.go @@ -1,13 +1,18 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type NetDisconnect struct { Text string } func ParseNetDisconnect(reader *bitreader.Reader) NetDisconnect { - return NetDisconnect{ + netDisconnect := NetDisconnect{ Text: reader.TryReadString(), } + writer.TempAppendLine("\t\tText: %s", netDisconnect.Text) + return netDisconnect } diff --git a/pkg/messages/types/netFile.go b/pkg/messages/types/netFile.go index c9c587d..4ebd770 100644 --- a/pkg/messages/types/netFile.go +++ b/pkg/messages/types/netFile.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" ) type NetFile struct { @@ -34,9 +35,13 @@ func (netFileFlags NetFileFlags) String() string { } func ParseNetFile(reader *bitreader.Reader) NetFile { - return NetFile{ + netFile := NetFile{ TransferId: reader.TryReadUInt32(), FileName: reader.TryReadString(), FileFlags: NetFileFlags(reader.TryReadBits(2)).String(), } + writer.TempAppendLine("\t\tTransfer ID: %d", netFile.TransferId) + writer.TempAppendLine("\t\tFile Name: %s", netFile.FileName) + writer.TempAppendLine("\t\tFile Flags: %s", netFile.FileFlags) + return netFile } diff --git a/pkg/messages/types/netNop.go b/pkg/messages/types/netNop.go index f942786..0ee1d0d 100644 --- a/pkg/messages/types/netNop.go +++ b/pkg/messages/types/netNop.go @@ -1,9 +1,13 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type NetNop struct{} func ParseNetNop(reader *bitreader.Reader) NetNop { + writer.TempAppendLine("\t\t{}") return NetNop{} } diff --git a/pkg/messages/types/netSetConVar.go b/pkg/messages/types/netSetConVar.go index 44b75b9..530cb6b 100644 --- a/pkg/messages/types/netSetConVar.go +++ b/pkg/messages/types/netSetConVar.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type NetSetConVar struct { Length uint8 @@ -15,11 +18,13 @@ type conVar struct { func ParseNetSetConVar(reader *bitreader.Reader) NetSetConVar { length := reader.TryReadUInt8() convars := []conVar{} + writer.TempAppendLine("\t\tLength: %d", length) for count := 0; count < int(length); count++ { convar := conVar{ Name: reader.TryReadString(), Value: reader.TryReadString(), } + writer.TempAppendLine("\t\t[%d] %s: %s", count, convar.Name, convar.Value) convars = append(convars, convar) } return NetSetConVar{ diff --git a/pkg/messages/types/netSignOnState.go b/pkg/messages/types/netSignOnState.go index 78d03aa..f784b0a 100644 --- a/pkg/messages/types/netSignOnState.go +++ b/pkg/messages/types/netSignOnState.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" ) type NetSignOnState struct { @@ -59,12 +60,17 @@ func ParseNetSignOnState(reader *bitreader.Reader) NetSignOnState { NumServerPlayers: reader.TryReadUInt32(), IdsLength: reader.TryReadUInt32(), } + writer.TempAppendLine("\t\tSign On State: %s", netSignOnState.SignOnState) + writer.TempAppendLine("\t\tSpawn Count: %d", netSignOnState.SpawnCount) + writer.TempAppendLine("\t\tNumber Of Server Players: %d", netSignOnState.NumServerPlayers) if netSignOnState.IdsLength > 0 { netSignOnState.PlayersNetworksIds = reader.TryReadBytesToSlice(uint64(netSignOnState.IdsLength)) + writer.TempAppendLine("\t\tPlayer Network IDs: %v", netSignOnState.PlayersNetworksIds) } netSignOnState.MapNameLength = reader.TryReadUInt32() if netSignOnState.MapNameLength > 0 { netSignOnState.MapName = reader.TryReadStringLength(uint64(netSignOnState.MapNameLength)) + writer.TempAppendLine("\t\tMap Name: %s", netSignOnState.MapName) } return netSignOnState } diff --git a/pkg/messages/types/netSplitScreenUser.go b/pkg/messages/types/netSplitScreenUser.go index 9e4caa8..6068a28 100644 --- a/pkg/messages/types/netSplitScreenUser.go +++ b/pkg/messages/types/netSplitScreenUser.go @@ -1,13 +1,18 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type NetSplitScreenUser struct { - Unknown bool + Slot bool } func ParseNetSplitScreenUser(reader *bitreader.Reader) NetSplitScreenUser { - return NetSplitScreenUser{ - Unknown: reader.TryReadBool(), + netSplitScreenUser := NetSplitScreenUser{ + Slot: reader.TryReadBool(), } + writer.TempAppendLine("\t\tSlot: %t", netSplitScreenUser.Slot) + return netSplitScreenUser } diff --git a/pkg/messages/types/netStringCmd.go b/pkg/messages/types/netStringCmd.go index da5a75b..57ae813 100644 --- a/pkg/messages/types/netStringCmd.go +++ b/pkg/messages/types/netStringCmd.go @@ -1,13 +1,20 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "strings" + + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type NetStringCmd struct { Command string } func ParseNetStringCmd(reader *bitreader.Reader) NetStringCmd { - return NetStringCmd{ + netStringCmd := NetStringCmd{ Command: reader.TryReadString(), } + writer.TempAppendLine("\t\tCommand: \"%s\"", strings.TrimSpace(netStringCmd.Command)) + return netStringCmd } diff --git a/pkg/messages/types/netTick.go b/pkg/messages/types/netTick.go index dc941ad..1c01171 100644 --- a/pkg/messages/types/netTick.go +++ b/pkg/messages/types/netTick.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type NetTick struct { Tick uint32 @@ -9,9 +12,13 @@ type NetTick struct { } func ParseNetTick(reader *bitreader.Reader) NetTick { - return NetTick{ + netTick := NetTick{ Tick: reader.TryReadUInt32(), HostFrameTime: float32(reader.TryReadUInt16()) / 1e5, HostFrameTimeStdDeviation: float32(reader.TryReadUInt16()) / 1e5, } + writer.TempAppendLine("\t\tTick: %d", netTick.Tick) + writer.TempAppendLine("\t\tHost Frame Time: %f", netTick.HostFrameTime) + writer.TempAppendLine("\t\tHost Frame Time Std Deviation: %f", netTick.HostFrameTimeStdDeviation) + return netTick } diff --git a/pkg/messages/types/svcBspDecal.go b/pkg/messages/types/svcBspDecal.go index 220f63a..cf94c1d 100644 --- a/pkg/messages/types/svcBspDecal.go +++ b/pkg/messages/types/svcBspDecal.go @@ -2,6 +2,7 @@ package messages import ( "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" ) type SvcBspDecal struct { @@ -27,6 +28,11 @@ func ParseSvcBspDecal(reader *bitreader.Reader) SvcBspDecal { svcBspDecal.ModelIndex = uint16(reader.TryReadBits(11)) } svcBspDecal.LowPriority = reader.TryReadBool() + writer.TempAppendLine("\t\tPosition: %v", svcBspDecal.Pos) + writer.TempAppendLine("\t\tDecal Texture Index: %d", svcBspDecal.DecalTextureIndex) + writer.TempAppendLine("\t\tEntity Index: %d", svcBspDecal.EntityIndex) + writer.TempAppendLine("\t\tModel Index: %d", svcBspDecal.ModelIndex) + writer.TempAppendLine("\t\tLow Priority: %t", svcBspDecal.LowPriority) return svcBspDecal } diff --git a/pkg/messages/types/svcClassInfo.go b/pkg/messages/types/svcClassInfo.go index d2f6a90..384c501 100644 --- a/pkg/messages/types/svcClassInfo.go +++ b/pkg/messages/types/svcClassInfo.go @@ -4,6 +4,7 @@ import ( "math" "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" ) type SvcClassInfo struct { @@ -24,14 +25,19 @@ func ParseSvcClassInfo(reader *bitreader.Reader) SvcClassInfo { CreateOnClient: reader.TryReadBool(), } classes := []serverClass{} + writer.TempAppendLine("\t\tCreate On Client: %t", svcClassInfo.CreateOnClient) if !svcClassInfo.CreateOnClient { + writer.TempAppendLine("\t\t%d Server Classes:", svcClassInfo.ClassCount) for count := 0; count < int(svcClassInfo.ClassCount); count++ { classes = append(classes, serverClass{ ClassId: int16(reader.TryReadBits(uint64(math.Log2(float64(svcClassInfo.ClassCount)) + 1))), ClassName: reader.TryReadString(), DataTableName: reader.TryReadString(), }) + writer.TempAppendLine("\t\t\t[%d] %s (%s)", classes[len(classes)-1].ClassId, classes[len(classes)-1].ClassName, classes[len(classes)-1].DataTableName) } + } else { + writer.TempAppendLine("\t\t%d Server Classes", svcClassInfo.ClassCount) } svcClassInfo.ServerClasses = classes return svcClassInfo diff --git a/pkg/messages/types/svcCmdKeyValues.go b/pkg/messages/types/svcCmdKeyValues.go index 8fdd076..5c80d0b 100644 --- a/pkg/messages/types/svcCmdKeyValues.go +++ b/pkg/messages/types/svcCmdKeyValues.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcCmdKeyValues struct { Length uint32 @@ -12,5 +15,6 @@ func ParseSvcCmdKeyValues(reader *bitreader.Reader) SvcCmdKeyValues { Length: reader.TryReadUInt32(), } svcCmdKeyValues.Data = reader.TryReadBytesToSlice(uint64(svcCmdKeyValues.Length)) + writer.TempAppendLine("\t\tData: %v", svcCmdKeyValues.Data) return svcCmdKeyValues } diff --git a/pkg/messages/types/svcCreateStringTable.go b/pkg/messages/types/svcCreateStringTable.go index aea40b0..ff2e27d 100644 --- a/pkg/messages/types/svcCreateStringTable.go +++ b/pkg/messages/types/svcCreateStringTable.go @@ -4,6 +4,7 @@ import ( "math" "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" ) type SvcCreateStringTable struct { @@ -31,6 +32,13 @@ func ParseSvcCreateStringTable(reader *bitreader.Reader) SvcCreateStringTable { svcCreateStringTable.UserDataSizeBits = int8(reader.TryReadBits(4)) } svcCreateStringTable.Flags = int8(reader.TryReadBits(2)) + writer.TempAppendLine("\t\tName: %s", svcCreateStringTable.Name) + writer.TempAppendLine("\t\tMax Enties: %d", svcCreateStringTable.MaxEntries) + writer.TempAppendLine("\t\tNumber Of Entiries: %d", svcCreateStringTable.NumEntries) + writer.TempAppendLine("\t\tUser Data Fixed Size: %t", svcCreateStringTable.UserDataFixedSize) + writer.TempAppendLine("\t\tUser Data Size: %d", svcCreateStringTable.UserDataSize) + writer.TempAppendLine("\t\tUser Data Size In Bits: %d", svcCreateStringTable.UserDataSizeBits) + writer.TempAppendLine("\t\tFlags: %d", svcCreateStringTable.Flags) reader.SkipBits(uint64(svcCreateStringTable.Length)) // TODO: StringTable parsing return svcCreateStringTable } diff --git a/pkg/messages/types/svcCrosshairAngle.go b/pkg/messages/types/svcCrosshairAngle.go index b7d234c..efd6d77 100644 --- a/pkg/messages/types/svcCrosshairAngle.go +++ b/pkg/messages/types/svcCrosshairAngle.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcCrosshairAngle struct { Angle crosshairAngles @@ -13,11 +16,15 @@ type crosshairAngles struct { } func ParseSvcCrosshairAngle(reader *bitreader.Reader) SvcCrosshairAngle { - return SvcCrosshairAngle{ + svcCrosshairAngle := SvcCrosshairAngle{ Angle: crosshairAngles{ X: float32(reader.TryReadBits(16)), Y: float32(reader.TryReadBits(16)), Z: float32(reader.TryReadBits(16)), }, } + writer.TempAppendLine("\t\tX: %f", svcCrosshairAngle.Angle.X) + writer.TempAppendLine("\t\tY: %f", svcCrosshairAngle.Angle.Y) + writer.TempAppendLine("\t\tZ: %f", svcCrosshairAngle.Angle.Z) + return svcCrosshairAngle } diff --git a/pkg/messages/types/svcEntityMessage.go b/pkg/messages/types/svcEntityMessage.go index 58f42ba..a511fea 100644 --- a/pkg/messages/types/svcEntityMessage.go +++ b/pkg/messages/types/svcEntityMessage.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcEntityMessage struct { EntityIndex uint16 @@ -16,5 +19,8 @@ func ParseSvcEntityMessage(reader *bitreader.Reader) SvcEntityMessage { Length: uint16(reader.TryReadBits(11)), } svcEntityMessage.Data = reader.TryReadBitsToSlice(uint64(svcEntityMessage.Length)) + writer.TempAppendLine("\t\tEntity Index: %d", svcEntityMessage.EntityIndex) + writer.TempAppendLine("\t\tClass ID: %d", svcEntityMessage.ClassId) + writer.TempAppendLine("\t\tData: %v", svcEntityMessage.Data) return svcEntityMessage } diff --git a/pkg/messages/types/svcFixAngle.go b/pkg/messages/types/svcFixAngle.go index 95f67ec..b79c02d 100644 --- a/pkg/messages/types/svcFixAngle.go +++ b/pkg/messages/types/svcFixAngle.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcFixAngle struct { Relative bool @@ -14,7 +17,7 @@ type fixAngles struct { } func ParseSvcFixAngle(reader *bitreader.Reader) SvcFixAngle { - return SvcFixAngle{ + svcFixAngle := SvcFixAngle{ Relative: reader.TryReadBool(), Angle: fixAngles{ X: float32(reader.TryReadBits(16)), @@ -22,4 +25,9 @@ func ParseSvcFixAngle(reader *bitreader.Reader) SvcFixAngle { Z: float32(reader.TryReadBits(16)), }, } + writer.TempAppendLine("\t\tRelative: %t", svcFixAngle.Relative) + writer.TempAppendLine("\t\tX: %f", svcFixAngle.Angle.X) + writer.TempAppendLine("\t\tY: %f", svcFixAngle.Angle.Y) + writer.TempAppendLine("\t\tZ: %f", svcFixAngle.Angle.Z) + return svcFixAngle } diff --git a/pkg/messages/types/svcGameEvent.go b/pkg/messages/types/svcGameEvent.go index 9e4564a..e12d75a 100644 --- a/pkg/messages/types/svcGameEvent.go +++ b/pkg/messages/types/svcGameEvent.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcGameEvent struct { Length uint16 @@ -12,5 +15,6 @@ func ParseSvcGameEvent(reader *bitreader.Reader) SvcGameEvent { Length: uint16(reader.TryReadBits(11)), } svcGameEvent.Data = reader.TryReadBitsToSlice(uint64(svcGameEvent.Length)) + writer.TempAppendLine("\t\tData: %v", svcGameEvent.Data) return svcGameEvent } diff --git a/pkg/messages/types/svcGameEventList.go b/pkg/messages/types/svcGameEventList.go index c6eb896..1fa7589 100644 --- a/pkg/messages/types/svcGameEventList.go +++ b/pkg/messages/types/svcGameEventList.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcGameEventList struct { Events int16 @@ -17,5 +20,6 @@ func ParseSvcGameEventList(reader *bitreader.Reader) SvcGameEventList { Length: int32(reader.TryReadBits(20)), } reader.TryReadBitsToSlice(uint64(svcGameEventList.Length)) + writer.TempAppendLine("\t\tEvents: %d", svcGameEventList.Events) return svcGameEventList } diff --git a/pkg/messages/types/svcGetCvarValue.go b/pkg/messages/types/svcGetCvarValue.go index 19fc362..939e6b6 100644 --- a/pkg/messages/types/svcGetCvarValue.go +++ b/pkg/messages/types/svcGetCvarValue.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcGetCvarValue struct { Cookie int32 @@ -12,5 +15,7 @@ func ParseSvcGetCvarValue(reader *bitreader.Reader) SvcGetCvarValue { Cookie: reader.TryReadSInt32(), CvarName: reader.TryReadString(), } + writer.TempAppendLine("\t\tCookie: %d", svcGetCvarValue.Cookie) + writer.TempAppendLine("\t\tCvar: \"%s\"", svcGetCvarValue.CvarName) return svcGetCvarValue } diff --git a/pkg/messages/types/svcMenu.go b/pkg/messages/types/svcMenu.go index 9e8e2eb..33ccb70 100644 --- a/pkg/messages/types/svcMenu.go +++ b/pkg/messages/types/svcMenu.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcMenu struct { Type uint16 @@ -14,5 +17,7 @@ func ParseSvcMenu(reader *bitreader.Reader) SvcMenu { Length: reader.TryReadUInt32(), } svcMenu.Data = reader.TryReadBitsToSlice(uint64(svcMenu.Length)) + writer.TempAppendLine("\t\tType: %d", svcMenu.Type) + writer.TempAppendLine("\t\tData: %v", svcMenu.Data) return svcMenu } diff --git a/pkg/messages/types/svcPacketEntities.go b/pkg/messages/types/svcPacketEntities.go index 2d86bf2..05b6794 100644 --- a/pkg/messages/types/svcPacketEntities.go +++ b/pkg/messages/types/svcPacketEntities.go @@ -2,6 +2,7 @@ package messages import ( "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" ) type SvcPacketEntities struct { @@ -30,5 +31,12 @@ func ParseSvcPacketEntities(reader *bitreader.Reader) SvcPacketEntities { svcPacketEntities.Length = uint32(reader.TryReadBits(20)) svcPacketEntities.UpdatedBaseline = reader.TryReadBool() svcPacketEntities.Data = reader.TryReadBitsToSlice(uint64(svcPacketEntities.Length)) + writer.TempAppendLine("\t\tMax Entries: %d", svcPacketEntities.MaxEntries) + writer.TempAppendLine("\t\tIs Delta: %t", svcPacketEntities.IsDelta) + writer.TempAppendLine("\t\tDelta From: %d", svcPacketEntities.DeltaFrom) + writer.TempAppendLine("\t\tBaseline: %t", svcPacketEntities.BaseLine) + writer.TempAppendLine("\t\tUpdated Baseline: %t", svcPacketEntities.UpdatedBaseline) + writer.TempAppendLine("\t\t%d Updated Entries:", svcPacketEntities.UpdatedEntries) + writer.TempAppendLine("\t\tData: %v", svcPacketEntities.Data) return svcPacketEntities } diff --git a/pkg/messages/types/svcPaintmapData.go b/pkg/messages/types/svcPaintmapData.go index 380016a..40f6ad0 100644 --- a/pkg/messages/types/svcPaintmapData.go +++ b/pkg/messages/types/svcPaintmapData.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcPaintmapData struct { Length uint32 @@ -12,5 +15,6 @@ func ParseSvcPaintmapData(reader *bitreader.Reader) SvcPaintmapData { Length: reader.TryReadUInt32(), } svcPaintmapData.Data = reader.TryReadBitsToSlice(uint64(svcPaintmapData.Length)) + writer.TempAppendLine("\t\tData: %v", svcPaintmapData.Data) return svcPaintmapData } diff --git a/pkg/messages/types/svcPrefetch.go b/pkg/messages/types/svcPrefetch.go index 50d01e9..b71e61f 100644 --- a/pkg/messages/types/svcPrefetch.go +++ b/pkg/messages/types/svcPrefetch.go @@ -1,13 +1,18 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcPrefetch struct { SoundIndex int16 } func ParseSvcPrefetch(reader *bitreader.Reader) SvcPrefetch { - return SvcPrefetch{ + svcPrefetch := SvcPrefetch{ SoundIndex: int16(reader.TryReadBits(13)), } + writer.TempAppendLine("\t\tSound Index: %d", svcPrefetch.SoundIndex) + return svcPrefetch } diff --git a/pkg/messages/types/svcPrint.go b/pkg/messages/types/svcPrint.go index f31d046..760a3c5 100644 --- a/pkg/messages/types/svcPrint.go +++ b/pkg/messages/types/svcPrint.go @@ -1,13 +1,21 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "strings" + + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcPrint struct { Message string } func ParseSvcPrint(reader *bitreader.Reader) SvcPrint { - return SvcPrint{ + svcPrint := SvcPrint{ Message: reader.TryReadString(), } + // common psycopath behaviour + writer.TempAppendLine("\t\t%s", strings.Replace(strings.ReplaceAll(strings.ReplaceAll(svcPrint.Message, "\n", "\n\t\t"), "\n\t\t\n\t\t", ""), "\n\t\t", "", 1)) + return svcPrint } diff --git a/pkg/messages/types/svcSendTable.go b/pkg/messages/types/svcSendTable.go index 2395e9f..78df195 100644 --- a/pkg/messages/types/svcSendTable.go +++ b/pkg/messages/types/svcSendTable.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcSendTable struct { NeedsDecoder bool @@ -14,5 +17,8 @@ func ParseSvcSendTable(reader *bitreader.Reader) SvcSendTable { Length: reader.TryReadUInt8(), } svcSendTable.Props = uint32(reader.TryReadBits(uint64(svcSendTable.Length))) + writer.TempAppendLine("\t\tNeeds Decoder: %t", svcSendTable.NeedsDecoder) + writer.TempAppendLine("\t\tLength: %d", svcSendTable.Length) + writer.TempAppendLine("\t\tProps: %d", svcSendTable.Props) return svcSendTable } diff --git a/pkg/messages/types/svcServerInfo.go b/pkg/messages/types/svcServerInfo.go index 7d44569..a6acd53 100644 --- a/pkg/messages/types/svcServerInfo.go +++ b/pkg/messages/types/svcServerInfo.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcServerInfo struct { Protocol uint16 @@ -22,7 +25,7 @@ type SvcServerInfo struct { } func ParseSvcServerInfo(reader *bitreader.Reader) SvcServerInfo { - return SvcServerInfo{ + svcServerInfo := SvcServerInfo{ Protocol: reader.TryReadUInt16(), ServerCount: reader.TryReadUInt32(), IsHltv: reader.TryReadBool(), @@ -40,4 +43,21 @@ func ParseSvcServerInfo(reader *bitreader.Reader) SvcServerInfo { SkyName: reader.TryReadString(), HostName: reader.TryReadString(), } + writer.TempAppendLine("\t\tNetwork Protocol: %d", svcServerInfo.Protocol) + writer.TempAppendLine("\t\tServer Count: %d", svcServerInfo.ServerCount) + writer.TempAppendLine("\t\tIs Hltv: %t", svcServerInfo.IsHltv) + writer.TempAppendLine("\t\tIs Dedicated: %t", svcServerInfo.IsDedicated) + writer.TempAppendLine("\t\tServer Client CRC: %d", svcServerInfo.ClientCrc) + writer.TempAppendLine("\t\tString Table CRC: %d", svcServerInfo.StringTableCrc) + writer.TempAppendLine("\t\tMax Server Classes: %d", svcServerInfo.MaxServerClasses) + writer.TempAppendLine("\t\tServer Map CRC: %d", svcServerInfo.MapCrc) + writer.TempAppendLine("\t\tCurrent Player Count: %d", svcServerInfo.PlayerCount) + writer.TempAppendLine("\t\tMax Player Count: %d", svcServerInfo.MaxClients) + writer.TempAppendLine("\t\tInterval Per Tick: %f", svcServerInfo.TickInterval) + writer.TempAppendLine("\t\tPlatform: %s", svcServerInfo.Platform) + writer.TempAppendLine("\t\tGame Directory: %s", svcServerInfo.GameDir) + writer.TempAppendLine("\t\tMap Name: %s", svcServerInfo.MapName) + writer.TempAppendLine("\t\tSky Name: %s", svcServerInfo.SkyName) + writer.TempAppendLine("\t\tHost Name: %s", svcServerInfo.HostName) + return svcServerInfo } diff --git a/pkg/messages/types/svcSetPause.go b/pkg/messages/types/svcSetPause.go index 551a4d3..d979ac5 100644 --- a/pkg/messages/types/svcSetPause.go +++ b/pkg/messages/types/svcSetPause.go @@ -1,13 +1,18 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcSetPause struct { Paused bool } func ParseSvcSetPause(reader *bitreader.Reader) SvcSetPause { - return SvcSetPause{ + svcSetPause := SvcSetPause{ Paused: reader.TryReadBool(), } + writer.TempAppendLine("\t\tPaused: %t", svcSetPause.Paused) + return svcSetPause } diff --git a/pkg/messages/types/svcSetView.go b/pkg/messages/types/svcSetView.go index 4ba5e3c..bdb6203 100644 --- a/pkg/messages/types/svcSetView.go +++ b/pkg/messages/types/svcSetView.go @@ -1,13 +1,18 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcSetView struct { EntityIndex uint16 } func ParseSvcSetView(reader *bitreader.Reader) SvcSetView { - return SvcSetView{ + svcSetView := SvcSetView{ EntityIndex: uint16(reader.TryReadBits(11)), } + writer.TempAppendLine("\t\tEntity Index: %d", svcSetView.EntityIndex) + return svcSetView } diff --git a/pkg/messages/types/svcSounds.go b/pkg/messages/types/svcSounds.go index 1553450..1affeb4 100644 --- a/pkg/messages/types/svcSounds.go +++ b/pkg/messages/types/svcSounds.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcSounds struct { ReliableSound bool @@ -21,5 +24,8 @@ func ParseSvcSounds(reader *bitreader.Reader) SvcSounds { svcSounds.Length = reader.TryReadUInt16() } svcSounds.Data = reader.TryReadBitsToSlice(uint64(svcSounds.Length)) + writer.TempAppendLine("\t\tReliable Sound: %t", svcSounds.ReliableSound) + writer.TempAppendLine("\t\tSound Count: %d", svcSounds.SoundCount) + writer.TempAppendLine("\t\tData: %v", svcSounds.Data) return svcSounds } diff --git a/pkg/messages/types/svcSplitScreen.go b/pkg/messages/types/svcSplitScreen.go index 5ddc131..653438a 100644 --- a/pkg/messages/types/svcSplitScreen.go +++ b/pkg/messages/types/svcSplitScreen.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcSplitScreen struct { RemoveUser bool @@ -14,5 +17,7 @@ func ParseSvcSplitScreen(reader *bitreader.Reader) SvcSplitScreen { Length: uint16(reader.TryReadBits(11)), } svcSplitScreen.Data = reader.TryReadBitsToSlice(uint64(svcSplitScreen.Length)) + writer.TempAppendLine("\t\tRemove User: %t", svcSplitScreen.RemoveUser) + writer.TempAppendLine("\t\tData: %v", svcSplitScreen.Data) return svcSplitScreen } diff --git a/pkg/messages/types/svcTempEntities.go b/pkg/messages/types/svcTempEntities.go index 9c20a65..407bfd6 100644 --- a/pkg/messages/types/svcTempEntities.go +++ b/pkg/messages/types/svcTempEntities.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcTempEntities struct { NumEntries uint8 @@ -14,5 +17,7 @@ func ParseSvcTempEntities(reader *bitreader.Reader) SvcTempEntities { Length: uint32(reader.TryReadBits(17)), } svcTempEntities.Data = reader.TryReadBitsToSlice(uint64(svcTempEntities.Length)) + writer.TempAppendLine("\t\tNumber Of Entries: %d", svcTempEntities.NumEntries) + writer.TempAppendLine("\t\tData: %v", svcTempEntities.Data) return svcTempEntities } diff --git a/pkg/messages/types/svcUpdateStringTable.go b/pkg/messages/types/svcUpdateStringTable.go index 0ff076c..68c8fb5 100644 --- a/pkg/messages/types/svcUpdateStringTable.go +++ b/pkg/messages/types/svcUpdateStringTable.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcUpdateStringTable struct { TableId uint8 @@ -18,5 +21,7 @@ func ParseSvcUpdateStringTable(reader *bitreader.Reader) SvcUpdateStringTable { } svcUpdateStringTable.Length = int32(reader.TryReadBits(20)) svcUpdateStringTable.Data = reader.TryReadBitsToSlice(uint64(svcUpdateStringTable.Length)) + writer.TempAppendLine("\t\tTable ID: %d", svcUpdateStringTable.TableId) + writer.TempAppendLine("\t\tNumber Of Changed Entries: %d", svcUpdateStringTable.NumChangedEntries) return svcUpdateStringTable } diff --git a/pkg/messages/types/svcUserMessage.go b/pkg/messages/types/svcUserMessage.go index 3cc6de2..e5b1943 100644 --- a/pkg/messages/types/svcUserMessage.go +++ b/pkg/messages/types/svcUserMessage.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcUserMessage struct { Type int8 @@ -86,6 +89,8 @@ func ParseSvcUserMessage(reader *bitreader.Reader) SvcUserMessage { Length: int16(reader.TryReadBits(12)), } svcUserMessage.Data = reader.TryReadBitsToSlice(uint64(svcUserMessage.Length)) + writer.TempAppendLine("\t\tType: %d", svcUserMessage.Type) + writer.TempAppendLine("\t\tData: %v", svcUserMessage.Data) return svcUserMessage } diff --git a/pkg/messages/types/svcVoiceData.go b/pkg/messages/types/svcVoiceData.go index efcae85..c3e08ee 100644 --- a/pkg/messages/types/svcVoiceData.go +++ b/pkg/messages/types/svcVoiceData.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcVoiceData struct { FromClient uint8 @@ -18,5 +21,8 @@ func ParseSvcVoiceData(reader *bitreader.Reader) SvcVoiceData { svcVoiceData.Proximity = true } svcVoiceData.Data = reader.TryReadBitsToSlice(uint64(svcVoiceData.Length)) + writer.TempAppendLine("\t\tFrom Client: %d", svcVoiceData.FromClient) + writer.TempAppendLine("\t\tProximity: %t", svcVoiceData.Proximity) + writer.TempAppendLine("\t\tData: %v", svcVoiceData.Data) return svcVoiceData } diff --git a/pkg/messages/types/svcVoiceInit.go b/pkg/messages/types/svcVoiceInit.go index a6d711a..03e0e25 100644 --- a/pkg/messages/types/svcVoiceInit.go +++ b/pkg/messages/types/svcVoiceInit.go @@ -1,6 +1,9 @@ package messages -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" + "github.com/pektezol/demoparser/pkg/writer" +) type SvcVoiceInit struct { Codec string @@ -22,5 +25,8 @@ func ParseSvcVoiceInit(reader *bitreader.Reader) SvcVoiceInit { svcVoiceInit.SampleRate = 11025 } } + writer.TempAppendLine("\t\tCodec: %s", svcVoiceInit.Codec) + writer.TempAppendLine("\t\tQuality: %d", svcVoiceInit.Quality) + writer.TempAppendLine("\t\tSample Rate: %d", svcVoiceInit.SampleRate) return svcVoiceInit } -- cgit v1.2.3