From 2a4da0a73e11f2817e2a26abe955b0eec64c8efa Mon Sep 17 00:00:00 2001
From: Branden J Brown <zephyrtronium@gmail.com>
Date: Tue, 2 Jun 2026 13:38:50 -0400
Subject: [PATCH] mdb: don't list carnival bonus sparks to exclude them

---
 mdb/spark.go             | 2 ++
 mdb/sql/spark-effect.sql | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mdb/spark.go b/mdb/spark.go
index eaa0e50..ba741c2 100644
--- a/mdb/spark.go
+++ b/mdb/spark.go
@@ -26,6 +26,7 @@ func Sparks(ctx context.Context, db *sqlitex.Pool) ([]horse.Spark, error) {
 	var sp []horse.Spark
 	{
 		stmt := conn.Prep(sparkSQL)
+		defer stmt.Reset()
 		for {
 			ok, err := stmt.Step()
 			if err != nil {
@@ -49,6 +50,7 @@ func Sparks(ctx context.Context, db *sqlitex.Pool) ([]horse.Spark, error) {
 		}
 	}
 	stmt := conn.Prep(sparkEffectSQL)
+	defer stmt.Reset()
 	cur := sp
 	last := 0
 	for {
diff --git a/mdb/sql/spark-effect.sql b/mdb/sql/spark-effect.sql
index cf84c92..3e18066 100644
--- a/mdb/sql/spark-effect.sql
+++ b/mdb/sql/spark-effect.sql
@@ -5,5 +5,10 @@ SELECT
 	value_1,
 	value_2
 FROM succession_factor_effect
-WHERE factor_group_id NOT IN (40001) -- exclude Carnival Bonus
+-- exclude Carnival Bonus
+WHERE factor_group_id NOT IN (
+	SELECT factor_group_id
+	FROM succession_factor
+	WHERE factor_type = 7
+)
 ORDER BY factor_group_id, effect_id, id