easterobot 1.3.1__tar.gz → 1.3.2__tar.gz

{easterobot-1.3.1 → easterobot-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easterobot
-Version: 1.3.1
+Version: 1.3.2
 Summary: Discord bot for Easter.
 Project-URL: Homepage, https://github.com/Dashstrom/easterobot
 Project-URL: Repository, https://github.com/Dashstrom/easterobot

{easterobot-1.3.1 → easterobot-1.3.2}/easterobot/commands/game.py

@@ -91,13 +91,13 @@ async def game_dual(  # noqa: C901, D103, PLR0912
         )
         if len(e1) < bet:
             await ctx.response.send_message(
-                "Vous n'avez pas assez d'oeufs",
+                "Vous n'avez pas assez d'œufs",
                 ephemeral=True,
             )
             return
         if len(e2) < bet:
             await ctx.response.send_message(
-                f"{member.mention} n'a pas assez d'oeufs",
+                f"{member.mention} n'a pas assez d'œufs",
                 ephemeral=True,
             )
             return
@@ -113,7 +113,7 @@ async def game_dual(  # noqa: C901, D103, PLR0912
                 )
                 if len(e1) < bet:
                     await ctx.response.send_message(
-                        "Vous n'avez plus assez d'oeufs",
+                        "Vous n'avez plus assez d'œufs",
                         ephemeral=True,
                     )
                     return
@@ -121,7 +121,7 @@ async def game_dual(  # noqa: C901, D103, PLR0912
                     e.lock = True
                 if len(e2) < bet:
                     await ctx.response.send_message(
-                        f"{member.mention} n'a plus assez d'oeufs",
+                        f"{member.mention} n'a plus assez d'œufs",
                         ephemeral=True,
                     )
                     return

{easterobot-1.3.1 → easterobot-1.3.2}/easterobot/commands/info.py

@@ -51,9 +51,9 @@ async def info_command(
                 title=f"Informations sur {hunter.display_name}",
                 description=(
                     f"Classement : {hunter_rank.badge}\n"
-                    f"Nombre d'oeufs : `{hunter_rank.eggs}`\n"
+                    f"Nombre d'œufs : `{hunter_rank.eggs}`\n"
                     f"Chance brute : `{member_luck.luck:.0%}`\n"
-                    f"Chance de trouver un oeuf : `{member_luck.discovered:.0%}`\n"
+                    f"Chance de trouver un œuf : `{member_luck.discovered:.0%}`\n"
                     f"Chance de se faire voler : `{member_luck.spotted:.0%}`"
                 ),
             ),

{easterobot-1.3.1 → easterobot-1.3.2}/easterobot/hunts/luck.py

@@ -18,6 +18,8 @@ class HuntLuck:
     @property
     def discovered(self) -> float:
         """Discovered probability."""
+        if self.egg_count <= self.config.commands.search.discovered.shield:
+            return 1.0
         prob = self.config.commands.search.discovered.probability(self.luck)
         if self.sleep_hours:
             prob /= self.config.sleep.divide_discovered
@@ -26,6 +28,8 @@ class HuntLuck:
     @property
     def spotted(self) -> float:
         """Spotted probability."""
+        if self.egg_count <= self.config.commands.search.spotted.shield:
+            return 0.0
         prob = self.config.commands.search.spotted.probability(self.luck)
         if self.sleep_hours:
             prob /= self.config.sleep.divide_spotted
@@ -33,21 +37,22 @@ class HuntLuck:
 
     def sample_discovered(self) -> bool:
         """Get if player get detected."""
-        if self.egg_count <= self.config.commands.search.discovered.shield:
-            logger.info("discovered: shield with %s eggs", self.egg_count)
-            return True
         sample = RAND.random()
+        discovered = self.discovered
         logger.info(
-            "discovered: expect over %.2f got %.2f",
-            self.discovered,
+            "discovered: expect over %.4f got %.4f",
+            discovered,
             sample,
         )
-        return self.discovered > sample
+        return discovered > sample
 
     def sample_spotted(self) -> bool:
         """Get if player get spotted."""
-        if self.egg_count <= self.config.commands.search.spotted.shield:
-            logger.info("spotted: shield with %s eggs", self.egg_count)
-            return True
         sample = RAND.random()
-        return self.spotted < sample
+        spotted = self.spotted
+        logger.info(
+            "spotted: expect over %.4f got %.4f",
+            spotted,
+            sample,
+        )
+        return spotted > sample

{easterobot-1.3.1 → easterobot-1.3.2}/easterobot/resources/config.example.yml

@@ -321,35 +321,35 @@ action:
       gif: https://media4.giphy.com/media/v1.Y2lkPTc5MGI3NjExMTh2ZjFrdDdpN2h3aXZtYWxtcmdmNGI2ZWoyczg5b3d4Y2c0N2pwbiZlcD12MV9pbnRlcm5hbF9naWZfYnlfaWQmY3Q9Zw/3otPoxbuCuvXTbICfm/giphy.gif
     fail:
       text: "On a connu des morts de hamster plus originales, la peur de perdre l'œuf l’a emporté."
-      gif: https://tenor.com/view/hamster-ayasan-gif-24417559
+      gif: https://c.tenor.com/9t7q9vCcYmMAAAAd/tenor.gif
   - text: "Pinguiner pour l'œuf"
     success:
       text: "I'm fast as fuck, boy. {Iel} court en s'enfuyant avec l'œuf."
       gif: https://media0.giphy.com/media/v1.Y2lkPTc5MGI3NjExYXBrcmQwemt3Y2x1NXdrcnV0aWZxcWZrMGtzYXV4NTBrZGFhYnFhOSZlcD12MV9pbnRlcm5hbF9naWZfYnlfaWQmY3Q9Zw/y5xRFqfdkgEXS/giphy.gif
     fail:
       text: "Saboté par un autre pingouin. {Iel} prend une petite baignade."
-      gif: https://tenor.com/view/penguin-slap-gif-5263949288532448516
+      gif: https://c.tenor.com/SQ1N_QKllQQAAAAd/tenor.gif
   - text: "Invoquer un chat pour l'œuf"
     success:
-      text: "Oh waw, quel maniement félin de l'œuf !"
-      gif: https://tenor.com/view/happy-easter-images2022-cute-cat-gif-25406467
+      text: Oh waw, quel maniement félin de l'œuf !
+      gif: https://c.tenor.com/vwfpPXNTDPEAAAAd/tenor.gif
     fail:
       text: "{Iel} n'est pas tombé{e} sur le chat le plus adroit du quartier, {iel} tombe fatalement."
-      gif: https://tenor.com/view/cat-meme-fall-down-sink-counter-gif-2237760511603157439
-  - text: "Boire l'œuf ?"
+      gif: https://c.tenor.com/Hw4fVEKAqb8AAAAd/tenor.gif
+  - text: Boire l'œuf ?
     success:
       text: "Effectivement, quand ils sont solides, ça a plus de chances d'être des œufs. {Iel} récupère un œuf."
-      gif: https://tenor.com/view/sml-junior-oh-man-guys-i-found-so-many-eggs-finding-eggs-gif-25432207
+      gif: https://c.tenor.com/cqBCSM5N55UAAAAd/tenor.gif
     fail:
       text: "Mmhh, effectivement, un œuf, ça ne se boit pas. Sa vision double l'empêche d'attraper l'œuf."
       gif: https://gifdb.com/images/high/easter-bunny-bud-light-6y0qi1qackuq0ijb.webp
-  - text: "Poler pour l'oeuf"
+  - text: "Poler pour l'œuf"
     success:
       text: "Quelle adresse, {iel} séduit le lapin de Pâques et obtient un œuf"
-      gif: https://tenor.com/view/easter-happyeaster-eastersunday-easterbunny-lol-gif-4003716
+      gif: https://c.tenor.com/aThWCOLIhvwAAAAd/tenor.gif
     fail:
       text: "Oulà, je n'aurais pas aimé être à sa place."
-      gif: https://tenor.com/view/pole-whoops-fall-oh-no-face-plant-gif-14246225
+      gif: https://c.tenor.com/WQV-9F8Wt7QAAAAd/tenor.gif
   - text: "Ramasser calmement l'œuf"
     success:
       text: "Sa sagesse lui a permis d'arriver en vie jusqu'à l'œuf."

{easterobot-1.3.1 → easterobot-1.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "easterobot"
-version = "1.3.1"
+version = "1.3.2"
 description = "Discord bot for Easter."
 authors = [
     { name = "Dashstrom", email = "dashstrom.pro@gmail.com" }
@@ -231,7 +231,7 @@ imports = ["shutil", "sys", "pathlib"]
 
 [tool.pytest.ini_options]
 log_cli = true
-log_cli_level = "INFO"
+log_cli_level = "WARNING"
 addopts = "-vvv --doctest-modules --ignore=easterobot/alembic"
 doctest_optionflags = "DONT_ACCEPT_TRUE_FOR_1 NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL ELLIPSIS"
 #asyncio_mode = "auto"

{easterobot-1.3.1 → easterobot-1.3.2}/tests/test_search.py

@@ -24,8 +24,8 @@ async def test_luck(session: AsyncSession, config: MConfig) -> None:
     hunt = HuntQuery(config)
     for user_id, egg_count in (
         (USER_ID_1, 0),
-        (USER_ID_2, 4),
-        (USER_ID_3, 8),
+        (USER_ID_2, 15),
+        (USER_ID_3, 30),
     ):
         for _ in range(egg_count):
             session.add(
@@ -37,13 +37,18 @@ async def test_luck(session: AsyncSession, config: MConfig) -> None:
                 )
             )
         await session.commit()
+    N = 10_000  # noqa: N806
     for user_id, egg_count, luck, discovered, spotted in (
-        (USER_ID_1, 0, 1.0, 0.9, 0.333),
-        (USER_ID_2, 4, 0.5, 0.75, 0.4995),
-        (USER_ID_3, 8, 0.0, 0.6, 0.666),
+        (USER_ID_1, 0, 1.0, 1.0, 0.0),
+        (USER_ID_2, 15, 0.5, 0.75, 0.4995),
+        (USER_ID_3, 30, 0.0, 0.6, 0.666),
     ):
         member_luck = await hunt.get_luck(session, GUILD_ID, user_id)
         assert member_luck.egg_count == egg_count
         assert isclose(member_luck.luck, luck)
         assert isclose(member_luck.discovered, discovered)
         assert isclose(member_luck.spotted, spotted)
+        prob_d = sum(member_luck.sample_discovered() for _ in range(N)) / N
+        prob_s = sum(member_luck.sample_spotted() for _ in range(N)) / N
+        assert isclose(prob_d, discovered, rel_tol=5e-2)
+        assert isclose(prob_s, spotted, rel_tol=5e-2)

{easterobot-1.3.1 → easterobot-1.3.2}/uv.lock

@@ -541,7 +541,7 @@ wheels = [
 
 [[package]]
 name = "easterobot"
-version = "1.3.1"
+version = "1.3.2"
 source = { editable = "." }
 dependencies = [
     { name = "aiosqlite" },