mdb: don't list carnival bonus sparks to exclude them

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 {

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