2022/11-setlist/data.csv

@@ -1,19 +1,19 @@
 name,volume,traits,audience,effect,blurb
-Opener,mp,,2,+3 {A} if the first song in your set,
+Opener,mp,,2,+3 {a} if the first song in your set,
 Intermission,ppp,,0,,
 Love Ballad,f,l,4,,
 Rage Against The Man,fff,a,4,,
 Everything Is Awesome,mf,j,4,,
 Tears in the Rain,p,s,4,,
-Breakup Song,ff,la,3,+3 {A} if another band played a {l} song in this time block,
-New Relationship,mf,lj,2,+4 {A} if this is the first {l} song in any band's setlist,
-Brokenhearted,p,ls,3,+1 {A} if the next song in your setlist is a {l} song,
-Mixed Messages,ff,aj,2,+3 {A} if this is the loudest song in this time block,
-Betrayed,f,as,2,+3 {A} if this is immediately following a {j} song in your setlist,
-Happy To Be Sad,f,js,1,+2 {A} for each {s} song already in your setlist,
+Breakup Song,ff,la,3,+3 {a} if another band played a {l} song,
+New Relationship,mf,lj,+4 {a} if the first {l} song in any band's setlist,
+Brokenhearted,p,ls,0,,
+Mixed Messages,f,aj,0,,
+Betrayed,f,as,2,+3 {a} if immediately following a {j} song in your setlist,
+Happy To Be Sad,f,js,0,+2 {a} for each {s} song already in your setlist,
 Indignant Love,f,laj,0,,
-Unrequited Love,mp,las,2,+3 {A} if this is the quietest song in this time block,
-Butterflies In The Stomach,mf,ljs,0,,
-Rampage,fff,ajs,3,+1 {A} for each {a} song in this time block,
-Everything At Once,f,lajs,2,+3 {a} if all of {l}{a}{j}{s} are already in your setlist,
-Wildcard,f,lajs,-1,+2 {A} for each song already in your setlist,
+Unrequited Love,f,las,0,,
+Butterflies In The Stomach,f,ljs,0,,
+Rampage,f,ajs,0,,
+Everything At Once,f,lajs,0,,
+Wildcard,f,lajs,0,,

2022/11-setlist/deck.rb

@@ -52,16 +52,13 @@ Squib::Deck.new(cards: data.nrows) do
   text layout: :description, str: data.effect.zip(data.blurb).map { |e, b|
     "#{e}#{b ? "\n<i>#{b}</i>" : nil}"
   } do |embed|
-    embed.svg key: '{A}', width: 32, height: 32, data: Icons::AUDIENCE
+    embed.svg key: '{a}', width: 32, height: 32, data: Icons::AUDIENCE
     embed.svg key: '{l}', width: 32, height: 32, data: Icons::LOVE
     embed.svg key: '{a}', width: 32, height: 32, data: Icons::ANGER
     embed.svg key: '{j}', width: 32, height: 32, data: Icons::JOY
     embed.svg key: '{s}', width: 32, height: 32, data: Icons::SAD
   end
-  text layout: :volume, markup: true, str: data.volume.map { |v| "<b><i>#{v} (#{VOLUMES[v]})</i></b>" }
-  text layout: :audience, ellipsize: :autoscale, str: data.audience.map { |au| "{A}#{au}"} do |embed|
-    embed.svg key: '{A}', width: 48, height: 48, data: Icons::AUDIENCE
-  end
+  text layout: :type, markup: true, str: data.volume.map { |v| "<b><i>#{v} (#{VOLUMES[v]})</i></b>" }
 
   save format: :png
   save_sheet prefix: "sheet",

2022/11-setlist/layout.yml

@@ -1,11 +0,0 @@
-volume:
-  x: 90
-  y: 955
-  width: 320
-  height: 50
-  align: left
-
-audience:
-  extends: volume
-  x: += 329
-  align: right