CSGOWTF/csgowtfd
3
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

fixed unknown color

Browse Source
This commit is contained in:
Giovanni Harting
2021-10-13 16:27:30 +02:00
parent c35df3a8b5
commit ddd9b79ebb
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
csgo/demo_parser.go
View File

@@ -267,14 +267,21 @@ func (p *DemoParser) parseWorker() {
switch demoPlayer.Color() { switch demoPlayer.Color() {
case common.Yellow: case common.Yellow:
tMatchPlayer.Color = stats.ColorYellow tMatchPlayer.Color = stats.ColorYellow
break
case common.Green: case common.Green:
tMatchPlayer.Color = stats.ColorGreen tMatchPlayer.Color = stats.ColorGreen
break
case common.Purple: case common.Purple:
tMatchPlayer.Color = stats.ColorPurple tMatchPlayer.Color = stats.ColorPurple
break
case common.Blue: case common.Blue:
tMatchPlayer.Color = stats.ColorBlue tMatchPlayer.Color = stats.ColorBlue
break
case common.Orange: case common.Orange:
tMatchPlayer.Color = stats.ColorOrange tMatchPlayer.Color = stats.ColorOrange
break
default:
tMatchPlayer.Color = stats.ColorGrey
} }
} }
} }

2
ent/migrate/schema.go
View File

@@ -81,7 +81,7 @@ var (
{Name: "hit_group_right_leg", Type: field.TypeUint, Nullable: true}, {Name: "hit_group_right_leg", Type: field.TypeUint, Nullable: true},
{Name: "hit_group_gear", Type: field.TypeUint, Nullable: true}, {Name: "hit_group_gear", Type: field.TypeUint, Nullable: true},
{Name: "crosshair", Type: field.TypeString, 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: "kast", Type: field.TypeInt, Nullable: true},
{Name: "flash_duration_self", Type: field.TypeFloat32, Nullable: true}, {Name: "flash_duration_self", Type: field.TypeFloat32, Nullable: true},
{Name: "flash_duration_team", Type: field.TypeFloat32, Nullable: true}, {Name: "flash_duration_team", Type: field.TypeFloat32, Nullable: true},

2
ent/schema/stats.go
View File

@@ -43,7 +43,7 @@ func (Stats) Fields() []ent.Field {
field.Uint("hit_group_right_leg").Optional(), field.Uint("hit_group_right_leg").Optional(),
field.Uint("hit_group_gear").Optional(), field.Uint("hit_group_gear").Optional(),
field.String("crosshair").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.Int("kast").Optional(),
field.Float32("flash_duration_self").Optional(), field.Float32("flash_duration_self").Optional(),
field.Float32("flash_duration_team").Optional(), field.Float32("flash_duration_team").Optional(),

3
ent/stats/stats.go
View File

@@ -184,6 +184,7 @@ const (
ColorPurple Color = "purple" ColorPurple Color = "purple"
ColorBlue Color = "blue" ColorBlue Color = "blue"
ColorOrange Color = "orange" ColorOrange Color = "orange"
ColorGrey Color = "grey"
) )
func (c Color) String() string { 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. // ColorValidator is a validator for the "color" field enum values. It is called by the builders before save.
func ColorValidator(c Color) error { func ColorValidator(c Color) error {
switch c { switch c {
case ColorGreen, ColorYellow, ColorPurple, ColorBlue, ColorOrange: case ColorGreen, ColorYellow, ColorPurple, ColorBlue, ColorOrange, ColorGrey:
return nil return nil
default: default:
return fmt.Errorf("stats: invalid enum value for color field: %q", c) return fmt.Errorf("stats: invalid enum value for color field: %q", c)