diff options
| -rw-r--r-- | internal/admin/api_colors.go | 22 | ||||
| -rw-r--r-- | internal/game/cmd_score.go | 6 |
2 files changed, 15 insertions, 13 deletions
diff --git a/internal/admin/api_colors.go b/internal/admin/api_colors.go index 00caa98..16fb00a 100644 --- a/internal/admin/api_colors.go +++ b/internal/admin/api_colors.go @@ -352,8 +352,8 @@ func buildPreview() []colorSection { ln(seg("Task bar high", ""), seg("[", ""), seg("██████", "task_bar_high"), seg("░░░░", "hp_bar_empty"), seg("]", "")), ln(seg("Task bar med ", ""), seg("[", ""), seg("████", "task_bar_med"), seg("░░░░░░", "hp_bar_empty"), seg("]", "")), ln(seg("Task bar low ", ""), seg("[", ""), seg("██", "task_bar_low"), seg("░░░░░░░░", "hp_bar_empty"), seg("]", "")), - ln(seg("BAT ", ""), seg("[", ""), seg("██████", "battery_bar"), seg("░░░░░░░░░░░░░░░░░░░░", ""), seg("] corbat", "")), - ln(seg("ENG ", ""), seg("[", ""), seg("█████████████", "run_energy_bar"), seg("░░░░░░░░░░░░", "hp_bar_empty"), seg("]", "")), + ln(seg("Battery ", ""), seg("[", ""), seg("██████", "battery_bar"), seg("░░░░░░░░░░░░░░░░░░░░", "hp_bar_empty"), seg("]", "")), + ln(seg("Run En. ", ""), seg("[", ""), seg("█████████████", "run_energy_bar"), seg("░░░░░░░░░░░░░", "hp_bar_empty"), seg("]", "")), txt(""), // Constants composed with player colors, as they appear in real // combat output. Lets the admin see a hp_bar_med / hp_bar_low @@ -377,12 +377,11 @@ func buildPreview() []colorSection { seg("12", "skill_lvl_base")), txt(""), ln(seg("Level diff: ", ""), - seg("(level 10)", "level_diff_equal"), seg(" vs you 10", ""), - seg(" (level 13)", "level_diff_up_small"), seg(" vs you 10", ""), - seg(" (level 20)", "level_diff_up_big")), - ln(seg(" ", ""), - seg("(level 7)", "level_diff_down_small"), seg(" vs you 10", ""), - seg(" (level 3)", "level_diff_down_big"), seg(" vs you 10", "")), + seg("(level 10)", "level_diff_equal"), seg(" ", ""), + seg("(level 13)", "level_diff_up_small"), seg(" ", ""), + seg("(level 20)", "level_diff_up_big"), seg(" ", ""), + seg("(level 7)", "level_diff_down_small"), seg(" ", ""), + seg("(level 3)", "level_diff_down_big")), txt(""), ln(seg("Technology: ", ""), seg("Buff Helper ", "tech_name_unlocked"), @@ -395,8 +394,11 @@ func buildPreview() []colorSection { ln(seg("Active: ", ""), seg("[ON] ", "active_tech_on"), seg("BullsEye ", "active_tech_stat"), seg("[BUFF] ", "active_tech_status"), seg("Strength", "active_tech_stat")), - ln(seg("Max values: ", ""), - seg("Combat Lvl 99 / HP 40 / BAT 100 / ENG 100", "score_max_value")), + ln(seg("Score panel: ", ""), + seg("Combat Lvl 99", "score_max_value"), seg(" / HP ", ""), + seg("40", "score_max_value"), seg(" / Battery ", ""), + seg("100", "score_max_value"), seg(" / Run En. ", ""), + seg("100", "score_max_value")), txt(""), ln(seg("Skill table", ""), seg(" (", "table_header_label"), seg("table_header", "table_header_label"), seg(" ", ""), seg("header", "table_header_label"), seg(") ", ""), seg("Skill ", "table_header_label"), seg("Abbr ", "table_header_detail"), seg("Level ", "table_header_value"), seg("XP ", "table_header_xp"), seg("XP to Next", "table_header_xp")), diff --git a/internal/game/cmd_score.go b/internal/game/cmd_score.go index 3949486..426dc08 100644 --- a/internal/game/cmd_score.go +++ b/internal/game/cmd_score.go @@ -109,7 +109,7 @@ func (g *Game) doScore(sess *net.Session) { hpStyle := g.hpBarStyle(sess, p.HP, p.MaxHP()) hpBarStr := ui.RenderColoredBar(p.HP, p.MaxHP(), 26, unicode, hpStyle, mode) hpFg := g.hpBarStyle(sess, p.HP, p.MaxHP()).FilledColor - hpLine := fmt.Sprintf("HP [%s] %s / %s", + hpLine := fmt.Sprintf("HP [%s] %s / %s", hpBarStr, color.Render(mode, color.ColorSpec{Fg: hpFg}, fmt.Sprint(p.HP)), g.colorizeConstant(sess, "score_max_value", fmt.Sprint(p.MaxHP()))) @@ -118,7 +118,7 @@ func (g *Game) doScore(sess *net.Session) { batBarRaw := ui.RenderBarF(p.Battery, p.MaxBattery(), 26, unicode) batBarStr := color.Render(mode, g.resolveConstant(sess, "battery_bar"), batBarRaw) batFg := g.resolveConstant(sess, "battery_bar").Fg - batLine := fmt.Sprintf("BAT [%s] %s / %s", + batLine := fmt.Sprintf("Battery [%s] %s / %s", batBarStr, color.Render(mode, color.ColorSpec{Fg: batFg}, fmt.Sprintf("%.1f", p.Battery)), g.colorizeConstant(sess, "score_max_value", fmt.Sprintf("%.0f", p.MaxBattery()))) @@ -128,7 +128,7 @@ func (g *Game) doScore(sess *net.Session) { engEmpty := g.resolveConstant(sess, "hp_bar_empty") engStyle := &ui.BarStyle{FilledColor: engSpec.Fg, EmptyColor: engEmpty.Fg, EmptyDim: engEmpty.Dim} engBarStr := ui.RenderColoredBar(p.RunEnergy, p.MaxRunEnergy(), 26, unicode, engStyle, mode) - engLine := fmt.Sprintf("ENG [%s] %s / %s", + engLine := fmt.Sprintf("Run En. [%s] %s / %s", engBarStr, color.Render(mode, color.ColorSpec{Fg: engSpec.Fg}, fmt.Sprint(p.RunEnergy)), g.colorizeConstant(sess, "score_max_value", fmt.Sprint(p.MaxRunEnergy()))) |