passive -> boon

CardList.json

@@ -4,17 +4,17 @@
     "face": {
       "front": {
         "name": "Rapid Response",
-        "type": "Passive",
+        "type": "Boon",
         "cost": 0,
         "image": "https://docs.brut.systems/judah/entropy/000.png",
         "isHorizontal": true
       }
     },
     "name": "Rapid Response",
-    "type": "Passive",
+    "type": "Boon",
     "cost": 0,
     "isToken": false,
-    "Lane": "⬜ Passive",
+    "Lane": "⬜ Boon",
     "Entropy": 0,
     "Force": 0,
     "_legal": {
@@ -26,17 +26,17 @@
     "face": {
       "front": {
         "name": "Breaker",
-        "type": "Passive",
+        "type": "Boon",
         "cost": 0,
         "image": "https://docs.brut.systems/judah/entropy/001.png",
         "isHorizontal": true
       }
     },
     "name": "Breaker",
-    "type": "Passive",
+    "type": "Boon",
     "cost": 0,
     "isToken": false,
-    "Lane": "⬜ Passive",
+    "Lane": "⬜ Boon",
     "Entropy": 0,
     "Force": 0,
     "_legal": {
@@ -48,17 +48,17 @@
     "face": {
       "front": {
         "name": "Inverse Entropy",
-        "type": "Passive",
+        "type": "Boon",
         "cost": 0,
         "image": "https://docs.brut.systems/judah/entropy/002.png",
         "isHorizontal": true
       }
     },
     "name": "Inverse Entropy",
-    "type": "Passive",
+    "type": "Boon",
     "cost": 0,
     "isToken": false,
-    "Lane": "⬜ Passive",
+    "Lane": "⬜ Boon",
     "Entropy": 0,
     "Force": 0,
     "_legal": {
@@ -70,17 +70,17 @@
     "face": {
       "front": {
         "name": "Deathwish",
-        "type": "Passive",
+        "type": "Boon",
         "cost": 0,
         "image": "https://docs.brut.systems/judah/entropy/003.png",
         "isHorizontal": true
       }
     },
     "name": "Deathwish",
-    "type": "Passive",
+    "type": "Boon",
     "cost": 0,
     "isToken": false,
-    "Lane": "⬜ Passive",
+    "Lane": "⬜ Boon",
     "Entropy": 0,
     "Force": 0,
     "_legal": {
@@ -91,14 +91,14 @@
     "id": "004",
     "face": {
       "front": {
-        "name": "WarmReflex",
+        "name": "AbsentAperture",
         "type": "Unit",
         "cost": 1,
         "image": "https://docs.brut.systems/judah/entropy/004.png",
         "isHorizontal": true
       }
     },
-    "name": "WarmReflex",
+    "name": "AbsentAperture",
     "type": "Unit",
     "cost": 1,
     "isToken": true,
@@ -113,14 +113,14 @@
     "id": "005",
     "face": {
       "front": {
-        "name": "GrossBulk",
+        "name": "BluntPosture",
         "type": "Unit",
         "cost": 1,
         "image": "https://docs.brut.systems/judah/entropy/005.png",
         "isHorizontal": true
       }
     },
-    "name": "GrossBulk",
+    "name": "BluntPosture",
     "type": "Unit",
     "cost": 1,
     "isToken": true,
@@ -135,14 +135,14 @@
     "id": "006",
     "face": {
       "front": {
-        "name": "NominalGradient",
+        "name": "TerminalDeficit",
         "type": "Unit",
         "cost": 1,
         "image": "https://docs.brut.systems/judah/entropy/006.png",
         "isHorizontal": true
       }
     },
-    "name": "NominalGradient",
+    "name": "TerminalDeficit",
     "type": "Unit",
     "cost": 1,
     "isToken": false,
@@ -157,14 +157,14 @@
     "id": "007",
     "face": {
       "front": {
-        "name": "CivicSubstrate",
+        "name": "AbsentGradient",
         "type": "Unit",
         "cost": 2,
         "image": "https://docs.brut.systems/judah/entropy/007.png",
         "isHorizontal": true
       }
     },
-    "name": "CivicSubstrate",
+    "name": "AbsentGradient",
     "type": "Unit",
     "cost": 2,
     "isToken": false,
@@ -179,14 +179,14 @@
     "id": "008",
     "face": {
       "front": {
-        "name": "ConcaveConviction",
+        "name": "CompositeVolume",
         "type": "Unit",
         "cost": 3,
         "image": "https://docs.brut.systems/judah/entropy/008.png",
         "isHorizontal": true
       }
     },
-    "name": "ConcaveConviction",
+    "name": "CompositeVolume",
     "type": "Unit",
     "cost": 3,
     "isToken": false,
@@ -201,14 +201,14 @@
     "id": "009",
     "face": {
       "front": {
-        "name": "VampiricDosage",
+        "name": "DullCartilage",
         "type": "Unit",
         "cost": 4,
         "image": "https://docs.brut.systems/judah/entropy/009.png",
         "isHorizontal": true
       }
     },
-    "name": "VampiricDosage",
+    "name": "DullCartilage",
     "type": "Unit",
     "cost": 4,
     "isToken": false,
@@ -223,14 +223,14 @@
     "id": "010",
     "face": {
       "front": {
-        "name": "DullCortex",
+        "name": "FlatTendon",
         "type": "Unit",
         "cost": 5,
         "image": "https://docs.brut.systems/judah/entropy/010.png",
         "isHorizontal": true
       }
     },
-    "name": "DullCortex",
+    "name": "FlatTendon",
     "type": "Unit",
     "cost": 5,
     "isToken": false,
@@ -245,14 +245,14 @@
     "id": "011",
     "face": {
       "front": {
-        "name": "DullSubstrate",
+        "name": "PolarCortex",
         "type": "Unit",
         "cost": 5,
         "image": "https://docs.brut.systems/judah/entropy/011.png",
         "isHorizontal": true
       }
     },
-    "name": "DullSubstrate",
+    "name": "PolarCortex",
     "type": "Unit",
     "cost": 5,
     "isToken": false,
@@ -267,14 +267,14 @@
     "id": "012",
     "face": {
       "front": {
-        "name": "MootProspect",
+        "name": "CivicMembrane",
         "type": "Unit",
         "cost": 5,
         "image": "https://docs.brut.systems/judah/entropy/012.png",
         "isHorizontal": true
       }
     },
-    "name": "MootProspect",
+    "name": "CivicMembrane",
     "type": "Unit",
     "cost": 5,
     "isToken": false,
@@ -289,14 +289,14 @@
     "id": "013",
     "face": {
       "front": {
-        "name": "ErrantVolume",
+        "name": "ConcaveVolume",
         "type": "Unit",
         "cost": 3,
         "image": "https://docs.brut.systems/judah/entropy/013.png",
         "isHorizontal": true
       }
     },
-    "name": "ErrantVolume",
+    "name": "ConcaveVolume",
     "type": "Unit",
     "cost": 3,
     "isToken": false,
@@ -311,14 +311,14 @@
     "id": "014",
     "face": {
       "front": {
-        "name": "LucidPosture",
+        "name": "MootPosture",
         "type": "Unit",
         "cost": 3,
         "image": "https://docs.brut.systems/judah/entropy/014.png",
         "isHorizontal": true
       }
     },
-    "name": "LucidPosture",
+    "name": "MootPosture",
     "type": "Unit",
     "cost": 3,
     "isToken": false,
@@ -333,14 +333,14 @@
     "id": "015",
     "face": {
       "front": {
-        "name": "LateralFilament",
+        "name": "LiveVolume",
         "type": "Unit",
         "cost": 5,
         "image": "https://docs.brut.systems/judah/entropy/015.png",
         "isHorizontal": true
       }
     },
-    "name": "LateralFilament",
+    "name": "LiveVolume",
     "type": "Unit",
     "cost": 5,
     "isToken": false,
@@ -355,14 +355,14 @@
     "id": "016",
     "face": {
       "front": {
-        "name": "LucidGradient",
+        "name": "FormerConviction",
         "type": "Unit",
         "cost": 6,
         "image": "https://docs.brut.systems/judah/entropy/016.png",
         "isHorizontal": true
       }
     },
-    "name": "LucidGradient",
+    "name": "FormerConviction",
     "type": "Unit",
     "cost": 6,
     "isToken": false,
@@ -377,14 +377,14 @@
     "id": "017",
     "face": {
       "front": {
-        "name": "LiveFilament",
+        "name": "RoteMandate",
         "type": "Unit",
         "cost": 7,
         "image": "https://docs.brut.systems/judah/entropy/017.png",
         "isHorizontal": true
       }
     },
-    "name": "LiveFilament",
+    "name": "RoteMandate",
     "type": "Unit",
     "cost": 7,
     "isToken": false,
@@ -399,14 +399,14 @@
     "id": "018",
     "face": {
       "front": {
-        "name": "ErrantDeficit",
+        "name": "LateralDividend",
         "type": "Unit",
         "cost": 6,
         "image": "https://docs.brut.systems/judah/entropy/018.png",
         "isHorizontal": true
       }
     },
-    "name": "ErrantDeficit",
+    "name": "LateralDividend",
     "type": "Unit",
     "cost": 6,
     "isToken": false,
@@ -421,14 +421,14 @@
     "id": "019",
     "face": {
       "front": {
-        "name": "NominalAperture",
+        "name": "PolarContour",
         "type": "Unit",
         "cost": 9,
         "image": "https://docs.brut.systems/judah/entropy/019.png",
         "isHorizontal": true
       }
     },
-    "name": "NominalAperture",
+    "name": "PolarContour",
     "type": "Unit",
     "cost": 9,
     "isToken": false,
@@ -443,14 +443,14 @@
     "id": "020",
     "face": {
       "front": {
-        "name": "SpentTendon",
+        "name": "PolarDeficit",
         "type": "Unit",
         "cost": 4,
         "image": "https://docs.brut.systems/judah/entropy/020.png",
         "isHorizontal": true
       }
     },
-    "name": "SpentTendon",
+    "name": "PolarDeficit",
     "type": "Unit",
     "cost": 4,
     "isToken": false,
@@ -465,14 +465,14 @@
     "id": "021",
     "face": {
       "front": {
-        "name": "PassiveFilament",
+        "name": "FlatMembrane",
         "type": "Unit",
         "cost": 2,
         "image": "https://docs.brut.systems/judah/entropy/021.png",
         "isHorizontal": true
       }
     },
-    "name": "PassiveFilament",
+    "name": "FlatMembrane",
     "type": "Unit",
     "cost": 2,
     "isToken": false,
@@ -487,14 +487,14 @@
     "id": "022",
     "face": {
       "front": {
-        "name": "LucidInlet",
+        "name": "CivicMorale",
         "type": "Unit",
         "cost": 2,
         "image": "https://docs.brut.systems/judah/entropy/022.png",
         "isHorizontal": true
       }
     },
-    "name": "LucidInlet",
+    "name": "CivicMorale",
     "type": "Unit",
     "cost": 2,
     "isToken": false,
@@ -509,14 +509,14 @@
     "id": "023",
     "face": {
       "front": {
-        "name": "NominalAperture",
+        "name": "SpentConviction",
         "type": "Unit",
         "cost": 3,
         "image": "https://docs.brut.systems/judah/entropy/023.png",
         "isHorizontal": true
       }
     },
-    "name": "NominalAperture",
+    "name": "SpentConviction",
     "type": "Unit",
     "cost": 3,
     "isToken": false,
@@ -531,14 +531,14 @@
     "id": "024",
     "face": {
       "front": {
-        "name": "ResidualRapport",
+        "name": "LucidMorale",
         "type": "Unit",
         "cost": 2,
         "image": "https://docs.brut.systems/judah/entropy/024.png",
         "isHorizontal": true
       }
     },
-    "name": "ResidualRapport",
+    "name": "LucidMorale",
     "type": "Unit",
     "cost": 2,
     "isToken": false,
@@ -553,14 +553,14 @@
     "id": "025",
     "face": {
       "front": {
-        "name": "RagingPosture",
+        "name": "DullJudgement",
         "type": "Unit",
         "cost": 8,
         "image": "https://docs.brut.systems/judah/entropy/025.png",
         "isHorizontal": true
       }
     },
-    "name": "RagingPosture",
+    "name": "DullJudgement",
     "type": "Unit",
     "cost": 8,
     "isToken": false,
@@ -575,14 +575,14 @@
     "id": "026",
     "face": {
       "front": {
-        "name": "FormerAperture",
+        "name": "TerminalBulk",
         "type": "Unit",
         "cost": 10,
         "image": "https://docs.brut.systems/judah/entropy/026.png",
         "isHorizontal": true
       }
     },
-    "name": "FormerAperture",
+    "name": "TerminalBulk",
     "type": "Unit",
     "cost": 10,
     "isToken": false,
@@ -597,14 +597,14 @@
     "id": "027",
     "face": {
       "front": {
-        "name": "ConcaveReflex",
+        "name": "RagingJudgement",
         "type": "Unit",
         "cost": 3,
         "image": "https://docs.brut.systems/judah/entropy/027.png",
         "isHorizontal": true
       }
     },
-    "name": "ConcaveReflex",
+    "name": "RagingJudgement",
     "type": "Unit",
     "cost": 3,
     "isToken": false,
@@ -619,14 +619,14 @@
     "id": "028",
     "face": {
       "front": {
-        "name": "AmbientVolume",
+        "name": "TerminalConviction",
         "type": "Unit",
         "cost": 3,
         "image": "https://docs.brut.systems/judah/entropy/028.png",
         "isHorizontal": true
       }
     },
-    "name": "AmbientVolume",
+    "name": "TerminalConviction",
     "type": "Unit",
     "cost": 3,
     "isToken": false,
@@ -641,14 +641,14 @@
     "id": "029",
     "face": {
       "front": {
-        "name": "CompositeSubstrate",
+        "name": "RoteMorale",
         "type": "Unit",
         "cost": 5,
         "image": "https://docs.brut.systems/judah/entropy/029.png",
         "isHorizontal": true
       }
     },
-    "name": "CompositeSubstrate",
+    "name": "RoteMorale",
     "type": "Unit",
     "cost": 5,
     "isToken": false,
@@ -663,14 +663,14 @@
     "id": "030",
     "face": {
       "front": {
-        "name": "MootMutation",
+        "name": "ConcaveSubstrate",
         "type": "Unit",
         "cost": 1,
         "image": "https://docs.brut.systems/judah/entropy/030.png",
         "isHorizontal": true
       }
     },
-    "name": "MootMutation",
+    "name": "ConcaveSubstrate",
     "type": "Unit",
     "cost": 1,
     "isToken": false,
@@ -685,14 +685,14 @@
     "id": "031",
     "face": {
       "front": {
-        "name": "ErrantDosage",
+        "name": "LateralFilament",
         "type": "Unit",
         "cost": 6,
         "image": "https://docs.brut.systems/judah/entropy/031.png",
         "isHorizontal": true
       }
     },
-    "name": "ErrantDosage",
+    "name": "LateralFilament",
     "type": "Unit",
     "cost": 6,
     "isToken": false,
@@ -707,14 +707,14 @@
     "id": "032",
     "face": {
       "front": {
-        "name": "SpentSubstrate",
+        "name": "InlandReflex",
         "type": "Unit",
         "cost": 4,
         "image": "https://docs.brut.systems/judah/entropy/032.png",
         "isHorizontal": true
       }
     },
-    "name": "SpentSubstrate",
+    "name": "InlandReflex",
     "type": "Unit",
     "cost": 4,
     "isToken": false,
@@ -729,14 +729,14 @@
     "id": "033",
     "face": {
       "front": {
-        "name": "FlatCartilage",
+        "name": "CivicContour",
         "type": "Spell",
         "cost": 3,
         "image": "https://docs.brut.systems/judah/entropy/033.png",
         "isHorizontal": true
       }
     },
-    "name": "FlatCartilage",
+    "name": "CivicContour",
     "type": "Spell",
     "cost": 3,
     "isToken": false,
@@ -751,14 +751,14 @@
     "id": "034",
     "face": {
       "front": {
-        "name": "WarmProspect",
+        "name": "BluntOffset",
         "type": "Spell",
         "cost": 3,
         "image": "https://docs.brut.systems/judah/entropy/034.png",
         "isHorizontal": true
       }
     },
-    "name": "WarmProspect",
+    "name": "BluntOffset",
     "type": "Spell",
     "cost": 3,
     "isToken": false,
@@ -773,14 +773,14 @@
     "id": "035",
     "face": {
       "front": {
-        "name": "FormerCompact",
+        "name": "RoteDividend",
         "type": "Spell",
         "cost": 1,
         "image": "https://docs.brut.systems/judah/entropy/035.png",
         "isHorizontal": true
       }
     },
-    "name": "FormerCompact",
+    "name": "RoteDividend",
     "type": "Spell",
     "cost": 1,
     "isToken": false,
@@ -795,14 +795,14 @@
     "id": "036",
     "face": {
       "front": {
-        "name": "InlandCortex",
+        "name": "GrossCartilage",
         "type": "Spell",
         "cost": 2,
         "image": "https://docs.brut.systems/judah/entropy/036.png",
         "isHorizontal": true
       }
     },
-    "name": "InlandCortex",
+    "name": "GrossCartilage",
     "type": "Spell",
     "cost": 2,
     "isToken": false,
@@ -817,14 +817,14 @@
     "id": "037",
     "face": {
       "front": {
-        "name": "MootReflex",
+        "name": "AbsentTendon",
         "type": "Spell",
         "cost": 4,
         "image": "https://docs.brut.systems/judah/entropy/037.png",
         "isHorizontal": true
       }
     },
-    "name": "MootReflex",
+    "name": "AbsentTendon",
     "type": "Spell",
     "cost": 4,
     "isToken": false,
@@ -839,14 +839,14 @@
     "id": "038",
     "face": {
       "front": {
-        "name": "ResidualAxis",
+        "name": "DullContour",
         "type": "Spell",
         "cost": 8,
         "image": "https://docs.brut.systems/judah/entropy/038.png",
         "isHorizontal": true
       }
     },
-    "name": "ResidualAxis",
+    "name": "DullContour",
     "type": "Spell",
     "cost": 8,
     "isToken": false,
@@ -861,14 +861,14 @@
     "id": "039",
     "face": {
       "front": {
-        "name": "LucidMutation",
+        "name": "DullMorale",
         "type": "Spell",
         "cost": 14,
         "image": "https://docs.brut.systems/judah/entropy/039.png",
         "isHorizontal": true
       }
     },
-    "name": "LucidMutation",
+    "name": "DullMorale",
     "type": "Spell",
     "cost": 14,
     "isToken": false,
@@ -883,14 +883,14 @@
     "id": "040",
     "face": {
       "front": {
-        "name": "PassiveMorale",
+        "name": "DullVolume",
         "type": "Spell",
         "cost": 5,
         "image": "https://docs.brut.systems/judah/entropy/040.png",
         "isHorizontal": true
       }
     },
-    "name": "PassiveMorale",
+    "name": "DullVolume",
     "type": "Spell",
     "cost": 5,
     "isToken": false,
@@ -905,14 +905,14 @@
     "id": "041",
     "face": {
       "front": {
-        "name": "TerminalMorale",
+        "name": "WarmRapport",
         "type": "Spell",
         "cost": 3,
         "image": "https://docs.brut.systems/judah/entropy/041.png",
         "isHorizontal": true
       }
     },
-    "name": "TerminalMorale",
+    "name": "WarmRapport",
     "type": "Spell",
     "cost": 3,
     "isToken": false,
@@ -927,14 +927,14 @@
     "id": "042",
     "face": {
       "front": {
-        "name": "LucidSurplus",
+        "name": "MootJudgement",
         "type": "Spell",
         "cost": 1,
         "image": "https://docs.brut.systems/judah/entropy/042.png",
         "isHorizontal": true
       }
     },
-    "name": "LucidSurplus",
+    "name": "MootJudgement",
     "type": "Spell",
     "cost": 1,
     "isToken": false,
@@ -949,14 +949,14 @@
     "id": "043",
     "face": {
       "front": {
-        "name": "AmbientCartilage",
+        "name": "RagingJudgement",
         "type": "Spell",
         "cost": 7,
         "image": "https://docs.brut.systems/judah/entropy/043.png",
         "isHorizontal": true
       }
     },
-    "name": "AmbientCartilage",
+    "name": "RagingJudgement",
     "type": "Spell",
     "cost": 7,
     "isToken": false,
@@ -971,14 +971,14 @@
     "id": "044",
     "face": {
       "front": {
-        "name": "MootCompact",
+        "name": "ConvergentTendon",
         "type": "Spell",
         "cost": 2,
         "image": "https://docs.brut.systems/judah/entropy/044.png",
         "isHorizontal": true
       }
     },
-    "name": "MootCompact",
+    "name": "ConvergentTendon",
     "type": "Spell",
     "cost": 2,
     "isToken": false,
@@ -993,14 +993,14 @@
     "id": "045",
     "face": {
       "front": {
-        "name": "ExcessMutation",
+        "name": "BareOffset",
         "type": "Spell",
         "cost": 5,
         "image": "https://docs.brut.systems/judah/entropy/045.png",
         "isHorizontal": true
       }
     },
-    "name": "ExcessMutation",
+    "name": "BareOffset",
     "type": "Spell",
     "cost": 5,
     "isToken": false,
@@ -1015,14 +1015,14 @@
     "id": "046",
     "face": {
       "front": {
-        "name": "CivicShrine",
+        "name": "DullMutation",
         "type": "Spell",
         "cost": 12,
         "image": "https://docs.brut.systems/judah/entropy/046.png",
         "isHorizontal": true
       }
     },
-    "name": "CivicShrine",
+    "name": "DullMutation",
     "type": "Spell",
     "cost": 12,
     "isToken": false,

cards.go

@@ -10,13 +10,13 @@ var CARDS = []struct {
 	name     string
 	desc     string
 }{
-	{typ: Passive, recovery: 3,
+	{typ: Boon, recovery: 3,
 		name: `Rapid Response`, desc: `Your {{spell}}s cost {{1 entropy}} less.`},
-	{typ: Passive, recovery: 2,
+	{typ: Boon, recovery: 2,
 		name: `Breaker`, desc: `The first {{unit}} you play per turn costs {{1 entropy}} less.`},
-	{typ: Passive, recovery: 0,
+	{typ: Boon, recovery: 0,
 		name: `Inverse Entropy`, desc: `All {{lifesteal}} bonuses are +1.`},
-	{typ: Passive, recovery: 0,
+	{typ: Boon, recovery: 0,
 		name: `Deathwish`, desc: `Cards cost {{1 entropy}} to draw. {{recover}} your unit's initial {{entropy}} when they die.`},
 
 	{typ: Unit, lane: Red, entropy: 1, force: 1, token: true,

main.go

@@ -25,13 +25,13 @@ type Type int
 const (
 	Unit Type = iota
 	Spell
-	Passive
+	Boon
 )
 
 func (l Lane) String() string {
 	switch l {
 	case Any:
-		return "⬜ Passive"
+		return "⬜ Boon"
 	case Red:
 		return "🟥 Red"
 	case Green:
@@ -47,8 +47,8 @@ func (t Type) String() string {
 	switch t {
 	case Unit:
 		return "Unit"
-	case Passive:
+	case Boon:
-		return "Passive"
+		return "Boon"
 	case Spell:
 		return "Spell"
 	default:
@@ -107,7 +107,7 @@ func main() {
 			color = [3]float64{120.0 / 255.0, 190.0 / 255.0, 248.0 / 255.0}
 		default:
 			color = [3]float64{184.0 / 255.0, 184.0 / 255.0, 184.0 / 255.0}
-			baseimg = "base-passive.png"
+			baseimg = "base-boon.png"
 		}
 
 		img, err := gg.LoadImage("docs/" + baseimg)
@@ -121,7 +121,7 @@ func main() {
 		}
 
 		// Draw force
-		if card.typ != Passive {
+		if card.typ != Boon {
 			ctx.SetRGB(1, 1, 1)
 			ctx.Push()
 			{
@@ -136,13 +136,9 @@ func main() {
 		ctx.SetRGB(color[0], color[1], color[2])
 		ctx.Push()
 		{
-			ctx.Translate(273, 115)
+			ctx.Translate(270, 115)
 			ctx.Rotate(270 * math.Pi / 180)
-			var prefix string
+			ctx.DrawStringAnchored(fmt.Sprintf("%d", max(card.entropy, card.recovery)), 0, 0, 0.5, 0.5)
-			if card.typ == Passive {
-				prefix = "+"
-			}
-			ctx.DrawStringAnchored(fmt.Sprintf("%s%d", prefix, max(card.entropy, card.recovery)), 0, 0, 0.5, 0.5)
 		}
 		ctx.Pop()
 
@@ -228,7 +224,7 @@ func generateTemporaryName() string {
 			"Nominal",
 			"Convergent",
 			"Partial",
-			"Passive",
+			"Boon",
 			"Raging",
 			"Polar",
 			"Residual",