Starting to add in assets.

client/assets/imagebank.go

@@ -0,0 +1,51 @@
+package assets
+
+import (
+	"bytes"
+	_ "embed"
+	"image"
+	"log"
+
+	"github.com/hajimehoshi/ebiten/v2"
+)
+
+type ImgAssetName string
+
+const (
+	Green  ImgAssetName = "Green"
+	Blue   ImgAssetName = "Blue"
+	Yellow ImgAssetName = "Yellow"
+	Red    ImgAssetName = "Red"
+)
+
+var (
+	ImageBank map[ImgAssetName]*ebiten.Image
+
+	//go:embed dino_blue.png
+	blue_img []byte
+	//go:embed dino_green.png
+	green_img []byte
+	//go:embed dino_red.png
+	red_img []byte
+	//go:embed dino_yellow.png
+	yellow_img []byte
+)
+
+func init() {
+	ImageBank = make(map[ImgAssetName]*ebiten.Image)
+
+	ImageBank[Blue] = LoadImageFatal(blue_img)
+	ImageBank[Green] = LoadImageFatal(green_img)
+	ImageBank[Red] = LoadImageFatal(red_img)
+	ImageBank[Yellow] = LoadImageFatal(yellow_img)
+}
+
+func LoadImageFatal(b []byte) *ebiten.Image {
+
+	img, _, err := image.Decode(bytes.NewReader(b))
+	if err != nil {
+		log.Fatal(err)
+	}
+	return ebiten.NewImageFromImage(img)
+
+}

client/client/client.go

@@ -34,23 +34,6 @@ func NewClient() *Client {
 	return c
 }
 
-func (c *Client) SendProtoData(coords *pb.ClientCoordinates) {
-
-	data, err := proto.Marshal(coords)
-	if err != nil {
-		fmt.Println("Couldn't serialize. ", err)
-		return
-	}
-
-	// Add length prefix
-	length := uint32(len(data))
-	buf := make([]byte, 4+len(data))
-	binary.BigEndian.PutUint32(buf[:4], length)
-	copy(buf[4:], data)
-
-	c.SendBuffer(c.conn, buf)
-}
-
 func (c *Client) SendBuffer(conn net.Conn, buf []byte) {
 	// Ensure complete write
 	totalWritten := 0
@@ -66,34 +49,36 @@ func (c *Client) SendBuffer(conn net.Conn, buf []byte) {
 
 func (c *Client) ReadData(callback func(*pb.ServerEnvelope)) {
 
-	for {
+	if c.connected {
-		lengthBuf := make([]byte, 4)
+		for {
-		_, err := io.ReadFull(c.conn, lengthBuf)
+			lengthBuf := make([]byte, 4)
-		if err != nil {
+			_, err := io.ReadFull(c.conn, lengthBuf)
-			fmt.Println("failed to read length prefix: ", err)
+			if err != nil {
-			return
+				fmt.Println("failed to read length prefix: ", err)
+				return
+			}
+
+			length := binary.BigEndian.Uint32(lengthBuf)
+
+			data := make([]byte, length)
+			_, err = io.ReadFull(c.conn, data)
+			if err != nil {
+				fmt.Println("failed to read data: ", err)
+				return
+			}
+
+			var envelope pb.ServerEnvelope
+			err = proto.Unmarshal(data, &envelope)
+			if err != nil {
+				fmt.Println("Couldn't deserialize envelope : ", err)
+				return
+			}
+
+			if callback != nil {
+				callback(&envelope)
+			}
+
 		}
-
-		length := binary.BigEndian.Uint32(lengthBuf)
-
-		data := make([]byte, length)
-		_, err = io.ReadFull(c.conn, data)
-		if err != nil {
-			fmt.Println("failed to read data: ", err)
-			return
-		}
-
-		var envelope pb.ServerEnvelope
-		err = proto.Unmarshal(data, &envelope)
-		if err != nil {
-			fmt.Println("Couldn't deserialize envelope : ", err)
-			return
-		}
-
-		if callback != nil {
-			callback(&envelope)
-		}
-
 	}
 
 }

client/elements/block.go

@@ -3,6 +3,7 @@ package elements
 import (
 	"client/gamedata"
 	"image/color"
+	"math"
 
 	"github.com/hajimehoshi/ebiten/v2"
 )
@@ -11,27 +12,37 @@ type Block struct {
 	Sprite   *ebiten.Image
 	cycle    int
 	position gamedata.Coordinates
+	target   gamedata.Coordinates
 	hit      bool
+	clr      color.RGBA
 }
 
 func NewBlock() *Block {
 	return &Block{
 		Sprite: ebiten.NewImage(20, 20),
 		cycle:  0,
+		clr:    color.RGBA{R: 0xff, G: 0x00, B: 0x00, A: 0x00},
 	}
 }
 
 func (b *Block) Update() {
+
+	dx := b.target.X - b.position.X
+	dy := b.target.Y - b.position.Y
+
+	delta := math.Sqrt(dx*dx + dy*dy)
+	angle := math.Atan2(dy, dx)
+	if delta > 0.5 {
+		b.position.X += delta * math.Cos(angle) / 2
+		b.position.Y += delta * math.Sin(angle) / 2
+	}
+
 	b.cycle++
 }
 
 func (b *Block) Draw() {
 	b.Sprite.Clear()
-	if !b.hit {
+	b.Sprite.Fill(b.clr)
-		b.Sprite.Fill(color.RGBA{R: 0xff, G: 0x00, B: 0x00, A: 0x00})
-	} else {
-		b.Sprite.Fill(color.RGBA{R: 0x00, G: 0xff, B: 0x00, A: 0xff})
-	}
 }
 
 func (b *Block) SetPosition(pos gamedata.Coordinates) {
@@ -42,10 +53,18 @@ func (b *Block) GetPosition() gamedata.Coordinates {
 	return b.position
 }
 
-func (b *Block) SetHit(hit bool) {
+func (b *Block) SetTargetPosition(pos gamedata.Coordinates) {
-	b.hit = hit
+	b.target = pos
+}
+
+func (b *Block) GetTargetosition() gamedata.Coordinates {
+	return b.target
 }
 
 func (b *Block) GetHit() bool {
 	return b.hit
 }
+
+func (b *Block) SetColor(clr color.RGBA) {
+	b.clr = clr
+}

client/elements/dino.go

@@ -0,0 +1,106 @@
+package elements
+
+import (
+	"client/assets"
+	"client/gamedata"
+	"image"
+
+	"github.com/hajimehoshi/ebiten/v2"
+)
+
+const (
+	dinoWidth  = 24
+	dinoHeight = 24
+)
+
+type DinoInfo struct {
+	DinoAction gamedata.DinoAction
+	NumCycles  int
+	XOffset    int
+}
+
+var (
+	dinoCycleCount = []DinoInfo{
+		{gamedata.DinoActionIdle, 4, 0},
+		{gamedata.DinoActionWalk, 6, 4},
+		{gamedata.DinoActionSlap, 3, 10},
+	}
+)
+
+type Dino struct {
+	Sprite     *ebiten.Image
+	dinotype   gamedata.DinoType
+	dinoaction gamedata.DinoAction
+	cycle      int
+	asset      *ebiten.Image
+	left       bool
+	slapping   bool
+}
+
+func NewDino(dtype gamedata.DinoType) *Dino {
+	dino := &Dino{
+		Sprite:     ebiten.NewImage(dinoWidth*2, dinoHeight*2),
+		cycle:      0,
+		dinotype:   dtype,
+		dinoaction: gamedata.DinoActionIdle,
+	}
+
+	switch dtype {
+	case gamedata.DinoTypeBlue:
+		dino.asset = assets.ImageBank[assets.Blue]
+	case gamedata.DinoTypeGreen:
+		dino.asset = assets.ImageBank[assets.Green]
+	case gamedata.DinoTypeRed:
+		dino.asset = assets.ImageBank[assets.Red]
+	case gamedata.DinoTypeYellow:
+		dino.asset = assets.ImageBank[assets.Yellow]
+	}
+
+	return dino
+}
+
+func (d *Dino) Update() {
+	d.cycle++
+}
+
+func (d *Dino) Draw() {
+	d.Sprite.Clear()
+
+	idx := d.cycle / 8 % dinoCycleCount[d.dinoaction].NumCycles
+	x0 := dinoWidth * (idx + dinoCycleCount[d.dinoaction].XOffset)
+	y0 := 0
+	x1 := x0 + dinoWidth
+	y1 := dinoHeight
+
+	op := &ebiten.DrawImageOptions{}
+	if d.left {
+		op.GeoM.Scale(-1, 1)
+		op.GeoM.Translate(dinoWidth, 0)
+	}
+	op.GeoM.Translate(-dinoWidth/2, -dinoHeight/2)
+	op.GeoM.Scale(2, 2)
+	op.GeoM.Translate(dinoWidth, dinoHeight)
+	d.Sprite.DrawImage(d.asset.SubImage(image.Rect(x0, y0, x1, y1)).(*ebiten.Image), op)
+
+	if d.slapping && idx >= dinoCycleCount[d.dinoaction].NumCycles-1 {
+		d.slapping = false
+	}
+
+}
+
+func (d *Dino) SetAction(action gamedata.DinoAction) {
+	if d.slapping {
+		//wait until we're done slapping
+	} else {
+		d.dinoaction = action
+		if action == gamedata.DinoActionSlap {
+			d.cycle = 0
+			d.slapping = true
+		}
+	}
+
+}
+
+func (d *Dino) SetLeft(left bool) {
+	d.left = left
+}

client/game/game.go

@@ -7,20 +7,34 @@ import (
 	"client/gamedata"
 	"client/pb"
 	"fmt"
+	"image/color"
 	"maps"
+	"math"
 	"sync"
 	"time"
 
 	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/inpututil"
 	"github.com/hajimehoshi/ebiten/v2/text/v2"
+	"github.com/hajimehoshi/ebiten/v2/vector"
 	"golang.org/x/exp/rand"
 )
 
-var (
+const (
-	screenWidth  = 640
+	screenWidth   = 640
-	screenHeight = 480
+	screenHeight  = 480
+	movementLimit = 5
+	stageRadius   = 200
+)
 
-	namelist = []string{"slappy", "mick", "rodney", "george", "ringo", "robin", "temitry "}
+var (
+	namelist = []string{"slappy", "mick", "rodney", "george", "ringo",
+		"robin", "temitry", "evangeline", "ron", "abigail", "lester",
+		"maynard", "agnes", "stacey", "wendell", "susanne", "myrtle",
+		"teresa", "kristi", "genos", "felton", "lawrence", "rosie",
+		"nigel", "constance", "maryellen", "dollie", "markus",
+		"dorthy", "lazaro", "willa", "dino", "gustavo", "conrad",
+		"georgia", "lucinda", "saitama"}
 )
 
 func init() {
@@ -28,29 +42,30 @@ func init() {
 }
 
 type ClientData struct {
-	Id       int
+	Id         int
-	Address  string
+	Address    string
-	Name     string
+	Name       string
-	Position gamedata.Coordinates
+	Position   gamedata.Coordinates
-	Hit      bool
+	Hit        bool
+	Eliminated bool
 }
 
 type Game struct {
-	name      string
+	name        string
-	blocky    *elements.Block
+	blocky      *elements.Block
-	hitblocky *elements.Block
+	hitblocky   *elements.Block
-	gameId    int
+	elimblocky  *elements.Block
+	gameId      int
+	realclients map[int]ClientData
+	gameclient  *client.Client
+	cycle       int
+	mu          sync.Mutex
 
-	//players map[client.Identity]
+	//similar fields that we see in the client list, but for us
+	eliminated bool
+	hit        bool
 
-	clients map[string]ClientData
+	dino *elements.Dino
-
-	gameclient *client.Client
-	cycle      int
-
-	position gamedata.Coordinates
-
-	mu sync.Mutex
 }
 
 func NewGame() *Game {
@@ -58,13 +73,20 @@ func NewGame() *Game {
 		gameclient: client.NewClient(),
 		blocky:     elements.NewBlock(),
 		hitblocky:  elements.NewBlock(),
+		elimblocky: elements.NewBlock(),
 		cycle:      0,
 		name:       namelist[rand.Intn(len(namelist))],
+		dino:       elements.NewDino(gamedata.DinoTypeGreen),
 	}
 
-	g.hitblocky.SetHit(true)
+	g.blocky.SetColor(color.RGBA{R: 0xff, G: 0x00, B: 0x00, A: 0xff})
+	g.hitblocky.SetColor(color.RGBA{R: 0x00, G: 0xff, B: 0xff, A: 0xff})
+	g.elimblocky.SetColor(color.RGBA{R: 0x00, G: 0x00, B: 0xff, A: 0xff})
 
-	g.clients = make(map[string]ClientData)
+	g.blocky.SetPosition(gamedata.Coordinates{X: float64(screenWidth) / 2, Y: float64(screenHeight) / 2})
+	g.blocky.SetTargetPosition(gamedata.Coordinates{X: float64(screenWidth) / 2, Y: float64(screenHeight) / 2})
+
+	g.realclients = make(map[int]ClientData)
 
 	//g.gameId = g.gameclient.GetIdentity()
 	go g.gameclient.ReadData(g.HandleServerData)
@@ -73,47 +95,12 @@ func NewGame() *Game {
 
 func (g *Game) Update() error {
 
-	x, y := ebiten.CursorPosition()
+	g.blocky.Update()
-	g.position.X = float64(x)
+	g.dino.Update()
-	g.position.Y = float64(y)
+	//g.hitblocky.Update()
 
-	g.blocky.SetPosition(g.position)
+	g.HandleInput()
-
+	g.SendPosition()
-	//broadcast our position
-	if g.cycle%2 == 0 {
-		if g.gameclient.IsConnected() {
-			//g.gameclient.SendData(fmt.Sprintf("%s,%.0f,%.0f\n", g.name, g.position.X, g.position.Y))
-
-			cd := &pb.ClientCoordinates{
-				Name: g.name,
-				Coordinates: &pb.Coordinates{
-					X: g.position.X,
-					Y: g.position.Y,
-				},
-			}
-
-			envelope := &pb.ClientEnvelope{
-				Payload: &pb.ClientEnvelope_Coordinates{
-					Coordinates: cd,
-				},
-			}
-
-			g.gameclient.SendMessage(envelope)
-
-			//g.gameclient.SendProtoData(cd)
-			/*
-				cd := *client.ClientData{
-					Name: g.name,
-					Address: g.
-				}*/
-
-		}
-	}
-
-	//cleanup client list every 2 seconds
-	if g.cycle%120 == 0 {
-		go g.CleanupClients()
-	}
 
 	g.cycle++
 	return nil
@@ -124,11 +111,22 @@ func (g *Game) Draw(screen *ebiten.Image) {
 
 	g.blocky.Draw()
 	g.hitblocky.Draw()
+	g.elimblocky.Draw()
+
+	vector.StrokeCircle(screen, float32(screenWidth)/2, float32(screenHeight)/2, stageRadius, 3, color.White, true)
 
 	op := &ebiten.DrawImageOptions{}
 	op.GeoM.Translate(-float64(g.blocky.Sprite.Bounds().Dx())/2, -float64(g.blocky.Sprite.Bounds().Dy())/2)
 	op.GeoM.Translate(g.blocky.GetPosition().X, g.blocky.GetPosition().Y)
-	screen.DrawImage(g.blocky.Sprite, op)
+	if !g.eliminated {
+		if !g.hit {
+			screen.DrawImage(g.blocky.Sprite, op)
+		} else {
+			screen.DrawImage(g.hitblocky.Sprite, op)
+		}
+	} else {
+		screen.DrawImage(g.elimblocky.Sprite, op)
+	}
 	f2 := &text.GoTextFace{
 		Source: fonts.LaunchyFont.New,
 		Size:   12,
@@ -138,16 +136,21 @@ func (g *Game) Draw(screen *ebiten.Image) {
 	text.Draw(screen, "you ("+g.name+")", f2, top)
 
 	g.mu.Lock()
-	clientcopy := maps.Clone(g.clients)
+	clientcopy := maps.Clone(g.realclients)
 	g.mu.Unlock()
 	for _, client := range clientcopy {
 		op := &ebiten.DrawImageOptions{}
 		op.GeoM.Translate(-float64(g.blocky.Sprite.Bounds().Dx())/2, -float64(g.blocky.Sprite.Bounds().Dy())/2)
 		op.GeoM.Translate(client.Position.X, client.Position.Y)
-		if !client.Hit {
+
-			screen.DrawImage(g.blocky.Sprite, op)
+		if client.Eliminated {
+			screen.DrawImage(g.elimblocky.Sprite, op)
 		} else {
-			screen.DrawImage(g.hitblocky.Sprite, op)
+			if !client.Hit {
+				screen.DrawImage(g.blocky.Sprite, op)
+			} else {
+				screen.DrawImage(g.hitblocky.Sprite, op)
+			}
 		}
 
 		f2 := &text.GoTextFace{
@@ -159,6 +162,12 @@ func (g *Game) Draw(screen *ebiten.Image) {
 		text.Draw(screen, client.Name, f2, top)
 	}
 
+	g.dino.Draw()
+	dop := &ebiten.DrawImageOptions{}
+	dop.GeoM.Translate(-float64(g.dino.Sprite.Bounds().Dx())/2, -float64(g.dino.Sprite.Bounds().Dy())/2)
+	dop.GeoM.Translate(g.blocky.GetPosition().X, g.blocky.GetPosition().Y)
+	screen.DrawImage(g.dino.Sprite, dop)
+
 }
 
 func (g *Game) Layout(outsideWidth, outsideHeight int) (screenwidth, screenheight int) {
@@ -181,25 +190,152 @@ func (g *Game) HandleServerData(envelope *pb.ServerEnvelope) {
 						X: client.Coordinates.X,
 						Y: client.Coordinates.Y,
 					},
-					Hit: client.Hit,
+					Hit:        client.Hit,
+					Eliminated: client.Eliminated,
 				}
 
 				g.mu.Lock()
-				g.clients[update.Address] = update
+				g.realclients[int(client.Id)] = update
 				g.mu.Unlock()
+			} else {
+				g.eliminated = client.Eliminated
+				g.hit = client.Hit
+				//this is us
+
+				//g.blocky.SetHit(client.Hit)
+
 			}
 		}
-
+	case *pb.ServerEnvelope_Event:
+		//add or remove client from client list
+		if payload.Event.Connected && payload.Event.Id != int32(g.gameId) {
+			realclient := ClientData{
+				Id: int(payload.Event.Id),
+			}
+			g.realclients[int(payload.Event.Id)] = realclient
+		} else {
+			delete(g.realclients, int(payload.Event.Id))
+		}
 	case *pb.ServerEnvelope_Identity:
-		fmt.Println("Server is trying to give us our id.")
+		fmt.Println("Server is trying to give us our id: ", payload.Identity.Id)
 		g.gameId = int(payload.Identity.Id)
+	case *pb.ServerEnvelope_Gameevent:
+		//fmt.Printf("someone slapping! target:%d, instigator:%d isSlap:%d", payload.Gameevent.Target, payload.Gameevent.Instigator, payload.Gameevent.Slap)
+
+		switch payload.Gameevent.Event.(type) {
+		case *pb.GameEvent_Slap:
+			if payload.Gameevent.Target == int32(g.gameId) {
+				g.mu.Lock()
+				dx := g.blocky.GetPosition().X - g.realclients[int(payload.Gameevent.Instigator)].Position.X
+				dy := g.blocky.GetPosition().Y - g.realclients[int(payload.Gameevent.Instigator)].Position.Y
+				g.mu.Unlock()
+
+				if dx != 0 {
+					dx = (dx / math.Abs(dx)) * 100
+				}
+				if dy != 0 {
+					dy = (dy / math.Abs(dy)) * 100
+				}
+				if dx == 0 && dy == 0 {
+					b := rand.Intn(2)
+					if b == 0 {
+						dx = 100
+						dy = 100
+					} else {
+						dx = -100
+						dy = -100
+					}
+				}
+
+				cpos := gamedata.Coordinates{}
+				cpos.X = g.blocky.GetPosition().X + dx
+				cpos.Y = g.blocky.GetPosition().Y + dy
+				g.blocky.SetTargetPosition(cpos)
+			}
+		case *pb.GameEvent_Eliminated:
+			fmt.Println("someone eliminated...", payload.Gameevent.Target)
+
+			/*
+				g.mu.Lock()
+				client := g.realclients[int(payload.Gameevent.Target)]
+				client.Eliminated = true
+				g.realclients[int(payload.Gameevent.Target)] = client
+				g.mu.Unlock()
+			*/
+		}
 	}
 }
 
-func (g *Game) CleanupClients() {
+func (g *Game) HandleInput() {
-	g.mu.Lock()
+
-	for k := range g.clients {
+	dx := 0
-		delete(g.clients, k)
+	dy := 0
+
+	if ebiten.IsKeyPressed(ebiten.KeyW) {
+		dy = -movementLimit
+	}
+	if ebiten.IsKeyPressed(ebiten.KeyS) {
+		dy = +movementLimit
+	}
+	if ebiten.IsKeyPressed(ebiten.KeyA) {
+		dx = -movementLimit
+		g.dino.SetLeft(true)
+	}
+	if ebiten.IsKeyPressed(ebiten.KeyD) {
+		dx = +movementLimit
+		g.dino.SetLeft(false)
+	}
+
+	if math.Abs(float64(dx)) > 0 || math.Abs(float64(dy)) > 0 {
+		g.dino.SetAction(gamedata.DinoActionWalk)
+	} else {
+		g.dino.SetAction(gamedata.DinoActionIdle)
+	}
+
+	cpos := g.blocky.GetPosition()
+	cpos.X += float64(dx)
+	cpos.Y += float64(dy)
+	g.blocky.SetTargetPosition(cpos)
+
+	if inpututil.IsKeyJustPressed(ebiten.KeySpace) {
+		g.SendSlap()
+		g.dino.SetAction(gamedata.DinoActionSlap)
+	}
+
+}
+
+func (g *Game) SendPosition() {
+	//broadcast our position
+	if g.gameclient.IsConnected() {
+		cd := &pb.ClientCoordinates{
+			Name: g.name,
+			Coordinates: &pb.Coordinates{
+				X: g.blocky.GetPosition().X, //g.position.X,
+				Y: g.blocky.GetPosition().Y, //g.position.Y,
+			},
+		}
+
+		envelope := &pb.ClientEnvelope{
+			Payload: &pb.ClientEnvelope_Coordinates{
+				Coordinates: cd,
+			},
+		}
+
+		g.gameclient.SendMessage(envelope)
+	}
+}
+
+func (g *Game) SendSlap() {
+	if g.gameclient.IsConnected() {
+		slap := &pb.SlapEvent{
+			Slap: true,
+		}
+		envelope := &pb.ClientEnvelope{
+			Payload: &pb.ClientEnvelope_Slap{
+				Slap: slap,
+			},
+		}
+
+		g.gameclient.SendMessage(envelope)
 	}
-	g.mu.Unlock()
 }

client/gamedata/gamedata.go

@@ -1,6 +1,33 @@
 package gamedata
 
+import "math"
+
+type DinoType int
+
+const (
+	DinoTypeGreen DinoType = iota
+	DinoTypeBlue
+	DinoTypeRed
+	DinoTypeYellow
+	DinoTypeMax
+)
+
+type DinoAction int
+
+const (
+	DinoActionIdle DinoAction = iota
+	DinoActionWalk
+	DinoActionSlap
+	DinoActionMax
+)
+
 type Coordinates struct {
 	X float64 `json:"X"`
 	Y float64 `json:"Y"`
 }
+
+func (c Coordinates) Distance(p Coordinates) float64 {
+	dx := p.X - c.X
+	dy := p.Y - c.Y
+	return math.Sqrt(dx*dx + dy*dy)
+}

client/pb/clientdata.pb.go

@@ -132,6 +132,7 @@ type ClientData struct {
 	Name        string       `protobuf:"bytes,3,opt,name=Name,proto3" json:"Name,omitempty"`
 	Coordinates *Coordinates `protobuf:"bytes,4,opt,name=coordinates,proto3" json:"coordinates,omitempty"`
 	Hit         bool         `protobuf:"varint,5,opt,name=hit,proto3" json:"hit,omitempty"`
+	Eliminated  bool         `protobuf:"varint,6,opt,name=Eliminated,proto3" json:"Eliminated,omitempty"`
 }
 
 func (x *ClientData) Reset() {
@@ -199,6 +200,13 @@ func (x *ClientData) GetHit() bool {
 	return false
 }
 
+func (x *ClientData) GetEliminated() bool {
+	if x != nil {
+		return x.Eliminated
+	}
+	return false
+}
+
 type ClientCoordinates struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -350,6 +358,7 @@ type ClientEnvelope struct {
 	// Types that are assignable to Payload:
 	//
 	//	*ClientEnvelope_Coordinates
+	//	*ClientEnvelope_Slap
 	Payload isClientEnvelope_Payload `protobuf_oneof:"Payload"`
 }
 
@@ -397,6 +406,13 @@ func (x *ClientEnvelope) GetCoordinates() *ClientCoordinates {
 	return nil
 }
 
+func (x *ClientEnvelope) GetSlap() *SlapEvent {
+	if x, ok := x.GetPayload().(*ClientEnvelope_Slap); ok {
+		return x.Slap
+	}
+	return nil
+}
+
 type isClientEnvelope_Payload interface {
 	isClientEnvelope_Payload()
 }
@@ -405,8 +421,207 @@ type ClientEnvelope_Coordinates struct {
 	Coordinates *ClientCoordinates `protobuf:"bytes,1,opt,name=coordinates,proto3,oneof"`
 }
 
+type ClientEnvelope_Slap struct {
+	Slap *SlapEvent `protobuf:"bytes,2,opt,name=slap,proto3,oneof"`
+}
+
 func (*ClientEnvelope_Coordinates) isClientEnvelope_Payload() {}
 
+func (*ClientEnvelope_Slap) isClientEnvelope_Payload() {}
+
+type SlapEvent struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Slap bool `protobuf:"varint,1,opt,name=Slap,proto3" json:"Slap,omitempty"`
+}
+
+func (x *SlapEvent) Reset() {
+	*x = SlapEvent{}
+	mi := &file_clientdata_proto_msgTypes[6]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *SlapEvent) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SlapEvent) ProtoMessage() {}
+
+func (x *SlapEvent) ProtoReflect() protoreflect.Message {
+	mi := &file_clientdata_proto_msgTypes[6]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SlapEvent.ProtoReflect.Descriptor instead.
+func (*SlapEvent) Descriptor() ([]byte, []int) {
+	return file_clientdata_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *SlapEvent) GetSlap() bool {
+	if x != nil {
+		return x.Slap
+	}
+	return false
+}
+
+type ClientEvent struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id        int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"`
+	Connected bool  `protobuf:"varint,2,opt,name=Connected,proto3" json:"Connected,omitempty"`
+}
+
+func (x *ClientEvent) Reset() {
+	*x = ClientEvent{}
+	mi := &file_clientdata_proto_msgTypes[7]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *ClientEvent) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ClientEvent) ProtoMessage() {}
+
+func (x *ClientEvent) ProtoReflect() protoreflect.Message {
+	mi := &file_clientdata_proto_msgTypes[7]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ClientEvent.ProtoReflect.Descriptor instead.
+func (*ClientEvent) Descriptor() ([]byte, []int) {
+	return file_clientdata_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *ClientEvent) GetId() int32 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *ClientEvent) GetConnected() bool {
+	if x != nil {
+		return x.Connected
+	}
+	return false
+}
+
+type GameEvent struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Instigator int32 `protobuf:"varint,1,opt,name=Instigator,proto3" json:"Instigator,omitempty"`
+	Target     int32 `protobuf:"varint,2,opt,name=Target,proto3" json:"Target,omitempty"`
+	// Types that are assignable to Event:
+	//
+	//	*GameEvent_Slap
+	//	*GameEvent_Eliminated
+	Event isGameEvent_Event `protobuf_oneof:"Event"`
+}
+
+func (x *GameEvent) Reset() {
+	*x = GameEvent{}
+	mi := &file_clientdata_proto_msgTypes[8]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *GameEvent) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GameEvent) ProtoMessage() {}
+
+func (x *GameEvent) ProtoReflect() protoreflect.Message {
+	mi := &file_clientdata_proto_msgTypes[8]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GameEvent.ProtoReflect.Descriptor instead.
+func (*GameEvent) Descriptor() ([]byte, []int) {
+	return file_clientdata_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *GameEvent) GetInstigator() int32 {
+	if x != nil {
+		return x.Instigator
+	}
+	return 0
+}
+
+func (x *GameEvent) GetTarget() int32 {
+	if x != nil {
+		return x.Target
+	}
+	return 0
+}
+
+func (m *GameEvent) GetEvent() isGameEvent_Event {
+	if m != nil {
+		return m.Event
+	}
+	return nil
+}
+
+func (x *GameEvent) GetSlap() bool {
+	if x, ok := x.GetEvent().(*GameEvent_Slap); ok {
+		return x.Slap
+	}
+	return false
+}
+
+func (x *GameEvent) GetEliminated() bool {
+	if x, ok := x.GetEvent().(*GameEvent_Eliminated); ok {
+		return x.Eliminated
+	}
+	return false
+}
+
+type isGameEvent_Event interface {
+	isGameEvent_Event()
+}
+
+type GameEvent_Slap struct {
+	Slap bool `protobuf:"varint,3,opt,name=Slap,proto3,oneof"`
+}
+
+type GameEvent_Eliminated struct {
+	Eliminated bool `protobuf:"varint,4,opt,name=Eliminated,proto3,oneof"`
+}
+
+func (*GameEvent_Slap) isGameEvent_Event() {}
+
+func (*GameEvent_Eliminated) isGameEvent_Event() {}
+
 type ServerEnvelope struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -416,12 +631,14 @@ type ServerEnvelope struct {
 	//
 	//	*ServerEnvelope_Identity
 	//	*ServerEnvelope_Broadcast
+	//	*ServerEnvelope_Event
+	//	*ServerEnvelope_Gameevent
 	Payload isServerEnvelope_Payload `protobuf_oneof:"Payload"`
 }
 
 func (x *ServerEnvelope) Reset() {
 	*x = ServerEnvelope{}
-	mi := &file_clientdata_proto_msgTypes[6]
+	mi := &file_clientdata_proto_msgTypes[9]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -433,7 +650,7 @@ func (x *ServerEnvelope) String() string {
 func (*ServerEnvelope) ProtoMessage() {}
 
 func (x *ServerEnvelope) ProtoReflect() protoreflect.Message {
-	mi := &file_clientdata_proto_msgTypes[6]
+	mi := &file_clientdata_proto_msgTypes[9]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -446,7 +663,7 @@ func (x *ServerEnvelope) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ServerEnvelope.ProtoReflect.Descriptor instead.
 func (*ServerEnvelope) Descriptor() ([]byte, []int) {
-	return file_clientdata_proto_rawDescGZIP(), []int{6}
+	return file_clientdata_proto_rawDescGZIP(), []int{9}
 }
 
 func (m *ServerEnvelope) GetPayload() isServerEnvelope_Payload {
@@ -470,6 +687,20 @@ func (x *ServerEnvelope) GetBroadcast() *AllClients {
 	return nil
 }
 
+func (x *ServerEnvelope) GetEvent() *ClientEvent {
+	if x, ok := x.GetPayload().(*ServerEnvelope_Event); ok {
+		return x.Event
+	}
+	return nil
+}
+
+func (x *ServerEnvelope) GetGameevent() *GameEvent {
+	if x, ok := x.GetPayload().(*ServerEnvelope_Gameevent); ok {
+		return x.Gameevent
+	}
+	return nil
+}
+
 type isServerEnvelope_Payload interface {
 	isServerEnvelope_Payload()
 }
@@ -482,10 +713,22 @@ type ServerEnvelope_Broadcast struct {
 	Broadcast *AllClients `protobuf:"bytes,2,opt,name=broadcast,proto3,oneof"`
 }
 
+type ServerEnvelope_Event struct {
+	Event *ClientEvent `protobuf:"bytes,3,opt,name=event,proto3,oneof"`
+}
+
+type ServerEnvelope_Gameevent struct {
+	Gameevent *GameEvent `protobuf:"bytes,4,opt,name=gameevent,proto3,oneof"`
+}
+
 func (*ServerEnvelope_Identity) isServerEnvelope_Payload() {}
 
 func (*ServerEnvelope_Broadcast) isServerEnvelope_Payload() {}
 
+func (*ServerEnvelope_Event) isServerEnvelope_Payload() {}
+
+func (*ServerEnvelope_Gameevent) isServerEnvelope_Payload() {}
+
 var File_clientdata_proto protoreflect.FileDescriptor
 
 var file_clientdata_proto_rawDesc = []byte{
@@ -493,7 +736,7 @@ var file_clientdata_proto_rawDesc = []byte{
 	0x74, 0x6f, 0x12, 0x04, 0x6d, 0x61, 0x69, 0x6e, 0x22, 0x29, 0x0a, 0x0b, 0x43, 0x6f, 0x6f, 0x72,
 	0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x12, 0x0c, 0x0a, 0x01, 0x58, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x01, 0x52, 0x01, 0x58, 0x12, 0x0c, 0x0a, 0x01, 0x59, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01,
-	0x52, 0x01, 0x59, 0x22, 0x91, 0x01, 0x0a, 0x0a, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x44, 0x61,
+	0x52, 0x01, 0x59, 0x22, 0xb1, 0x01, 0x0a, 0x0a, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x44, 0x61,
 	0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
 	0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04,
@@ -502,7 +745,9 @@ var file_clientdata_proto_rawDesc = []byte{
 	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x43, 0x6f, 0x6f,
 	0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x52, 0x0b, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x69,
 	0x6e, 0x61, 0x74, 0x65, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x74, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x03, 0x68, 0x69, 0x74, 0x22, 0x5c, 0x0a, 0x11, 0x43, 0x6c, 0x69, 0x65, 0x6e,
+	0x28, 0x08, 0x52, 0x03, 0x68, 0x69, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x45, 0x6c, 0x69, 0x6d, 0x69,
+	0x6e, 0x61, 0x74, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x45, 0x6c, 0x69,
+	0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x64, 0x22, 0x5c, 0x0a, 0x11, 0x43, 0x6c, 0x69, 0x65, 0x6e,
 	0x74, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04,
 	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65,
 	0x12, 0x33, 0x0a, 0x0b, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x18,
@@ -514,27 +759,49 @@ var file_clientdata_proto_rawDesc = []byte{
 	0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x22,
 	0x20, 0x0a, 0x0e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74,
 	0x79, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49,
-	0x64, 0x22, 0x58, 0x0a, 0x0e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x76, 0x65, 0x6c,
+	0x64, 0x22, 0x7f, 0x0a, 0x0e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x76, 0x65, 0x6c,
 	0x6f, 0x70, 0x65, 0x12, 0x3b, 0x0a, 0x0b, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74,
 	0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e,
 	0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x65,
 	0x73, 0x48, 0x00, 0x52, 0x0b, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x73,
-	0x42, 0x09, 0x0a, 0x07, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x81, 0x01, 0x0a, 0x0e,
+	0x12, 0x25, 0x0a, 0x04, 0x73, 0x6c, 0x61, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f,
-	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x12, 0x32,
+	0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x53, 0x6c, 0x61, 0x70, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x48,
-	0x0a, 0x08, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x00, 0x52, 0x04, 0x73, 0x6c, 0x61, 0x70, 0x42, 0x09, 0x0a, 0x07, 0x50, 0x61, 0x79, 0x6c, 0x6f,
-	0x32, 0x14, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64,
+	0x61, 0x64, 0x22, 0x1f, 0x0a, 0x09, 0x53, 0x6c, 0x61, 0x70, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12,
-	0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x48, 0x00, 0x52, 0x08, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69,
+	0x12, 0x0a, 0x04, 0x53, 0x6c, 0x61, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x53,
-	0x74, 0x79, 0x12, 0x30, 0x0a, 0x09, 0x62, 0x72, 0x6f, 0x61, 0x64, 0x63, 0x61, 0x73, 0x74, 0x18,
+	0x6c, 0x61, 0x70, 0x22, 0x3b, 0x0a, 0x0b, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x45, 0x76, 0x65,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x41, 0x6c, 0x6c,
+	0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
-	0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x48, 0x00, 0x52, 0x09, 0x62, 0x72, 0x6f, 0x61, 0x64,
+	0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x18,
-	0x63, 0x61, 0x73, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x2a,
+	0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64,
-	0x56, 0x0a, 0x0b, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16,
+	0x22, 0x84, 0x01, 0x0a, 0x09, 0x47, 0x61, 0x6d, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1e,
-	0x0a, 0x12, 0x4d, 0x53, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x42, 0x52, 0x4f, 0x41, 0x44,
+	0x0a, 0x0a, 0x49, 0x6e, 0x73, 0x74, 0x69, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01,
-	0x43, 0x41, 0x53, 0x54, 0x10, 0x00, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x53, 0x47, 0x5f, 0x54, 0x59,
+	0x28, 0x05, 0x52, 0x0a, 0x49, 0x6e, 0x73, 0x74, 0x69, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x16,
-	0x50, 0x45, 0x5f, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x49, 0x54, 0x59, 0x10, 0x01, 0x12, 0x18, 0x0a,
+	0x0a, 0x06, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
-	0x14, 0x4d, 0x53, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x4f, 0x4f, 0x52, 0x44, 0x49,
+	0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x14, 0x0a, 0x04, 0x53, 0x6c, 0x61, 0x70, 0x18, 0x03,
-	0x4e, 0x41, 0x54, 0x45, 0x53, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62,
+	0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x04, 0x53, 0x6c, 0x61, 0x70, 0x12, 0x20, 0x0a, 0x0a,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x45, 0x6c, 0x69, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08,
+	0x48, 0x00, 0x52, 0x0a, 0x45, 0x6c, 0x69, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x64, 0x42, 0x07,
+	0x0a, 0x05, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x22, 0xdd, 0x01, 0x0a, 0x0e, 0x53, 0x65, 0x72, 0x76,
+	0x65, 0x72, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x69, 0x64,
+	0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d,
+	0x61, 0x69, 0x6e, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69,
+	0x74, 0x79, 0x48, 0x00, 0x52, 0x08, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x30,
+	0x0a, 0x09, 0x62, 0x72, 0x6f, 0x61, 0x64, 0x63, 0x61, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x10, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x41, 0x6c, 0x6c, 0x43, 0x6c, 0x69, 0x65,
+	0x6e, 0x74, 0x73, 0x48, 0x00, 0x52, 0x09, 0x62, 0x72, 0x6f, 0x61, 0x64, 0x63, 0x61, 0x73, 0x74,
+	0x12, 0x29, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x11, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x45, 0x76, 0x65,
+	0x6e, 0x74, 0x48, 0x00, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2f, 0x0a, 0x09, 0x67,
+	0x61, 0x6d, 0x65, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f,
+	0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x47, 0x61, 0x6d, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x48,
+	0x00, 0x52, 0x09, 0x67, 0x61, 0x6d, 0x65, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x09, 0x0a, 0x07,
+	0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x2a, 0x56, 0x0a, 0x0b, 0x4d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x12, 0x4d, 0x53, 0x47, 0x5f, 0x54, 0x59,
+	0x50, 0x45, 0x5f, 0x42, 0x52, 0x4f, 0x41, 0x44, 0x43, 0x41, 0x53, 0x54, 0x10, 0x00, 0x12, 0x15,
+	0x0a, 0x11, 0x4d, 0x53, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x44, 0x45, 0x4e, 0x54,
+	0x49, 0x54, 0x59, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x4d, 0x53, 0x47, 0x5f, 0x54, 0x59, 0x50,
+	0x45, 0x5f, 0x43, 0x4f, 0x4f, 0x52, 0x44, 0x49, 0x4e, 0x41, 0x54, 0x45, 0x53, 0x10, 0x02, 0x42,
+	0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -550,7 +817,7 @@ func file_clientdata_proto_rawDescGZIP() []byte {
 }
 
 var file_clientdata_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_clientdata_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_clientdata_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
 var file_clientdata_proto_goTypes = []any{
 	(MessageType)(0),          // 0: main.MessageType
 	(*Coordinates)(nil),       // 1: main.Coordinates
@@ -559,20 +826,26 @@ var file_clientdata_proto_goTypes = []any{
 	(*AllClients)(nil),        // 4: main.AllClients
 	(*ClientIdentity)(nil),    // 5: main.ClientIdentity
 	(*ClientEnvelope)(nil),    // 6: main.ClientEnvelope
-	(*ServerEnvelope)(nil),    // 7: main.ServerEnvelope
+	(*SlapEvent)(nil),         // 7: main.SlapEvent
+	(*ClientEvent)(nil),       // 8: main.ClientEvent
+	(*GameEvent)(nil),         // 9: main.GameEvent
+	(*ServerEnvelope)(nil),    // 10: main.ServerEnvelope
 }
 var file_clientdata_proto_depIdxs = []int32{
 	1, // 0: main.ClientData.coordinates:type_name -> main.Coordinates
 	1, // 1: main.ClientCoordinates.coordinates:type_name -> main.Coordinates
 	2, // 2: main.AllClients.Clients:type_name -> main.ClientData
 	3, // 3: main.ClientEnvelope.coordinates:type_name -> main.ClientCoordinates
-	5, // 4: main.ServerEnvelope.identity:type_name -> main.ClientIdentity
+	7, // 4: main.ClientEnvelope.slap:type_name -> main.SlapEvent
-	4, // 5: main.ServerEnvelope.broadcast:type_name -> main.AllClients
+	5, // 5: main.ServerEnvelope.identity:type_name -> main.ClientIdentity
-	6, // [6:6] is the sub-list for method output_type
+	4, // 6: main.ServerEnvelope.broadcast:type_name -> main.AllClients
-	6, // [6:6] is the sub-list for method input_type
+	8, // 7: main.ServerEnvelope.event:type_name -> main.ClientEvent
-	6, // [6:6] is the sub-list for extension type_name
+	9, // 8: main.ServerEnvelope.gameevent:type_name -> main.GameEvent
-	6, // [6:6] is the sub-list for extension extendee
+	9, // [9:9] is the sub-list for method output_type
-	0, // [0:6] is the sub-list for field type_name
+	9, // [9:9] is the sub-list for method input_type
+	9, // [9:9] is the sub-list for extension type_name
+	9, // [9:9] is the sub-list for extension extendee
+	0, // [0:9] is the sub-list for field type_name
 }
 
 func init() { file_clientdata_proto_init() }
@@ -582,10 +855,17 @@ func file_clientdata_proto_init() {
 	}
 	file_clientdata_proto_msgTypes[5].OneofWrappers = []any{
 		(*ClientEnvelope_Coordinates)(nil),
+		(*ClientEnvelope_Slap)(nil),
 	}
-	file_clientdata_proto_msgTypes[6].OneofWrappers = []any{
+	file_clientdata_proto_msgTypes[8].OneofWrappers = []any{
+		(*GameEvent_Slap)(nil),
+		(*GameEvent_Eliminated)(nil),
+	}
+	file_clientdata_proto_msgTypes[9].OneofWrappers = []any{
 		(*ServerEnvelope_Identity)(nil),
 		(*ServerEnvelope_Broadcast)(nil),
+		(*ServerEnvelope_Event)(nil),
+		(*ServerEnvelope_Gameevent)(nil),
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -593,7 +873,7 @@ func file_clientdata_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_clientdata_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   7,
+			NumMessages:   10,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

server/clientdata.proto

@@ -14,6 +14,7 @@ message ClientData {
     string Address = 2;
     string Name = 3;
     Coordinates coordinates = 4;
+    bool hit = 5;
 }
 
 message ClientCoordinates {
@@ -28,3 +29,41 @@ message AllClients{
 message ClientIdentity{
     int32 Id = 1;
 }
+
+message ClientEnvelope {
+    oneof Payload {
+        ClientCoordinates coordinates = 1;
+        SlapEvent slap = 2;
+    }
+}
+
+message SlapEvent {
+    bool Slap = 1;
+}
+
+message ClientEvent {
+    int32 Id = 1;
+    bool Connected = 2;
+}
+
+message GameEvent {
+    int32 Instigator = 1;
+    int32 Target = 2;
+    bool Slap = 3;
+}
+
+message ServerEnvelope {
+    oneof Payload {
+        ClientIdentity identity = 1;
+        AllClients broadcast = 2;
+        ClientEvent event = 3;
+        GameEvent gameevent = 4;
+    }
+}
+
+enum MessageType {
+    MSG_TYPE_BROADCAST = 0;
+    MSG_TYPE_IDENTITY = 1;
+    MSG_TYPE_COORDINATES = 2;
+}
+

server/gamedata/gamedata.go

@@ -1,6 +1,14 @@
 package gamedata
 
+import "math"
+
 type Coordinates struct {
 	X float64
 	Y float64
 }
+
+func (c Coordinates) Distance(p Coordinates) float64 {
+	dx := p.X - c.X
+	dy := p.Y - c.Y
+	return math.Sqrt(dx*dx + dy*dy)
+}

server/pb/clientdata.pb.go

@@ -132,6 +132,7 @@ type ClientData struct {
 	Name        string       `protobuf:"bytes,3,opt,name=Name,proto3" json:"Name,omitempty"`
 	Coordinates *Coordinates `protobuf:"bytes,4,opt,name=coordinates,proto3" json:"coordinates,omitempty"`
 	Hit         bool         `protobuf:"varint,5,opt,name=hit,proto3" json:"hit,omitempty"`
+	Eliminated  bool         `protobuf:"varint,6,opt,name=Eliminated,proto3" json:"Eliminated,omitempty"`
 }
 
 func (x *ClientData) Reset() {
@@ -199,6 +200,13 @@ func (x *ClientData) GetHit() bool {
 	return false
 }
 
+func (x *ClientData) GetEliminated() bool {
+	if x != nil {
+		return x.Eliminated
+	}
+	return false
+}
+
 type ClientCoordinates struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -350,6 +358,7 @@ type ClientEnvelope struct {
 	// Types that are assignable to Payload:
 	//
 	//	*ClientEnvelope_Coordinates
+	//	*ClientEnvelope_Slap
 	Payload isClientEnvelope_Payload `protobuf_oneof:"Payload"`
 }
 
@@ -397,6 +406,13 @@ func (x *ClientEnvelope) GetCoordinates() *ClientCoordinates {
 	return nil
 }
 
+func (x *ClientEnvelope) GetSlap() *SlapEvent {
+	if x, ok := x.GetPayload().(*ClientEnvelope_Slap); ok {
+		return x.Slap
+	}
+	return nil
+}
+
 type isClientEnvelope_Payload interface {
 	isClientEnvelope_Payload()
 }
@@ -405,8 +421,207 @@ type ClientEnvelope_Coordinates struct {
 	Coordinates *ClientCoordinates `protobuf:"bytes,1,opt,name=coordinates,proto3,oneof"`
 }
 
+type ClientEnvelope_Slap struct {
+	Slap *SlapEvent `protobuf:"bytes,2,opt,name=slap,proto3,oneof"`
+}
+
 func (*ClientEnvelope_Coordinates) isClientEnvelope_Payload() {}
 
+func (*ClientEnvelope_Slap) isClientEnvelope_Payload() {}
+
+type SlapEvent struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Slap bool `protobuf:"varint,1,opt,name=Slap,proto3" json:"Slap,omitempty"`
+}
+
+func (x *SlapEvent) Reset() {
+	*x = SlapEvent{}
+	mi := &file_clientdata_proto_msgTypes[6]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *SlapEvent) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SlapEvent) ProtoMessage() {}
+
+func (x *SlapEvent) ProtoReflect() protoreflect.Message {
+	mi := &file_clientdata_proto_msgTypes[6]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SlapEvent.ProtoReflect.Descriptor instead.
+func (*SlapEvent) Descriptor() ([]byte, []int) {
+	return file_clientdata_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *SlapEvent) GetSlap() bool {
+	if x != nil {
+		return x.Slap
+	}
+	return false
+}
+
+type ClientEvent struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id        int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"`
+	Connected bool  `protobuf:"varint,2,opt,name=Connected,proto3" json:"Connected,omitempty"`
+}
+
+func (x *ClientEvent) Reset() {
+	*x = ClientEvent{}
+	mi := &file_clientdata_proto_msgTypes[7]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *ClientEvent) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ClientEvent) ProtoMessage() {}
+
+func (x *ClientEvent) ProtoReflect() protoreflect.Message {
+	mi := &file_clientdata_proto_msgTypes[7]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ClientEvent.ProtoReflect.Descriptor instead.
+func (*ClientEvent) Descriptor() ([]byte, []int) {
+	return file_clientdata_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *ClientEvent) GetId() int32 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *ClientEvent) GetConnected() bool {
+	if x != nil {
+		return x.Connected
+	}
+	return false
+}
+
+type GameEvent struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Instigator int32 `protobuf:"varint,1,opt,name=Instigator,proto3" json:"Instigator,omitempty"`
+	Target     int32 `protobuf:"varint,2,opt,name=Target,proto3" json:"Target,omitempty"`
+	// Types that are assignable to Event:
+	//
+	//	*GameEvent_Slap
+	//	*GameEvent_Eliminated
+	Event isGameEvent_Event `protobuf_oneof:"Event"`
+}
+
+func (x *GameEvent) Reset() {
+	*x = GameEvent{}
+	mi := &file_clientdata_proto_msgTypes[8]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *GameEvent) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GameEvent) ProtoMessage() {}
+
+func (x *GameEvent) ProtoReflect() protoreflect.Message {
+	mi := &file_clientdata_proto_msgTypes[8]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GameEvent.ProtoReflect.Descriptor instead.
+func (*GameEvent) Descriptor() ([]byte, []int) {
+	return file_clientdata_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *GameEvent) GetInstigator() int32 {
+	if x != nil {
+		return x.Instigator
+	}
+	return 0
+}
+
+func (x *GameEvent) GetTarget() int32 {
+	if x != nil {
+		return x.Target
+	}
+	return 0
+}
+
+func (m *GameEvent) GetEvent() isGameEvent_Event {
+	if m != nil {
+		return m.Event
+	}
+	return nil
+}
+
+func (x *GameEvent) GetSlap() bool {
+	if x, ok := x.GetEvent().(*GameEvent_Slap); ok {
+		return x.Slap
+	}
+	return false
+}
+
+func (x *GameEvent) GetEliminated() bool {
+	if x, ok := x.GetEvent().(*GameEvent_Eliminated); ok {
+		return x.Eliminated
+	}
+	return false
+}
+
+type isGameEvent_Event interface {
+	isGameEvent_Event()
+}
+
+type GameEvent_Slap struct {
+	Slap bool `protobuf:"varint,3,opt,name=Slap,proto3,oneof"`
+}
+
+type GameEvent_Eliminated struct {
+	Eliminated bool `protobuf:"varint,4,opt,name=Eliminated,proto3,oneof"`
+}
+
+func (*GameEvent_Slap) isGameEvent_Event() {}
+
+func (*GameEvent_Eliminated) isGameEvent_Event() {}
+
 type ServerEnvelope struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -416,12 +631,14 @@ type ServerEnvelope struct {
 	//
 	//	*ServerEnvelope_Identity
 	//	*ServerEnvelope_Broadcast
+	//	*ServerEnvelope_Event
+	//	*ServerEnvelope_Gameevent
 	Payload isServerEnvelope_Payload `protobuf_oneof:"Payload"`
 }
 
 func (x *ServerEnvelope) Reset() {
 	*x = ServerEnvelope{}
-	mi := &file_clientdata_proto_msgTypes[6]
+	mi := &file_clientdata_proto_msgTypes[9]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -433,7 +650,7 @@ func (x *ServerEnvelope) String() string {
 func (*ServerEnvelope) ProtoMessage() {}
 
 func (x *ServerEnvelope) ProtoReflect() protoreflect.Message {
-	mi := &file_clientdata_proto_msgTypes[6]
+	mi := &file_clientdata_proto_msgTypes[9]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -446,7 +663,7 @@ func (x *ServerEnvelope) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ServerEnvelope.ProtoReflect.Descriptor instead.
 func (*ServerEnvelope) Descriptor() ([]byte, []int) {
-	return file_clientdata_proto_rawDescGZIP(), []int{6}
+	return file_clientdata_proto_rawDescGZIP(), []int{9}
 }
 
 func (m *ServerEnvelope) GetPayload() isServerEnvelope_Payload {
@@ -470,6 +687,20 @@ func (x *ServerEnvelope) GetBroadcast() *AllClients {
 	return nil
 }
 
+func (x *ServerEnvelope) GetEvent() *ClientEvent {
+	if x, ok := x.GetPayload().(*ServerEnvelope_Event); ok {
+		return x.Event
+	}
+	return nil
+}
+
+func (x *ServerEnvelope) GetGameevent() *GameEvent {
+	if x, ok := x.GetPayload().(*ServerEnvelope_Gameevent); ok {
+		return x.Gameevent
+	}
+	return nil
+}
+
 type isServerEnvelope_Payload interface {
 	isServerEnvelope_Payload()
 }
@@ -482,10 +713,22 @@ type ServerEnvelope_Broadcast struct {
 	Broadcast *AllClients `protobuf:"bytes,2,opt,name=broadcast,proto3,oneof"`
 }
 
+type ServerEnvelope_Event struct {
+	Event *ClientEvent `protobuf:"bytes,3,opt,name=event,proto3,oneof"`
+}
+
+type ServerEnvelope_Gameevent struct {
+	Gameevent *GameEvent `protobuf:"bytes,4,opt,name=gameevent,proto3,oneof"`
+}
+
 func (*ServerEnvelope_Identity) isServerEnvelope_Payload() {}
 
 func (*ServerEnvelope_Broadcast) isServerEnvelope_Payload() {}
 
+func (*ServerEnvelope_Event) isServerEnvelope_Payload() {}
+
+func (*ServerEnvelope_Gameevent) isServerEnvelope_Payload() {}
+
 var File_clientdata_proto protoreflect.FileDescriptor
 
 var file_clientdata_proto_rawDesc = []byte{
@@ -493,7 +736,7 @@ var file_clientdata_proto_rawDesc = []byte{
 	0x74, 0x6f, 0x12, 0x04, 0x6d, 0x61, 0x69, 0x6e, 0x22, 0x29, 0x0a, 0x0b, 0x43, 0x6f, 0x6f, 0x72,
 	0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x12, 0x0c, 0x0a, 0x01, 0x58, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x01, 0x52, 0x01, 0x58, 0x12, 0x0c, 0x0a, 0x01, 0x59, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01,
-	0x52, 0x01, 0x59, 0x22, 0x91, 0x01, 0x0a, 0x0a, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x44, 0x61,
+	0x52, 0x01, 0x59, 0x22, 0xb1, 0x01, 0x0a, 0x0a, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x44, 0x61,
 	0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
 	0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04,
@@ -502,7 +745,9 @@ var file_clientdata_proto_rawDesc = []byte{
 	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x43, 0x6f, 0x6f,
 	0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x52, 0x0b, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x69,
 	0x6e, 0x61, 0x74, 0x65, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x74, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x03, 0x68, 0x69, 0x74, 0x22, 0x5c, 0x0a, 0x11, 0x43, 0x6c, 0x69, 0x65, 0x6e,
+	0x28, 0x08, 0x52, 0x03, 0x68, 0x69, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x45, 0x6c, 0x69, 0x6d, 0x69,
+	0x6e, 0x61, 0x74, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x45, 0x6c, 0x69,
+	0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x64, 0x22, 0x5c, 0x0a, 0x11, 0x43, 0x6c, 0x69, 0x65, 0x6e,
 	0x74, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04,
 	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65,
 	0x12, 0x33, 0x0a, 0x0b, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x18,
@@ -514,27 +759,49 @@ var file_clientdata_proto_rawDesc = []byte{
 	0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x22,
 	0x20, 0x0a, 0x0e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74,
 	0x79, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49,
-	0x64, 0x22, 0x58, 0x0a, 0x0e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x76, 0x65, 0x6c,
+	0x64, 0x22, 0x7f, 0x0a, 0x0e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x76, 0x65, 0x6c,
 	0x6f, 0x70, 0x65, 0x12, 0x3b, 0x0a, 0x0b, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74,
 	0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e,
 	0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x65,
 	0x73, 0x48, 0x00, 0x52, 0x0b, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x73,
-	0x42, 0x09, 0x0a, 0x07, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x81, 0x01, 0x0a, 0x0e,
+	0x12, 0x25, 0x0a, 0x04, 0x73, 0x6c, 0x61, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f,
-	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x12, 0x32,
+	0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x53, 0x6c, 0x61, 0x70, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x48,
-	0x0a, 0x08, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x00, 0x52, 0x04, 0x73, 0x6c, 0x61, 0x70, 0x42, 0x09, 0x0a, 0x07, 0x50, 0x61, 0x79, 0x6c, 0x6f,
-	0x32, 0x14, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64,
+	0x61, 0x64, 0x22, 0x1f, 0x0a, 0x09, 0x53, 0x6c, 0x61, 0x70, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12,
-	0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x48, 0x00, 0x52, 0x08, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69,
+	0x12, 0x0a, 0x04, 0x53, 0x6c, 0x61, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x53,
-	0x74, 0x79, 0x12, 0x30, 0x0a, 0x09, 0x62, 0x72, 0x6f, 0x61, 0x64, 0x63, 0x61, 0x73, 0x74, 0x18,
+	0x6c, 0x61, 0x70, 0x22, 0x3b, 0x0a, 0x0b, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x45, 0x76, 0x65,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x41, 0x6c, 0x6c,
+	0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
-	0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x48, 0x00, 0x52, 0x09, 0x62, 0x72, 0x6f, 0x61, 0x64,
+	0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x18,
-	0x63, 0x61, 0x73, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x2a,
+	0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64,
-	0x56, 0x0a, 0x0b, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16,
+	0x22, 0x84, 0x01, 0x0a, 0x09, 0x47, 0x61, 0x6d, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1e,
-	0x0a, 0x12, 0x4d, 0x53, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x42, 0x52, 0x4f, 0x41, 0x44,
+	0x0a, 0x0a, 0x49, 0x6e, 0x73, 0x74, 0x69, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01,
-	0x43, 0x41, 0x53, 0x54, 0x10, 0x00, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x53, 0x47, 0x5f, 0x54, 0x59,
+	0x28, 0x05, 0x52, 0x0a, 0x49, 0x6e, 0x73, 0x74, 0x69, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x16,
-	0x50, 0x45, 0x5f, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x49, 0x54, 0x59, 0x10, 0x01, 0x12, 0x18, 0x0a,
+	0x0a, 0x06, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
-	0x14, 0x4d, 0x53, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x4f, 0x4f, 0x52, 0x44, 0x49,
+	0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x14, 0x0a, 0x04, 0x53, 0x6c, 0x61, 0x70, 0x18, 0x03,
-	0x4e, 0x41, 0x54, 0x45, 0x53, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62,
+	0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x04, 0x53, 0x6c, 0x61, 0x70, 0x12, 0x20, 0x0a, 0x0a,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x45, 0x6c, 0x69, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08,
+	0x48, 0x00, 0x52, 0x0a, 0x45, 0x6c, 0x69, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x64, 0x42, 0x07,
+	0x0a, 0x05, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x22, 0xdd, 0x01, 0x0a, 0x0e, 0x53, 0x65, 0x72, 0x76,
+	0x65, 0x72, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x69, 0x64,
+	0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d,
+	0x61, 0x69, 0x6e, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69,
+	0x74, 0x79, 0x48, 0x00, 0x52, 0x08, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x30,
+	0x0a, 0x09, 0x62, 0x72, 0x6f, 0x61, 0x64, 0x63, 0x61, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x10, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x41, 0x6c, 0x6c, 0x43, 0x6c, 0x69, 0x65,
+	0x6e, 0x74, 0x73, 0x48, 0x00, 0x52, 0x09, 0x62, 0x72, 0x6f, 0x61, 0x64, 0x63, 0x61, 0x73, 0x74,
+	0x12, 0x29, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x11, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x45, 0x76, 0x65,
+	0x6e, 0x74, 0x48, 0x00, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2f, 0x0a, 0x09, 0x67,
+	0x61, 0x6d, 0x65, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f,
+	0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x47, 0x61, 0x6d, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x48,
+	0x00, 0x52, 0x09, 0x67, 0x61, 0x6d, 0x65, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x09, 0x0a, 0x07,
+	0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x2a, 0x56, 0x0a, 0x0b, 0x4d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x12, 0x4d, 0x53, 0x47, 0x5f, 0x54, 0x59,
+	0x50, 0x45, 0x5f, 0x42, 0x52, 0x4f, 0x41, 0x44, 0x43, 0x41, 0x53, 0x54, 0x10, 0x00, 0x12, 0x15,
+	0x0a, 0x11, 0x4d, 0x53, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x44, 0x45, 0x4e, 0x54,
+	0x49, 0x54, 0x59, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x4d, 0x53, 0x47, 0x5f, 0x54, 0x59, 0x50,
+	0x45, 0x5f, 0x43, 0x4f, 0x4f, 0x52, 0x44, 0x49, 0x4e, 0x41, 0x54, 0x45, 0x53, 0x10, 0x02, 0x42,
+	0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -550,7 +817,7 @@ func file_clientdata_proto_rawDescGZIP() []byte {
 }
 
 var file_clientdata_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_clientdata_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_clientdata_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
 var file_clientdata_proto_goTypes = []any{
 	(MessageType)(0),          // 0: main.MessageType
 	(*Coordinates)(nil),       // 1: main.Coordinates
@@ -559,20 +826,26 @@ var file_clientdata_proto_goTypes = []any{
 	(*AllClients)(nil),        // 4: main.AllClients
 	(*ClientIdentity)(nil),    // 5: main.ClientIdentity
 	(*ClientEnvelope)(nil),    // 6: main.ClientEnvelope
-	(*ServerEnvelope)(nil),    // 7: main.ServerEnvelope
+	(*SlapEvent)(nil),         // 7: main.SlapEvent
+	(*ClientEvent)(nil),       // 8: main.ClientEvent
+	(*GameEvent)(nil),         // 9: main.GameEvent
+	(*ServerEnvelope)(nil),    // 10: main.ServerEnvelope
 }
 var file_clientdata_proto_depIdxs = []int32{
 	1, // 0: main.ClientData.coordinates:type_name -> main.Coordinates
 	1, // 1: main.ClientCoordinates.coordinates:type_name -> main.Coordinates
 	2, // 2: main.AllClients.Clients:type_name -> main.ClientData
 	3, // 3: main.ClientEnvelope.coordinates:type_name -> main.ClientCoordinates
-	5, // 4: main.ServerEnvelope.identity:type_name -> main.ClientIdentity
+	7, // 4: main.ClientEnvelope.slap:type_name -> main.SlapEvent
-	4, // 5: main.ServerEnvelope.broadcast:type_name -> main.AllClients
+	5, // 5: main.ServerEnvelope.identity:type_name -> main.ClientIdentity
-	6, // [6:6] is the sub-list for method output_type
+	4, // 6: main.ServerEnvelope.broadcast:type_name -> main.AllClients
-	6, // [6:6] is the sub-list for method input_type
+	8, // 7: main.ServerEnvelope.event:type_name -> main.ClientEvent
-	6, // [6:6] is the sub-list for extension type_name
+	9, // 8: main.ServerEnvelope.gameevent:type_name -> main.GameEvent
-	6, // [6:6] is the sub-list for extension extendee
+	9, // [9:9] is the sub-list for method output_type
-	0, // [0:6] is the sub-list for field type_name
+	9, // [9:9] is the sub-list for method input_type
+	9, // [9:9] is the sub-list for extension type_name
+	9, // [9:9] is the sub-list for extension extendee
+	0, // [0:9] is the sub-list for field type_name
 }
 
 func init() { file_clientdata_proto_init() }
@@ -582,10 +855,17 @@ func file_clientdata_proto_init() {
 	}
 	file_clientdata_proto_msgTypes[5].OneofWrappers = []any{
 		(*ClientEnvelope_Coordinates)(nil),
+		(*ClientEnvelope_Slap)(nil),
 	}
-	file_clientdata_proto_msgTypes[6].OneofWrappers = []any{
+	file_clientdata_proto_msgTypes[8].OneofWrappers = []any{
+		(*GameEvent_Slap)(nil),
+		(*GameEvent_Eliminated)(nil),
+	}
+	file_clientdata_proto_msgTypes[9].OneofWrappers = []any{
 		(*ServerEnvelope_Identity)(nil),
 		(*ServerEnvelope_Broadcast)(nil),
+		(*ServerEnvelope_Event)(nil),
+		(*ServerEnvelope_Gameevent)(nil),
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -593,7 +873,7 @@ func file_clientdata_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_clientdata_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   7,
+			NumMessages:   10,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

server/server/server.go

@@ -16,15 +16,21 @@ import (
 )
 
 const (
-	boxwidth = 20
+	boxwidth    = 20
+	boxheight   = 20
+	checkRadius = 200
 )
 
 type ClientData struct {
-	Id       int
+	Id         int
-	Address  string
+	Address    string
-	Name     string
+	Name       string
-	Position gamedata.Coordinates
+	Position   gamedata.Coordinates
-	Hit      bool
+	Hit        bool
+	Target     int
+	Targets    []int
+	Slapping   bool
+	Eliminated bool
 }
 
 type Server struct {
@@ -75,11 +81,13 @@ func (s *Server) HandleClient(conn net.Conn, id int) {
 		s.mu.Lock()
 		delete(s.clientlist, conn)
 		s.mu.Unlock()
+		s.SendClientEvent(conn, id, false)
 		conn.Close()
 	}()
 
 	//before we add the client to the clientlist, let's send them their unique id first
 	s.SendClientIdentity(conn, id)
+	s.SendClientEvent(conn, id, true)
 
 	for {
 		// Read data from the client
@@ -120,26 +128,69 @@ func (s *Server) HandleClient(conn net.Conn, id int) {
 				Address:  conn.RemoteAddr().String(),
 				Name:     payload.Coordinates.Name,
 				Position: gamedata.Coordinates{X: payload.Coordinates.Coordinates.X, Y: payload.Coordinates.Coordinates.Y},
+				Hit:      false,
 			}
 
+			s.mu.Lock()
 			//check if we have any collisions with other entities
 			for _, client := range s.clientlist {
 				if client.Id != id {
 
 					dx := client.Position.X - cd.Position.X
 					dy := client.Position.Y - cd.Position.Y
-					if math.Abs(dx) < boxwidth && math.Abs(dy) < boxwidth {
+					if math.Abs(dx) < boxwidth && math.Abs(dy) < boxheight {
 						//collision, mark it
 						cd.Hit = true
+						//cd.Target = client.Id
+						cd.Targets = append(cd.Targets, client.Id)
 					}
-
 				}
 			}
 
+			p1 := gamedata.Coordinates{
+				X: cd.Position.X - boxwidth/2,
+				Y: cd.Position.Y - boxheight/2,
+			}
+			p2 := gamedata.Coordinates{
+				X: cd.Position.X - boxwidth/2,
+				Y: cd.Position.Y + boxheight/2,
+			}
+			p3 := gamedata.Coordinates{
+				X: cd.Position.X + boxwidth/2,
+				Y: cd.Position.Y + boxheight/2,
+			}
+			p4 := gamedata.Coordinates{
+				X: cd.Position.X + boxwidth/2,
+				Y: cd.Position.Y - boxheight/2,
+			}
+			circle := gamedata.Coordinates{
+				X: 640 / 2,
+				Y: 480 / 2,
+			}
+
+			if circle.Distance(p1) > checkRadius &&
+				circle.Distance(p2) > checkRadius &&
+				circle.Distance(p3) > checkRadius &&
+				circle.Distance(p4) > checkRadius {
+				fmt.Println("client is OUT ", cd.Id)
+				cd.Eliminated = true
+			}
 			//update the client list
-			s.mu.Lock()
 			s.clientlist[conn] = cd
 			s.mu.Unlock()
+
+			//s.CheckElimination(cd)
+
+		case *pb.ClientEnvelope_Slap:
+
+			s.mu.Lock()
+			slapper := s.clientlist[conn]
+			s.mu.Unlock()
+
+			for _, target := range slapper.Targets {
+				s.BroadcastSlap(id, target)
+			}
+
 		}
 
 	}
@@ -178,7 +229,7 @@ func (s *Server) ManageBroadcast() {
 		}
 		s.mu.Unlock()
 
-		time.Sleep(time.Millisecond * 30)
+		time.Sleep(time.Millisecond * 15)
 	}
 }
 
@@ -197,7 +248,8 @@ func (s *Server) BuildBroadcastMessage() *pb.AllClients {
 				X: data.Position.X,
 				Y: data.Position.Y,
 			},
-			Hit: data.Hit,
+			Hit:        data.Hit,
+			Eliminated: data.Eliminated,
 		}
 		result.Clients = append(result.Clients, clientdata)
 	}
@@ -252,3 +304,93 @@ func (s *Server) SendClientIdentity(conn net.Conn, id int) {
 
 	s.SendMessage(conn, envelope)
 }
+
+func (s *Server) SendClientEvent(conn net.Conn, id int, connected bool) {
+	event := &pb.ClientEvent{
+		Id:        int32(id),
+		Connected: connected,
+	}
+	envelope := &pb.ServerEnvelope{
+		Payload: &pb.ServerEnvelope_Event{
+			Event: event,
+		},
+	}
+
+	s.mu.Lock()
+	for conn := range s.clientlist {
+		s.SendMessage(conn, envelope)
+	}
+	s.mu.Unlock()
+
+}
+
+func (s *Server) BroadcastSlap(instigator, target int) {
+
+	slap := &pb.GameEvent_Slap{
+		Slap: true,
+	}
+	envelope := &pb.ServerEnvelope{
+		Payload: &pb.ServerEnvelope_Gameevent{
+			Gameevent: &pb.GameEvent{
+				Instigator: int32(instigator),
+				Target:     int32(target),
+				Event:      slap,
+			},
+		},
+	}
+
+	s.mu.Lock()
+	for conn := range s.clientlist {
+		s.SendMessage(conn, envelope)
+	}
+	s.mu.Unlock()
+
+}
+
+func (s *Server) CheckElimination(cd ClientData) {
+	p1 := gamedata.Coordinates{
+		X: cd.Position.X - boxwidth/2,
+		Y: cd.Position.Y - boxheight/2,
+	}
+	p2 := gamedata.Coordinates{
+		X: cd.Position.X - boxwidth/2,
+		Y: cd.Position.Y + boxheight/2,
+	}
+	p3 := gamedata.Coordinates{
+		X: cd.Position.X + boxwidth/2,
+		Y: cd.Position.Y + boxheight/2,
+	}
+	p4 := gamedata.Coordinates{
+		X: cd.Position.X + boxwidth/2,
+		Y: cd.Position.Y - boxheight/2,
+	}
+	circle := gamedata.Coordinates{
+		X: 640 / 2,
+		Y: 480 / 2,
+	}
+
+	if circle.Distance(p1) > checkRadius &&
+		circle.Distance(p2) > checkRadius &&
+		circle.Distance(p3) > checkRadius &&
+		circle.Distance(p4) > checkRadius {
+		fmt.Println("client is OUT ", cd.Id)
+
+		elim := &pb.GameEvent_Eliminated{
+			Eliminated: true,
+		}
+		envelope := &pb.ServerEnvelope{
+			Payload: &pb.ServerEnvelope_Gameevent{
+				Gameevent: &pb.GameEvent{
+					Target: int32(cd.Id),
+					Event:  elim,
+				},
+			},
+		}
+		s.mu.Lock()
+		for conn := range s.clientlist {
+			s.SendMessage(conn, envelope)
+		}
+		s.mu.Unlock()
+
+	}
+}