From 0775875cc42ca4243bfb9b95e15a4a75beba5548 Mon Sep 17 00:00:00 2001
From: Joseph Keen <icrona@gmail.com>
Date: Mon, 17 Oct 2022 09:09:57 -0600
Subject: [PATCH 1/6] Add handling for TftYP entitlements in the workshop

Due to the modular nature of this book, it was broken into 7 different sources and only those were given out. This checks if you have access to all 7 'modules', and grants the TftYP entitlement if you do.
---
 ddb/client.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ddb/client.py b/ddb/client.py
index 83cf73d1b..8a8c6c357 100644
--- a/ddb/client.py
+++ b/ddb/client.py
@@ -93,6 +93,11 @@ async def get_accessible_entities(self, ctx, user_id, entity_type):
             if entity.is_free or user_licenses & entity.license_ids:
                 accessible.add(entity.entity_id)
 
+        # source 14 is TftYP, and 16-22 are the modules within.
+        # DDB only gives entitlements for the modules
+        if entity_type == "source" and {16, 17, 18, 19, 20, 21, 22}.issubset(user_licenses):
+            accessible.add(14)
+
         log.debug(f"Discord user {user_id} can see {entity_type}s {accessible}")
 
         return accessible

From 2f5070d8e5323cc2eb87a699c24c3615b7925745 Mon Sep 17 00:00:00 2001
From: Joseph Keen <icrona@gmail.com>
Date: Mon, 17 Oct 2022 09:12:27 -0600
Subject: [PATCH 2/6] Add an `AliasSpellbook.get(spellname)` method to get a
 specific spell from the spellbook

---
 aliasing/api/statblock.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/aliasing/api/statblock.py b/aliasing/api/statblock.py
index 56244a0eb..87e66d6e8 100644
--- a/aliasing/api/statblock.py
+++ b/aliasing/api/statblock.py
@@ -697,6 +697,7 @@ def __init__(self, spellbook):
         """
         self._spellbook = spellbook
         self._spells = None
+        self._spell_dict = None
 
     @property
     def dc(self):
@@ -782,6 +783,19 @@ def max_pact_slots(self):
         """
         return self._spellbook.max_pact_slots
 
+    def get(self, spell_name: str):
+        """
+        Returns the spell of the given name, case-insensitive, if it's in the spellbook, or None if it is not.
+
+        :rtype: AliasSpellbookSpell or None
+        """
+        if self._spell_dict is None:
+            if self._spells is None:
+                self._spells = [AliasSpellbookSpell(s) for s in self._spellbook.spells]
+            self._spell_dict = {spell.name.lower(): spell for spell in self._spells}
+
+        return self._spell_dict.get(spell_name.lower())
+
     def slots_str(self, level):
         """
         :param int level: The level of spell slot to return.

From 4a20d6a356e3a028f2958fdcb61423dc2ff46243 Mon Sep 17 00:00:00 2001
From: Joseph Keen <icrona@gmail.com>
Date: Mon, 17 Oct 2022 09:55:34 -0600
Subject: [PATCH 3/6] Updating phrasing on `!help embed` or inline fields

Resolves #1866
---
 cogs5e/pbpUtils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cogs5e/pbpUtils.py b/cogs5e/pbpUtils.py
index 144375636..542e66aac 100644
--- a/cogs5e/pbpUtils.py
+++ b/cogs5e/pbpUtils.py
@@ -43,7 +43,7 @@ async def embed(self, ctx, *, args):
         -image <image url>
         -footer <footer text>
         -f "<Field Title>|<Field Text>[|inline]"
-            (e.g. "Donuts|I have 15 donuts|inline" for an inline field, or "Donuts|I have 15 donuts" for one with its own line.)
+            (e.g. "Donuts|I have 15 donuts|inline" for up to 3 inline fields on a single line, or "Donuts|I have 15 donuts" for one with its own line.)
         -color [hex color]
             Leave blank for random color.
         -t <timeout (0..600)>

From 7eeb6fa62794889f5eafe4a43e6b3a52d4994c45 Mon Sep 17 00:00:00 2001
From: Joseph Keen <icrona@gmail.com>
Date: Mon, 17 Oct 2022 10:27:23 -0600
Subject: [PATCH 4/6] Add a `-effects` arg to `!init reroll` to remove all
 ieffects from all combatants

Implements #1867
---
 cogs5e/initiative/cog.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cogs5e/initiative/cog.py b/cogs5e/initiative/cog.py
index 969e74f79..23f8147ed 100644
--- a/cogs5e/initiative/cog.py
+++ b/cogs5e/initiative/cog.py
@@ -524,6 +524,7 @@ async def reroll(self, ctx, *args):
         Rerolls initiative for all combatants, and starts a new round of combat.
         __Valid Arguments__
         `-restart` - Resets the round counter (effectively restarting initiative).
+        `-effects` - Removes all effects from all combatants
         """
         combat = await ctx.get_combat()
         a = argparse(args)
@@ -535,6 +536,11 @@ async def reroll(self, ctx, *args):
         if a.last("restart"):
             combat.round_num = 0
 
+        # -reset (#1867)
+        if a.last("effects"):
+            [combatant.remove_all_effects() for combatant in combat.combatants]
+            await ctx.send("Removed effects from all combatants.")
+
         # repost summary message
         old_summary = combat.get_summary_msg()
         new_summary = await ctx.send(combat.get_summary())

From 622da843c53845740f300fc39fcc6b4117f844d1 Mon Sep 17 00:00:00 2001
From: Joseph Keen <icrona@gmail.com>
Date: Mon, 17 Oct 2022 11:47:03 -0600
Subject: [PATCH 5/6] Update `AliasSpellbook.get()` to return a list of spells
 with the given name

---
 aliasing/api/statblock.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/aliasing/api/statblock.py b/aliasing/api/statblock.py
index 87e66d6e8..f964098ff 100644
--- a/aliasing/api/statblock.py
+++ b/aliasing/api/statblock.py
@@ -697,7 +697,6 @@ def __init__(self, spellbook):
         """
         self._spellbook = spellbook
         self._spells = None
-        self._spell_dict = None
 
     @property
     def dc(self):
@@ -785,16 +784,14 @@ def max_pact_slots(self):
 
     def get(self, spell_name: str):
         """
-        Returns the spell of the given name, case-insensitive, if it's in the spellbook, or None if it is not.
+        Returns a list of the spells of the given name in the spellbook, case-insensitive.
 
-        :rtype: AliasSpellbookSpell or None
+        :rtype: List[AliasSpellbookSpell]
         """
-        if self._spell_dict is None:
-            if self._spells is None:
-                self._spells = [AliasSpellbookSpell(s) for s in self._spellbook.spells]
-            self._spell_dict = {spell.name.lower(): spell for spell in self._spells}
+        if self._spells is None:
+            self._spells = [AliasSpellbookSpell(s) for s in self._spellbook.spells]
 
-        return self._spell_dict.get(spell_name.lower())
+        return [spell for spell in self._spells if spell_name.lower() == spell.name.lower()]
 
     def slots_str(self, level):
         """

From 354a2761088c8913cbee1214fbc40c69019dcc51 Mon Sep 17 00:00:00 2001
From: Joseph Keen <icrona@gmail.com>
Date: Mon, 17 Oct 2022 14:07:49 -0600
Subject: [PATCH 6/6] Rename method to `.find()`

---
 aliasing/api/statblock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aliasing/api/statblock.py b/aliasing/api/statblock.py
index f964098ff..ba8ba9a2e 100644
--- a/aliasing/api/statblock.py
+++ b/aliasing/api/statblock.py
@@ -782,7 +782,7 @@ def max_pact_slots(self):
         """
         return self._spellbook.max_pact_slots
 
-    def get(self, spell_name: str):
+    def find(self, spell_name: str):
         """
         Returns a list of the spells of the given name in the spellbook, case-insensitive.