diff --git a/csgo/demo_parser.go b/csgo/demo_parser.go index 8d869f9..9085210 100644 --- a/csgo/demo_parser.go +++ b/csgo/demo_parser.go @@ -267,14 +267,21 @@ func (p *DemoParser) parseWorker() { switch demoPlayer.Color() { case common.Yellow: tMatchPlayer.Color = stats.ColorYellow + break case common.Green: tMatchPlayer.Color = stats.ColorGreen + break case common.Purple: tMatchPlayer.Color = stats.ColorPurple + break case common.Blue: tMatchPlayer.Color = stats.ColorBlue + break case common.Orange: tMatchPlayer.Color = stats.ColorOrange + break + default: + tMatchPlayer.Color = stats.ColorGrey } } } diff --git a/ent/migrate/schema.go b/ent/migrate/schema.go index 7126df5..330acf2 100644 --- a/ent/migrate/schema.go +++ b/ent/migrate/schema.go @@ -81,7 +81,7 @@ var ( {Name: "hit_group_right_leg", Type: field.TypeUint, Nullable: true}, {Name: "hit_group_gear", Type: field.TypeUint, Nullable: true}, {Name: "crosshair", Type: field.TypeString, Nullable: true}, - {Name: "color", Type: field.TypeEnum, Nullable: true, Enums: []string{"green", "yellow", "purple", "blue", "orange"}}, + {Name: "color", Type: field.TypeEnum, Nullable: true, Enums: []string{"green", "yellow", "purple", "blue", "orange", "grey"}}, {Name: "kast", Type: field.TypeInt, Nullable: true}, {Name: "flash_duration_self", Type: field.TypeFloat32, Nullable: true}, {Name: "flash_duration_team", Type: field.TypeFloat32, Nullable: true}, diff --git a/ent/schema/stats.go b/ent/schema/stats.go index d7ff5fd..b8dfc04 100644 --- a/ent/schema/stats.go +++ b/ent/schema/stats.go @@ -43,7 +43,7 @@ func (Stats) Fields() []ent.Field { field.Uint("hit_group_right_leg").Optional(), field.Uint("hit_group_gear").Optional(), field.String("crosshair").Optional(), - field.Enum("color").Optional().Values("green", "yellow", "purple", "blue", "orange"), + field.Enum("color").Optional().Values("green", "yellow", "purple", "blue", "orange", "grey"), field.Int("kast").Optional(), field.Float32("flash_duration_self").Optional(), field.Float32("flash_duration_team").Optional(), diff --git a/ent/stats/stats.go b/ent/stats/stats.go index 7f3e781..dd16ac2 100644 --- a/ent/stats/stats.go +++ b/ent/stats/stats.go @@ -184,6 +184,7 @@ const ( ColorPurple Color = "purple" ColorBlue Color = "blue" ColorOrange Color = "orange" + ColorGrey Color = "grey" ) func (c Color) String() string { @@ -193,7 +194,7 @@ func (c Color) String() string { // ColorValidator is a validator for the "color" field enum values. It is called by the builders before save. func ColorValidator(c Color) error { switch c { - case ColorGreen, ColorYellow, ColorPurple, ColorBlue, ColorOrange: + case ColorGreen, ColorYellow, ColorPurple, ColorBlue, ColorOrange, ColorGrey: return nil default: return fmt.Errorf("stats: invalid enum value for color field: %q", c)