From a2337732ee49f932ea8ee3825178a5f507489e4f Mon Sep 17 00:00:00 2001
From: Branden J Brown <zephyrtronium@gmail.com>
Date: Tue, 28 Jul 2026 01:45:03 -0400
Subject: [PATCH] include scenario and character

---
 main.go |  2 +-
 row.go  | 57 ++++++++++++++++++++++++++++++++-------------------------
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/main.go b/main.go
index 20dc0eb..8c37232 100644
--- a/main.go
+++ b/main.go
@@ -53,7 +53,7 @@ func dofile(w *csv.Writer, name string) {
 		return
 	}
 
-	for row := range ismRows(name, ism.ProgressLog) {
+	for row := range ismRows(name, ism) {
 		if err := w.Write(row.csv()); err != nil {
 			log.Error("write row", slog.Any("err", err))
 		}
diff --git a/row.go b/row.go
index d79e536..f61ba6b 100644
--- a/row.go
+++ b/row.go
@@ -17,6 +17,8 @@ type Row struct {
 	Wit                int
 	SP                 int
 	NumSkills          int
+	Scenario           int
+	Character          int
 	Deck1              int
 	Deck2              int
 	Deck3              int
@@ -47,17 +49,18 @@ func init() {
 	}
 }
 
-func ismRows(key string, ism IdleSingleModeProgressLog) iter.Seq[Row] {
+func ismRows(key string, ism WorkIdleSingleMode) iter.Seq[Row] {
 	return func(yield func(Row) bool) {
-		races := len(ism.RaceHistory)
+		pl := ism.ProgressLog
+		races := len(pl.RaceHistory)
 		var wins int
-		for _, r := range ism.RaceHistory {
+		for _, r := range pl.RaceHistory {
 			if r.RaceHistory.ResultRank == 1 {
 				wins++
 			}
 		}
 		var conditions [11]bool
-		for _, v := range ism.CharaEffectLog {
+		for _, v := range pl.CharaEffectLog {
 			if v.CharaEffectID < 1 || v.CharaEffectID > 11 {
 				slog.Warn("skipping unknown charaEffectID", slog.Int("id", int(v.CharaEffectID)), slog.Bool("active", v.IsActive))
 				continue
@@ -66,12 +69,14 @@ func ismRows(key string, ism IdleSingleModeProgressLog) iter.Seq[Row] {
 		}
 		row := Row{
 			File:               key,
-			Deck1:              int(ism.SupportCardGains[0].SupportCardID),
-			Deck2:              int(ism.SupportCardGains[1].SupportCardID),
-			Deck3:              int(ism.SupportCardGains[2].SupportCardID),
-			Deck4:              int(ism.SupportCardGains[3].SupportCardID),
-			Deck5:              int(ism.SupportCardGains[4].SupportCardID),
-			Deck6:              int(ism.SupportCardGains[5].SupportCardID),
+			Scenario:           int(ism.Chara.ScenarioID),
+			Character:          int(ism.Chara.CardID),
+			Deck1:              int(pl.SupportCardGains[0].SupportCardID),
+			Deck2:              int(pl.SupportCardGains[1].SupportCardID),
+			Deck3:              int(pl.SupportCardGains[2].SupportCardID),
+			Deck4:              int(pl.SupportCardGains[3].SupportCardID),
+			Deck5:              int(pl.SupportCardGains[4].SupportCardID),
+			Deck6:              int(pl.SupportCardGains[5].SupportCardID),
 			Races:              races,
 			Wins:               wins,
 			NightOwl:           conditions[0],
@@ -88,30 +93,30 @@ func ismRows(key string, ism IdleSingleModeProgressLog) iter.Seq[Row] {
 		}
 
 		row.GainSource = "Events"
-		row.Speed = int(ism.EventGain.Speed.Value)
-		row.Stamina = int(ism.EventGain.Stamina.Value)
-		row.Power = int(ism.EventGain.Power.Value)
-		row.Guts = int(ism.EventGain.Guts.Value)
-		row.Wit = int(ism.EventGain.Wiz.Value)
-		row.SP = int(ism.EventGain.SkillPoint)
-		row.NumSkills = len(ism.EventGain.SkillTips)
+		row.Speed = int(pl.EventGain.Speed.Value)
+		row.Stamina = int(pl.EventGain.Stamina.Value)
+		row.Power = int(pl.EventGain.Power.Value)
+		row.Guts = int(pl.EventGain.Guts.Value)
+		row.Wit = int(pl.EventGain.Wiz.Value)
+		row.SP = int(pl.EventGain.SkillPoint)
+		row.NumSkills = len(pl.EventGain.SkillTips)
 		if !yield(row) {
 			return
 		}
 
 		row.GainSource = "Inspiration"
-		row.Speed = int(ism.SuccessionGain.Speed.Value)
-		row.Stamina = int(ism.SuccessionGain.Stamina.Value)
-		row.Power = int(ism.SuccessionGain.Power.Value)
-		row.Guts = int(ism.SuccessionGain.Guts.Value)
-		row.Wit = int(ism.SuccessionGain.Wiz.Value)
-		row.SP = int(ism.SuccessionGain.SkillPoint)
-		row.NumSkills = len(ism.SuccessionGain.SkillTips)
+		row.Speed = int(pl.SuccessionGain.Speed.Value)
+		row.Stamina = int(pl.SuccessionGain.Stamina.Value)
+		row.Power = int(pl.SuccessionGain.Power.Value)
+		row.Guts = int(pl.SuccessionGain.Guts.Value)
+		row.Wit = int(pl.SuccessionGain.Wiz.Value)
+		row.SP = int(pl.SuccessionGain.SkillPoint)
+		row.NumSkills = len(pl.SuccessionGain.SkillTips)
 		if !yield(row) {
 			return
 		}
 
-		for _, sup := range ism.SupportCardGains {
+		for _, sup := range pl.SupportCardGains {
 			row.GainSource = strconv.Itoa(int(sup.SupportCardID))
 			row.Speed = int(sup.GainInfo.Speed.Value)
 			row.Stamina = int(sup.GainInfo.Stamina.Value)
@@ -138,6 +143,8 @@ func (r Row) csv() []string {
 		strconv.Itoa(r.Wit),
 		strconv.Itoa(r.SP),
 		strconv.Itoa(r.NumSkills),
+		strconv.Itoa(r.Scenario),
+		strconv.Itoa(r.Character),
 		strconv.Itoa(r.Deck1),
 		strconv.Itoa(r.Deck2),
 		strconv.Itoa(r.Deck3),