horse, mdb: include id in lobby conversations

Fixes #13.

character.go

@@ -28,6 +28,8 @@ type AffinityDetail struct {
 
 // Conversation describes a lobby conversation.
 type Conversation struct {
+	// ID is the conversation ID.
+	ID int32 `json:"id"`
 	// CharacterID is the ID of the character who has the conversation as
 	// a gallery entry.
 	CharacterID CharacterID `json:"chara_id"`

mdb/character.go

@@ -89,13 +89,14 @@ func Umas(ctx context.Context, db *sqlitex.Pool) ([]horse.Uma, error) {
 func Conversations(ctx context.Context, db *sqlitex.Pool) ([]horse.Conversation, error) {
 	return load(ctx, db, make([]horse.Conversation, 0, 1024), conversationSQL, func(s *sqlite.Stmt) horse.Conversation {
 		return horse.Conversation{
-			CharacterID:   horse.CharacterID(s.ColumnInt(0)),
+			ID:            s.ColumnInt32(0),
-			Number:        s.ColumnInt(1),
+			CharacterID:   horse.CharacterID(s.ColumnInt(1)),
-			Location:      horse.LobbyConversationLocationID(s.ColumnInt(2)),
+			Number:        s.ColumnInt(2),
-			Chara1:        horse.CharacterID(s.ColumnInt(3)),
+			Location:      horse.LobbyConversationLocationID(s.ColumnInt(3)),
-			Chara2:        horse.CharacterID(s.ColumnInt(4)),
+			Chara1:        horse.CharacterID(s.ColumnInt(4)),
-			Chara3:        horse.CharacterID(s.ColumnInt(5)),
+			Chara2:        horse.CharacterID(s.ColumnInt(5)),
-			ConditionType: s.ColumnInt(6),
+			Chara3:        horse.CharacterID(s.ColumnInt(6)),
+			ConditionType: s.ColumnInt(7),
 		}
 	})
 }

mdb/character_test.go

@@ -238,12 +238,14 @@ func TestConversations(t *testing.T) {
 	}
 	want := []horse.Conversation{
 		{
+			ID:          1,
 			CharacterID: 1001,
 			Number:      1,
 			Location:    410,
 			Chara1:      1001,
 		},
 		{
+			ID:            2,
 			CharacterID:   1001,
 			Number:        2,
 			Location:      510,
@@ -251,6 +253,7 @@ func TestConversations(t *testing.T) {
 			ConditionType: 1,
 		},
 		{
+			ID:            3,
 			CharacterID:   1001,
 			Number:        3,
 			Location:      310,
@@ -258,6 +261,7 @@ func TestConversations(t *testing.T) {
 			ConditionType: 1,
 		},
 		{
+			ID:            76,
 			CharacterID:   1001,
 			Number:        4,
 			Location:      120,
@@ -266,6 +270,7 @@ func TestConversations(t *testing.T) {
 			ConditionType: 2,
 		},
 		{
+			ID:            77,
 			CharacterID:   1001,
 			Number:        5,
 			Location:      520,
@@ -274,6 +279,7 @@ func TestConversations(t *testing.T) {
 			ConditionType: 3,
 		},
 		{
+			ID:            126,
 			CharacterID:   1001,
 			Number:        6,
 			Location:      430,
@@ -283,12 +289,14 @@ func TestConversations(t *testing.T) {
 			ConditionType: 1,
 		},
 		{
+			ID:          4,
 			CharacterID: 1002,
 			Number:      1,
 			Location:    310,
 			Chara1:      1002,
 		},
 		{
+			ID:            5,
 			CharacterID:   1002,
 			Number:        2,
 			Location:      210,
@@ -296,6 +304,7 @@ func TestConversations(t *testing.T) {
 			ConditionType: 1,
 		},
 		{
+			ID:            6,
 			CharacterID:   1002,
 			Number:        3,
 			Location:      110,
@@ -303,6 +312,7 @@ func TestConversations(t *testing.T) {
 			ConditionType: 1,
 		},
 		{
+			ID:            78,
 			CharacterID:   1002,
 			Number:        4,
 			Location:      520,
@@ -311,6 +321,7 @@ func TestConversations(t *testing.T) {
 			ConditionType: 3,
 		},
 		{
+			ID:            79,
 			CharacterID:   1002,
 			Number:        5,
 			Location:      220,

mdb/skill.go

@@ -18,6 +18,8 @@ var (
 	skillGroupSQL string
 	//go:embed sql/skill.sql
 	skillSQL string
+	//go:embed sql/skill-group-skills.sql
+	skillGroupSkillsSQL string
 )
 
 // SkillGroups retrieves all skill groups.
@@ -35,84 +37,128 @@ func SkillGroups(ctx context.Context, db *sqlitex.Pool) ([]horse.SkillGroup, err
 
 // Skills retrieves all skills.
 func Skills(ctx context.Context, db *sqlitex.Pool) ([]horse.Skill, error) {
-	return load(ctx, db, nil, skillSQL, func(s *sqlite.Stmt) horse.Skill {
+	// We don't use func load here because we have multiple queries to run.
-		return horse.Skill{
+	conn, err := db.Take(ctx)
-			ID:          horse.SkillID(s.ColumnInt(0)),
+	defer db.Put(conn)
-			Name:        s.ColumnText(1),
+	if err != nil {
-			Description: s.ColumnText(2),
+		return nil, err
-			Group:       horse.SkillGroupID(s.ColumnInt32(3)),
+	}
-			Rarity:      int8(s.ColumnInt(5)),
+	var sk []horse.Skill
-			GroupRate:   int8(s.ColumnInt(6)),
+	{
-			GradeValue:  s.ColumnInt32(7),
+		stmt := conn.Prep(skillSQL)
-			WitCheck:    s.ColumnBool(8),
+		defer stmt.Reset()
-			Activations: trimActivations([]horse.Activation{
+		for {
-				{
+			ok, err := stmt.Step()
-					Precondition: s.ColumnText(9),
+			if err != nil {
-					Condition:    s.ColumnText(10),
+				return nil, err
-					Duration:     horse.TenThousandths(s.ColumnInt(11)),
+			}
-					DurScale:     horse.DurScale(s.ColumnInt(12)),
+			if !ok {
-					Cooldown:     horse.TenThousandths(s.ColumnInt(13)),
+				break
-					Abilities: trimAbilities([]horse.Ability{
+			}
-						{
+			s := horse.Skill{
-							Type:        horse.AbilityType(s.ColumnInt(14)),
+				ID:          horse.SkillID(stmt.ColumnInt(0)),
-							ValueUsage:  horse.AbilityValueUsage(s.ColumnInt(15)),
+				Name:        stmt.ColumnText(1),
-							Value:       horse.TenThousandths(s.ColumnInt(16)),
+				Description: stmt.ColumnText(2),
-							Target:      horse.AbilityTarget(s.ColumnInt(17)),
+				GroupSkills: make([]horse.GroupSkill, 0, 3),
-							TargetValue: s.ColumnInt32(18),
+				Group:       horse.SkillGroupID(stmt.ColumnInt32(3)),
-						},
+				Rarity:      int8(stmt.ColumnInt(5)),
-						{
+				GroupRate:   int8(stmt.ColumnInt(6)),
-							Type:        horse.AbilityType(s.ColumnInt(19)),
+				GradeValue:  stmt.ColumnInt32(7),
-							ValueUsage:  horse.AbilityValueUsage(s.ColumnInt(20)),
+				WitCheck:    stmt.ColumnBool(8),
-							Value:       horse.TenThousandths(s.ColumnInt(21)),
+				Activations: trimActivations([]horse.Activation{
-							Target:      horse.AbilityTarget(s.ColumnInt(22)),
+					{
-							TargetValue: s.ColumnInt32(23),
+						Precondition: stmt.ColumnText(9),
-						},
+						Condition:    stmt.ColumnText(10),
-						{
+						Duration:     horse.TenThousandths(stmt.ColumnInt(11)),
-							Type:        horse.AbilityType(s.ColumnInt(24)),
+						DurScale:     horse.DurScale(stmt.ColumnInt(12)),
-							ValueUsage:  horse.AbilityValueUsage(s.ColumnInt(25)),
+						Cooldown:     horse.TenThousandths(stmt.ColumnInt(13)),
-							Value:       horse.TenThousandths(s.ColumnInt(26)),
+						Abilities: trimAbilities([]horse.Ability{
-							Target:      horse.AbilityTarget(s.ColumnInt(27)),
+							{
-							TargetValue: s.ColumnInt32(28),
+								Type:        horse.AbilityType(stmt.ColumnInt(14)),
-						},
+								ValueUsage:  horse.AbilityValueUsage(stmt.ColumnInt(15)),
-					}),
+								Value:       horse.TenThousandths(stmt.ColumnInt(16)),
-				},
+								Target:      horse.AbilityTarget(stmt.ColumnInt(17)),
-				{
+								TargetValue: stmt.ColumnInt32(18),
-					Precondition: s.ColumnText(29),
+							},
-					Condition:    s.ColumnText(30),
+							{
-					Duration:     horse.TenThousandths(s.ColumnInt(31)),
+								Type:        horse.AbilityType(stmt.ColumnInt(19)),
-					DurScale:     horse.DurScale(s.ColumnInt(32)),
+								ValueUsage:  horse.AbilityValueUsage(stmt.ColumnInt(20)),
-					Cooldown:     horse.TenThousandths(s.ColumnInt(33)),
+								Value:       horse.TenThousandths(stmt.ColumnInt(21)),
-					Abilities: trimAbilities([]horse.Ability{
+								Target:      horse.AbilityTarget(stmt.ColumnInt(22)),
-						{
+								TargetValue: stmt.ColumnInt32(23),
-							Type:        horse.AbilityType(s.ColumnInt(34)),
+							},
-							ValueUsage:  horse.AbilityValueUsage(s.ColumnInt(35)),
+							{
-							Value:       horse.TenThousandths(s.ColumnInt(36)),
+								Type:        horse.AbilityType(stmt.ColumnInt(24)),
-							Target:      horse.AbilityTarget(s.ColumnInt(37)),
+								ValueUsage:  horse.AbilityValueUsage(stmt.ColumnInt(25)),
-							TargetValue: s.ColumnInt32(38),
+								Value:       horse.TenThousandths(stmt.ColumnInt(26)),
-						},
+								Target:      horse.AbilityTarget(stmt.ColumnInt(27)),
-						{
+								TargetValue: stmt.ColumnInt32(28),
-							Type:        horse.AbilityType(s.ColumnInt(39)),
+							},
-							ValueUsage:  horse.AbilityValueUsage(s.ColumnInt(40)),
+						}),
-							Value:       horse.TenThousandths(s.ColumnInt(41)),
+					},
-							Target:      horse.AbilityTarget(s.ColumnInt(42)),
+					{
-							TargetValue: s.ColumnInt32(43),
+						Precondition: stmt.ColumnText(29),
-						},
+						Condition:    stmt.ColumnText(30),
-						{
+						Duration:     horse.TenThousandths(stmt.ColumnInt(31)),
-							Type:        horse.AbilityType(s.ColumnInt(44)),
+						DurScale:     horse.DurScale(stmt.ColumnInt(32)),
-							ValueUsage:  horse.AbilityValueUsage(s.ColumnInt(45)),
+						Cooldown:     horse.TenThousandths(stmt.ColumnInt(33)),
-							Value:       horse.TenThousandths(s.ColumnInt(46)),
+						Abilities: trimAbilities([]horse.Ability{
-							Target:      horse.AbilityTarget(s.ColumnInt(47)),
+							{
-							TargetValue: s.ColumnInt32(48),
+								Type:        horse.AbilityType(stmt.ColumnInt(34)),
-						},
+								ValueUsage:  horse.AbilityValueUsage(stmt.ColumnInt(35)),
-					}),
+								Value:       horse.TenThousandths(stmt.ColumnInt(36)),
-				},
+								Target:      horse.AbilityTarget(stmt.ColumnInt(37)),
-			}),
+								TargetValue: stmt.ColumnInt32(38),
-			UniqueOwner: s.ColumnText(52), // TODO(zeph): should be id, not name
+							},
-			Tags:        parseTags(s.ColumnText(54)),
+							{
-			SPCost:      s.ColumnInt(49),
+								Type:        horse.AbilityType(stmt.ColumnInt(39)),
-			IconID:      s.ColumnInt(53),
+								ValueUsage:  horse.AbilityValueUsage(stmt.ColumnInt(40)),
+								Value:       horse.TenThousandths(stmt.ColumnInt(41)),
+								Target:      horse.AbilityTarget(stmt.ColumnInt(42)),
+								TargetValue: stmt.ColumnInt32(43),
+							},
+							{
+								Type:        horse.AbilityType(stmt.ColumnInt(44)),
+								ValueUsage:  horse.AbilityValueUsage(stmt.ColumnInt(45)),
+								Value:       horse.TenThousandths(stmt.ColumnInt(46)),
+								Target:      horse.AbilityTarget(stmt.ColumnInt(47)),
+								TargetValue: stmt.ColumnInt32(48),
+							},
+						}),
+					},
+				}),
+				UniqueOwner: stmt.ColumnText(52), // TODO(zeph): should be id, not name
+				Tags:        parseTags(stmt.ColumnText(54)),
+				SPCost:      stmt.ColumnInt(49),
+				IconID:      stmt.ColumnInt(53),
+			}
+			sk = append(sk, s)
 		}
-	})
+	}
+	stmt := conn.Prep(skillGroupSkillsSQL)
+	defer stmt.Reset()
+	cur := sk
+	for {
+		ok, err := stmt.Step()
+		if err != nil {
+			return nil, err
+		}
+		if !ok {
+			break
+		}
+		// We sort skills by ID first, so we can add group skills in a single pass.
+		id := stmt.ColumnInt(0)
+		for len(cur) != 0 && cur[0].ID != horse.SkillID(id) {
+			cur = cur[1:]
+		}
+		g := horse.GroupSkill{
+			ID:        horse.SkillID(stmt.ColumnInt(1)),
+			GroupRate: int8(stmt.ColumnInt(2)),
+			Rarity:    int8(stmt.ColumnInt(3)),
+		}
+		cur[0].GroupSkills = append(cur[0].GroupSkills, g)
+	}
+	return sk, nil
 }
 
 func parseTags(s string) []uint16 {

mdb/skill_test.go

@@ -49,11 +49,16 @@ func TestSkills(t *testing.T) {
 			ID:          10351,
 			Name:        "V Is for Victory!",
 			Description: "Moderately increase velocity with winning ambition when positioned toward the front on the final straight after engaging in a challenge on the final corner or later.",
-			Group:       1035,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      3,
+				{ID: 100351, GroupRate: 1, Rarity: 4},
-			GroupRate:   1,
+				{ID: 10351, GroupRate: 1, Rarity: 3},
-			GradeValue:  240,
+				{ID: 900351, GroupRate: 2, Rarity: 1},
-			WitCheck:    false,
+			},
+			Group:      1035,
+			Rarity:     3,
+			GroupRate:  1,
+			GradeValue: 240,
+			WitCheck:   false,
 			Activations: []horse.Activation{
 				{
 					Precondition: "is_finalcorner==1&blocked_side_continuetime>=2",
@@ -81,11 +86,15 @@ func TestSkills(t *testing.T) {
 			ID:          100011,
 			Name:        "Shooting Star",
 			Description: "Ride the momentum to increase velocity and very slightly increase acceleration after passing another runner toward the front late-race.",
-			Group:       10001,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      5,
+				{ID: 100011, GroupRate: 1, Rarity: 5},
-			GroupRate:   1,
+				{ID: 900011, GroupRate: 2, Rarity: 1},
-			GradeValue:  340,
+			},
-			WitCheck:    false,
+			Group:      10001,
+			Rarity:     5,
+			GroupRate:  1,
+			GradeValue: 340,
+			WitCheck:   false,
 			Activations: []horse.Activation{
 				{
 					Precondition: "",
@@ -120,11 +129,16 @@ func TestSkills(t *testing.T) {
 			ID:          100351,
 			Name:        "Our Ticket to Win!",
 			Description: "Increase velocity with winning ambition when positioned toward the front on the final straight after engaging in a challenge on the final corner or later.",
-			Group:       10035,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      4,
+				{ID: 100351, GroupRate: 1, Rarity: 4},
-			GroupRate:   1,
+				{ID: 10351, GroupRate: 1, Rarity: 3},
-			GradeValue:  340,
+				{ID: 900351, GroupRate: 2, Rarity: 1},
-			WitCheck:    false,
+			},
+			Group:      10035,
+			Rarity:     4,
+			GroupRate:  1,
+			GradeValue: 340,
+			WitCheck:   false,
 			Activations: []horse.Activation{
 				{
 					Precondition: "is_finalcorner==1&blocked_side_continuetime>=2",
@@ -152,11 +166,15 @@ func TestSkills(t *testing.T) {
 			ID:          110241,
 			Name:        "Flowery☆Maneuver",
 			Description: "Increase velocity when passing another runner toward the front on the final corner. If passing toward the back, increase acceleration instead.",
-			Group:       11024,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      5,
+				{ID: 110241, GroupRate: 1, Rarity: 5},
-			GroupRate:   1,
+				{ID: 910241, GroupRate: 2, Rarity: 1},
-			GradeValue:  340,
+			},
-			WitCheck:    false,
+			Group:      11024,
+			Rarity:     5,
+			GroupRate:  1,
+			GradeValue: 340,
+			WitCheck:   false,
 			Activations: []horse.Activation{
 				{
 					Precondition: "",
@@ -200,11 +218,17 @@ func TestSkills(t *testing.T) {
 			ID:          200011,
 			Name:        "Right-Handed ◎",
 			Description: "Increase performance on right-handed tracks.",
-			Group:       20001,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      1,
+				{ID: 200013, GroupRate: -1, Rarity: 1},
-			GroupRate:   2,
+				{ID: 200012, GroupRate: 1, Rarity: 1},
-			GradeValue:  174,
+				{ID: 200011, GroupRate: 2, Rarity: 1},
-			WitCheck:    false,
+				{ID: 200014, GroupRate: 3, Rarity: 2},
+			},
+			Group:      20001,
+			Rarity:     1,
+			GroupRate:  2,
+			GradeValue: 174,
+			WitCheck:   false,
 			Activations: []horse.Activation{
 				{
 					Precondition: "",
@@ -231,11 +255,17 @@ func TestSkills(t *testing.T) {
 			ID:          200012,
 			Name:        "Right-Handed ○",
 			Description: "Moderately increase performance on right-handed tracks.",
-			Group:       20001,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      1,
+				{ID: 200013, GroupRate: -1, Rarity: 1},
-			GroupRate:   1,
+				{ID: 200012, GroupRate: 1, Rarity: 1},
-			GradeValue:  129,
+				{ID: 200011, GroupRate: 2, Rarity: 1},
-			WitCheck:    false,
+				{ID: 200014, GroupRate: 3, Rarity: 2},
+			},
+			Group:      20001,
+			Rarity:     1,
+			GroupRate:  1,
+			GradeValue: 129,
+			WitCheck:   false,
 			Activations: []horse.Activation{
 				{
 					Precondition: "",
@@ -262,11 +292,17 @@ func TestSkills(t *testing.T) {
 			ID:          200013,
 			Name:        "Right-Handed ×",
 			Description: "Moderately decrease performance on right-handed tracks.",
-			Group:       20001,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      1,
+				{ID: 200013, GroupRate: -1, Rarity: 1},
-			GroupRate:   -1,
+				{ID: 200012, GroupRate: 1, Rarity: 1},
-			GradeValue:  -129,
+				{ID: 200011, GroupRate: 2, Rarity: 1},
-			WitCheck:    false,
+				{ID: 200014, GroupRate: 3, Rarity: 2},
+			},
+			Group:      20001,
+			Rarity:     1,
+			GroupRate:  -1,
+			GradeValue: -129,
+			WitCheck:   false,
 			Activations: []horse.Activation{
 				{
 					Precondition: "",
@@ -293,11 +329,17 @@ func TestSkills(t *testing.T) {
 			ID:          200014,
 			Name:        "Right-Handed Demon",
 			Description: "Increase proficiency in right-handed tracks, increasing Speed and Power.",
-			Group:       20001,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      2,
+				{ID: 200013, GroupRate: -1, Rarity: 1},
-			GroupRate:   3,
+				{ID: 200012, GroupRate: 1, Rarity: 1},
-			GradeValue:  461,
+				{ID: 200011, GroupRate: 2, Rarity: 1},
-			WitCheck:    false,
+				{ID: 200014, GroupRate: 3, Rarity: 2},
+			},
+			Group:      20001,
+			Rarity:     2,
+			GroupRate:  3,
+			GradeValue: 461,
+			WitCheck:   false,
 			Activations: []horse.Activation{
 				{
 					Precondition: "",
@@ -331,11 +373,16 @@ func TestSkills(t *testing.T) {
 			ID:          200021,
 			Name:        "Left-Handed ◎",
 			Description: "Increase performance on left-handed tracks.",
-			Group:       20002,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      1,
+				{ID: 200023, GroupRate: -1, Rarity: 1},
-			GroupRate:   2,
+				{ID: 200022, GroupRate: 1, Rarity: 1},
-			GradeValue:  174,
+				{ID: 200021, GroupRate: 2, Rarity: 1},
-			WitCheck:    false,
+			},
+			Group:      20002,
+			Rarity:     1,
+			GroupRate:  2,
+			GradeValue: 174,
+			WitCheck:   false,
 			Activations: []horse.Activation{
 				{
 					Precondition: "",
@@ -362,11 +409,16 @@ func TestSkills(t *testing.T) {
 			ID:          200022,
 			Name:        "Left-Handed ○",
 			Description: "Moderately increase performance on left-handed tracks.",
-			Group:       20002,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      1,
+				{ID: 200023, GroupRate: -1, Rarity: 1},
-			GroupRate:   1,
+				{ID: 200022, GroupRate: 1, Rarity: 1},
-			GradeValue:  129,
+				{ID: 200021, GroupRate: 2, Rarity: 1},
-			WitCheck:    false,
+			},
+			Group:      20002,
+			Rarity:     1,
+			GroupRate:  1,
+			GradeValue: 129,
+			WitCheck:   false,
 			Activations: []horse.Activation{
 				{
 					Precondition: "",
@@ -393,11 +445,16 @@ func TestSkills(t *testing.T) {
 			ID:          200023,
 			Name:        "Left-Handed ×",
 			Description: "Moderately decrease performance on left-handed tracks.",
-			Group:       20002,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      1,
+				{ID: 200023, GroupRate: -1, Rarity: 1},
-			GroupRate:   -1,
+				{ID: 200022, GroupRate: 1, Rarity: 1},
-			GradeValue:  -129,
+				{ID: 200021, GroupRate: 2, Rarity: 1},
-			WitCheck:    false,
+			},
+			Group:      20002,
+			Rarity:     1,
+			GroupRate:  -1,
+			GradeValue: -129,
+			WitCheck:   false,
 			Activations: []horse.Activation{
 				{
 					Precondition: "",
@@ -424,11 +481,15 @@ func TestSkills(t *testing.T) {
 			ID:          200361,
 			Name:        "Beeline Burst",
 			Description: "Increase velocity on a straight.",
-			Group:       20036,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      2,
+				{ID: 200362, GroupRate: 1, Rarity: 1},
-			GroupRate:   2,
+				{ID: 200361, GroupRate: 2, Rarity: 2},
-			GradeValue:  508,
+			},
-			WitCheck:    true,
+			Group:      20036,
+			Rarity:     2,
+			GroupRate:  2,
+			GradeValue: 508,
+			WitCheck:   true,
 			Activations: []horse.Activation{
 				{
 					Precondition: "",
@@ -455,11 +516,15 @@ func TestSkills(t *testing.T) {
 			ID:          200362,
 			Name:        "Straightaway Adept",
 			Description: "Slightly increase velocity on a straight.",
-			Group:       20036,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      1,
+				{ID: 200362, GroupRate: 1, Rarity: 1},
-			GroupRate:   1,
+				{ID: 200361, GroupRate: 2, Rarity: 2},
-			GradeValue:  217,
+			},
-			WitCheck:    true,
+			Group:      20036,
+			Rarity:     1,
+			GroupRate:  1,
+			GradeValue: 217,
+			WitCheck:   true,
 			Activations: []horse.Activation{
 				{
 					Precondition: "",
@@ -486,11 +551,14 @@ func TestSkills(t *testing.T) {
 			ID:          200831,
 			Name:        "Subdued Front Runners",
 			Description: "Slightly increase fatigue for front runners early-race.",
-			Group:       20083,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      1,
+				{ID: 200831, GroupRate: 1, Rarity: 1},
-			GroupRate:   1,
+			},
-			GradeValue:  217,
+			Group:      20083,
-			WitCheck:    true,
+			Rarity:     1,
+			GroupRate:  1,
+			GradeValue: 217,
+			WitCheck:   true,
 			Activations: []horse.Activation{
 				{
 					Precondition: "",
@@ -517,11 +585,14 @@ func TestSkills(t *testing.T) {
 			ID:          201801,
 			Name:        "♡ 3D Nail Art",
 			Description: "Moderately decrease performance on firm ground.",
-			Group:       20180,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      1,
+				{ID: 201801, GroupRate: -1, Rarity: 1},
-			GroupRate:   -1,
+			},
-			GradeValue:  -129,
+			Group:      20180,
-			WitCheck:    false,
+			Rarity:     1,
+			GroupRate:  -1,
+			GradeValue: -129,
+			WitCheck:   false,
 			Activations: []horse.Activation{
 				{
 					Precondition: "",
@@ -548,11 +619,14 @@ func TestSkills(t *testing.T) {
 			ID:          300011,
 			Name:        "Unquenched Thirst",
 			Description: "Moderately increase performance with the desire to race.",
-			Group:       30001,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      1,
+				{ID: 300011, GroupRate: 1, Rarity: 1},
-			GroupRate:   1,
+			},
-			GradeValue:  0,
+			Group:      30001,
-			WitCheck:    false,
+			Rarity:     1,
+			GroupRate:  1,
+			GradeValue: 0,
+			WitCheck:   false,
 			Activations: []horse.Activation{
 				{
 					Precondition: "",
@@ -579,11 +653,15 @@ func TestSkills(t *testing.T) {
 			ID:          900011,
 			Name:        "Shooting Star",
 			Description: "Slightly increase velocity and very minimally increase acceleration after passing another runner toward the front late-race.",
-			Group:       10001,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      1,
+				{ID: 100011, GroupRate: 1, Rarity: 5},
-			GroupRate:   2,
+				{ID: 900011, GroupRate: 2, Rarity: 1},
-			GradeValue:  180,
+			},
-			WitCheck:    true,
+			Group:      10001,
+			Rarity:     1,
+			GroupRate:  2,
+			GradeValue: 180,
+			WitCheck:   true,
 			Activations: []horse.Activation{
 				{
 					Precondition: "",
@@ -618,11 +696,16 @@ func TestSkills(t *testing.T) {
 			ID:          900351,
 			Name:        "Our Ticket to Win!",
 			Description: "Slightly increase velocity when positioned toward the front on the final straight after engaging in a challenge on the final corner or later.",
-			Group:       10035,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      1,
+				{ID: 100351, GroupRate: 1, Rarity: 4},
-			GroupRate:   2,
+				{ID: 10351, GroupRate: 1, Rarity: 3},
-			GradeValue:  180,
+				{ID: 900351, GroupRate: 2, Rarity: 1},
-			WitCheck:    true,
+			},
+			Group:      10035,
+			Rarity:     1,
+			GroupRate:  2,
+			GradeValue: 180,
+			WitCheck:   true,
 			Activations: []horse.Activation{
 				{
 					Precondition: "is_finalcorner==1&blocked_side_continuetime>=2",
@@ -650,11 +733,15 @@ func TestSkills(t *testing.T) {
 			ID:          910241,
 			Name:        "Flowery☆Maneuver",
 			Description: "Slightly increase velocity when passing another runner toward the front on the final corner. If passing toward the back, slightly increase acceleration instead.",
-			Group:       11024,
+			GroupSkills: []horse.GroupSkill{
-			Rarity:      1,
+				{ID: 110241, GroupRate: 1, Rarity: 5},
-			GroupRate:   2,
+				{ID: 910241, GroupRate: 2, Rarity: 1},
-			GradeValue:  180,
+			},
-			WitCheck:    true,
+			Group:      11024,
+			Rarity:     1,
+			GroupRate:  2,
+			GradeValue: 180,
+			WitCheck:   true,
 			Activations: []horse.Activation{
 				{
 					Precondition: "",

mdb/sql/conversation.sql

@@ -1,4 +1,5 @@
 SELECT
+	id,
 	gallery_chara_id,
     disp_order,
 	pos_id,

mdb/sql/skill-group-skills.sql

@@ -0,0 +1,43 @@
+WITH g AS (
+	SELECT
+		l.id AS l,
+		r.id AS r,
+		r.group_rate,
+		r.rarity
+	FROM skill_data l
+		JOIN skill_data r ON l.group_id = r.group_id
+	
+	UNION ALL
+
+	SELECT
+		s.id AS l,
+		i.id AS r,
+		i.group_rate,
+		i.rarity
+	FROM skill_data s
+		JOIN skill_data i ON s.id IN (i.unique_skill_id_1, i.unique_skill_id_2)
+	
+	UNION ALL
+
+	SELECT
+		s.id AS l,
+		i.id AS r,
+		i.group_rate,
+		i.rarity
+	FROM skill_data s
+		JOIN skill_data i ON i.id IN (s.unique_skill_id_1, s.unique_skill_id_2)
+
+	UNION ALL
+
+	SELECT
+		l.id AS l,
+		r.id AS r,
+		r.group_rate,
+		r.rarity
+	FROM skill_data i
+		JOIN skill_data l ON l.id IN (i.unique_skill_id_1, i.unique_skill_id_2)
+		JOIN skill_data r ON r.id IN (i.unique_skill_id_1, i.unique_skill_id_2)
+	WHERE l.id != r.id
+)
+SELECT * FROM g
+ORDER BY l, group_rate, rarity DESC

skill.go

@@ -30,6 +30,7 @@ type Skill struct {
 	ID          SkillID      `json:"skill_id"`
 	Name        string       `json:"name"`
 	Description string       `json:"description"`
+	GroupSkills []GroupSkill `json:"group_skills"`
 	Group       SkillGroupID `json:"group"`
 	Rarity      int8         `json:"rarity"`
 	GroupRate   int8         `json:"group_rate"`
@@ -42,6 +43,12 @@ type Skill struct {
 	IconID      int          `json:"icon_id"`
 }
 
+type GroupSkill struct {
+	ID        SkillID `json:"skill_id"`
+	GroupRate int8    `json:"group_rate"`
+	Rarity    int8    `json:"rarity"`
+}
+
 // Activation is the parameters controlling when a skill activates.
 type Activation struct {
 	Precondition string         `json:"precondition,omitzero"`

zenno/src/lib/data/convo.ts

@@ -49,11 +49,16 @@ export function convoCharas(c: Conversation): number[] {
 
 export function requiredCharas(c: Conversation): number[] {
 	switch (c.condition_type) {
-		case Required.None: return []
+		case Required.None:
-		case Required.All: return convoCharas(c);
+			return [];
-		case Required.Chara1: return [c.chara_1];
+		case Required.All:
-		case Required.Chara2: return [c.chara_2!];
+			return convoCharas(c);
-		case Required.Chara3: return [c.chara_3!];
+		case Required.Chara1:
+			return [c.chara_1];
+		case Required.Chara2:
+			return [c.chara_2!];
+		case Required.Chara3:
+			return [c.chara_3!];
 	}
 }
 

zenno/src/routes/doc/frbm/+page.svelte

@@ -1143,22 +1143,14 @@
 		>. (This race is why I made it.)
 	</p>
 
-	<Sec h={3} id="jbc-sprint">JBC Sprint (Ooi ver.)</Sec>
+	<div id="jbc-sprint" class="hidden target:block">
-	<p>
+		<h3>JBC Sprint</h3>
-		An even more anti-front track is Ooi 1200 Dirt. This one is actively malicious. Visually, it looks like late race starts on a
+		<p>
-		corner, but the portion before the stretch is a special <i>neither corner nor straight</i> property. That means Angling won't activate,
+			It used to be the case that Oi 1200 Dirt had a strange neither-straight-nor-corner segment at the start of late race so that
-		and VPP is delayed (though still within the accel period).
+			Angling wouldn't activate. As of the 1 Jul update, the corner is now connected to the final straight, so there is no longer
-	</p>
+			anything remarkable about this track.
-	<p>
+		</p>
-		Fortunately, JBC Sprint is after summer, which means you should be able to stat diff your opponents. If you are planning to
+	</div>
-		win this race, you may want to prioritize a bit of extra speed training, or take Front Straights/Corners. If MANT, don't be
-		too surprised if you lose a clock or five to a Taiki Shuttle rival.
-	</p>
-	<p>
-		Since the 1 Jul update, the JBC races take place at a randomly selected one of the NAR courses (Ooi, Kawasaki, Funabashi,
-		Morioka) each year. If you're hunting for a completionist title on a front runner, you have the option of just not picking an
-		Ooi JBC Sprint; the others are all Angling tracks.
-	</p>
 
 	<Sec h={3} id="3k">Kikuka Sho &amp; Tenno Sho (Spring)</Sec>
 	<p>