23 files changed, 440 insertions, 4 deletions

diff --git a/packets/messages/message.go b/packets/messages/message.go
index c508bfa..05690cc 100644
--- a/packets/messages/message.go
+++ b/packets/messages/message.go
@@ -40,6 +40,50 @@ func ParseMessage(data []byte) []Message {
                         messages = append(messages, Message{Data: types.ParseSvcClassInfo(reader)})
                 case 0x11:
                         messages = append(messages, Message{Data: types.ParseSvcSetPause(reader)})
+                case 0x12:
+                        messages = append(messages, Message{Data: types.ParseSvcCreateStringTable(reader)})
+                case 0x13:
+                        messages = append(messages, Message{Data: types.ParseSvcUpdateStringTable(reader)})
+                case 0x14:
+                        messages = append(messages, Message{Data: types.ParseSvcVoiceInit(reader)})
+                case 0x15:
+                        messages = append(messages, Message{Data: types.ParseSvcVoiceData(reader)})
+                case 0x16:
+                        messages = append(messages, Message{Data: types.ParseSvcPrint(reader)})
+                case 0x17:
+                        messages = append(messages, Message{Data: types.ParseSvcSounds(reader)})
+                case 0x18:
+                        messages = append(messages, Message{Data: types.ParseSvcSetView(reader)})
+                case 0x19:
+                        messages = append(messages, Message{Data: types.ParseSvcFixAngle(reader)})
+                case 0x20:
+                        messages = append(messages, Message{Data: types.ParseSvcCrosshairAngle(reader)})
+                case 0x21:
+                        // TODO: SvcBspDecal
+                case 0x22:
+                        messages = append(messages, Message{Data: types.ParseSvcSplitScreen(reader)})
+                case 0x23:
+                        messages = append(messages, Message{Data: types.ParseSvcUserMessage(reader)})
+                case 0x24:
+                        messages = append(messages, Message{Data: types.ParseSvcEntityMessage(reader)})
+                case 0x25:
+                        // TODO: SvcGameEvent
+                case 0x26:
+                        messages = append(messages, Message{Data: types.ParseSvcPacketEntities(reader)})
+                case 0x27:
+                        messages = append(messages, Message{Data: types.ParseSvcTempEntities(reader)})
+                case 0x28:
+                        messages = append(messages, Message{Data: types.ParseSvcPrefetch(reader)})
+                case 0x29:
+                        messages = append(messages, Message{Data: types.ParseSvcMenu(reader)})
+                case 0x30:
+                        messages = append(messages, Message{Data: types.ParseSvcGameEventList(reader)})
+                case 0x31:
+                        messages = append(messages, Message{Data: types.ParseSvcGetCvarValue(reader)})
+                case 0x32:
+                        messages = append(messages, Message{Data: types.ParseSvcCmdKeyValues(reader)})
+                case 0x33:
+                        messages = append(messages, Message{Data: types.ParseSvcPaintmapData(reader)})
                 }
         }
         return messages
diff --git a/packets/messages/types/SvcClassInfo.go b/packets/messages/types/SvcClassInfo.go
index fb9dbd8..d41723d 100644
--- a/packets/messages/types/SvcClassInfo.go
+++ b/packets/messages/types/SvcClassInfo.go
@@ -1,8 +1,6 @@
 package types
 
 import (
-        "math"
-
         "github.com/pektezol/bitreader"
 )
 
@@ -24,7 +22,7 @@ func ParseSvcClassInfo(reader *bitreader.ReaderType) SvcClassInfo {
         if createonclient {
                 serverclasses := make([]ServerClass, length)
                 for i := 0; i < int(length); i++ {
-                        id, err := reader.ReadBits(int(math.Log2(float64(length))) + 1)
+                        id, err := reader.ReadBits(HighestBitIndex(uint(length)) + 1)
                         if err != nil {
                                 panic(err)
                         }
@@ -40,3 +38,10 @@ func ParseSvcClassInfo(reader *bitreader.ReaderType) SvcClassInfo {
                 ServerClasses:  serverclasses,
         }
 }
+
+func HighestBitIndex(i uint) int {
+        var j int
+        for j = 31; j >= 0 && (i&(1<<j)) == 0; j-- {
+        }
+        return j
+}
diff --git a/packets/messages/types/SvcCmdKeyValues.go b/packets/messages/types/SvcCmdKeyValues.go
new file mode 100644
index 0000000..06504a2
--- /dev/null
+++ b/packets/messages/types/SvcCmdKeyValues.go
@@ -0,0 +1,14 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcCmdKeyValues struct {
+        Data []byte
+}
+
+func ParseSvcCmdKeyValues(reader *bitreader.ReaderType) SvcCmdKeyValues {
+        length := reader.TryReadInt32()
+        return SvcCmdKeyValues{
+                Data: reader.TryReadBytesToSlice(int(length)),
+        }
+}
diff --git a/packets/messages/types/SvcCreateStringTable.go b/packets/messages/types/SvcCreateStringTable.go
new file mode 100644
index 0000000..6e97ea7
--- /dev/null
+++ b/packets/messages/types/SvcCreateStringTable.go
@@ -0,0 +1,32 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcCreateStringTable struct {
+        Name              string
+        MaxEntries        uint16
+        NumEntries        uint8
+        UserDataFixedSize bool
+        UserDataSize      uint16
+        UserDataSizeBits  uint8
+        Flags             uint8
+        StringData        int
+}
+
+func ParseSvcCreateStringTable(reader *bitreader.ReaderType) SvcCreateStringTable {
+        svccreatestringtable := SvcCreateStringTable{
+                Name:       reader.TryReadString(),
+                MaxEntries: reader.TryReadInt16(),
+        }
+        svccreatestringtable.NumEntries = uint8(reader.TryReadBits(HighestBitIndex(uint(svccreatestringtable.MaxEntries)) + 1))
+        length := reader.TryReadBits(20)
+        svccreatestringtable.UserDataFixedSize = reader.TryReadBool()
+        if svccreatestringtable.UserDataFixedSize {
+                svccreatestringtable.UserDataSize = uint16(reader.TryReadBits(12))
+                svccreatestringtable.UserDataSizeBits = uint8(reader.TryReadBits(4))
+        }
+        svccreatestringtable.Flags = uint8(reader.TryReadBits(2))
+        svccreatestringtable.StringData = int(reader.TryReadBits(int(length / 8)))
+        return svccreatestringtable
+
+}
diff --git a/packets/messages/types/SvcCrosshairAngle.go b/packets/messages/types/SvcCrosshairAngle.go
new file mode 100644
index 0000000..6584426
--- /dev/null
+++ b/packets/messages/types/SvcCrosshairAngle.go
@@ -0,0 +1,17 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcCrosshairAngle struct {
+        Angle []int16
+}
+
+func ParseSvcCrosshairAngle(reader *bitreader.ReaderType) SvcCrosshairAngle {
+        return SvcCrosshairAngle{
+                Angle: []int16{
+                        int16(reader.TryReadInt16()),
+                        int16(reader.TryReadInt16()),
+                        int16(reader.TryReadInt16()),
+                },
+        }
+}
diff --git a/packets/messages/types/SvcEntityMessage.go b/packets/messages/types/SvcEntityMessage.go
new file mode 100644
index 0000000..f4fb518
--- /dev/null
+++ b/packets/messages/types/SvcEntityMessage.go
@@ -0,0 +1,20 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcEntityMessage struct {
+        EntityIndex int16
+        ClassId     int16
+        Data        []byte
+}
+
+func ParseSvcEntityMessage(reader *bitreader.ReaderType) SvcEntityMessage {
+        entityindex := reader.TryReadBits(11)
+        classid := reader.TryReadBits(9)
+        length := reader.TryReadBits(11)
+        return SvcEntityMessage{
+                EntityIndex: int16(entityindex),
+                ClassId:     int16(classid),
+                Data:        reader.TryReadBytesToSlice(int(length / 8)),
+        }
+}
diff --git a/packets/messages/types/SvcFixAngle.go b/packets/messages/types/SvcFixAngle.go
new file mode 100644
index 0000000..d98dedd
--- /dev/null
+++ b/packets/messages/types/SvcFixAngle.go
@@ -0,0 +1,21 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcFixAngle struct {
+        Relative bool
+        Angle    []int16
+}
+
+func ParseSvcFixAngle(reader *bitreader.ReaderType) SvcFixAngle {
+        relative := reader.TryReadBool()
+        angles := []int16{
+                int16(reader.TryReadInt16()),
+                int16(reader.TryReadInt16()),
+                int16(reader.TryReadInt16()),
+        }
+        return SvcFixAngle{
+                Relative: relative,
+                Angle:    angles,
+        }
+}
diff --git a/packets/messages/types/SvcGameEventList.go b/packets/messages/types/SvcGameEventList.go
new file mode 100644
index 0000000..bdba161
--- /dev/null
+++ b/packets/messages/types/SvcGameEventList.go
@@ -0,0 +1,17 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcGameEventList struct {
+        Events int16
+        Data   []byte
+}
+
+func ParseSvcGameEventList(reader *bitreader.ReaderType) SvcGameEventList {
+        events := reader.TryReadBits(9)
+        length := reader.TryReadBits(20)
+        return SvcGameEventList{
+                Events: int16(events),
+                Data:   reader.TryReadBytesToSlice(int(length)),
+        }
+}
diff --git a/packets/messages/types/SvcGetCvarValue.go b/packets/messages/types/SvcGetCvarValue.go
new file mode 100644
index 0000000..2925da5
--- /dev/null
+++ b/packets/messages/types/SvcGetCvarValue.go
@@ -0,0 +1,15 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcGetCvarValue struct {
+        Cookie   string
+        CvarName string
+}
+
+func ParseSvcGetCvarValue(reader *bitreader.ReaderType) SvcGetCvarValue {
+        return SvcGetCvarValue{
+                Cookie:   reader.TryReadStringLen(32),
+                CvarName: reader.TryReadString(),
+        }
+}
diff --git a/packets/messages/types/SvcMenu.go b/packets/messages/types/SvcMenu.go
new file mode 100644
index 0000000..312115a
--- /dev/null
+++ b/packets/messages/types/SvcMenu.go
@@ -0,0 +1,17 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcMenu struct {
+        MenuType int16
+        Data     []byte
+}
+
+func ParseSvcMenu(reader *bitreader.ReaderType) SvcMenu {
+        menutype := reader.TryReadInt16()
+        length := reader.TryReadInt32()
+        return SvcMenu{
+                MenuType: int16(menutype),
+                Data:     reader.TryReadBytesToSlice(int(length / 8)),
+        }
+}
diff --git a/packets/messages/types/SvcPacketEntities.go b/packets/messages/types/SvcPacketEntities.go
new file mode 100644
index 0000000..bc4c41a
--- /dev/null
+++ b/packets/messages/types/SvcPacketEntities.go
@@ -0,0 +1,39 @@
+package types
+
+import (
+        "fmt"
+
+        "github.com/pektezol/bitreader"
+)
+
+type SvcPacketEntities struct {
+        MaxEntries     uint16
+        IsDelta        bool
+        DeltaFrom      int32
+        BaseLine       bool
+        UpdatedEntries uint16
+        UpdateBaseline bool
+        Data           []byte
+}
+
+func ParseSvcPacketEntities(reader *bitreader.ReaderType) SvcPacketEntities {
+        maxentries := reader.TryReadBits(11)
+        isdelta := reader.TryReadBool()
+        var deltafrom int32
+        if isdelta {
+                deltafrom = int32(reader.TryReadInt32())
+        }
+        baseline := reader.TryReadBool()
+        updatedentries := reader.TryReadBits(11)
+        length := reader.TryReadBits(20)
+        fmt.Println(length)
+        return SvcPacketEntities{
+                MaxEntries:     uint16(maxentries),
+                IsDelta:        isdelta,
+                DeltaFrom:      deltafrom,
+                BaseLine:       baseline,
+                UpdatedEntries: uint16(updatedentries),
+                UpdateBaseline: reader.TryReadBool(),
+                Data:           reader.TryReadBytesToSlice(int(length / 8)),
+        }
+}
diff --git a/packets/messages/types/SvcPaintmapData.go b/packets/messages/types/SvcPaintmapData.go
new file mode 100644
index 0000000..f3bd1a3
--- /dev/null
+++ b/packets/messages/types/SvcPaintmapData.go
@@ -0,0 +1,14 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcPaintmapData struct {
+        Data []byte
+}
+
+func ParseSvcPaintmapData(reader *bitreader.ReaderType) SvcPaintmapData {
+        length := reader.TryReadInt32()
+        return SvcPaintmapData{
+                Data: reader.TryReadBytesToSlice(int(length / 8)),
+        }
+}
diff --git a/packets/messages/types/SvcPrefetch.go b/packets/messages/types/SvcPrefetch.go
new file mode 100644
index 0000000..b277252
--- /dev/null
+++ b/packets/messages/types/SvcPrefetch.go
@@ -0,0 +1,13 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcPrefetch struct {
+        SoundIndex int16
+}
+
+func ParseSvcPrefetch(reader *bitreader.ReaderType) SvcPrefetch {
+        return SvcPrefetch{
+                SoundIndex: int16(reader.TryReadBits(13)),
+        }
+}
diff --git a/packets/messages/types/SvcPrint.go b/packets/messages/types/SvcPrint.go
new file mode 100644
index 0000000..c6d91ac
--- /dev/null
+++ b/packets/messages/types/SvcPrint.go
@@ -0,0 +1,13 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcPrint struct {
+        Message string
+}
+
+func ParseSvcPrint(reader *bitreader.ReaderType) SvcPrint {
+        return SvcPrint{
+                Message: reader.TryReadString(),
+        }
+}
diff --git a/packets/messages/types/SvcSetView.go b/packets/messages/types/SvcSetView.go
new file mode 100644
index 0000000..5507eae
--- /dev/null
+++ b/packets/messages/types/SvcSetView.go
@@ -0,0 +1,13 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcSetView struct {
+        EntityIndex int16
+}
+
+func ParseSvcSetView(reader *bitreader.ReaderType) SvcSetView {
+        return SvcSetView{
+                EntityIndex: int16(reader.TryReadBits(11)),
+        }
+}
diff --git a/packets/messages/types/SvcSounds.go b/packets/messages/types/SvcSounds.go
new file mode 100644
index 0000000..1f76a03
--- /dev/null
+++ b/packets/messages/types/SvcSounds.go
@@ -0,0 +1,31 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcSounds struct {
+        ReliableSound bool
+        Size          int8
+        Data          []byte
+}
+
+func ParseSvcSounds(reader *bitreader.ReaderType) SvcSounds {
+        reliablesound := reader.TryReadBool()
+        var size int8
+        var length int16
+        if reliablesound {
+                size = 1
+        } else {
+                size = int8(reader.TryReadInt8())
+        }
+        if reliablesound {
+                length = int16(reader.TryReadInt8())
+        } else {
+                length = int16(reader.TryReadInt16())
+        }
+        data := reader.TryReadBytesToSlice(int(length / 8))
+        return SvcSounds{
+                ReliableSound: reliablesound,
+                Size:          size,
+                Data:          data,
+        }
+}
diff --git a/packets/messages/types/SvcSplitScreen.go b/packets/messages/types/SvcSplitScreen.go
new file mode 100644
index 0000000..6727558
--- /dev/null
+++ b/packets/messages/types/SvcSplitScreen.go
@@ -0,0 +1,17 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcSplitScreen struct {
+        Unk  bool
+        Data []byte
+}
+
+func ParseSvcSplitScreen(reader *bitreader.ReaderType) SvcSplitScreen {
+        unk := reader.TryReadBool()
+        length := reader.TryReadBits(11)
+        return SvcSplitScreen{
+                Unk:  unk,
+                Data: reader.TryReadBytesToSlice(int(length / 8)),
+        }
+}
diff --git a/packets/messages/types/SvcTempEntities.go b/packets/messages/types/SvcTempEntities.go
new file mode 100644
index 0000000..cd021a8
--- /dev/null
+++ b/packets/messages/types/SvcTempEntities.go
@@ -0,0 +1,17 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcTempEntities struct {
+        NumEntries uint8
+        Data       []byte
+}
+
+func ParseSvcTempEntities(reader *bitreader.ReaderType) SvcTempEntities {
+        numentries := reader.TryReadInt8()
+        length := reader.TryReadBits(17)
+        return SvcTempEntities{
+                NumEntries: numentries,
+                Data:       reader.TryReadBytesToSlice(int(length / 8)),
+        }
+}
diff --git a/packets/messages/types/SvcUpdateStringTable.go b/packets/messages/types/SvcUpdateStringTable.go
new file mode 100644
index 0000000..d4a0609
--- /dev/null
+++ b/packets/messages/types/SvcUpdateStringTable.go
@@ -0,0 +1,21 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcUpdateStringTable struct {
+        TableId           int8
+        NumChangedEntries int16
+        Data              []byte
+}
+
+func ParseSvcUpdateStringTable(reader *bitreader.ReaderType) SvcUpdateStringTable {
+        svcupdatestringtable := SvcUpdateStringTable{
+                TableId: int8(reader.TryReadBits(5)),
+        }
+        if reader.TryReadBool() {
+                svcupdatestringtable.NumChangedEntries = int16(reader.TryReadInt16())
+        }
+        length := reader.TryReadBits(20)
+        svcupdatestringtable.Data = reader.TryReadBytesToSlice(int(length / 8))
+        return svcupdatestringtable
+}
diff --git a/packets/messages/types/SvcUserMessage.go b/packets/messages/types/SvcUserMessage.go
new file mode 100644
index 0000000..2e6f74a
--- /dev/null
+++ b/packets/messages/types/SvcUserMessage.go
@@ -0,0 +1,17 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcUserMessage struct {
+        MsgType uint8
+        Data    []byte
+}
+
+func ParseSvcUserMessage(reader *bitreader.ReaderType) SvcUserMessage {
+        msgtype := reader.TryReadInt8()
+        length := reader.TryReadBits(12)
+        return SvcUserMessage{
+                MsgType: msgtype,
+                Data:    reader.TryReadBytesToSlice(int(length / 8)),
+        }
+}
diff --git a/packets/messages/types/SvcVoiceData.go b/packets/messages/types/SvcVoiceData.go
new file mode 100644
index 0000000..f99db38
--- /dev/null
+++ b/packets/messages/types/SvcVoiceData.go
@@ -0,0 +1,19 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcVoiceData struct {
+        Client    int8
+        Proximity int8
+        Data      []byte
+}
+
+func ParseSvcVoiceData(reader *bitreader.ReaderType) SvcVoiceData {
+        svcvoicedata := SvcVoiceData{
+                Client:    int8(reader.TryReadInt8()),
+                Proximity: int8(reader.TryReadInt8()),
+        }
+        length := reader.TryReadInt16()
+        svcvoicedata.Data = reader.TryReadBytesToSlice(int(length / 8))
+        return svcvoicedata
+}
diff --git a/packets/messages/types/SvcVoiceInit.go b/packets/messages/types/SvcVoiceInit.go
new file mode 100644
index 0000000..3e18a7b
--- /dev/null
+++ b/packets/messages/types/SvcVoiceInit.go
@@ -0,0 +1,20 @@
+package types
+
+import "github.com/pektezol/bitreader"
+
+type SvcVoiceInit struct {
+        Codec   string
+        Quality uint8
+        Unk     float32
+}
+
+func ParseSvcVoiceInit(reader *bitreader.ReaderType) SvcVoiceInit {
+        svcvoiceinit := SvcVoiceInit{
+                Codec:   reader.TryReadString(),
+                Quality: reader.TryReadInt8(),
+        }
+        if svcvoiceinit.Quality == 255 {
+                svcvoiceinit.Unk = reader.TryReadFloat32()
+        }
+        return svcvoiceinit
+}
diff --git a/packets/packet.go b/packets/packet.go
index 23a21e6..b27f2e7 100644
--- a/packets/packet.go
+++ b/packets/packet.go
@@ -44,7 +44,7 @@ func ParsePacket(reader *bitreader.ReaderType) (status int) {
                         Size: int32(reader.TryReadInt32()),
                 }
                 consoleCmd.Data = reader.TryReadStringLen(int(consoleCmd.Size))
-                //fmt.Printf("[%d] (%d) ConsoleCmd: %s\n", messageTick, messageType, consoleCmd.Data)
+                fmt.Printf("[%d] (%d) ConsoleCmd: %s\n", messageTick, messageType, consoleCmd.Data)
                 return 4
         case 0x05: // TODO: UserCmd - Buttons
                 userCmd := UserCmd{