diego/networkzero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Slapping in the mix.

Browse Source
This commit is contained in:
iegod
2024-12-12 07:12:46 -05:00
parent ad6a061e5a
commit 913d5e93d4
7 changed files with 601 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
server/clientdata.proto
View File

@@ -14,6 +14,7 @@ message ClientData {
string Address = 2;
string Name = 3;
Coordinates coordinates = 4;
bool hit = 5;
}
message ClientCoordinates {
@@ -27,4 +28,42 @@ 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;
}

238
server/pb/clientdata.pb.go
View File

@@ -350,6 +350,7 @@ type ClientEnvelope struct {
// Types that are assignable to Payload:
//
// *ClientEnvelope_Coordinates
// *ClientEnvelope_Slap
Payload isClientEnvelope_Payload `protobuf_oneof:"Payload"`
}
@@ -397,6 +398,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 +413,59 @@ 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
@@ -418,7 +477,7 @@ type ClientEvent struct {
func (x *ClientEvent) Reset() {
*x = ClientEvent{}
mi := &file_clientdata_proto_msgTypes[6]
mi := &file_clientdata_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -430,7 +489,7 @@ func (x *ClientEvent) String() string {
func (*ClientEvent) ProtoMessage() {}
func (x *ClientEvent) ProtoReflect() protoreflect.Message {
mi := &file_clientdata_proto_msgTypes[6]
mi := &file_clientdata_proto_msgTypes[7]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -443,7 +502,7 @@ func (x *ClientEvent) ProtoReflect() protoreflect.Message {
// Deprecated: Use ClientEvent.ProtoReflect.Descriptor instead.
func (*ClientEvent) Descriptor() ([]byte, []int) {
return file_clientdata_proto_rawDescGZIP(), []int{6}
return file_clientdata_proto_rawDescGZIP(), []int{7}
}
func (x *ClientEvent) GetId() int32 {
@@ -460,6 +519,67 @@ func (x *ClientEvent) GetConnected() bool {
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"`
Slap bool `protobuf:"varint,3,opt,name=Slap,proto3" json:"Slap,omitempty"`
}
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 (x *GameEvent) GetSlap() bool {
if x != nil {
return x.Slap
}
return false
}
type ServerEnvelope struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@@ -470,12 +590,13 @@ 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[7]
mi := &file_clientdata_proto_msgTypes[9]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -487,7 +608,7 @@ func (x *ServerEnvelope) String() string {
func (*ServerEnvelope) ProtoMessage() {}
func (x *ServerEnvelope) ProtoReflect() protoreflect.Message {
mi := &file_clientdata_proto_msgTypes[7]
mi := &file_clientdata_proto_msgTypes[9]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -500,7 +621,7 @@ func (x *ServerEnvelope) ProtoReflect() protoreflect.Message {
// Deprecated: Use ServerEnvelope.ProtoReflect.Descriptor instead.
func (*ServerEnvelope) Descriptor() ([]byte, []int) {
return file_clientdata_proto_rawDescGZIP(), []int{7}
return file_clientdata_proto_rawDescGZIP(), []int{9}
}
func (m *ServerEnvelope) GetPayload() isServerEnvelope_Payload {
@@ -531,6 +652,13 @@ func (x *ServerEnvelope) GetEvent() *ClientEvent {
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()
}
@@ -547,12 +675,18 @@ 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{
@@ -581,33 +715,47 @@ 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, 0x3b, 0x0a, 0x0b, 0x43,
0x6c, 0x69, 0x65, 0x6e, 0x74, 0x45, 0x76, 0x65, 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, 0xac, 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, 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,
0x12, 0x25, 0x0a, 0x04, 0x73, 0x6c, 0x61, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f,
0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x53, 0x6c, 0x61, 0x70, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x48,
0x00, 0x52, 0x04, 0x73, 0x6c, 0x61, 0x70, 0x42, 0x09, 0x0a, 0x07, 0x50, 0x61, 0x79, 0x6c, 0x6f,
0x61, 0x64, 0x22, 0x1f, 0x0a, 0x09, 0x53, 0x6c, 0x61, 0x70, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12,
0x12, 0x0a, 0x04, 0x53, 0x6c, 0x61, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x53,
0x6c, 0x61, 0x70, 0x22, 0x3b, 0x0a, 0x0b, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x45, 0x76, 0x65,
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,
}
var (
@@ -623,7 +771,7 @@ func file_clientdata_proto_rawDescGZIP() []byte {
}
var file_clientdata_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_clientdata_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
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
@@ -632,22 +780,26 @@ var file_clientdata_proto_goTypes = []any{
(*AllClients)(nil), // 4: main.AllClients
(*ClientIdentity)(nil), // 5: main.ClientIdentity
(*ClientEnvelope)(nil), // 6: main.ClientEnvelope
(*ClientEvent)(nil), // 7: main.ClientEvent
(*ServerEnvelope)(nil), // 8: 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
4, // 5: main.ServerEnvelope.broadcast:type_name -> main.AllClients
7, // 6: main.ServerEnvelope.event:type_name -> main.ClientEvent
7, // [7:7] is the sub-list for method output_type
7, // [7:7] is the sub-list for method input_type
7, // [7:7] is the sub-list for extension type_name
7, // [7:7] is the sub-list for extension extendee
0, // [0:7] is the sub-list for field type_name
7, // 4: main.ClientEnvelope.slap:type_name -> main.SlapEvent
5, // 5: main.ServerEnvelope.identity:type_name -> main.ClientIdentity
4, // 6: main.ServerEnvelope.broadcast:type_name -> main.AllClients
8, // 7: main.ServerEnvelope.event:type_name -> main.ClientEvent
9, // 8: main.ServerEnvelope.gameevent:type_name -> main.GameEvent
9, // [9:9] is the sub-list for method output_type
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() }
@@ -657,11 +809,13 @@ func file_clientdata_proto_init() {
}
file_clientdata_proto_msgTypes[5].OneofWrappers = []any{
(*ClientEnvelope_Coordinates)(nil),
(*ClientEnvelope_Slap)(nil),
}
file_clientdata_proto_msgTypes[7].OneofWrappers = []any{
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{
@@ -669,7 +823,7 @@ func file_clientdata_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_clientdata_proto_rawDesc,
NumEnums: 1,
NumMessages: 8,
NumMessages: 10,
NumExtensions: 0,
NumServices: 0,
},

32
server/server/server.go
View File

@@ -25,6 +25,8 @@ type ClientData struct {
Name string
Position gamedata.Coordinates
Hit bool
Target int
Slapping bool
}
type Server struct {
@@ -124,6 +126,7 @@ func (s *Server) HandleClient(conn net.Conn, id int) {
Position: gamedata.Coordinates{X: payload.Coordinates.Coordinates.X, Y: payload.Coordinates.Coordinates.Y},
}
s.mu.Lock()
//check if we have any collisions with other entities
for _, client := range s.clientlist {
if client.Id != id {
@@ -133,15 +136,20 @@ func (s *Server) HandleClient(conn net.Conn, id int) {
if math.Abs(dx) < boxwidth && math.Abs(dy) < boxwidth {
//collision, mark it
cd.Hit = true
cd.Target = client.Id
}
}
}
//update the client list
s.mu.Lock()
s.clientlist[conn] = cd
s.mu.Unlock()
case *pb.ClientEnvelope_Slap:
if s.clientlist[conn].Target != 0 && s.clientlist[conn].Hit {
s.BroadcastSlap(id, s.clientlist[conn].Target)
} else {
fmt.Println("Invalid slap detected.")
}
}
}
@@ -273,3 +281,23 @@ func (s *Server) SendClientEvent(conn net.Conn, id int, connected bool) {
s.mu.Unlock()
}
func (s *Server) BroadcastSlap(instigator, target int) {
envelope := &pb.ServerEnvelope{
Payload: &pb.ServerEnvelope_Gameevent{
Gameevent: &pb.GameEvent{
Instigator: int32(instigator),
Target: int32(target),
Slap: true,
},
},
}
s.mu.Lock()
for conn := range s.clientlist {
s.SendMessage(conn, envelope)
}
s.mu.Unlock()
}