Added ring/elimination mechanic.
This commit is contained in:
@@ -14,12 +14,14 @@ type Block struct {
|
||||
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},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,11 +42,7 @@ func (b *Block) Update() {
|
||||
|
||||
func (b *Block) Draw() {
|
||||
b.Sprite.Clear()
|
||||
if !b.hit {
|
||||
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})
|
||||
}
|
||||
b.Sprite.Fill(b.clr)
|
||||
}
|
||||
|
||||
func (b *Block) SetPosition(pos gamedata.Coordinates) {
|
||||
@@ -63,10 +61,10 @@ func (b *Block) GetTargetosition() gamedata.Coordinates {
|
||||
return b.target
|
||||
}
|
||||
|
||||
func (b *Block) SetHit(hit bool) {
|
||||
b.hit = hit
|
||||
}
|
||||
|
||||
func (b *Block) GetHit() bool {
|
||||
return b.hit
|
||||
}
|
||||
|
||||
func (b *Block) SetColor(clr color.RGBA) {
|
||||
b.clr = clr
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
"client/gamedata"
|
||||
"client/pb"
|
||||
"fmt"
|
||||
"image/color"
|
||||
"maps"
|
||||
"math"
|
||||
"sync"
|
||||
@@ -15,14 +16,18 @@ import (
|
||||
"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
|
||||
screenHeight = 480
|
||||
movementLimit = 5
|
||||
stageRadius = 200
|
||||
)
|
||||
|
||||
var (
|
||||
namelist = []string{"slappy", "mick", "rodney", "george", "ringo",
|
||||
"robin", "temitry", "evangeline", "ron", "abigail", "lester",
|
||||
"maynard", "agnes", "stacey", "wendell", "susanne", "myrtle",
|
||||
@@ -37,22 +42,28 @@ func init() {
|
||||
}
|
||||
|
||||
type ClientData struct {
|
||||
Id int
|
||||
Address string
|
||||
Name string
|
||||
Position gamedata.Coordinates
|
||||
Hit bool
|
||||
Id int
|
||||
Address string
|
||||
Name string
|
||||
Position gamedata.Coordinates
|
||||
Hit bool
|
||||
Eliminated bool
|
||||
}
|
||||
|
||||
type Game struct {
|
||||
name string
|
||||
blocky *elements.Block
|
||||
hitblocky *elements.Block
|
||||
elimblocky *elements.Block
|
||||
gameId int
|
||||
realclients map[int]ClientData
|
||||
gameclient *client.Client
|
||||
cycle int
|
||||
mu sync.Mutex
|
||||
|
||||
//similar fields that we see in the client list, but for us
|
||||
eliminated bool
|
||||
hit bool
|
||||
}
|
||||
|
||||
func NewGame() *Game {
|
||||
@@ -60,11 +71,14 @@ func NewGame() *Game {
|
||||
gameclient: client.NewClient(),
|
||||
blocky: elements.NewBlock(),
|
||||
hitblocky: elements.NewBlock(),
|
||||
elimblocky: elements.NewBlock(),
|
||||
cycle: 0,
|
||||
name: namelist[rand.Intn(len(namelist))],
|
||||
}
|
||||
|
||||
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.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})
|
||||
@@ -93,11 +107,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,
|
||||
@@ -113,10 +138,15 @@ func (g *Game) Draw(screen *ebiten.Image) {
|
||||
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{
|
||||
@@ -150,14 +180,20 @@ 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.realclients[int(client.Id)] = update
|
||||
g.mu.Unlock()
|
||||
} else {
|
||||
g.blocky.SetHit(client.Hit)
|
||||
g.eliminated = client.Eliminated
|
||||
g.hit = client.Hit
|
||||
//this is us
|
||||
|
||||
//g.blocky.SetHit(client.Hit)
|
||||
|
||||
}
|
||||
}
|
||||
case *pb.ServerEnvelope_Event:
|
||||
@@ -174,35 +210,48 @@ func (g *Game) HandleServerData(envelope *pb.ServerEnvelope) {
|
||||
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)
|
||||
//fmt.Printf("someone slapping! target:%d, instigator:%d isSlap:%d", payload.Gameevent.Target, payload.Gameevent.Instigator, payload.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()
|
||||
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
|
||||
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)
|
||||
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()
|
||||
*/
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,14 @@
|
||||
package gamedata
|
||||
|
||||
import "math"
|
||||
|
||||
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)
|
||||
}
|
||||
|
||||
@@ -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
|
||||
@@ -526,7 +534,11 @@ type GameEvent struct {
|
||||
|
||||
Instigator int32 `protobuf:"varint,1,opt,name=Instigator,proto3" json:"Instigator,omitempty"`
|
||||
Target int32 `protobuf:"varint,2,opt,name=Target,proto3" json:"Target,omitempty"`
|
||||
Slap bool `protobuf:"varint,3,opt,name=Slap,proto3" json:"Slap,omitempty"`
|
||||
// Types that are assignable to Event:
|
||||
//
|
||||
// *GameEvent_Slap
|
||||
// *GameEvent_Eliminated
|
||||
Event isGameEvent_Event `protobuf_oneof:"Event"`
|
||||
}
|
||||
|
||||
func (x *GameEvent) Reset() {
|
||||
@@ -573,13 +585,43 @@ func (x *GameEvent) GetTarget() int32 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (m *GameEvent) GetEvent() isGameEvent_Event {
|
||||
if m != nil {
|
||||
return m.Event
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *GameEvent) GetSlap() bool {
|
||||
if x != nil {
|
||||
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
|
||||
@@ -694,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,
|
||||
@@ -703,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,
|
||||
@@ -729,33 +773,35 @@ var file_clientdata_proto_rawDesc = []byte{
|
||||
0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
|
||||
0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64,
|
||||
0x22, 0x57, 0x0a, 0x09, 0x47, 0x61, 0x6d, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1e, 0x0a,
|
||||
0x0a, 0x49, 0x6e, 0x73, 0x74, 0x69, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x0a, 0x49, 0x6e, 0x73, 0x74, 0x69, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x16, 0x0a,
|
||||
0x06, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54,
|
||||
0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6c, 0x61, 0x70, 0x18, 0x03, 0x20,
|
||||
0x01, 0x28, 0x08, 0x52, 0x04, 0x53, 0x6c, 0x61, 0x70, 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,
|
||||
0x22, 0x84, 0x01, 0x0a, 0x09, 0x47, 0x61, 0x6d, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1e,
|
||||
0x0a, 0x0a, 0x49, 0x6e, 0x73, 0x74, 0x69, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x0a, 0x49, 0x6e, 0x73, 0x74, 0x69, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x16,
|
||||
0x0a, 0x06, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
|
||||
0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x14, 0x0a, 0x04, 0x53, 0x6c, 0x61, 0x70, 0x18, 0x03,
|
||||
0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x04, 0x53, 0x6c, 0x61, 0x70, 0x12, 0x20, 0x0a, 0x0a,
|
||||
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 (
|
||||
@@ -811,6 +857,10 @@ func file_clientdata_proto_init() {
|
||||
(*ClientEnvelope_Coordinates)(nil),
|
||||
(*ClientEnvelope_Slap)(nil),
|
||||
}
|
||||
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),
|
||||
|
||||
Reference in New Issue
Block a user