easterobot 1.3.1__py3-none-any.whl → 1.3.2__py3-none-any.whl

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/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/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/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.dist-info → easterobot-1.3.2.dist-info}/METADATA

@@ -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.dist-info → easterobot-1.3.2.dist-info}/RECORD

@@ -19,9 +19,9 @@ easterobot/commands/basket.py,sha256=sV6JfPxg4U98dTTA5tr1wnMVM5DI9UXGL6FWL9OphTw
 easterobot/commands/disable.py,sha256=AMSUBIdS6H8PMv2iYJIOMPuciEUtrTVUWe9bAJ6m1yA,975
 easterobot/commands/edit.py,sha256=jppdU6A62zhWaO_LFukbp2eTSyiL9NKyK7fBI9n1Ph8,2139
 easterobot/commands/enable.py,sha256=MtvNFzQWjxB9QoHq2YF4j_KTLPnAVDayflUPemQGNuQ,1099
-easterobot/commands/game.py,sha256=WS_yj0SZB3BjhrKOJsqYYTXyxasdrru2_JjkuNS7RoE,6291
+easterobot/commands/game.py,sha256=TMSv05qWAT_xKqg0AeelaDyvPxadZeyN4JfLbvucDUI,6291
 easterobot/commands/help.py,sha256=FWYSkmYvFzrGKBV7I-qu6J4EYXjRjFCJvDa5F48OaEU,1133
-easterobot/commands/info.py,sha256=y8tA0wKScZ7C-54LNIeH1z2dtKiaSMJsfkM3edi07js,1812
+easterobot/commands/info.py,sha256=mh2vStpkRbuwwvV7PxPv0nhSMI-AP58c_cMvDa8ohW8,1812
 easterobot/commands/reset.py,sha256=ImumXlaWclJsV3p6vQeMcRKpww9i0P7pSOzH0gnEU9M,3753
 easterobot/commands/search.py,sha256=rgpqkcYutp0UgW_BN77YxdUg5zqWrQ4RRbBt4V49wo4,3304
 easterobot/commands/top.py,sha256=qjtRtvBKeKq228nRm_RYLY8HMrnz3n_fteBlr4WCpG0,3017
@@ -32,10 +32,10 @@ easterobot/games/rock_paper_scissor.py,sha256=LeYyZrE2fjPQk0AQnnN-YM2fkCkNtsfkR1
 easterobot/games/tic_tac_toe.py,sha256=pBHMfU9wmr6XGRr91IIG6cUwCF4xHZh3482KATFIs2A,5128
 easterobot/hunts/__init__.py,sha256=R0fO04m1F9kEmBy_5EzlYvWVjmY74q5adINEZGGnwCQ,258
 easterobot/hunts/hunt.py,sha256=fgjkgJB57AJxlYTq3nh4pbbAx-0OfmsDLTIjv1nb_zI,17758
-easterobot/hunts/luck.py,sha256=mn_x_Hc57GxeLK_CSw9d_0vhiiQTYeygaLKPMAIf6gk,1566
+easterobot/hunts/luck.py,sha256=liQIkQEb_quBpyJsfSUd6wDXI0-SW2KakL-fMrx5T4M,1592
 easterobot/hunts/rank.py,sha256=EYvyXfYqklvMflJJfcByYHhaU_NKq_D10aqOl7XuF8E,2274
 easterobot/resources/alembic.ini,sha256=SmGkhRx5iZMpjEa5avCfz1lpF0_WZPEbGA_6MSI1GjU,3297
-easterobot/resources/config.example.yml,sha256=qfujEwZR_mEmHB3A_nzuIDB1KiNF2Yei7P7TNeNd80Q,38869
+easterobot/resources/config.example.yml,sha256=KuB_sSQ1U6cdhL5JT45OVrStcryYvVUauV_xVS9fmec,38689
 easterobot/resources/credits.txt,sha256=zJT_OmCi_PqBPQnWPvWWI9sJx6hPrXcDnNNpLRWDd20,378
 easterobot/resources/logging.conf,sha256=RSL4k79N5oQb1hEtr5SiR_IAiKjkAHZaR4DR9lOxA-M,838
 easterobot/resources/logo.png,sha256=DUFH6Tq8MjW0LGWVc4sox6RvBZCQWHZHTM2e5Ua4od4,82599
@@ -63,8 +63,8 @@ easterobot/resources/emotes/icons/arrow.png,sha256=ZkAicY2AONJUQRTdvkG77wPO5EYE9
 easterobot/resources/emotes/icons/end.png,sha256=8jkufw0aS99tyZCb80PUzT2mkipQrYxwuFOFmOH6UNk,24526
 easterobot/resources/emotes/icons/versus.png,sha256=Ss9PZu4nENB7xo8Kdunt0STvCSrMbo-bTaYz-NJ8tfI,29212
 easterobot/resources/emotes/icons/wait.png,sha256=xXK6bKtPpD1f5wSjMGqzuPzVdV4gkOgMSJ_fVjuzJp4,20378
-easterobot-1.3.1.dist-info/METADATA,sha256=0wQhEUonxw9DMrOFkAM7xBvlybqo-qSkmLStkpd43d4,7787
-easterobot-1.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-easterobot-1.3.1.dist-info/entry_points.txt,sha256=KaH17cNnu7qbWxFcMaj1wZ9GPTjWJ1OTqkBMhoLOmCQ,57
-easterobot-1.3.1.dist-info/licenses/LICENSE,sha256=kYRz570GVPktzhJxWtaencsrsjdKSetpe5WISlDrvnY,1093
-easterobot-1.3.1.dist-info/RECORD,,
+easterobot-1.3.2.dist-info/METADATA,sha256=LvLy9sHS_h0hixexE9vvbMfr4sLYs9LrVRqDQIbNWjw,7787
+easterobot-1.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+easterobot-1.3.2.dist-info/entry_points.txt,sha256=KaH17cNnu7qbWxFcMaj1wZ9GPTjWJ1OTqkBMhoLOmCQ,57
+easterobot-1.3.2.dist-info/licenses/LICENSE,sha256=kYRz570GVPktzhJxWtaencsrsjdKSetpe5WISlDrvnY,1093
+easterobot-1.3.2.dist-info/RECORD,,