pf2e-spellbook 1.0.0 → 1.2.1

package/dist/manifest.webmanifest

@@ -6,8 +6,8 @@
   "scope": ".",
   "display": "standalone",
   "orientation": "portrait",
-  "background_color": "#1b130c",
-  "theme_color": "#2b1d12",
+  "background_color": "#14161b",
+  "theme_color": "#14161b",
   "icons": [
     { "src": "icon.svg", "sizes": "any", "type": "image/svg+xml", "purpose": "any maskable" }
   ]

package/dist/sw.js

@@ -2,7 +2,7 @@
    Network-first for the app page (fresh when online, cached when offline),
    cache-first for static assets. Cache version is stamped at build time so a
    redeploy refreshes clients automatically. */
-const CACHE = "pf2e-spellbook-20260627130553";
+const CACHE = "pf2e-spellbook-20260708225220";
 const SHELL = ["./", "./index.html", "./manifest.webmanifest", "./icon.svg"];
 
 self.addEventListener("install", (e) => {

package/package.json

@@ -1,15 +1,33 @@
 {
   "name": "pf2e-spellbook",
-  "version": "1.0.0",
+  "version": "1.2.1",
   "description": "Interactive Pathfinder 2e spellbook (single self-contained HTML).",
-  "keywords": ["pathfinder", "pf2e", "spellbook", "spells", "ttrpg"],
+  "keywords": [
+    "pathfinder",
+    "pf2e",
+    "spellbook",
+    "spells",
+    "ttrpg"
+  ],
   "homepage": "https://thewhytewolf.github.io/pf2espellcards/",
-  "repository": { "type": "git", "url": "git+https://github.com/TheWhyteWolf/pf2espellcards.git" },
-  "bugs": { "url": "https://github.com/TheWhyteWolf/pf2espellcards/issues" },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/TheWhyteWolf/pf2espellcards.git"
+  },
+  "bugs": {
+    "url": "https://github.com/TheWhyteWolf/pf2espellcards/issues"
+  },
   "author": "Whyte",
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
+  "bin": {
+    "pf2e-spellbook": "bin/cli.mjs"
+  },
+  "engines": {
+    "node": ">=18"
+  },
   "files": [
+    "bin/",
     "src/",
     "tools/",
     "data/",

package/src/classes.js

@@ -52,6 +52,46 @@ function psychicSlots(level){
   return slots;
 }
 
+/* ============================================================
+   INLINE SVG ICON REGISTRY
+   Thin line icons (24x24, stroke = currentColor) so they inherit the
+   active accent colour. Keyed by name; classes/features reference a key
+   instead of an emoji. iconSvg() wraps the path data in an <svg>.
+   ============================================================ */
+const ICONS={
+  /* classes */
+  cleric:'<circle cx="12" cy="12" r="3.4"/><path d="M12 3v2.6M12 18.4V21M3 12h2.6M18.4 12H21M5.6 5.6l1.9 1.9M16.5 16.5l1.9 1.9M18.4 5.6l-1.9 1.9M7.5 16.5l-1.9 1.9"/>',
+  wizard:'<path d="M12 3.5 4.5 19.5h15z"/><circle cx="12" cy="13.5" r="1.9"/>',
+  druid:'<path d="M5 19.5C5 11 10.5 5 19 4.5 19 13 13.5 19 5 19.5z"/><path d="M11.5 12 5 19.5"/>',
+  witch:'<path d="M17.5 15.2A6 6 0 1 1 11.3 5a5 5 0 0 0 6.2 10.2z"/><path d="M18.3 3.6l.8 1.9 1.9.8-1.9.8-.8 1.9-.8-1.9-1.9-.8 1.9-.8z"/>',
+  sorcerer:'<path d="M12 3c2.8 3.6 4.6 5.6 4.6 8.4a4.6 4.6 0 0 1-9.2 0c0-1.2.6-2.2 1.6-3.1.3 1.1 1 1.6 1.6 1.6C9.4 8.4 10.3 5.7 12 3z"/>',
+  bard:'<path d="M9.5 17.5V6.2l9-2v9.6"/><circle cx="6.8" cy="17.5" r="2.4"/><circle cx="15.8" cy="15.8" r="2.4"/>',
+  oracle:'<path d="M2.5 12S6 6 12 6s9.5 6 9.5 6-3.5 6-9.5 6-9.5-6-9.5-6z"/><circle cx="12" cy="12" r="2.4"/>',
+  magus:'<path d="M17.5 3.5 20.5 6.5 12 15l-3 1 1-3z"/><path d="M8 14l-4 4"/><path d="M5.5 15.5l3 3"/>',
+  summoner:'<circle cx="9.2" cy="12" r="4.8"/><circle cx="14.8" cy="12" r="4.8"/>',
+  psychic:'<path d="M12 12a1.5 1.5 0 1 0 1.6-1.5A3.6 3.6 0 1 0 8.4 12 5.7 5.7 0 1 0 17.7 7.7"/>',
+  animist:'<path d="M12 3c2 2.5 3.1 4 3.1 6a3.1 3.1 0 0 1-6.2 0c0-1 .5-2 1.5-2.9.3.8.8 1.2 1.3 1.2C11 6 11 5 12 3z"/><path d="M12 12v6"/><path d="M9 21h6"/>',
+  /* navigation */
+  today:'<rect x="7" y="3.5" width="12.5" height="17" rx="2"/><path d="M4.5 7v11.5a2 2 0 0 0 2 2h9.5"/>',
+  prepare:'<path d="M3 18.5h18"/><path d="M6.5 18.5a5.5 5.5 0 0 1 11 0"/><path d="M12 3v3M4.2 8.7l1.7 1.7M19.8 8.7l-1.7 1.7"/>',
+  browse:'<path d="M4 5.2A2 2 0 0 1 6 3.2h5.2v15.6H6a2 2 0 0 0-2 2z"/><path d="M20 5.2a2 2 0 0 0-2-2h-5.2v15.6H18a2 2 0 0 1 2 2z"/>',
+  help:'<circle cx="12" cy="12" r="9"/><path d="M9.4 9.4a2.6 2.6 0 1 1 3.6 2.4c-.9.5-1.1 1-1.1 1.9"/><path d="M12 16.7v.01"/>',
+  /* features / utility */
+  school:'<path d="M2.5 8.5 12 4.5l9.5 4-9.5 4z"/><path d="M6.5 10.5v4c0 1.5 11 1.5 11 0v-4"/><path d="M21.5 8.5v5"/>',
+  bonded:'<path d="M9.3 12.4a3 3 0 0 1 0-4.2l1.9-1.9a3 3 0 0 1 4.2 4.2l-1 1"/><path d="M14.7 11.6a3 3 0 0 1 0 4.2l-1.9 1.9a3 3 0 0 1-4.2-4.2l1-1"/>',
+  heal:'<path d="M12 5.5v13M5.5 12h13"/>',
+  harm:'<path d="M12 3a7 7 0 0 0-7 7c0 2 1 3.6 2.2 4.6V17a1 1 0 0 0 1 1h7.6a1 1 0 0 0 1-1v-2.4C19 13.6 20 12 20 10a7 7 0 0 0-7-7z" transform="translate(-1 0)"/><circle cx="8.5" cy="10.5" r="1.1"/><circle cx="13.5" cy="10.5" r="1.1"/><path d="M9 18v2M11 18v2M13 18v2"/>',
+  menu:'<circle cx="12" cy="8" r="3.4"/><path d="M5.5 20a6.5 6.5 0 0 1 13 0"/>',
+  filter:'<path d="M4 7h16M4 12h16M4 17h16"/><circle cx="9" cy="7" r="2"/><circle cx="15" cy="12" r="2"/><circle cx="8" cy="17" r="2"/>',
+  plus:'<path d="M12 5.5v13M5.5 12h13"/>',
+  book:'<path d="M12 6.5C9.5 4.7 6 4.7 3.5 6v13c2.5-1.3 6-1.3 8.5.5 2.5-1.8 6-1.8 8.5-.5V6c-2.5-1.3-6-1.3-8.5.5z"/><path d="M12 6.5v13"/>',
+};
+function iconSvg(name, cls){
+  return '<svg class="icn '+(cls||"")+'" viewBox="0 0 24 24" fill="none" stroke="currentColor" '+
+    'stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">'+
+    (ICONS[name]||"")+'</svg>';
+}
+
 /* [minLevel, proficiency bonus] for spell DC / spell attack, highest first.
    Bonus = 2/4/6/8 for trained/expert/master/legendary.
    Wizard, Druid, Sorcerer, Bard, Oracle, Psychic and the Cloistered Cleric
@@ -99,13 +139,13 @@ const CORE_HELP=[
   ["Remaster vs. legacy (original) rules",
    "This app uses the current <b>Remaster</b> spell names and rules. If your group still plays the <b>original</b> (pre-Remaster) edition, most spells are identical — and renamed ones show a small <i>“formerly …”</i> note, so you can also <b>search by the old name</b> (e.g. searching <b>Magic Missile</b> finds <b>Force Barrage</b>). A few legacy spells that weren't changed are still listed under their original names too.<br><br>A few wording changes to keep in mind: spell <b>rank</b> = spell <b>level</b>; <b>vitality</b>/<b>void</b> damage = the old <b>positive</b>/<b>negative</b>; and <b>holy</b>/<b>unholy</b> replace the old <b>good</b>/<b>evil</b> alignment damage. The numbers and effects are the same."],
   ["Multiple characters, backup & sharing",
-   "Tap the <b>👤</b> button (top right) to keep <b>several characters</b> and switch between them — each remembers its own prepared spells. From there you can also <b>Export</b> a character to a code to back it up or send to a friend, and <b>Import</b> a code someone shares with you. Everything is stored on your device."],
+   "Tap the <b>character</b> button (top right) to keep <b>several characters</b> and switch between them — each remembers its own prepared spells. From there you can also <b>Export</b> a character to a code to back it up or send to a friend, and <b>Import</b> a code someone shares with you. Everything is stored on your device."],
 ];
 
 const CLASSES={
   /* ---------------- CLERIC ---------------- */
   cleric:{
-    id:"cleric", name:"Cleric", icon:"⛪",
+    id:"cleric", name:"Cleric", icon:"cleric", color:"#d8a23a",
     tagline:"Divine prepared caster · the party's main healer",
     tradition:"divine", keyAbility:"Wisdom", keyAbilityShort:"Wis",
     casting:"prepared", slots:"full", prof:FULL_CASTER_PROF, cantrips:5,
@@ -128,63 +168,59 @@ const CLASSES={
 
   /* ---------------- WIZARD ---------------- */
   wizard:{
-    id:"wizard", name:"Wizard", icon:"🪄",
+    id:"wizard", name:"Wizard", icon:"wizard", color:"#7b6cf0",
     tagline:"Arcane prepared caster · the widest spell list",
     tradition:"arcane", keyAbility:"Intelligence", keyAbilityShort:"Int",
     casting:"prepared", slots:"full", prof:FULL_CASTER_PROF, cantrips:5,
-    preview:true,
     features:[
-      {type:"extraSlots", key:"school", icon:"🎓", label:"Arcane school slot",
+      {type:"extraSlots", key:"school", icon:"school", label:"Arcane school slot",
        note:"One extra slot of each rank you can cast, which must hold a spell from your chosen school / curriculum."},
-      {type:"dailyResource", key:"bonded", icon:"🔗", label:"Drain Bonded Item", uses:1,
+      {type:"dailyResource", key:"bonded", icon:"bonded", label:"Drain Bonded Item", uses:1,
        note:"Once per day, recast a spell you already cast today without spending its slot."},
     ],
     help:[
       ["What does a wizard do?",
        "You're an <b>Arcane</b> prepared caster with the broadest spell list in the game. You Prepare spells each morning from your spellbook, leaning on control and damage like <b>Fireball</b> plus utility."],
       ["Arcane school slot",
-       "Your school (curriculum) gives you <b>one extra prepared slot of every rank</b> you can cast. Fill the 🎓 slots with spells from your school. The app adds these slots automatically."],
+       "Your school (curriculum) gives you <b>one extra prepared slot of every rank</b> you can cast. Fill the <b>school</b> slots with spells from your school. The app adds these slots automatically."],
       ["Drain Bonded Item",
-       "Once per day you can <b>Drain your Bonded Item</b> to recast a spell you've already cast that day, without spending another slot. Tick the 🔗 tracker on Cast Today when you use it."],
+       "Once per day you can <b>Drain your Bonded Item</b> to recast a spell you've already cast that day, without spending another slot. Tick the <b>Drain Bonded Item</b> tracker on Cast Today when you use it."],
     ],
   },
 
   /* ---------------- DRUID ---------------- */
   druid:{
-    id:"druid", name:"Druid", icon:"🌿",
+    id:"druid", name:"Druid", icon:"druid", color:"#4faf6d",
     tagline:"Primal prepared caster · nature's versatility",
     tradition:"primal", keyAbility:"Wisdom", keyAbilityShort:"Wis",
     casting:"prepared", slots:"full", prof:FULL_CASTER_PROF, cantrips:5,
-    preview:true,
     features:[{type:"note", title:"Druidic order", text:"Pick your order's focus spells (Heal Animal, Tempest Surge, Wild/Untamed Form…) in the Focus section below. Companion/familiar bookkeeping stays on your sheet."}],
     help:[
       ["What does a druid do?",
-       "You're a <b>Primal</b> prepared caster tied to nature, with strong healing, control, and battlefield spells. Many druids also use order focus spells to shapeshift (coming soon to the app)."],
+       "You're a <b>Primal</b> prepared caster tied to nature, with strong healing, control, and battlefield spells. Many druids also use order focus spells to shapeshift — add the ones you know in the Focus section."],
     ],
   },
 
   /* ---------------- WITCH ---------------- */
   witch:{
-    id:"witch", name:"Witch", icon:"🔮",
+    id:"witch", name:"Witch", icon:"witch", color:"#b061b8",
     tagline:"Prepared caster · your patron sets the tradition",
     traditionFrom:"patron", defaultTradition:"occult",
     keyAbility:"Intelligence", keyAbilityShort:"Int",
     casting:"prepared", slots:"full", prof:FULL_CASTER_PROF, cantrips:5,
-    preview:true,
     features:[{type:"note", title:"Hexes & familiar", text:"Choose your patron's tradition above, then add your hex focus spells in the Focus section below. Familiar details stay on your sheet."}],
     help:[
       ["What does a witch do?",
-       "You're a prepared caster whose <b>patron</b> grants your magic — set your patron's <b>tradition</b> (arcane, divine, occult, or primal) in the character section, and your spell list follows. Witches also cast <b>hexes</b> through a familiar (coming soon)."],
+       "You're a prepared caster whose <b>patron</b> grants your magic — set your patron's <b>tradition</b> (arcane, divine, occult, or primal) in the character section, and your spell list follows. Witches also cast <b>hexes</b> — add your hex focus spells in the Focus section (your familiar stays on your sheet)."],
     ],
   },
 
   /* ---------------- SORCERER ---------------- */
   sorcerer:{
-    id:"sorcerer", name:"Sorcerer", icon:"✨",
+    id:"sorcerer", name:"Sorcerer", icon:"sorcerer", color:"#e05a52",
     tagline:"Spontaneous caster · magic in the blood",
     traditionFrom:"bloodline", keyAbility:"Charisma", keyAbilityShort:"Cha",
     casting:"spontaneous", slots:"full", prof:FULL_CASTER_PROF, cantrips:5,
-    preview:true,
     features:[
       {type:"signature"},
       {type:"note", title:"Bloodline magic", text:"Add your bloodline focus spells in the Focus section below. Blood-magic side effects are described on each spell but tracked by you."},
@@ -199,18 +235,17 @@ const CLASSES={
 
   /* ---------------- BARD ---------------- */
   bard:{
-    id:"bard", name:"Bard", icon:"🎵",
+    id:"bard", name:"Bard", icon:"bard", color:"#34a8c4",
     tagline:"Occult spontaneous caster · master of support",
     tradition:"occult", keyAbility:"Charisma", keyAbilityShort:"Cha",
     casting:"spontaneous", slots:"full", prof:FULL_CASTER_PROF, cantrips:5,
-    preview:true,
     features:[
       {type:"signature"},
       {type:"note", title:"Compositions & muse", text:"Add your composition focus spells (Courageous Anthem, Counter Performance…) in the Focus section below."},
     ],
     help:[
       ["What does a bard do?",
-       "You're an <b>Occult</b> <b>spontaneous</b> caster and the game's best supporter. You build a repertoire and cast flexibly, and your composition cantrips/focus spells buff the party (coming soon)."],
+       "You're an <b>Occult</b> <b>spontaneous</b> caster and the game's best supporter. You build a repertoire and cast flexibly, and your composition cantrips/focus spells buff the party — add them in the Focus section."],
       ["Signature spells",
        "Mark spells as <b>signature</b> (the ★) to heighten them with higher-rank slots. One per rank is the usual choice."],
     ],
@@ -218,30 +253,35 @@ const CLASSES={
 
   /* ---------------- ORACLE ---------------- */
   oracle:{
-    id:"oracle", name:"Oracle", icon:"👁",
+    id:"oracle", name:"Oracle", icon:"oracle", color:"#c061d6",
     tagline:"Divine spontaneous caster · power at a price",
     tradition:"divine", keyAbility:"Charisma", keyAbilityShort:"Cha",
     casting:"spontaneous", slots:"full", prof:FULL_CASTER_PROF, cantrips:5,
-    preview:true,
     features:[
       {type:"signature"},
-      {type:"note", title:"Mystery & revelations", text:"Add your revelation focus spells in the Focus section below. Your escalating oracular curse is tracked on your sheet."},
+      {type:"stageTracker", key:"curse", icon:"oracle", label:"Oracular curse", max:4,
+       note:"Your curse deepens by a stage each time you use a cursebound action — stronger effects, worse drawbacks. Resting clears it."},
+      {type:"note", title:"Mystery & revelations", text:"Add your revelation focus spells in the Focus section below, and track your escalating oracular curse on Cast Today."},
     ],
     help:[
       ["What does an oracle do?",
-       "You're a <b>Divine</b> <b>spontaneous</b> caster channeling a <b>mystery</b>. You build a repertoire and cast flexibly; your revelation spells deepen an escalating <b>curse</b> (coming soon)."],
+       "You're a <b>Divine</b> <b>spontaneous</b> caster channeling a <b>mystery</b>. You build a repertoire and cast flexibly. Add your revelation focus spells in the Focus section; your escalating <b>curse</b> is tracked on your sheet."],
       ["Signature spells",
        "Mark spells as <b>signature</b> (the ★) to heighten them with higher-rank slots — usually one per spell rank."],
     ],
   },
   /* ---------------- MAGUS ---------------- */
   magus:{
-    id:"magus", name:"Magus", icon:"⚔️",
+    id:"magus", name:"Magus", icon:"magus", color:"#5d82e0",
     tagline:"Arcane half-caster · blade and spell as one",
     tradition:"arcane", keyAbility:"Intelligence", keyAbilityShort:"Int",
     casting:"prepared", slots:"partial", prof:PARTIAL_CASTER_PROF, cantrips:5,
-    preview:true,
-    features:[{type:"note", title:"Spellstrike & conflux spells", text:"Add your conflux focus spells (Force Fang, etc.) in the Focus section. Spellstrike itself is a martial action recharged by Arcane Cascade — track it on your sheet. You have only a few spell slots, always in your top two ranks."}],
+    features:[
+      {type:"studiousSlots", key:"studious", minLevel:7, rank:2, count:2, label:"Studious spells",
+       spells:["gecko-grip","sure-strike","water-breathing"],
+       note:"From level 7, two extra 2nd-rank slots for utility spells only: Gecko Grip, Sure Strike, or Water Breathing — plus one spell from your hybrid study, which you add on your sheet."},
+      {type:"note", title:"Spellstrike & conflux spells", text:"Add your conflux focus spells (Force Fang, etc.) in the Focus section. Spellstrike itself is a martial action recharged by Arcane Cascade — track it on your sheet. Your main spell slots are always your top two ranks."},
+    ],
     help:[
       ["What does a magus do?",
        "You're a martial <b>Arcane</b> caster who fuses weapon strikes with spells via <b>Spellstrike</b>. You only get a <b>handful of spell slots</b> (always your two highest ranks), so each prepared spell is precious — often a damaging spell to channel through Spellstrike."],
@@ -252,14 +292,13 @@ const CLASSES={
 
   /* ---------------- SUMMONER ---------------- */
   summoner:{
-    id:"summoner", name:"Summoner", icon:"👹",
+    id:"summoner", name:"Summoner", icon:"summoner", color:"#2bb59a",
     tagline:"Half-caster · you and your eidolon, as one",
     traditionFrom:"patron", defaultTradition:"arcane",
     traditionChoiceLabel:"Eidolon's tradition",
     traditionChoiceHint:"your eidolon's essence sets your spell tradition",
     keyAbility:"Charisma", keyAbilityShort:"Cha",
     casting:"spontaneous", slots:"partial", prof:PARTIAL_CASTER_PROF, cantrips:5,
-    preview:true,
     features:[
       {type:"signature"},
       {type:"note", title:"Eidolon & shared life", text:"Choose your eidolon's tradition above and add evolution focus spells in the Focus section. You get only a few slots (top two ranks). Your shared HP pool and the eidolon's actions stay on your sheet."},
@@ -274,14 +313,15 @@ const CLASSES={
 
   /* ---------------- PSYCHIC ---------------- */
   psychic:{
-    id:"psychic", name:"Psychic", icon:"🧠",
+    id:"psychic", name:"Psychic", icon:"psychic", color:"#e05fa6",
     tagline:"Occult spontaneous caster · few spells, mighty cantrips",
     tradition:"occult", keyAbility:"Int or Cha", keyAbilityShort:"Key",
-    casting:"spontaneous", slots:"psychic", prof:FULL_CASTER_PROF, cantrips:5,
-    preview:true,
+    casting:"spontaneous", slots:"psychic", prof:FULL_CASTER_PROF, cantrips:3,
     features:[
       {type:"signature"},
-      {type:"note", title:"Psi cantrips, Amps & Unleash Psyche", text:"Your psi cantrips appear in the Focus section — cast them at will, and spend a Focus Point to Amp them (use Refocus to recover). Your spell DC uses Intelligence or Charisma, whichever your conscious mind chose. Unleash Psyche is tracked on your sheet."},
+      {type:"dailyResource", key:"unleash", icon:"psychic", label:"Unleash Psyche", uses:1, verb:"Unleash", recharge:"refocus",
+       note:"Surge your psyche for 2 rounds — bigger cantrips and better spell attacks. Afterward your mind is strained; Refocus to Unleash again."},
+      {type:"note", title:"Psi cantrips & Amps", text:"Your psi cantrips appear in the Focus section — cast them at will, or spend a Focus Point to Amp them (tap Amp). Refocus to recover points. Your spell DC uses Intelligence or Charisma, whichever your conscious mind chose."},
     ],
     help:[
       ["What does a psychic do?",
@@ -293,15 +333,14 @@ const CLASSES={
 
   /* ---------------- ANIMIST ---------------- */
   animist:{
-    id:"animist", name:"Animist", icon:"🕯️",
+    id:"animist", name:"Animist", icon:"animist", color:"#e08a3c",
     tagline:"Divine prepared caster · channels apparitions (spirits)",
     tradition:"divine", keyAbility:"Wisdom", keyAbilityShort:"Wis",
     casting:"prepared", slots:"full", prof:FULL_CASTER_PROF, cantrips:4,
-    preview:true,
     features:[{type:"note", title:"Apparitions & vessel spells", text:"You prepare divine spells; your attuned apparitions grant a vessel focus spell (add the ones you know in the Focus section below) and a separate spontaneous repertoire of apparition spells that stays on your character sheet."}],
     help:[
       ["What does an animist do?",
-       "You're a <b>Divine</b> prepared caster who channels <b>apparitions</b> — spirits that lend you power. You prepare divine spells like a cleric, and your attuned apparitions grant extra spells plus a <b>vessel</b> focus spell. The app tracks your divine slots, cantrips and DC; apparition attunement and the apparition repertoire stay on your sheet (coming soon)."],
+       "You're a <b>Divine</b> prepared caster who channels <b>apparitions</b> — spirits that lend you power. You prepare divine spells like a cleric, and your attuned apparitions grant extra spells plus a <b>vessel</b> focus spell. The app tracks your divine slots, cantrips and DC; apparition attunement and the apparition repertoire stay on your character sheet."],
       ["Cantrips & apparitions",
        "You know <b>4 cantrips</b> — two you choose plus two granted by your attuned apparitions. Your <b>vessel</b> focus spell (from your primary apparition) appears in the Focus section; cast it with Focus Points like other focus spells."],
     ],