cmd/horsebot: move to here

cmd/horsebot/.gitignore

@@ -0,0 +1 @@
+token

cmd/horsebot/README.md

@@ -0,0 +1,10 @@
+# horsebot
+
+Discord bot serving horse game data.
+
+Production instance is named Zenno Rob Roy, because she has read all about Umamusume and is always happy to share her knowledge and give recommendations.
+
+## Running
+
+The bot always uses the Gateway API.
+If the `-http` argument is provided, it will also use the HTTP API, and `-key` must also be provided.

cmd/horsebot/autocomplete/autocomplete.go

@@ -0,0 +1,56 @@
+package autocomplete
+
+import (
+	"bytes"
+	"cmp"
+	"slices"
+	"sync"
+
+	"github.com/junegunn/fzf/src/algo"
+	"github.com/junegunn/fzf/src/util"
+)
+
+// Set is an autocomplete set.
+type Set[V any] struct {
+	keys []util.Chars
+	vals []V
+}
+
+// Add associates a value with a key in the autocomplete set.
+// The behavior is undefined if the key already has a value.
+func (s *Set[V]) Add(key string, val V) {
+	k := util.ToChars([]byte(key))
+	i, _ := slices.BinarySearchFunc(s.keys, k, func(a, b util.Chars) int {
+		return bytes.Compare(a.Bytes(), b.Bytes())
+	})
+	s.keys = slices.Insert(s.keys, i, k)
+	s.vals = slices.Insert(s.vals, i, val)
+}
+
+// Find appends to r all values in the set with keys that key matches.
+func (s *Set[V]) Find(r []V, key string) []V {
+	initFzf()
+	var (
+		p = []rune(key)
+
+		got  []V
+		t    []algo.Result
+		slab util.Slab
+	)
+	for i := range s.keys {
+		res, _ := algo.FuzzyMatchV2(false, true, true, &s.keys[i], p, false, &slab)
+		if res.Score <= 0 {
+			continue
+		}
+		j, _ := slices.BinarySearchFunc(t, res, func(a, b algo.Result) int { return -cmp.Compare(a.Score, b.Score) })
+		// Insert after all other matches with the same score for stability.
+		for j < len(t) && t[j].Score == res.Score {
+			j++
+		}
+		t = slices.Insert(t, j, res)
+		got = slices.Insert(got, j, s.vals[i])
+	}
+	return append(r, got...)
+}
+
+var initFzf = sync.OnceFunc(func() { algo.Init("default") })

cmd/horsebot/autocomplete/autocomplete_test.go

@@ -0,0 +1,70 @@
+package autocomplete_test
+
+import (
+	"slices"
+	"testing"
+
+	"git.sunturtle.xyz/zephyr/horse/cmd/horsebot/autocomplete"
+)
+
+func these(s ...string) []string { return s }
+
+func TestAutocomplete(t *testing.T) {
+	cases := []struct {
+		name   string
+		add    []string
+		search string
+		want   []string
+	}{
+		{
+			name:   "empty",
+			add:    nil,
+			search: "",
+			want:   nil,
+		},
+		{
+			name:   "exact",
+			add:    these("bocchi"),
+			search: "bocchi",
+			want:   these("bocchi"),
+		},
+		{
+			name:   "extra",
+			add:    these("bocchi", "ryo", "nijika", "kita"),
+			search: "bocchi",
+			want:   these("bocchi"),
+		},
+		{
+			name:   "short",
+			add:    these("bocchi", "ryo", "nijika", "kita"),
+			search: "o",
+			want:   these("bocchi", "ryo"),
+		},
+		{
+			name:   "unrelated",
+			add:    these("bocchi", "ryo", "nijika", "kita"),
+			search: "x",
+			want:   nil,
+		},
+		{
+			name:   "map",
+			add:    these("Corazón ☆ Ardiente"),
+			search: "corazo",
+			want:   these("Corazón ☆ Ardiente"),
+		},
+	}
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			var set autocomplete.Set[string]
+			for _, s := range c.add {
+				set.Add(s, s)
+			}
+			got := set.Find(nil, c.search)
+			slices.Sort(c.want)
+			slices.Sort(got)
+			if !slices.Equal(c.want, got) {
+				t.Errorf("wrong results: want %q, got %q", c.want, got)
+			}
+		})
+	}
+}

cmd/horsebot/log.go

@@ -0,0 +1,55 @@
+package main
+
+import (
+	"log/slog"
+
+	"github.com/disgoorg/disgo/discord"
+	"github.com/disgoorg/disgo/handler"
+)
+
+func logMiddleware(next handler.Handler) handler.Handler {
+	return func(e *handler.InteractionEvent) error {
+		var msg string
+		attrs := make([]slog.Attr, 0, 8)
+		attrs = append(attrs,
+			slog.Uint64("interaction", uint64(e.Interaction.ID())),
+			slog.Uint64("user", uint64(e.Interaction.User().ID)),
+		)
+		if guild := e.Interaction.GuildID(); guild != nil {
+			attrs = append(attrs, slog.String("guild", guild.String()))
+		}
+		switch i := e.Interaction.(type) {
+		case discord.ApplicationCommandInteraction:
+			msg = "command"
+			attrs = append(attrs,
+				slog.String("name", i.Data.CommandName()),
+				slog.Int("type", int(i.Data.Type())),
+			)
+			switch data := i.Data.(type) {
+			case discord.SlashCommandInteractionData:
+				attrs = append(attrs, slog.String("path", data.CommandPath()))
+			}
+
+		case discord.AutocompleteInteraction:
+			msg = "autocomplete"
+			attrs = append(attrs,
+				slog.String("name", i.Data.CommandName),
+				slog.String("path", i.Data.CommandPath()),
+				slog.String("focus", i.Data.Focused().Name),
+			)
+
+		case discord.ComponentInteraction:
+			msg = "component"
+			attrs = append(attrs,
+				slog.Int("type", int(i.Data.Type())),
+				slog.String("custom", i.Data.CustomID()),
+			)
+
+		default:
+			slog.WarnContext(e.Ctx, "unknown interaction", slog.Any("event", e))
+			return nil
+		}
+		slog.LogAttrs(e.Ctx, slog.LevelInfo, msg, attrs...)
+		return next(e)
+	}
+}

cmd/horsebot/main.go

@@ -0,0 +1,183 @@
+package main
+
+import (
+	"bytes"
+	"context"
+	"flag"
+	"fmt"
+	"log/slog"
+	"os"
+	"os/signal"
+	"strconv"
+	"time"
+
+	"github.com/disgoorg/disgo"
+	"github.com/disgoorg/disgo/bot"
+	"github.com/disgoorg/disgo/discord"
+	"github.com/disgoorg/disgo/handler"
+	"github.com/disgoorg/disgo/handler/middleware"
+	"github.com/disgoorg/disgo/httpserver"
+	"github.com/disgoorg/disgo/rest"
+
+	"git.sunturtle.xyz/zephyr/horse/horse"
+	"git.sunturtle.xyz/zephyr/horse/horse/global"
+)
+
+func main() {
+	var (
+		tokenFile string
+		// http api options
+		addr   string
+		route  string
+		pubkey string
+		// logging options
+		level   slog.Level
+		textfmt string
+	)
+	flag.StringVar(&tokenFile, "token", "", "`file` containing the Discord bot token")
+	flag.StringVar(&addr, "http", "", "`address` to bind HTTP API server")
+	flag.StringVar(&route, "route", "/interactions/callback", "`path` to serve HTTP API calls")
+	flag.StringVar(&pubkey, "key", "", "Discord public key")
+	flag.TextVar(&level, "log", slog.LevelInfo, "slog logging `level`")
+	flag.StringVar(&textfmt, "log-format", "text", "slog logging `format`, text or json")
+	flag.Parse()
+
+	var lh slog.Handler
+	switch textfmt {
+	case "text":
+		lh = slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: level})
+	case "json":
+		lh = slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{Level: level})
+	default:
+		fmt.Fprintf(os.Stderr, "invalid log format %q, must be text or json", textfmt)
+		os.Exit(1)
+	}
+	slog.SetDefault(slog.New(lh))
+
+	token, err := os.ReadFile(tokenFile)
+	if err != nil {
+		slog.Error("reading token", slog.Any("err", err))
+		os.Exit(1)
+	}
+	token = bytes.TrimSuffix(token, []byte{'\n'})
+
+	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)
+
+	r := handler.New()
+	r.DefaultContext(func() context.Context { return ctx })
+	r.Use(middleware.Go)
+	r.Use(logMiddleware)
+	r.Route("/skill", func(r handler.Router) {
+		r.SlashCommand("/", skillHandler)
+		r.Autocomplete("/", skillAutocomplete)
+		r.ButtonComponent("/{id}", skillButton)
+	})
+
+	opts := []bot.ConfigOpt{bot.WithDefaultGateway(), bot.WithEventListeners(r)}
+	if addr != "" {
+		if pubkey == "" {
+			slog.Error("Discord public key must be provided when using HTTP API")
+			os.Exit(1)
+		}
+		opts = append(opts, bot.WithHTTPServerConfigOpts(pubkey,
+			httpserver.WithAddress(addr),
+			httpserver.WithURL(route),
+		))
+	}
+
+	slog.Info("connect", slog.String("disgo", disgo.Version))
+	client, err := disgo.New(string(token), opts...)
+	if err != nil {
+		slog.Error("building bot", slog.Any("err", err))
+		os.Exit(1)
+	}
+
+	if err := handler.SyncCommands(client, commands, nil, rest.WithCtx(ctx)); err != nil {
+		slog.Error("syncing commands", slog.Any("err", err))
+		os.Exit(1)
+	}
+
+	if addr != "" {
+		slog.Info("start HTTP server", slog.String("address", addr), slog.String("route", route))
+		if err := client.OpenHTTPServer(); err != nil {
+			slog.Error("starting HTTP server", slog.Any("err", err))
+			stop()
+		}
+	}
+	slog.Info("start gateway")
+	if err := client.OpenGateway(ctx); err != nil {
+		slog.Error("starting gateway", slog.Any("err", err))
+		stop()
+	}
+	slog.Info("ready")
+	<-ctx.Done()
+	stop()
+
+	ctx, stop = context.WithTimeout(context.Background(), 5*time.Second)
+	defer stop()
+	client.Close(ctx)
+}
+
+var commands = []discord.ApplicationCommandCreate{
+	discord.SlashCommandCreate{
+		Name:        "skill",
+		Description: "Umamusume skill data",
+		Options: []discord.ApplicationCommandOption{
+			discord.ApplicationCommandOptionString{
+				Name:         "query",
+				Description:  "Skill name or ID",
+				Required:     true,
+				Autocomplete: true,
+			},
+		},
+	},
+}
+
+func skillHandler(data discord.SlashCommandInteractionData, e *handler.CommandEvent) error {
+	q := data.String("query")
+	id, err := strconv.ParseInt(q, 10, 32)
+	if err == nil {
+		// note inverted condition; this is when we have an id
+		id = int64(global.AllSkills[horse.SkillID(id)].ID)
+	}
+	if id == 0 {
+		// Either we weren't given a number or the number doesn't match any skill ID.
+		v := global.SkillNameToID[q]
+		if v == 0 {
+			// No such skill.
+			m := discord.MessageCreate{
+				Content: "No such skill.",
+				Flags:   discord.MessageFlagEphemeral,
+			}
+			return e.CreateMessage(m)
+		}
+		id = int64(v)
+	}
+	// TODO(zeph): search conditions and effects, give a list
+	m := discord.MessageCreate{
+		Components: []discord.LayoutComponent{RenderSkill(horse.SkillID(id), global.AllSkills, global.SkillGroups)},
+		Flags:      discord.MessageFlagIsComponentsV2,
+	}
+	return e.CreateMessage(m)
+}
+
+func skillAutocomplete(e *handler.AutocompleteEvent) error {
+	q := e.Data.String("query")
+	opts := skillGlobalAuto().Find(nil, q)
+	return e.AutocompleteResult(opts[:min(len(opts), 25)])
+}
+
+func skillButton(data discord.ButtonInteractionData, e *handler.ComponentEvent) error {
+	id, err := strconv.ParseInt(e.Vars["id"], 10, 32)
+	if err != nil {
+		m := discord.MessageCreate{
+			Content: "That button produced an invalid skill ID. That's not supposed to happen.",
+			Flags:   discord.MessageFlagEphemeral,
+		}
+		return e.CreateMessage(m)
+	}
+	m := discord.MessageUpdate{
+		Components: &[]discord.LayoutComponent{RenderSkill(horse.SkillID(id), global.AllSkills, global.SkillGroups)},
+	}
+	return e.UpdateMessage(m)
+}

cmd/horsebot/skill.go

@@ -0,0 +1,148 @@
+package main
+
+import (
+	"fmt"
+	"strings"
+	"sync"
+
+	"github.com/disgoorg/disgo/discord"
+
+	"git.sunturtle.xyz/zephyr/horse/cmd/horsebot/autocomplete"
+	"git.sunturtle.xyz/zephyr/horse/horse"
+	"git.sunturtle.xyz/zephyr/horse/horse/global"
+)
+
+func RenderSkill(id horse.SkillID, all map[horse.SkillID]horse.Skill, groups map[int32][4]horse.SkillID) discord.ContainerComponent {
+	s, ok := all[id]
+	if !ok {
+		return discord.NewContainer(discord.NewTextDisplayf("invalid skill ID %v made it to RenderSkill", id))
+	}
+
+	thumburl := fmt.Sprintf("https://gametora.com/images/umamusume/skill_icons/utx_ico_skill_%d.png", s.IconID)
+	top := "## " + s.Name
+	if s.UniqueOwner != "" {
+		top += "\n-# " + s.UniqueOwner
+	}
+	r := discord.NewContainer(
+		discord.NewSection(
+			discord.NewTextDisplay(top),
+			discord.NewTextDisplay(s.Description),
+		).WithAccessory(discord.NewThumbnail(thumburl)),
+	)
+	var skilltype string
+	switch {
+	case s.Rarity == 3, s.Rarity == 4, s.Rarity == 5:
+		// unique of various star levels
+		r.AccentColor = 0xaca4d4
+		skilltype = "Unique Skill"
+	case s.UniqueOwner != "":
+		r.AccentColor = 0xcccccc
+		skilltype = "Inherited Unique"
+	case s.Rarity == 2:
+		// rare (gold)
+		r.AccentColor = 0xd7c25b
+		skilltype = "Rare Skill"
+	case s.GroupRate == -1:
+		// negative (purple) skill
+		r.AccentColor = 0x9151d4
+		skilltype = "Negative Skill"
+	case !s.WitCheck:
+		// should be passive (green)
+		r.AccentColor = 0x66ae1c
+		skilltype = "Passive Skill"
+	case isDebuff(s):
+		// debuff (red)
+		r.AccentColor = 0xe34747
+		skilltype = "Debuff Skill"
+	case s.Rarity == 1:
+		// common (white)
+		r.AccentColor = 0xcccccc
+		skilltype = "Common Skill"
+	}
+	r.Components = append(r.Components, discord.NewSmallSeparator())
+	text := make([]string, 0, 3)
+	abils := make([]string, 0, 3)
+	for _, act := range s.Activations {
+		text, abils = text[:0], abils[:0]
+		if act.Precondition != "" {
+			text = append(text, "Precondition: "+formatCondition(act.Precondition))
+		}
+		text = append(text, "Condition: "+formatCondition(act.Condition))
+		var t string
+		switch {
+		case act.Duration < 0:
+			// passive; do nothing
+		case act.Duration == 0:
+			t = "Instantaneous "
+		case act.Duration >= 500e4:
+			t = "Permanent "
+		default:
+			t = "For " + act.Duration.String() + "s, "
+		}
+		for _, a := range act.Abilities {
+			abils = append(abils, a.String())
+		}
+		t += strings.Join(abils, ", ")
+		if act.Cooldown > 0 && act.Cooldown < 500e4 {
+			t += " on " + act.Cooldown.String() + "s cooldown"
+		}
+		text = append(text, t)
+		r.Components = append(r.Components, discord.NewTextDisplay(strings.Join(text, "\n")))
+	}
+
+	l := discord.NewTextDisplayf("%s ・ SP cost %d ・ Grade value %d ・ [Conditions on GameTora](https://gametora.com/umamusume/skill-condition-viewer?skill=%d)", skilltype, s.SPCost, s.GradeValue, s.ID)
+	r.Components = append(r.Components, discord.NewSmallSeparator(), l)
+	rel := make([]horse.Skill, 0, 4)
+	for _, id := range groups[s.Group] {
+		if id != 0 {
+			rel = append(rel, all[id])
+		}
+	}
+	if len(rel) > 1 {
+		buttons := make([]discord.InteractiveComponent, 0, 4)
+		for _, rs := range rel {
+			b := discord.NewSecondaryButton(rs.Name, fmt.Sprintf("/skill/%d", rs.ID))
+			if rs.ID == id {
+				b = b.AsDisabled()
+			}
+			buttons = append(buttons, b)
+		}
+		r.Components = append(r.Components, discord.NewActionRow(buttons...))
+	}
+	return r
+}
+
+func formatCondition(s string) string {
+	s = strings.ReplaceAll(s, "&", " & ")
+	if strings.ContainsRune(s, '@') {
+		return "```\n" + strings.ReplaceAll(s, "@", "\n@\n") + "```"
+	}
+	return "`" + s + "`"
+}
+
+func isDebuff(s horse.Skill) bool {
+	for _, act := range s.Activations {
+		for _, a := range act.Abilities {
+			if a.Value < 0 {
+				return true
+			}
+		}
+	}
+	return false
+}
+
+var skillGlobalAuto = sync.OnceValue(func() *autocomplete.Set[discord.AutocompleteChoice] {
+	var set autocomplete.Set[discord.AutocompleteChoice]
+	for _, id := range global.OrderedSkills {
+		s := global.AllSkills[id]
+		set.Add(s.Name, discord.AutocompleteChoiceString{Name: s.Name, Value: s.Name})
+		if s.UniqueOwner != "" {
+			if s.Rarity >= 3 {
+				set.Add(s.UniqueOwner, discord.AutocompleteChoiceString{Name: "Unique: " + s.UniqueOwner, Value: s.Name})
+			} else {
+				set.Add(s.UniqueOwner, discord.AutocompleteChoiceString{Name: "Inherited unique: " + s.UniqueOwner, Value: s.Name})
+			}
+		}
+	}
+	return &set
+})

go.mod

@@ -1,20 +1,30 @@
 module git.sunturtle.xyz/zephyr/horse
 
-go 1.24.1
+go 1.25.5
 
 require (
+	github.com/disgoorg/disgo v0.19.0-rc.15
+	github.com/junegunn/fzf v0.67.0
 	golang.org/x/sync v0.14.0
 	zombiezen.com/go/sqlite v1.4.2
 )
 
 require (
+	github.com/disgoorg/json/v2 v2.0.0 // indirect
+	github.com/disgoorg/omit v1.0.0 // indirect
+	github.com/disgoorg/snowflake/v2 v2.0.3 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/klauspost/compress v1.18.2 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/sasha-s/go-csync v0.0.0-20240107134140-fcbab37b09ad // indirect
+	golang.org/x/crypto v0.46.0 // indirect
 	golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/sys v0.39.0 // indirect
 	modernc.org/libc v1.65.7 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect

go.sum

@@ -1,15 +1,41 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/disgoorg/disgo v0.19.0-rc.15 h1:x0NsV2gcbdjwuztsg2wYXw76p1Cpc8f6ByDrkPcfQtU=
+github.com/disgoorg/disgo v0.19.0-rc.15/go.mod h1:14mgXzenkJqifkDmsEgU0zI1di6jNXodwX6L8geW33A=
+github.com/disgoorg/json/v2 v2.0.0 h1:U16yy/ARK7/aEpzjjqK1b/KaqqGHozUdeVw/DViEzQI=
+github.com/disgoorg/json/v2 v2.0.0/go.mod h1:jZTBC0nIE1WeetSEI3/Dka8g+qglb4FPVmp5I5HpEfI=
+github.com/disgoorg/omit v1.0.0 h1:y0LkVUOyUHT8ZlnhIAeOZEA22UYykeysK8bLJ0SfT78=
+github.com/disgoorg/omit v1.0.0/go.mod h1:RTmSARkf6PWT/UckwI0bV8XgWkWQoPppaT01rYKLcFQ=
+github.com/disgoorg/snowflake/v2 v2.0.3 h1:3B+PpFjr7j4ad7oeJu4RlQ+nYOTadsKapJIzgvSI2Ro=
+github.com/disgoorg/snowflake/v2 v2.0.3/go.mod h1:W6r7NUA7DwfZLwr00km6G4UnZ0zcoLBRufhkFWgAc4c=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/junegunn/fzf v0.67.0 h1:naiOdIkV5/ZCfHgKQIV/f5YDWowl95G6yyOQqW8FeSo=
+github.com/junegunn/fzf v0.67.0/go.mod h1:xlXX2/rmsccKQUnr9QOXPDi5DyV9cM0UjKy/huScBeE=
+github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk=
+github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
 github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/sasha-s/go-csync v0.0.0-20240107134140-fcbab37b09ad h1:qIQkSlF5vAUHxEmTbaqt1hkJ/t6skqEGYiMag343ucI=
+github.com/sasha-s/go-csync v0.0.0-20240107134140-fcbab37b09ad/go.mod h1:/pA7k3zsXKdjjAiUhB5CjuKib9KJGCaLvZwtxGC8U0s=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
+golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
 golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
 golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
 golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
@@ -17,12 +43,14 @@ golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
 golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
 golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
 golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 modernc.org/cc/v4 v4.26.1 h1:+X5NtzVBn0KgsBCBe+xkDC7twLb/jNVj9FPgiwSQO3s=
 modernc.org/cc/v4 v4.26.1/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
 modernc.org/ccgo/v4 v4.28.0 h1:rjznn6WWehKq7dG4JtLRKxb52Ecv8OUGah8+Z/SfpNU=

horse/global/race.go

@@ -29,9 +29,10 @@ const (
 	RaceAsahiHaiFuturityStakes     RaceID = 1022 // Asahi Hai Futurity Stakes
 	RaceArimaKinen                 RaceID = 1023 // Arima Kinen
 	RaceHopefulStakes              RaceID = 1024 // Hopeful Stakes
-	RaceTakarazukaKinenAlternate   RaceID = 1025 // Takarazuka Kinen
+	RaceTakarazukaKinenAlt1025     RaceID = 1025 // Takarazuka Kinen
-	RaceKikukaShoAlternate         RaceID = 1026 // Kikuka Sho
+	RaceKikukaShoAlt1026           RaceID = 1026 // Kikuka Sho
-	RaceTennoShoSpringAlternate    RaceID = 1027 // Tenno Sho (Spring)
+	RaceTennoShoSpringAlt1027      RaceID = 1027 // Tenno Sho (Spring)
+	RaceSatsukiShoAlt1028          RaceID = 1028 // Satsuki Sho
 	RaceTeioSho                    RaceID = 1101 // Teio Sho
 	RaceJapanDirtDerby             RaceID = 1102 // Japan Dirt Derby
 	RaceJBCLadiesClassic           RaceID = 1103 // JBC Ladies’ Classic
@@ -72,7 +73,7 @@ const (
 	RaceDailyHaiJuniorStakes       RaceID = 2032 // Daily Hai Junior Stakes
 	RaceStayersStakes              RaceID = 2033 // Stayers Stakes
 	RaceHanshinCup                 RaceID = 2034 // Hanshin Cup
-	RaceSpringStakesAlternate      RaceID = 2035 // Spring Stakes
+	RaceSpringStakesAlt2035        RaceID = 2035 // Spring Stakes
 	RaceKyotoKimpai                RaceID = 3001 // Kyoto Kimpai
 	RaceNakayamaKimpai             RaceID = 3002 // Nakayama Kimpai
 	RaceShinzanKinen               RaceID = 3003 // Shinzan Kinen
@@ -412,24 +413,30 @@ var AllRaces = map[RaceID]Race{
 		Name:      "Hopeful Stakes",
 		Thumbnail: 1024,
 	},
-	RaceTakarazukaKinenAlternate: {
+	RaceTakarazukaKinenAlt1025: {
 		ID:        1025,
-		Name:      "Takarazuka Kinen" + " (Alternate)",
+		Name:      "Takarazuka Kinen" + " (Alternate 1025)",
 		Thumbnail: 1012,
 		Primary:   1012,
 	},
-	RaceKikukaShoAlternate: {
+	RaceKikukaShoAlt1026: {
 		ID:        1026,
-		Name:      "Kikuka Sho" + " (Alternate)",
+		Name:      "Kikuka Sho" + " (Alternate 1026)",
 		Thumbnail: 1015,
 		Primary:   1015,
 	},
-	RaceTennoShoSpringAlternate: {
+	RaceTennoShoSpringAlt1027: {
 		ID:        1027,
-		Name:      "Tenno Sho (Spring)" + " (Alternate)",
+		Name:      "Tenno Sho (Spring)" + " (Alternate 1027)",
 		Thumbnail: 1027,
 		Primary:   1006,
 	},
+	RaceSatsukiShoAlt1028: {
+		ID:        1028,
+		Name:      "Satsuki Sho" + " (Alternate 1028)",
+		Thumbnail: 1028,
+		Primary:   1005,
+	},
 	RaceTeioSho: {
 		ID:        1101,
 		Name:      "Teio Sho",
@@ -630,9 +637,9 @@ var AllRaces = map[RaceID]Race{
 		Name:      "Hanshin Cup",
 		Thumbnail: 2034,
 	},
-	RaceSpringStakesAlternate: {
+	RaceSpringStakesAlt2035: {
 		ID:        2035,
-		Name:      "Spring Stakes" + " (Alternate)",
+		Name:      "Spring Stakes" + " (Alternate 2035)",
 		Thumbnail: 2010,
 		Primary:   2010,
 	},
@@ -1743,9 +1750,10 @@ var RaceNameToID = map[string]RaceID{
 	"Asahi Hai Futurity Stakes":                1022,
 	"Arima Kinen":                              1023,
 	"Hopeful Stakes":                           1024,
-	"Takarazuka Kinen" + " (Alternate)":   1025,
+	"Takarazuka Kinen" + " (Alternate 1025)":   1025,
-	"Kikuka Sho" + " (Alternate)":         1026,
+	"Kikuka Sho" + " (Alternate 1026)":         1026,
-	"Tenno Sho (Spring)" + " (Alternate)": 1027,
+	"Tenno Sho (Spring)" + " (Alternate 1027)": 1027,
+	"Satsuki Sho" + " (Alternate 1028)":        1028,
 	"Teio Sho":                                 1101,
 	"Japan Dirt Derby":                         1102,
 	"JBC Ladies’ Classic":                      1103,
@@ -1786,7 +1794,7 @@ var RaceNameToID = map[string]RaceID{
 	"Daily Hai Junior Stakes":                  2032,
 	"Stayers Stakes":                           2033,
 	"Hanshin Cup":                              2034,
-	"Spring Stakes" + " (Alternate)":      2035,
+	"Spring Stakes" + " (Alternate 2035)":      2035,
 	"Kyoto Kimpai":                             3001,
 	"Nakayama Kimpai":                          3002,
 	"Shinzan Kinen":                            3003,

horse/global/race.kk

@@ -32,9 +32,10 @@ pub type race
   Asahi-Hai-Futurity-Stakes
   Arima-Kinen
   Hopeful-Stakes
-  Takarazuka-Kinen-Alternate
+  Takarazuka-Kinen-Alt1025
-  Kikuka-Sho-Alternate
+  Kikuka-Sho-Alt1026
-  Tenno-Sho-Spring-Alternate
+  Tenno-Sho-Spring-Alt1027
+  Satsuki-Sho-Alt1028
   Teio-Sho
   Japan-Dirt-Derby
   JBC-Ladies-Classic
@@ -75,7 +76,7 @@ pub type race
   Daily-Hai-Junior-Stakes
   Stayers-Stakes
   Hanshin-Cup
-  Spring-Stakes-Alternate
+  Spring-Stakes-Alt2035
   Kyoto-Kimpai
   Nakayama-Kimpai
   Shinzan-Kinen
@@ -320,9 +321,10 @@ pub fun race-id(r: race): race-id
     Asahi-Hai-Futurity-Stakes -> Race-id(1022)
     Arima-Kinen -> Race-id(1023)
     Hopeful-Stakes -> Race-id(1024)
-    Takarazuka-Kinen-Alternate -> Race-id(1025)
+    Takarazuka-Kinen-Alt1025 -> Race-id(1025)
-    Kikuka-Sho-Alternate -> Race-id(1026)
+    Kikuka-Sho-Alt1026 -> Race-id(1026)
-    Tenno-Sho-Spring-Alternate -> Race-id(1027)
+    Tenno-Sho-Spring-Alt1027 -> Race-id(1027)
+    Satsuki-Sho-Alt1028 -> Race-id(1028)
     Teio-Sho -> Race-id(1101)
     Japan-Dirt-Derby -> Race-id(1102)
     JBC-Ladies-Classic -> Race-id(1103)
@@ -363,7 +365,7 @@ pub fun race-id(r: race): race-id
     Daily-Hai-Junior-Stakes -> Race-id(2032)
     Stayers-Stakes -> Race-id(2033)
     Hanshin-Cup -> Race-id(2034)
-    Spring-Stakes-Alternate -> Race-id(2035)
+    Spring-Stakes-Alt2035 -> Race-id(2035)
     Kyoto-Kimpai -> Race-id(3001)
     Nakayama-Kimpai -> Race-id(3002)
     Shinzan-Kinen -> Race-id(3003)
@@ -607,9 +609,10 @@ pub val all = [
   Asahi-Hai-Futurity-Stakes,
   Arima-Kinen,
   Hopeful-Stakes,
-  Takarazuka-Kinen-Alternate,
+  Takarazuka-Kinen-Alt1025,
-  Kikuka-Sho-Alternate,
+  Kikuka-Sho-Alt1026,
-  Tenno-Sho-Spring-Alternate,
+  Tenno-Sho-Spring-Alt1027,
+  Satsuki-Sho-Alt1028,
   Teio-Sho,
   Japan-Dirt-Derby,
   JBC-Ladies-Classic,
@@ -650,7 +653,7 @@ pub val all = [
   Daily-Hai-Junior-Stakes,
   Stayers-Stakes,
   Hanshin-Cup,
-  Spring-Stakes-Alternate,
+  Spring-Stakes-Alt2035,
   Kyoto-Kimpai,
   Nakayama-Kimpai,
   Shinzan-Kinen,
@@ -894,9 +897,10 @@ val name2id: rbmap<string, race-id> = rb-map/empty()
   .set("Asahi Hai Futurity Stakes", Race-id(1022))
   .set("Arima Kinen", Race-id(1023))
   .set("Hopeful Stakes", Race-id(1024))
-  .set("Takarazuka Kinen" ++ " (Alternate)", Race-id(1025))
+  .set("Takarazuka Kinen" ++ " (Alternate 1025)", Race-id(1025))
-  .set("Kikuka Sho" ++ " (Alternate)", Race-id(1026))
+  .set("Kikuka Sho" ++ " (Alternate 1026)", Race-id(1026))
-  .set("Tenno Sho (Spring)" ++ " (Alternate)", Race-id(1027))
+  .set("Tenno Sho (Spring)" ++ " (Alternate 1027)", Race-id(1027))
+  .set("Satsuki Sho" ++ " (Alternate 1028)", Race-id(1028))
   .set("Teio Sho", Race-id(1101))
   .set("Japan Dirt Derby", Race-id(1102))
   .set("JBC Ladies’ Classic", Race-id(1103))
@@ -937,7 +941,7 @@ val name2id: rbmap<string, race-id> = rb-map/empty()
   .set("Daily Hai Junior Stakes", Race-id(2032))
   .set("Stayers Stakes", Race-id(2033))
   .set("Hanshin Cup", Race-id(2034))
-  .set("Spring Stakes" ++ " (Alternate)", Race-id(2035))
+  .set("Spring Stakes" ++ " (Alternate 2035)", Race-id(2035))
   .set("Kyoto Kimpai", Race-id(3001))
   .set("Nakayama Kimpai", Race-id(3002))
   .set("Shinzan Kinen", Race-id(3003))
@@ -1156,13 +1160,13 @@ val name2id: rbmap<string, race-id> = rb-map/empty()
   .set("Senryo Sho", Race-id(4526))
 
 // Get the race ID that has the given exact name.
-// Alternate versions of races have " (Alternate)" in their names.
+// Alternate versions of races have an indication of their ID in their names.
 // If no race matches the name, the result is an invalid ID.
 pub fun from-name(name: string): race-id
   name2id.lookup(name).default(Race-id(0))
 
 // Get the name for a race.
-// Alternate versions of races have " (Alternate)" in their names.
+// Alternate versions of races have an indication of their ID in their names.
 // If no race matches the ID, the result is the numeric ID.
 pub fun show(r: race-id): string
   match r.game-id
@@ -1190,9 +1194,10 @@ pub fun show(r: race-id): string
     1022 -> "Asahi Hai Futurity Stakes"
     1023 -> "Arima Kinen"
     1024 -> "Hopeful Stakes"
-    1025 -> "Takarazuka Kinen" ++ " (Alternate)"
+    1025 -> "Takarazuka Kinen" ++ " (Alternate 1025)"
-    1026 -> "Kikuka Sho" ++ " (Alternate)"
+    1026 -> "Kikuka Sho" ++ " (Alternate 1026)"
-    1027 -> "Tenno Sho (Spring)" ++ " (Alternate)"
+    1027 -> "Tenno Sho (Spring)" ++ " (Alternate 1027)"
+    1028 -> "Satsuki Sho" ++ " (Alternate 1028)"
     1101 -> "Teio Sho"
     1102 -> "Japan Dirt Derby"
     1103 -> "JBC Ladies’ Classic"
@@ -1233,7 +1238,7 @@ pub fun show(r: race-id): string
     2032 -> "Daily Hai Junior Stakes"
     2033 -> "Stayers Stakes"
     2034 -> "Hanshin Cup"
-    2035 -> "Spring Stakes" ++ " (Alternate)"
+    2035 -> "Spring Stakes" ++ " (Alternate 2035)"
     3001 -> "Kyoto Kimpai"
     3002 -> "Nakayama Kimpai"
     3003 -> "Shinzan Kinen"
@@ -1483,6 +1488,7 @@ pub fun grade(r: race-id): grade
     1025 -> G1
     1026 -> G1
     1027 -> G1
+    1028 -> G1
     1101 -> G1
     1102 -> G1
     1103 -> G1
@@ -1773,6 +1779,7 @@ pub fun thumbnail(r: race-id): race-thumbnail-id
     1025 -> Race-thumbnail-id(1012)
     1026 -> Race-thumbnail-id(1015)
     1027 -> Race-thumbnail-id(1027)
+    1028 -> Race-thumbnail-id(1028)
     1101 -> Race-thumbnail-id(1101)
     1102 -> Race-thumbnail-id(1102)
     1103 -> Race-thumbnail-id(1103)
@@ -2040,5 +2047,6 @@ pub fun primary(r: race-id): race-id
     1025 -> Race-id(1012)
     1026 -> Race-id(1015)
     1027 -> Race-id(1006)
+    1028 -> Race-id(1005)
     2035 -> Race-id(2010)
     _ -> r

horse/global/saddle.go

@@ -158,6 +158,8 @@ const (
 	SaddleSeniorSpringTripleCrownAlt2 SaddleID = 151 // Senior Spring Triple Crown
 	SaddleTennoSweepAlt1              SaddleID = 152 // Tenno Sweep
 	SaddleTennoShoSpringAlt1          SaddleID = 153 // Tenno Sho (Spring)
+	SaddleClassicTripleCrownAlt2      SaddleID = 154 // Classic Triple Crown
+	SaddleSatsukiShoAlt1              SaddleID = 155 // Satsuki Sho
 )
 
 var AllSaddles = map[SaddleID]Saddle{
@@ -1088,4 +1090,18 @@ var AllSaddles = map[SaddleID]Saddle{
 		Type:    SaddleTypeG1,
 		Primary: 13,
 	},
+	SaddleClassicTripleCrownAlt2: {
+		ID:      154,
+		Name:    "Classic Triple Crown" + " (Alternate 2)",
+		Races:   []RaceID{102801, 101001, 101501},
+		Type:    SaddleTypeHonor,
+		Primary: 1,
+	},
+	SaddleSatsukiShoAlt1: {
+		ID:      155,
+		Name:    "Satsuki Sho" + " (Alternate 1)",
+		Races:   []RaceID{102801},
+		Type:    SaddleTypeG1,
+		Primary: 18,
+	},
 }

horse/global/saddle.kk

@@ -151,16 +151,18 @@ pub type saddle
   Chunichi-Shimbun-Hai
   Capella-S
   Turquoise-S
-  Classic-Triple-Crown-Alt1
+  Classic-Triple-Crown-Alt144
-  Senior-Spring-Triple-Crown-Alt1
+  Senior-Spring-Triple-Crown-Alt145
-  Dual-Grand-Prix-Alt1
+  Dual-Grand-Prix-Alt146
-  Takarazuka-Kinen-Alt1
+  Takarazuka-Kinen-Alt147
-  Kikuka-Sho-Alt1
+  Kikuka-Sho-Alt148
-  Spring-S-Alt1
+  Spring-S-Alt149
   Aoi-S
-  Senior-Spring-Triple-Crown-Alt2
+  Senior-Spring-Triple-Crown-Alt151
-  Tenno-Sweep-Alt1
+  Tenno-Sweep-Alt152
-  Tenno-Sho-Spring-Alt1
+  Tenno-Sho-Spring-Alt153
+  Classic-Triple-Crown-Alt154
+  Satsuki-Sho-Alt155
 
 // Get the saddle ID for a saddle.
 pub fun saddle-id(s: saddle): saddle-id
@@ -308,16 +310,18 @@ pub fun saddle-id(s: saddle): saddle-id
     Chunichi-Shimbun-Hai -> Saddle-id(141)
     Capella-S -> Saddle-id(142)
     Turquoise-S -> Saddle-id(143)
-    Classic-Triple-Crown-Alt1 -> Saddle-id(144)
+    Classic-Triple-Crown-Alt144 -> Saddle-id(144)
-    Senior-Spring-Triple-Crown-Alt1 -> Saddle-id(145)
+    Senior-Spring-Triple-Crown-Alt145 -> Saddle-id(145)
-    Dual-Grand-Prix-Alt1 -> Saddle-id(146)
+    Dual-Grand-Prix-Alt146 -> Saddle-id(146)
-    Takarazuka-Kinen-Alt1 -> Saddle-id(147)
+    Takarazuka-Kinen-Alt147 -> Saddle-id(147)
-    Kikuka-Sho-Alt1 -> Saddle-id(148)
+    Kikuka-Sho-Alt148 -> Saddle-id(148)
-    Spring-S-Alt1 -> Saddle-id(149)
+    Spring-S-Alt149 -> Saddle-id(149)
     Aoi-S -> Saddle-id(150)
-    Senior-Spring-Triple-Crown-Alt2 -> Saddle-id(151)
+    Senior-Spring-Triple-Crown-Alt151 -> Saddle-id(151)
-    Tenno-Sweep-Alt1 -> Saddle-id(152)
+    Tenno-Sweep-Alt152 -> Saddle-id(152)
-    Tenno-Sho-Spring-Alt1 -> Saddle-id(153)
+    Tenno-Sho-Spring-Alt153 -> Saddle-id(153)
+    Classic-Triple-Crown-Alt154 -> Saddle-id(154)
+    Satsuki-Sho-Alt155 -> Saddle-id(155)
   
 // List of all saddles in ID order for easy iterating.
 pub val all = [
@@ -464,20 +468,22 @@ pub val all = [
   Chunichi-Shimbun-Hai,
   Capella-S,
   Turquoise-S,
-  Classic-Triple-Crown-Alt1,
+  Classic-Triple-Crown-Alt144,
-  Senior-Spring-Triple-Crown-Alt1,
+  Senior-Spring-Triple-Crown-Alt145,
-  Dual-Grand-Prix-Alt1,
+  Dual-Grand-Prix-Alt146,
-  Takarazuka-Kinen-Alt1,
+  Takarazuka-Kinen-Alt147,
-  Kikuka-Sho-Alt1,
+  Kikuka-Sho-Alt148,
-  Spring-S-Alt1,
+  Spring-S-Alt149,
   Aoi-S,
-  Senior-Spring-Triple-Crown-Alt2,
+  Senior-Spring-Triple-Crown-Alt151,
-  Tenno-Sweep-Alt1,
+  Tenno-Sweep-Alt152,
-  Tenno-Sho-Spring-Alt1,
+  Tenno-Sho-Spring-Alt153,
+  Classic-Triple-Crown-Alt154,
+  Satsuki-Sho-Alt155,
 ]
 
 // Get the name for a saddle.
-// Alternate versions of saddles have an indication of such in their names.
+// Alternate versions of saddles have an indication of their ID in their names.
 // If no saddle matches the ID, the result contains the numeric ID.
 pub fun show(s: saddle-id): string
   match s.game-id
@@ -624,16 +630,18 @@ pub fun show(s: saddle-id): string
     141 -> "Chunichi Shimbun Hai"
     142 -> "Capella S."
     143 -> "Turquoise S."
-    144 -> "Classic Triple Crown" ++ " (Alternate 1)"
+    144 -> "Classic Triple Crown" ++ " (Alternate 144)"
-    145 -> "Senior Spring Triple Crown" ++ " (Alternate 1)"
+    145 -> "Senior Spring Triple Crown" ++ " (Alternate 145)"
-    146 -> "Dual Grand Prix" ++ " (Alternate 1)"
+    146 -> "Dual Grand Prix" ++ " (Alternate 146)"
-    147 -> "Takarazuka Kinen" ++ " (Alternate 1)"
+    147 -> "Takarazuka Kinen" ++ " (Alternate 147)"
-    148 -> "Kikuka Sho" ++ " (Alternate 1)"
+    148 -> "Kikuka Sho" ++ " (Alternate 148)"
-    149 -> "Spring S." ++ " (Alternate 1)"
+    149 -> "Spring S." ++ " (Alternate 149)"
     150 -> "Aoi S."
-    151 -> "Senior Spring Triple Crown" ++ " (Alternate 2)"
+    151 -> "Senior Spring Triple Crown" ++ " (Alternate 151)"
-    152 -> "Tenno Sweep" ++ " (Alternate 1)"
+    152 -> "Tenno Sweep" ++ " (Alternate 152)"
-    153 -> "Tenno Sho (Spring)" ++ " (Alternate 1)"
+    153 -> "Tenno Sho (Spring)" ++ " (Alternate 153)"
+    154 -> "Classic Triple Crown" ++ " (Alternate 154)"
+    155 -> "Satsuki Sho" ++ " (Alternate 155)"
     x -> "saddle " ++ x.show
 
 // Get the list of races that entitle a horse to a saddle.
@@ -793,6 +801,8 @@ pub fun races(s: saddle-id): list<race-id>
     151 -> [Race-id(100301), Race-id(102701), Race-id(101201), ]
     152 -> [Race-id(102701), Race-id(101601), ]
     153 -> [Race-id(102701), ]
+    154 -> [Race-id(102801), Race-id(101001), Race-id(101501), ]
+    155 -> [Race-id(102801), ]
     _ -> []
 
 // Get a saddle's type.
@@ -952,6 +962,8 @@ pub fun saddle-type(s: saddle-id): saddle-type
     151 -> Honor
     152 -> Honor
     153 -> G1-Win
+    154 -> Honor
+    155 -> G1-Win
     _ -> Honor
 
 // Get the primary ID for a saddle.
@@ -968,4 +980,6 @@ pub fun primary(s: saddle-id): saddle-id
     151 -> Saddle-id(4)
     152 -> Saddle-id(5)
     153 -> Saddle-id(13)
+    154 -> Saddle-id(1)
+    155 -> Saddle-id(18)
     _ -> s

horse/global/skill.go

@@ -67,6 +67,7 @@ const (
 	SkillMovingPastandBeyond                   SkillID = 100591  // Moving Past, and Beyond
 	SkillJustaLittleFarther                    SkillID = 100601  // Just a Little Farther!
 	SkillPridefulKing                          SkillID = 100611  // Prideful King
+	SkillAmbitiontoSurpasstheSakura            SkillID = 100691  // Ambition to Surpass the Sakura
 	SkillDazzlnDiver                           SkillID = 110011  // Dazzl'n ♪ Diver
 	SkillCertainVictory                        SkillID = 110031  // Certain Victory
 	SkillAKissforCourage                       SkillID = 110041  // A Kiss for Courage
@@ -136,6 +137,7 @@ const (
 	SkillSpringRunnerLv2                       SkillID = 200171  // Spring Runner ◎
 	SkillSpringRunner                          SkillID = 200172  // Spring Runner ○
 	SkillSpringRunnerX                         SkillID = 200173  // Spring Runner ×
+	SkillSpringSpectacle                       SkillID = 200174  // Spring Spectacle
 	SkillSummerRunnerLv2                       SkillID = 200181  // Summer Runner ◎
 	SkillSummerRunner                          SkillID = 200182  // Summer Runner ○
 	SkillSummerRunnerX                         SkillID = 200183  // Summer Runner ×
@@ -496,6 +498,7 @@ const (
 	SkillMovingPastandBeyondInherit            SkillID = 900591  // Moving Past, and Beyond
 	SkillJustaLittleFartherInherit             SkillID = 900601  // Just a Little Farther!
 	SkillPridefulKingInherit                   SkillID = 900611  // Prideful King
+	SkillAmbitiontoSurpasstheSakuraInherit     SkillID = 900691  // Ambition to Surpass the Sakura
 	SkillDazzlnDiverInherit                    SkillID = 910011  // Dazzl'n ♪ Diver
 	SkillCertainVictoryInherit                 SkillID = 910031  // Certain Victory
 	SkillAKissforCourageInherit                SkillID = 910041  // A Kiss for Courage
@@ -579,6 +582,7 @@ var OrderedSkills = [...]SkillID{
 	SkillMovingPastandBeyond,
 	SkillJustaLittleFarther,
 	SkillPridefulKing,
+	SkillAmbitiontoSurpasstheSakura,
 	SkillDazzlnDiver,
 	SkillCertainVictory,
 	SkillAKissforCourage,
@@ -648,6 +652,7 @@ var OrderedSkills = [...]SkillID{
 	SkillSpringRunnerLv2,
 	SkillSpringRunner,
 	SkillSpringRunnerX,
+	SkillSpringSpectacle,
 	SkillSummerRunnerLv2,
 	SkillSummerRunner,
 	SkillSummerRunnerX,
@@ -1008,6 +1013,7 @@ var OrderedSkills = [...]SkillID{
 	SkillMovingPastandBeyondInherit,
 	SkillJustaLittleFartherInherit,
 	SkillPridefulKingInherit,
+	SkillAmbitiontoSurpasstheSakuraInherit,
 	SkillDazzlnDiverInherit,
 	SkillCertainVictoryInherit,
 	SkillAKissforCourageInherit,
@@ -2362,6 +2368,27 @@ var AllSkills = map[SkillID]Skill{
 		UniqueOwner: "[King of Emeralds] King Halo",
 		IconID:      20013,
 	},
+	SkillAmbitiontoSurpasstheSakura: {
+		ID:          100691,
+		Name:        "Ambition to Surpass the Sakura",
+		Description: "Increase velocity with blossoming ambition when well-positioned and close to the runner ahead with 300m or less remaining.",
+		Group:       10069,
+		Rarity:      5,
+		GroupRate:   1,
+		GradeValue:  340,
+		Activations: []Activation{
+			{
+				Condition: "remain_distance<=300&order_rate<=40&bashin_diff_infront<=1",
+				Duration:  50000,
+				Cooldown:  5000000,
+				Abilities: []Ability{
+					{Type: 27, ValueUsage: 1, Value: 3500, Target: 1, TargetValue: 0},
+				},
+			},
+		},
+		UniqueOwner: "[Strength in Full Bloom] Sakura Chiyono O",
+		IconID:      20013,
+	},
 	SkillDazzlnDiver: {
 		ID:          110011,
 		Name:        "Dazzl'n ♪ Diver",
@@ -3782,6 +3809,27 @@ var AllSkills = map[SkillID]Skill{
 		SPCost: 50,
 		IconID: 10014,
 	},
+	SkillSpringSpectacle: {
+		ID:          200174,
+		Name:        "Spring Spectacle",
+		Description: "Increase performance in spring, boosting Speed and Power.",
+		Group:       20017,
+		Rarity:      2,
+		GroupRate:   3,
+		GradeValue:  461,
+		Activations: []Activation{
+			{
+				Condition: "season==1@season==5",
+				Duration:  -1,
+				Abilities: []Ability{
+					{Type: 1, ValueUsage: 1, Value: 600000, Target: 1, TargetValue: 0},
+					{Type: 3, ValueUsage: 1, Value: 600000, Target: 1, TargetValue: 0},
+				},
+			},
+		},
+		SPCost: 130,
+		IconID: 10012,
+	},
 	SkillSummerRunnerLv2: {
 		ID:          200181,
 		Name:        "Summer Runner ◎",
@@ -11684,6 +11732,29 @@ var AllSkills = map[SkillID]Skill{
 		SPCost:      200,
 		IconID:      20011,
 	},
+	SkillAmbitiontoSurpasstheSakuraInherit: {
+		ID:          900691,
+		Name:        "Ambition to Surpass the Sakura" + " (Inherited)",
+		Description: "Slightly increase velocity when well-positioned and close to the runner ahead with 300m or less remaining.",
+		Group:       10069,
+		Rarity:      1,
+		GroupRate:   2,
+		GradeValue:  180,
+		WitCheck:    true,
+		Activations: []Activation{
+			{
+				Condition: "remain_distance<=300&order_rate<=40&bashin_diff_infront<=1",
+				Duration:  30000,
+				Cooldown:  5000000,
+				Abilities: []Ability{
+					{Type: 27, ValueUsage: 1, Value: 1500, Target: 1, TargetValue: 0},
+				},
+			},
+		},
+		UniqueOwner: "[Strength in Full Bloom] Sakura Chiyono O",
+		SPCost:      200,
+		IconID:      20011,
+	},
 	SkillDazzlnDiverInherit: {
 		ID:          910011,
 		Name:        "Dazzl'n ♪ Diver" + " (Inherited)",
@@ -12173,6 +12244,7 @@ var SkillNameToID = map[string]SkillID{
 	"Moving Past, and Beyond":             100591,
 	"Just a Little Farther!":              100601,
 	"Prideful King":                       100611,
+	"Ambition to Surpass the Sakura":      100691,
 	"Dazzl'n ♪ Diver":                     110011,
 	"Certain Victory":                     110031,
 	"A Kiss for Courage":                  110041,
@@ -12242,6 +12314,7 @@ var SkillNameToID = map[string]SkillID{
 	"Spring Runner ◎":                     200171,
 	"Spring Runner ○":                     200172,
 	"Spring Runner ×":                     200173,
+	"Spring Spectacle":                    200174,
 	"Summer Runner ◎":                     200181,
 	"Summer Runner ○":                     200182,
 	"Summer Runner ×":                     200183,
@@ -12602,6 +12675,7 @@ var SkillNameToID = map[string]SkillID{
 	"Moving Past, and Beyond" + " (Inherited)":             900591,
 	"Just a Little Farther!" + " (Inherited)":              900601,
 	"Prideful King" + " (Inherited)":                       900611,
+	"Ambition to Surpass the Sakura" + " (Inherited)":      900691,
 	"Dazzl'n ♪ Diver" + " (Inherited)":                     910011,
 	"Certain Victory" + " (Inherited)":                     910031,
 	"A Kiss for Courage" + " (Inherited)":                  910041,
@@ -12685,6 +12759,7 @@ var SkillGroups = map[int32][4]SkillID{
 	10059:  {SkillMovingPastandBeyond, SkillMovingPastandBeyondInherit},
 	10060:  {SkillJustaLittleFarther, SkillJustaLittleFartherInherit},
 	10061:  {SkillPridefulKing, SkillPridefulKingInherit},
+	10069:  {SkillAmbitiontoSurpasstheSakura, SkillAmbitiontoSurpasstheSakuraInherit},
 	11001:  {SkillDazzlnDiver, SkillDazzlnDiverInherit},
 	11003:  {SkillCertainVictory, SkillCertainVictoryInherit},
 	11004:  {SkillAKissforCourage, SkillAKissforCourageInherit},
@@ -12718,7 +12793,7 @@ var SkillGroups = map[int32][4]SkillID{
 	20014:  {SkillNonStandardDistanceLv2, SkillNonStandardDistance, SkillNonStandardDistanceX},
 	20015:  {SkillFirmConditionsLv2, SkillFirmConditions, SkillFirmConditionsX},
 	20016:  {SkillWetConditionsLv2, SkillWetConditions, SkillWetConditionsX},
-	20017:  {SkillSpringRunnerLv2, SkillSpringRunner, SkillSpringRunnerX},
+	20017:  {SkillSpringRunnerLv2, SkillSpringRunner, SkillSpringRunnerX, SkillSpringSpectacle},
 	20018:  {SkillSummerRunnerLv2, SkillSummerRunner, SkillSummerRunnerX},
 	20019:  {SkillFallRunnerLv2, SkillFallRunner, SkillFallRunnerX, SkillFallFrenzy},
 	20020:  {SkillWinterRunnerLv2, SkillWinterRunner, SkillWinterRunnerX},

horse/global/skill.kk

@@ -72,6 +72,7 @@ pub type skill
   Moving-Past-and-Beyond
   Just-a-Little-Farther
   Prideful-King
+  Ambition-to-Surpass-the-Sakura
   Dazzl-n-Diver
   Certain-Victory
   A-Kiss-for-Courage
@@ -141,6 +142,7 @@ pub type skill
   Spring-Runner-Lv2
   Spring-Runner
   Spring-Runner-x
+  Spring-Spectacle
   Summer-Runner-Lv2
   Summer-Runner
   Summer-Runner-x
@@ -501,6 +503,7 @@ pub type skill
   Moving-Past-and-Beyond-Inherit
   Just-a-Little-Farther-Inherit
   Prideful-King-Inherit
+  Ambition-to-Surpass-the-Sakura-Inherit
   Dazzl-n-Diver-Inherit
   Certain-Victory-Inherit
   A-Kiss-for-Courage-Inherit
@@ -585,6 +588,7 @@ pub fun skill-id(s: skill): skill-id
     Moving-Past-and-Beyond -> Skill-id(100591)
     Just-a-Little-Farther -> Skill-id(100601)
     Prideful-King -> Skill-id(100611)
+    Ambition-to-Surpass-the-Sakura -> Skill-id(100691)
     Dazzl-n-Diver -> Skill-id(110011)
     Certain-Victory -> Skill-id(110031)
     A-Kiss-for-Courage -> Skill-id(110041)
@@ -654,6 +658,7 @@ pub fun skill-id(s: skill): skill-id
     Spring-Runner-Lv2 -> Skill-id(200171)
     Spring-Runner -> Skill-id(200172)
     Spring-Runner-x -> Skill-id(200173)
+    Spring-Spectacle -> Skill-id(200174)
     Summer-Runner-Lv2 -> Skill-id(200181)
     Summer-Runner -> Skill-id(200182)
     Summer-Runner-x -> Skill-id(200183)
@@ -1014,6 +1019,7 @@ pub fun skill-id(s: skill): skill-id
     Moving-Past-and-Beyond-Inherit -> Skill-id(900591)
     Just-a-Little-Farther-Inherit -> Skill-id(900601)
     Prideful-King-Inherit -> Skill-id(900611)
+    Ambition-to-Surpass-the-Sakura-Inherit -> Skill-id(900691)
     Dazzl-n-Diver-Inherit -> Skill-id(910011)
     Certain-Victory-Inherit -> Skill-id(910031)
     A-Kiss-for-Courage-Inherit -> Skill-id(910041)
@@ -1097,6 +1103,7 @@ pub val all = [
   Moving-Past-and-Beyond,
   Just-a-Little-Farther,
   Prideful-King,
+  Ambition-to-Surpass-the-Sakura,
   Dazzl-n-Diver,
   Certain-Victory,
   A-Kiss-for-Courage,
@@ -1166,6 +1173,7 @@ pub val all = [
   Spring-Runner-Lv2,
   Spring-Runner,
   Spring-Runner-x,
+  Spring-Spectacle,
   Summer-Runner-Lv2,
   Summer-Runner,
   Summer-Runner-x,
@@ -1526,6 +1534,7 @@ pub val all = [
   Moving-Past-and-Beyond-Inherit,
   Just-a-Little-Farther-Inherit,
   Prideful-King-Inherit,
+  Ambition-to-Surpass-the-Sakura-Inherit,
   Dazzl-n-Diver-Inherit,
   Certain-Victory-Inherit,
   A-Kiss-for-Courage-Inherit,
@@ -1609,6 +1618,7 @@ val name2id: rbmap<string, skill-id> = rb-map/empty()
   .set("Moving Past, and Beyond", Skill-id(100591))
   .set("Just a Little Farther!", Skill-id(100601))
   .set("Prideful King", Skill-id(100611))
+  .set("Ambition to Surpass the Sakura", Skill-id(100691))
   .set("Dazzl'n ♪ Diver", Skill-id(110011))
   .set("Certain Victory", Skill-id(110031))
   .set("A Kiss for Courage", Skill-id(110041))
@@ -1678,6 +1688,7 @@ val name2id: rbmap<string, skill-id> = rb-map/empty()
   .set("Spring Runner ◎", Skill-id(200171))
   .set("Spring Runner ○", Skill-id(200172))
   .set("Spring Runner ×", Skill-id(200173))
+  .set("Spring Spectacle", Skill-id(200174))
   .set("Summer Runner ◎", Skill-id(200181))
   .set("Summer Runner ○", Skill-id(200182))
   .set("Summer Runner ×", Skill-id(200183))
@@ -2038,6 +2049,7 @@ val name2id: rbmap<string, skill-id> = rb-map/empty()
   .set("Moving Past, and Beyond" ++ " (Inherited)", Skill-id(900591))
   .set("Just a Little Farther!" ++ " (Inherited)", Skill-id(900601))
   .set("Prideful King" ++ " (Inherited)", Skill-id(900611))
+  .set("Ambition to Surpass the Sakura" ++ " (Inherited)", Skill-id(900691))
   .set("Dazzl'n ♪ Diver" ++ " (Inherited)", Skill-id(910011))
   .set("Certain Victory" ++ " (Inherited)", Skill-id(910031))
   .set("A Kiss for Courage" ++ " (Inherited)", Skill-id(910041))
@@ -2130,6 +2142,7 @@ pub fun show(s: skill-id): string
     100591 -> "Moving Past, and Beyond"
     100601 -> "Just a Little Farther!"
     100611 -> "Prideful King"
+    100691 -> "Ambition to Surpass the Sakura"
     110011 -> "Dazzl'n ♪ Diver"
     110031 -> "Certain Victory"
     110041 -> "A Kiss for Courage"
@@ -2199,6 +2212,7 @@ pub fun show(s: skill-id): string
     200171 -> "Spring Runner ◎"
     200172 -> "Spring Runner ○"
     200173 -> "Spring Runner ×"
+    200174 -> "Spring Spectacle"
     200181 -> "Summer Runner ◎"
     200182 -> "Summer Runner ○"
     200183 -> "Summer Runner ×"
@@ -2559,6 +2573,7 @@ pub fun show(s: skill-id): string
     900591 -> "Moving Past, and Beyond" ++ " (Inherited)"
     900601 -> "Just a Little Farther!" ++ " (Inherited)"
     900611 -> "Prideful King" ++ " (Inherited)"
+    900691 -> "Ambition to Surpass the Sakura" ++ " (Inherited)"
     910011 -> "Dazzl'n ♪ Diver" ++ " (Inherited)"
     910031 -> "Certain Victory" ++ " (Inherited)"
     910041 -> "A Kiss for Courage" ++ " (Inherited)"
@@ -2645,6 +2660,7 @@ pub fun description(s: skill-id): string
     100591 -> "Having run the race calmly, increase acceleration with hardened determination when making a move mid-race, or on a crucial corner late-race whilst in midpack."
     100601 -> "Increase velocity with flaring fighting spirit when positioned 3rd and about to lose late-race."
     100611 -> "Greatly increase velocity in a true display of skill with 200m remaining after racing calmly."
+    100691 -> "Increase velocity with blossoming ambition when well-positioned and close to the runner ahead with 300m or less remaining."
     110011 -> "Recover endurance by relaxing after activating 2 skills when positioned midpack mid-race."
     110031 -> "Greatly increase velocity with an indomitable fighting spirit on the final straight after being on the heels of another runner toward the front on the final corner or later."
     110041 -> "Increase velocity enthusiastically when positioned toward the front in the second half of the race after recovering endurance with a skill."
@@ -2714,6 +2730,7 @@ pub fun description(s: skill-id): string
     200171 -> "Increase performance in spring."
     200172 -> "Moderately increase performance in spring."
     200173 -> "Moderately decrease performance in spring."
+    200174 -> "Increase performance in spring, boosting Speed and Power."
     200181 -> "Increase performance in summer."
     200182 -> "Moderately increase performance in summer."
     200183 -> "Moderately decrease performance in summer."
@@ -3074,6 +3091,7 @@ pub fun description(s: skill-id): string
     900591 -> "Having run the race calmly, slightly increase acceleration when making a move mid-race, or on a crucial corner late-race whilst in midpack."
     900601 -> "Slightly increase velocity when positioned 3rd and about to lose late-race."
     900611 -> "Moderately increase velocity in a true display of skill with 200m remaining after racing calmly."
+    900691 -> "Slightly increase velocity when well-positioned and close to the runner ahead with 300m or less remaining."
     910011 -> "Slightly recover endurance after activating 2 skills mid-race."
     910031 -> "Moderately increase velocity on the final straight after being on the heels of another runner toward the front on the final corner or later."
     910041 -> "Slightly increase velocity when positioned toward the front in the second half of the race after recovering endurance with a skill."
@@ -3160,6 +3178,7 @@ pub fun group(s: skill-id): skill-group-id
     100591 -> Skill-group-id(10059)
     100601 -> Skill-group-id(10060)
     100611 -> Skill-group-id(10061)
+    100691 -> Skill-group-id(10069)
     110011 -> Skill-group-id(11001)
     110031 -> Skill-group-id(11003)
     110041 -> Skill-group-id(11004)
@@ -3229,6 +3248,7 @@ pub fun group(s: skill-id): skill-group-id
     200171 -> Skill-group-id(20017)
     200172 -> Skill-group-id(20017)
     200173 -> Skill-group-id(20017)
+    200174 -> Skill-group-id(20017)
     200181 -> Skill-group-id(20018)
     200182 -> Skill-group-id(20018)
     200183 -> Skill-group-id(20018)
@@ -3589,6 +3609,7 @@ pub fun group(s: skill-id): skill-group-id
     900591 -> Skill-group-id(10059)
     900601 -> Skill-group-id(10060)
     900611 -> Skill-group-id(10061)
+    900691 -> Skill-group-id(10069)
     910011 -> Skill-group-id(11001)
     910031 -> Skill-group-id(11003)
     910041 -> Skill-group-id(11004)
@@ -3675,6 +3696,7 @@ pub fun rarity(s: skill-id): rarity
     100591 -> Unique
     100601 -> Unique-Upgraded
     100611 -> Unique-Upgraded
+    100691 -> Unique
     110011 -> Unique
     110031 -> Unique
     110041 -> Unique
@@ -3744,6 +3766,7 @@ pub fun rarity(s: skill-id): rarity
     200171 -> Common
     200172 -> Common
     200173 -> Common
+    200174 -> Rare
     200181 -> Common
     200182 -> Common
     200183 -> Common
@@ -4104,6 +4127,7 @@ pub fun rarity(s: skill-id): rarity
     900591 -> Common
     900601 -> Common
     900611 -> Common
+    900691 -> Common
     910011 -> Common
     910031 -> Common
     910041 -> Common
@@ -4190,6 +4214,7 @@ pub fun group-rate(s: skill-id): int
     100591 -> 1
     100601 -> 1
     100611 -> 1
+    100691 -> 1
     110011 -> 1
     110031 -> 1
     110041 -> 1
@@ -4259,6 +4284,7 @@ pub fun group-rate(s: skill-id): int
     200171 -> 2
     200172 -> 1
     200173 -> -1
+    200174 -> 3
     200181 -> 2
     200182 -> 1
     200183 -> -1
@@ -4619,6 +4645,7 @@ pub fun group-rate(s: skill-id): int
     900591 -> 2
     900601 -> 2
     900611 -> 2
+    900691 -> 2
     910011 -> 2
     910031 -> 2
     910041 -> 2
@@ -4705,6 +4732,7 @@ pub fun grade-value(s: skill-id): int
     100591 -> 340
     100601 -> 340
     100611 -> 340
+    100691 -> 340
     110011 -> 340
     110031 -> 340
     110041 -> 340
@@ -4774,6 +4802,7 @@ pub fun grade-value(s: skill-id): int
     200171 -> 174
     200172 -> 129
     200173 -> -129
+    200174 -> 461
     200181 -> 174
     200182 -> 129
     200183 -> -129
@@ -5134,6 +5163,7 @@ pub fun grade-value(s: skill-id): int
     900591 -> 180
     900601 -> 180
     900611 -> 180
+    900691 -> 180
     910011 -> 180
     910031 -> 180
     910041 -> 180
@@ -5220,6 +5250,7 @@ pub fun wit-check(s: skill-id): bool
     100591 -> False
     100601 -> False
     100611 -> False
+    100691 -> False
     110011 -> False
     110031 -> False
     110041 -> False
@@ -5289,6 +5320,7 @@ pub fun wit-check(s: skill-id): bool
     200171 -> False
     200172 -> False
     200173 -> False
+    200174 -> False
     200181 -> False
     200182 -> False
     200183 -> False
@@ -5649,6 +5681,7 @@ pub fun wit-check(s: skill-id): bool
     900591 -> True
     900601 -> True
     900611 -> True
+    900691 -> True
     910011 -> True
     910031 -> True
     910041 -> True
@@ -6706,6 +6739,21 @@ pub fun activations(s: skill-id): list<activation>
         ]
       ),
     ]
+    100691 -> [
+      Activation(
+        precondition = "",
+        condition = "remain_distance<=300&order_rate<=40&bashin_diff_infront<=1",
+        duration = 50000.decimal(-4),
+        cooldown = 5000000.decimal(-4),
+        abilities = [
+          Ability(
+            ability-type = Target-Speed(3500.decimal(-4)),
+            value-usage = Direct,
+            target = Self
+          ),
+        ]
+      ),
+    ]
     110011 -> [
       Activation(
         precondition = "",
@@ -7797,6 +7845,26 @@ pub fun activations(s: skill-id): list<activation>
         ]
       ),
     ]
+    200174 -> [
+      Activation(
+        precondition = "",
+        condition = "season==1@season==5",
+        duration = -1.decimal,
+        cooldown = 0.decimal,
+        abilities = [
+          Ability(
+            ability-type = Passive-Speed(600000.decimal(-4)),
+            value-usage = Direct,
+            target = Self
+          ),
+          Ability(
+            ability-type = Passive-Power(600000.decimal(-4)),
+            value-usage = Direct,
+            target = Self
+          ),
+        ]
+      ),
+    ]
     200181 -> [
       Activation(
         precondition = "",
@@ -13485,6 +13553,21 @@ pub fun activations(s: skill-id): list<activation>
         ]
       ),
     ]
+    900691 -> [
+      Activation(
+        precondition = "",
+        condition = "remain_distance<=300&order_rate<=40&bashin_diff_infront<=1",
+        duration = 30000.decimal(-4),
+        cooldown = 5000000.decimal(-4),
+        abilities = [
+          Ability(
+            ability-type = Target-Speed(1500.decimal(-4)),
+            value-usage = Direct,
+            target = Self
+          ),
+        ]
+      ),
+    ]
     910011 -> [
       Activation(
         precondition = "",
@@ -13862,6 +13945,7 @@ pub fun unique-owner(s: skill-id): maybe<trainee-id>
     100591 -> Just(Trainee-id(105901))
     100601 -> Just(Trainee-id(106001))
     100611 -> Just(Trainee-id(106101))
+    100691 -> Just(Trainee-id(106901))
     110011 -> Just(Trainee-id(100102))
     110031 -> Just(Trainee-id(100302))
     110041 -> Just(Trainee-id(100402))
@@ -13925,6 +14009,7 @@ pub fun unique-owner(s: skill-id): maybe<trainee-id>
     900591 -> Just(Trainee-id(105901))
     900601 -> Just(Trainee-id(106001))
     900611 -> Just(Trainee-id(106101))
+    900691 -> Just(Trainee-id(106901))
     910011 -> Just(Trainee-id(100102))
     910031 -> Just(Trainee-id(100302))
     910041 -> Just(Trainee-id(100402))
@@ -14010,6 +14095,7 @@ pub fun sp-cost(s: skill-id): int
     100591 -> 0
     100601 -> 0
     100611 -> 0
+    100691 -> 0
     110011 -> 0
     110031 -> 0
     110041 -> 0
@@ -14079,6 +14165,7 @@ pub fun sp-cost(s: skill-id): int
     200171 -> 110
     200172 -> 90
     200173 -> 50
+    200174 -> 130
     200181 -> 110
     200182 -> 90
     200183 -> 50
@@ -14439,6 +14526,7 @@ pub fun sp-cost(s: skill-id): int
     900591 -> 200
     900601 -> 200
     900611 -> 200
+    900691 -> 200
     910011 -> 200
     910031 -> 200
     910041 -> 200
@@ -14525,6 +14613,7 @@ pub fun icon-id(s: skill-id): skill-icon-id
     100591 -> Skill-icon-id(20043)
     100601 -> Skill-icon-id(20013)
     100611 -> Skill-icon-id(20013)
+    100691 -> Skill-icon-id(20013)
     110011 -> Skill-icon-id(20023)
     110031 -> Skill-icon-id(20013)
     110041 -> Skill-icon-id(20013)
@@ -14594,6 +14683,7 @@ pub fun icon-id(s: skill-id): skill-icon-id
     200171 -> Skill-icon-id(10011)
     200172 -> Skill-icon-id(10011)
     200173 -> Skill-icon-id(10014)
+    200174 -> Skill-icon-id(10012)
     200181 -> Skill-icon-id(10011)
     200182 -> Skill-icon-id(10011)
     200183 -> Skill-icon-id(10014)
@@ -14954,6 +15044,7 @@ pub fun icon-id(s: skill-id): skill-icon-id
     900591 -> Skill-icon-id(20041)
     900601 -> Skill-icon-id(20011)
     900611 -> Skill-icon-id(20011)
+    900691 -> Skill-icon-id(20011)
     910011 -> Skill-icon-id(20021)
     910031 -> Skill-icon-id(20011)
     910041 -> Skill-icon-id(20011)
@@ -15041,6 +15132,7 @@ pub fun skill-group/show(sg: skill-group-id): string
     10059 ->"Moving Past, and Beyond"
     10060 ->"Just a Little Farther!"
     10061 ->"Prideful King"
+    10069 ->"Ambition to Surpass the Sakura"
     11001 ->"Dazzl'n ♪ Diver"
     11003 ->"Certain Victory"
     11004 ->"A Kiss for Courage"
@@ -15309,6 +15401,7 @@ pub fun skill-group/skills(sg: skill-group-id): list<skill-id>
     10059 -> [Skill-id(100591), Skill-id(900591), ]
     10060 -> [Skill-id(100601), Skill-id(900601), ]
     10061 -> [Skill-id(100611), Skill-id(900611), ]
+    10069 -> [Skill-id(100691), Skill-id(900691), ]
     11001 -> [Skill-id(110011), Skill-id(910011), ]
     11003 -> [Skill-id(110031), Skill-id(910031), ]
     11004 -> [Skill-id(110041), Skill-id(910041), ]
@@ -15342,7 +15435,7 @@ pub fun skill-group/skills(sg: skill-group-id): list<skill-id>
     20014 -> [Skill-id(200141), Skill-id(200142), Skill-id(200143), ]
     20015 -> [Skill-id(200151), Skill-id(200152), Skill-id(200153), ]
     20016 -> [Skill-id(200161), Skill-id(200162), Skill-id(200163), ]
-    20017 -> [Skill-id(200171), Skill-id(200172), Skill-id(200173), ]
+    20017 -> [Skill-id(200171), Skill-id(200172), Skill-id(200173), Skill-id(200174), ]
     20018 -> [Skill-id(200181), Skill-id(200182), Skill-id(200183), ]
     20019 -> [Skill-id(200191), Skill-id(200192), Skill-id(200193), Skill-id(200194), ]
     20020 -> [Skill-id(200201), Skill-id(200202), Skill-id(200203), ]

horsegen/load.go

@@ -328,6 +328,7 @@ type Race struct {
 	Grade       int
 	ThumbnailID int
 	Primary     int
+	Alternate   int
 }
 
 func Races(ctx context.Context, db *sqlitex.Pool) ([]Race, error) {
@@ -357,6 +358,7 @@ func Races(ctx context.Context, db *sqlitex.Pool) ([]Race, error) {
 			Grade:       stmt.ColumnInt(2),
 			ThumbnailID: stmt.ColumnInt(3),
 			Primary:     stmt.ColumnInt(4),
+			Alternate:   stmt.ColumnInt(5),
 		}
 		r = append(r, race)
 	}

horsegen/race.go.template

@@ -7,15 +7,15 @@ import . "git.sunturtle.xyz/zephyr/horse/horse"
 
 const (
 	{{- range $r := $.Races }}
-	Race{{ goenum $r.Name }}{{ if ne $r.Primary $r.ID }}Alternate{{ end }} RaceID = {{ $r.ID }} // {{ $r.Name }}
+	Race{{ goenum $r.Name }}{{ if $r.Alternate }}Alt{{ $r.ID }}{{ end }} RaceID = {{ $r.ID }} // {{ $r.Name }}
 	{{- end }}
 )
 
 var AllRaces = map[RaceID]Race{
 	{{- range $r := $.Races }}
-	Race{{ goenum $r.Name }}{{ if ne $r.Primary $r.ID }}Alternate{{ end }}: {
+	Race{{ goenum $r.Name }}{{ if $r.Alternate }}Alt{{ $r.ID }}{{ end }}: {
 		ID: {{ $r.ID }},
-		Name: {{ printf "%q" $r.Name }}{{ if ne $r.Primary $r.ID }} + " (Alternate)"{{ end }},
+		Name: {{ printf "%q" $r.Name }}{{ if $r.Alternate }} + " (Alternate {{ $r.ID }})"{{ end }},
 		Thumbnail: {{ $r.ThumbnailID }},
 		{{- if ne $r.Primary $r.ID }}
 		Primary: {{ $r.Primary }},
@@ -26,7 +26,7 @@ var AllRaces = map[RaceID]Race{
 
 var RaceNameToID = map[string]RaceID{
 	{{- range $r := $.Races }}
-	{{ printf "%q" $r.Name }}{{ if ne $r.Primary $r.ID }} + " (Alternate)"{{ end }}: {{ $r.ID }},
+	{{ printf "%q" $r.Name }}{{ if $r.Alternate }} + " (Alternate {{ $r.ID }})"{{ end }}: {{ $r.ID }},
 	{{- end }}
 }
 {{ end }}

horsegen/race.kk.template

@@ -10,41 +10,41 @@ pub import horse/race
 // Enumeration of all races for type-safe programming.
 pub type race
   {{- range $r := $.Races }}
-  {{ kkenum $r.Name }}{{ if ne $r.Primary $r.ID }}-Alternate{{ end }}
+  {{ kkenum $r.Name }}{{ if $r.Alternate }}-Alt{{ $r.ID }}{{ end }}
   {{- end }}
 
 // Get the race ID for a race.
 pub fun race-id(r: race): race-id
   match r
     {{- range $r := $.Races }}
-    {{ kkenum $r.Name }}{{ if ne $r.Primary $r.ID }}-Alternate{{ end }} -> Race-id({{ $r.ID }})
+    {{ kkenum $r.Name }}{{ if $r.Alternate }}-Alt{{ $r.ID }}{{ end }} -> Race-id({{ $r.ID }})
     {{- end }}
 
 // List of all races in ID order for easy iterating.
 pub val all = [
   {{- range $r := $.Races }}
-  {{ kkenum $r.Name }}{{ if ne $r.Primary $r.ID }}-Alternate{{ end }},
+  {{ kkenum $r.Name }}{{ if $r.Alternate }}-Alt{{ $r.ID }}{{ end }},
   {{- end }}
 ]
 
 val name2id: rbmap<string, race-id> = rb-map/empty()
   {{- range $r := $.Races }}
-  .set({{ printf "%q" $r.Name }}{{ if ne $r.Primary $r.ID }} ++ " (Alternate)"{{ end }}, Race-id({{ $r.ID }}))
+  .set({{ printf "%q" $r.Name }}{{ if $r.Alternate }} ++ " (Alternate {{ $r.ID }})"{{ end }}, Race-id({{ $r.ID }}))
   {{- end }}
 
 // Get the race ID that has the given exact name.
-// Alternate versions of races have " (Alternate)" in their names.
+// Alternate versions of races have an indication of their ID in their names.
 // If no race matches the name, the result is an invalid ID.
 pub fun from-name(name: string): race-id
   name2id.lookup(name).default(Race-id(0))
 
 // Get the name for a race.
-// Alternate versions of races have " (Alternate)" in their names.
+// Alternate versions of races have an indication of their ID in their names.
 // If no race matches the ID, the result is the numeric ID.
 pub fun show(r: race-id): string
   match r.game-id
     {{- range $r := $.Races }}
-    {{ $r.ID }} -> {{ printf "%q" $r.Name }}{{ if ne $r.Primary $r.ID }} ++ " (Alternate)"{{ end }}
+    {{ $r.ID }} -> {{ printf "%q" $r.Name }}{{ if $r.Alternate }} ++ " (Alternate {{ $r.ID }})"{{ end }}
     {{- end }}
     x -> "race " ++ x.show
 
@@ -72,7 +72,7 @@ pub fun thumbnail(r: race-id): race-thumbnail-id
 pub fun primary(r: race-id): race-id
   match r.game-id
     {{- range $r := $.Races }}
-    {{- if ne $r.ID $r.Primary }}
+    {{- if $r.Alternate }}
     {{ $r.ID }} -> Race-id({{ $r.Primary }})
     {{- end }}
     {{- end }}

horsegen/race.sql

@@ -6,7 +6,8 @@ SELECT
 	race_names.name,
 	race.grade,
 	race.thumbnail_id,
-	MIN(race.id) OVER (PARTITION BY race_names.name) AS "primary"
+	MIN(race.id) OVER (PARTITION BY race_names.name) AS "primary",
+	ROW_NUMBER() OVER (PARTITION BY race_names.name ORDER BY race.id) - 1 AS "alternate"
 FROM race
 	JOIN race_names ON race.id = race_names.id
 WHERE race."group" = 1

horsegen/saddle.kk.template

@@ -10,30 +10,30 @@ pub import horse/{{ $.Region }}/race
 // Enumeration of all saddles for type-safe programming.
 pub type saddle
   {{- range $s := $.Saddles }}
-  {{ kkenum $s.Name }}{{ if $s.Alternate }}-Alt{{ $s.Alternate }}{{ end }}
+  {{ kkenum $s.Name }}{{ if $s.Alternate }}-Alt{{ $s.ID }}{{ end }}
   {{- end }}
 
 // Get the saddle ID for a saddle.
 pub fun saddle-id(s: saddle): saddle-id
   match s
     {{- range $s := $.Saddles }}
-    {{ kkenum $s.Name }}{{ if $s.Alternate }}-Alt{{ $s.Alternate }}{{ end }} -> Saddle-id({{ $s.ID }})
+    {{ kkenum $s.Name }}{{ if $s.Alternate }}-Alt{{ $s.ID }}{{ end }} -> Saddle-id({{ $s.ID }})
     {{- end }}
   
 // List of all saddles in ID order for easy iterating.
 pub val all = [
   {{- range $s := $.Saddles }}
-  {{ kkenum $s.Name }}{{ if $s.Alternate }}-Alt{{ $s.Alternate }}{{ end }},
+  {{ kkenum $s.Name }}{{ if $s.Alternate }}-Alt{{ $s.ID }}{{ end }},
   {{- end }}
 ]
 
 // Get the name for a saddle.
-// Alternate versions of saddles have an indication of such in their names.
+// Alternate versions of saddles have an indication of their ID in their names.
 // If no saddle matches the ID, the result contains the numeric ID.
 pub fun show(s: saddle-id): string
   match s.game-id
     {{- range $s := $.Saddles }}
-    {{ $s.ID }} -> {{ printf "%q" $s.Name }}{{ if $s.Alternate }} ++ " (Alternate {{ $s.Alternate }})"{{ end }}
+    {{ $s.ID }} -> {{ printf "%q" $s.Name }}{{ if $s.Alternate }} ++ " (Alternate {{ $s.ID }})"{{ end }}
     {{- end }}
     x -> "saddle " ++ x.show