Merge pull request #1868 from avrae/jokeen/2022w42

Jokeen/2022w42

aliasing/api/statblock.py

@@ -782,6 +782,17 @@ def max_pact_slots(self):
         """
         return self._spellbook.max_pact_slots
 
+    def find(self, spell_name: str):
+        """
+        Returns a list of the spells of the given name in the spellbook, case-insensitive.
+
+        :rtype: List[AliasSpellbookSpell]
+        """
+        if self._spells is None:
+            self._spells = [AliasSpellbookSpell(s) for s in self._spellbook.spells]
+
+        return [spell for spell in self._spells if spell_name.lower() == spell.name.lower()]
+
     def slots_str(self, level):
         """
         :param int level: The level of spell slot to return.

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())

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)>

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