New objective assets

config/config.go

@@ -360,6 +360,8 @@ func loadProfileAssetsBroadcaster() {
 		"killed": {},
 		"secure": {
 			team.Game.Name: {
+				filter.New(team.Game, Current.ProfileAssets()+"/game/rayquaza_ally.png", state.RayquazaSecurePurple.Int(), false),
+				filter.New(team.Game, Current.ProfileAssets()+"/game/rayquaza_enemy.png", state.RayquazaSecureOrange.Int(), false),
 				filter.New(team.Game, Current.ProfileAssets()+"/game/regice_ally.png", state.RegiceSecurePurple.Int(), false),
 				filter.New(team.Game, Current.ProfileAssets()+"/game/regice_enemy.png", state.RegiceSecureOrange.Int(), false),
 				filter.New(team.Game, Current.ProfileAssets()+"/game/regirock_ally.png", state.RegirockSecurePurple.Int(), false),
@@ -368,8 +370,6 @@ func loadProfileAssetsBroadcaster() {
 				filter.New(team.Game, Current.ProfileAssets()+"/game/registeel_enemy.png", state.RegisteelSecureOrange.Int(), false),
 				filter.New(team.Game, Current.ProfileAssets()+"/game/regieleki_ally.png", state.RegielekiSecurePurple.Int(), false),
 				filter.New(team.Game, Current.ProfileAssets()+"/game/regieleki_enemy.png", state.RegielekiSecureOrange.Int(), false),
-				filter.New(team.Game, Current.ProfileAssets()+"/game/rayquaza_ally.png", state.RayquazaSecurePurple.Int(), false),
-				filter.New(team.Game, Current.ProfileAssets()+"/game/rayquaza_enemy.png", state.RayquazaSecureOrange.Int(), false),
 			},
 		},
 		"ko": {
@@ -424,6 +424,8 @@ func loadProfileAssetsPlayer() {
 		},
 		"secure": {
 			team.Game.Name: {
+				filter.New(team.Game, Current.ProfileAssets()+"/game/rayquaza_ally.png", state.RayquazaSecurePurple.Int(), false),
+				filter.New(team.Game, Current.ProfileAssets()+"/game/rayquaza_enemy.png", state.RayquazaSecureOrange.Int(), false),
 				filter.New(team.Game, Current.ProfileAssets()+"/game/regieleki_ally.png", state.RegielekiSecurePurple.Int(), false),
 				filter.New(team.Game, Current.ProfileAssets()+"/game/regieleki_enemy.png", state.RegielekiSecureOrange.Int(), false),
 				filter.New(team.Game, Current.ProfileAssets()+"/game/regice_ally.png", state.RegiceSecurePurple.Int(), false),

detect/detect.go

@@ -269,7 +269,7 @@ func Objectives() {
 			continue
 		}
 
-		done := false
+		early := false
 
 		if time.Since(top) > time.Minute {
 			switch e := state.EventType(e); e {
@@ -279,67 +279,80 @@ func Objectives() {
 				server.SetRegieleki(team.Orange)
 				top = time.Now()
 
-				done = true
+				early = true
 			case state.RegielekiSecurePurple:
 				state.Add(e, server.Clock(), 0)
 				notify.Feed(team.Purple.NRGBA, "[%s] [%s] Regieleki secured", server.Clock(), strings.Title(team.Purple.Name))
 				server.SetRegieleki(team.Purple)
 				top = time.Now()
 
-				done = true
+				early = true
 			}
 		}
 
-		if !done && time.Since(bottom) > time.Minute {
+		if !early && time.Since(bottom) > time.Minute {
 			switch e := state.EventType(e); e {
 			case state.RegiceSecureOrange:
 				state.Add(e, server.Clock(), 0)
 				notify.Feed(team.Orange.NRGBA, "[%s] [%s] Regice secured", server.Clock(), strings.Title(team.Orange.Name))
 				server.SetRegice(team.Orange)
 				bottom = time.Now()
+
+				early = true
 			case state.RegiceSecurePurple:
 				state.Add(e, server.Clock(), 0)
 				notify.Feed(team.Purple.NRGBA, "[%s] [%s] Regice secured", server.Clock(), strings.Title(team.Purple.Name))
 				server.SetRegice(team.Purple)
 				bottom = time.Now()
 
+				early = true
 			case state.RegirockSecureOrange:
 				state.Add(e, server.Clock(), 0)
 				notify.Feed(team.Orange.NRGBA, "[%s] [%s] Regirock secured", server.Clock(), strings.Title(team.Orange.Name))
 				server.SetRegirock(team.Orange)
 				bottom = time.Now()
+
+				early = true
 			case state.RegirockSecurePurple:
 				state.Add(e, server.Clock(), 0)
 				notify.Feed(team.Purple.NRGBA, "[%s] [%s] Regirock secured", server.Clock(), strings.Title(team.Purple.Name))
 				server.SetRegirock(team.Purple)
 				bottom = time.Now()
 
+				early = true
 			case state.RegisteelSecureOrange:
 				state.Add(e, server.Clock(), 0)
 				notify.Feed(team.Orange.NRGBA, "[%s] [%s] Registeel secured", server.Clock(), strings.Title(team.Orange.Name))
 				server.SetRegisteel(team.Orange)
 				bottom = time.Now()
+
+				early = true
 			case state.RegisteelSecurePurple:
 				state.Add(e, server.Clock(), 0)
 				notify.Feed(team.Purple.NRGBA, "[%s] [%s] Registeel secured", server.Clock(), strings.Title(team.Purple.Name))
 				server.SetRegisteel(team.Purple)
 				bottom = time.Now()
+
+				early = true
 			}
 		}
 
-		if !done && time.Since(middle) > time.Minute {
+		if !early && time.Since(middle) > time.Minute {
 			switch e := state.EventType(e); e {
 			case state.RayquazaSecureOrange:
 				state.Add(e, server.Clock(), 0)
 				notify.Feed(team.Orange.NRGBA, "[%s] [%s] Rayquaza secured", server.Clock(), strings.Title(team.Orange.Name))
 				server.SetRayquaza(team.Orange)
 				middle = time.Now()
 
+				early = true
 			case state.RayquazaSecurePurple:
 				state.Add(e, server.Clock(), 0)
 				notify.Feed(team.Purple.NRGBA, "[%s] [%s] Rayquaza secured", server.Clock(), strings.Title(team.Purple.Name))
 				server.SetRayquaza(team.Purple)
 				middle = time.Now()
+
+				early = true
 			}
 		}
 

gui/gui.go

@@ -125,6 +125,10 @@ func New() {
 			max    int
 			ticks  int
 		}{0, 60, 0},
+
+		cpu:    "0%",
+		ram:    "0MB",
+		uptime: "00:00",
 	}
 
 	Window.Bar = title.New(

gui/loading.go

@@ -30,7 +30,7 @@ type loading struct {
 func (g *GUI) loading() {
 	l := &loading{
 		message: "Loading...",
-		tick:    time.NewTicker(time.Second / 2).C,
+		tick:    time.NewTicker(time.Millisecond * 250).C,
 	}
 
 	go l.while(g)
@@ -51,19 +51,18 @@ func (g *GUI) loading() {
 	dims := layout.Dimensions{}
 	inset := layout.Inset{}
 
-	messageLabel := material.Label(fonts.Calibri().Theme, unit.Sp(28), l.message)
+	messageLabel := material.Label(fonts.Calibri().Theme, unit.Sp(18.5), l.message)
 	messageLabel.Alignment = text.Middle
 	messageLabel.Color = nrgba.White.Color()
-	messageLabel.Font.Weight = 400
+	messageLabel.Font.Weight = 50
 
 	g.Window.Perform(system.ActionCenter)
 	g.Window.Perform(system.ActionRaise)
 
 	var ops op.Ops
 
 	for g.is == is.Loading {
-		e := <-g.Events()
-		switch e := e.(type) {
+		switch e := (<-g.Events()).(type) {
 		case app.ViewEvent:
 			g.HWND = e.HWND
 		case system.DestroyEvent:
@@ -99,7 +98,6 @@ func (g *GUI) loading() {
 						return messageLabel.Layout(gtx)
 					})
 				})
-
 			})
 
 			g.frame(gtx, e)
@@ -110,10 +108,9 @@ func (g *GUI) loading() {
 }
 
 func (l *loading) while(g *GUI) {
-	for iter := 0; g.is == is.Loading; {
-		select {
-		case <-l.tick:
-			l.message, iter = notify.Iter(iter)
-		}
+	i := 0
+
+	for ; g.is == is.Loading; <-l.tick {
+		l.message, i = notify.Iter(i)
 	}
 }

gui/main.go

@@ -469,7 +469,7 @@ func (g *GUI) main() {
 	}
 
 	uptimeLabel := material.H5(g.normal, g.uptime)
-	uptimeLabel.Color = nrgba.Slate.Color()
+	uptimeLabel.Color = nrgba.DreamyPurple.Color()
 	uptimeLabel.Alignment = text.Middle
 	uptimeLabel.TextSize = unit.Sp(14)
 
@@ -727,6 +727,8 @@ func (g *GUI) main() {
 									}
 								}
 								{
+									uptimeLabel.Text = g.uptime
+
 									layout.Inset{
 										Top:  unit.Dp(50),
 										Left: unit.Dp(float32(gtx.Constraints.Max.X - 90)),

gui/projector.go

@@ -64,7 +64,7 @@ func (g *GUI) projector() {
 		theme: g.normal,
 		since: time.Now(),
 
-		listTextSize: float32(12),
+		listTextSize: float32(14),
 	}
 
 	session, err := audio.New(audio.Disabled, audio.Default)