feat(fishing): Enhance fishing mechanics with improved rod durability and escape chances

Author: siqnole

cogs/admin/Admin.py

@@ -11,7 +11,6 @@
 import os
 import traceback
 from typing import Optional, List
-from cogs.Help import HelpPaginator
 
 logger = CogLogger('Admin')
 
@@ -401,10 +400,13 @@ async def shop_list(self, ctx, shop_type: str):
                 pages.append(embed)
 
             if len(pages) > 1:
-                view = HelpPaginator(pages, ctx.author)
-                view.update_buttons()
-                message = await ctx.reply(embed=pages[0], view=view)
-                view.message = message
+                # Simple pagination without complex view for now
+                for i, page in enumerate(pages):
+                    page.set_footer(text=f"Page {i+1}/{len(pages)}")
+                    if i == 0:
+                        await ctx.reply(embed=page)
+                    else:
+                        await ctx.send(embed=page)
             else:
                 await ctx.reply(embed=pages[0])
 

cogs/bronx/AI.py

@@ -50,7 +50,7 @@ def __init__(self, bot):
 ⚠️ THESE ARE THE ONLY VALID COMMANDS - DO NOT INVENT OTHERS ⚠️
 
 🤖 AI COMMANDS:
-• `.ai <message>` - Chat with BronxBot AI (aliases: `.chat`, `.aiask`, `.ask`, `.bronxai`)
+• `.ai <message>` - Chat with BronxBot AI (aliases: `.chat`, `.aiask`, `.bronxai`)
 • `.ai --thinking <message>` - Shows AI reasoning process
 • `.aiclear` - Clear conversation history (aliases: `.clearai`, `.resetai`, `.clearconvo`, `.resetconvo`)
 • `.aistatus` - Check AI service status [Admin] (aliases: `.aiinfo`, `.checkai`)
@@ -105,7 +105,7 @@ def __init__(self, bot):
 • `.serverinfo` - Server information (aliases: `.si`, `.guildinfo`)
 • `.uptime` - How long bot has been running
 • `.botinfo` - Bot statistics and info
-• `.poll <question>` - Create yes/no poll (aliases: `.ask`, `.yn`)
+• `.poll <question>` - Create yes/no poll (aliases: `.ask`, `.yn`, `.yesno`)
 • `.multipoll <question> <option1> <option2>...` - Multi-option poll
 • `.timestamp [style]` - Generate Discord timestamps
 • `.hexcolor [code]` - Show color preview
@@ -149,7 +149,7 @@ def __init__(self, bot):
 ⚠️ IMPORTANT: Commands can be used with their aliases interchangeably ⚠️
 
 Main Command = Aliases:
-• `.ai` = `.chat`, `.aiask`, `.ask`, `.bronxai`
+• `.ai` = `.chat`, `.aiask`, `.bronxai`
 • `.balance` = `.bal`, `.money`
 • `.pay` = `.give`, `.send`
 • `.deposit` = `.dep`, `.d`
@@ -163,7 +163,7 @@ def __init__(self, bot):
 • `.avatar` = `.av`
 • `.userinfo` = `.ui`, `.whois`
 • `.serverinfo` = `.si`, `.guildinfo`
-• `.poll` = `.ask`, `.yn`
+• `.poll` = `.ask`, `.yn`, `.yesno`
 • `.emojisteal` = `.steal`
 • `.cleanup` = `.cu`
 • `.calculate` = `.calc`, `.math`
@@ -558,7 +558,7 @@ def validate_response_for_hallucinations(self, response: str) -> str:
         """Check response for potential command hallucinations and warn if found"""
         # List of valid commands and their aliases
         valid_commands = [
-            'ai', 'chat', 'aiask', 'ask', 'bronxai', 'aiclear', 'clearai', 'resetai', 
+            'ai', 'chat', 'aiask', 'bronxai', 'aiclear', 'clearai', 'resetai', 
             'clearconvo', 'resetconvo', 'aistatus', 'aiinfo', 'checkai',
             'balance', 'bal', 'money', 'pay', 'give', 'send', 'deposit', 'dep', 'd',
             'withdraw', 'with', 'w', 'daily', 'beg', 'rob', 'work', 'job', 'choosejob',
@@ -590,14 +590,14 @@ def validate_response_for_hallucinations(self, response: str) -> str:
 
         return response
 
-    @commands.command(name='ai', aliases=['chat', 'aiask', 'ask', 'bronxai'])
+    @commands.command(name='ai', aliases=['chat', 'aiask', 'bronxai'])
     @commands.cooldown(1, 30, commands.BucketType.user)
     async def ai_chat(self, ctx, *, prompt: str):
         """Chat with BronxBot AI powered by Deepseek-8B
         
         Usage: .ai <your message>
         Usage: .ai --thinking <your message>  (shows AI reasoning process)
-        Aliases: .chat, .aiask, .ask, .bronxai
+        Aliases: .chat, .aiask, .bronxai
         Example: .ai What's the weather like in the Bronx?
         Example: .ai --thinking Explain quantum physics
         """

cogs/economy/fishing/fishing_core.py

@@ -122,10 +122,25 @@ async def set_active_rod_manual(self, user_id: int, rod_id: str) -> bool:
             self.logger.error(f"Failed to set active rod: {e}")
             return False
 
-    async def check_rod_durability(self, durability: float) -> bool:
-        """Check if rod survives this fishing attempt"""
-        break_chance = 1 - durability
-        return random.random() > break_chance
+    async def check_rod_durability(self, durability: float, rod_price: int = 0) -> bool:
+        """Check if rod survives this fishing attempt - Improved durability system"""
+        # Ensure minimum 95% durability (0.95 = 5% break chance maximum)
+        durability = max(0.95, min(0.998, durability))  # Cap durability at 99.8%
+        
+        base_break_chance = 1 - durability
+        
+        # High-end rods get durability bonuses (10-20% break chance reduction)
+        if rod_price >= 100000:  # Ultra expensive rods
+            base_break_chance *= 0.80  # 20% break chance reduction
+        elif rod_price >= 50000:  # Very expensive rods  
+            base_break_chance *= 0.85  # 15% break chance reduction
+        elif rod_price >= 20000:  # Expensive rods
+            base_break_chance *= 0.90  # 10% break chance reduction
+        
+        # Cap maximum break chance at 10% (was unlimited)
+        final_break_chance = min(0.10, base_break_chance)
+        
+        return random.random() > final_break_chance
 
     async def select_fish_from_rarity(self, rarity: str):
         """Select a random fish from the given rarity category"""
@@ -139,18 +154,32 @@ async def select_fish_from_rarity(self, rarity: str):
         return random.choice(fish_list)
 
     async def check_fish_escape(self, fish_template, rod_power: int):
-        """Check if fish escapes - More generous for expensive rods"""
+        """Check if fish escapes - Implements weight rule and balanced escape chances"""
         base_escape_chance = fish_template.get("escape_chance", 0.1)
 
-        # Reduce escape chance based on rod power (more generous scaling)
-        power_reduction = min(0.8, (rod_power - 1) * 0.15)  # Up to 80% reduction
-        final_escape_chance = max(0.01, base_escape_chance * (1 - power_reduction))
-        
-        # Generate fish weight
+        # Generate fish weight first
         min_weight = fish_template.get("min_weight", 0.1)
         max_weight = fish_template.get("max_weight", 1.0)
         fish_weight = random.uniform(min_weight, max_weight)
 
+        # WEIGHT RULE: Fish under 100kg (220 lbs) CANNOT escape - guaranteed catch!
+        if fish_weight < 100.0:
+            return False, fish_weight  # Fish cannot escape
+        
+        # For fish over 100kg, apply escape chance calculations
+        # Reduce escape chance based on rod power (limited scaling)
+        power_reduction = min(0.30, (rod_power - 1) * 0.05)  # Max 30% reduction (was 80%)
+        final_escape_chance = max(0.01, base_escape_chance * (1 - power_reduction))
+        
+        # Value-based escape penalties for high-value fish
+        fish_value = fish_template.get("base_value", 0)
+        if fish_value >= 1000000:  # 1M+ coins
+            final_escape_chance = min(0.99, final_escape_chance + 0.50)
+        elif fish_value >= 100000:  # 100K+ coins
+            final_escape_chance = min(0.98, final_escape_chance + 0.30)
+        elif fish_value >= 50000:   # 50K+ coins
+            final_escape_chance = min(0.95, final_escape_chance + 0.20)
+        
         # Check if fish escapes
         escaped = random.random() < final_escape_chance
 
@@ -250,6 +279,7 @@ async def fish(self, ctx):
             rod_multiplier = rod.get("multiplier", 1.0)
             rod_durability = rod.get("durability", 0.95)
             rod_power = rod.get("power", 1)
+            rod_price = rod.get("price", 0)
             bait_rates = current_bait.get("catch_rates", {})
 
             # Display suspense message
@@ -279,7 +309,7 @@ async def fish(self, ctx):
             await asyncio.sleep(random.uniform(2.5, 4.5))
 
             # Check rod durability first
-            if not await self.check_rod_durability(rod_durability):
+            if not await self.check_rod_durability(rod_durability, rod_price):
                 # Rod breaks!
                 break_embed = discord.Embed(
                     title="💥 Rod Broke!",
@@ -310,31 +340,43 @@ async def fish(self, ctx):
             # Determine what fish is hooked
             adjusted_rates = self._apply_rod_multiplier_properly(bait_rates, rod_multiplier)
 
-            total_weight = sum(adjusted_rates.values())
-            if total_weight == 0:
-                await message.edit(embed=discord.Embed(
-                    title="🌊 No Bite",
-                    description="Nothing seems interested in your bait...",
-                    color=0x6495ed
-                ))
-                return
-            
-            # Roll for fish rarity
-            roll = random.random() * total_weight
-            cumulative = 0
-            caught_rarity = "junk"
-            
-            for rarity, weight in adjusted_rates.items():
-                cumulative += weight
-                if roll <= cumulative:
-                    caught_rarity = rarity
-                    break
-            
-            # Select specific fish
-            fish_template = await self.select_fish_from_rarity(caught_rarity)
-            if not fish_template:
+            # BEGINNER ROD SAFETY NET: 10% chance to catch ANY fish, even ultra-rare ones
+            beginner_luck = False
+            if rod.get("_id", "").lower() in ["basic_rod", "beginner_rod"]:
+                if random.random() < 0.10:  # 10% chance
+                    beginner_luck = True
+                    # Pick from ALL rarities equally
+                    all_rarities = list(self.fish_database.keys())
+                    caught_rarity = random.choice(all_rarities)
+                    fish_template = await self.select_fish_from_rarity(caught_rarity)
+            
+            if not beginner_luck:
+                # Normal fishing logic
+                total_weight = sum(adjusted_rates.values())
+                if total_weight == 0:
+                    await message.edit(embed=discord.Embed(
+                        title="🌊 No Bite",
+                        description="Nothing seems interested in your bait...",
+                        color=0x6495ed
+                    ))
+                    return
+                
+                # Roll for fish rarity
+                roll = random.random() * total_weight
+                cumulative = 0
                 caught_rarity = "junk"
+                
+                for rarity, weight in adjusted_rates.items():
+                    cumulative += weight
+                    if roll <= cumulative:
+                        caught_rarity = rarity
+                        break
+                
+                # Select specific fish
                 fish_template = await self.select_fish_from_rarity(caught_rarity)
+                if not fish_template:
+                    caught_rarity = "junk"
+                    fish_template = await self.select_fish_from_rarity(caught_rarity)
 
             # Check if fish escapes
             escaped, fish_weight = await self.check_fish_escape(fish_template, rod_power)
@@ -408,6 +450,10 @@ async def fish(self, ctx):
                     color=config['color']
                 )
 
+                # Add BEGINNER'S LUCK message if this was a miracle catch
+                if beginner_luck:
+                    success_embed.description += f"\n\n🍀 **BEGINNER'S LUCK!** 🍀\n*Your basic rod defied the odds!*"
+                
                 if fish_count > 1:
                     success_embed.description += f"\n*(You have **{fish_count}x** of this fish)*"
 

cogs/economy/fishing/fishing_data.py

@@ -190,23 +190,23 @@ def _load_fish_database(self):
                 {"name": "Mahi-Mahi", "min_weight": 5.0, "max_weight": 25.0, "base_value": 1200, "escape_chance": 0.38}
             ],
             "rare": [
-                {"name": "Giant Squid", "min_weight": 100.0, "max_weight": 800.0, "base_value": 7500, "escape_chance": 0.70},
-                {"name": "Blue Whale", "min_weight": 50000.0, "max_weight": 150000.0, "base_value": 45000, "escape_chance": 0.85},
-                {"name": "Colossal Octopus", "min_weight": 200.0, "max_weight": 1000.0, "base_value": 12750, "escape_chance": 0.75},
-                {"name": "Megalodon", "min_weight": 5000.0, "max_weight": 15000.0, "base_value": 33000, "escape_chance": 0.80}
+                {"name": "Giant Squid", "min_weight": 100.0, "max_weight": 800.0, "base_value": 7500, "escape_chance": 0.85},
+                {"name": "Blue Whale", "min_weight": 50000.0, "max_weight": 150000.0, "base_value": 25000, "escape_chance": 0.88},
+                {"name": "Colossal Octopus", "min_weight": 200.0, "max_weight": 1000.0, "base_value": 12750, "escape_chance": 0.85},
+                {"name": "Megalodon", "min_weight": 5000.0, "max_weight": 15000.0, "base_value": 20000, "escape_chance": 0.88}
             ],
             "epic": [
-                {"name": "Leviathan", "min_weight": 1000.0, "max_weight": 5000.0, "base_value": 75000, "escape_chance": 0.90},
-                {"name": "Kraken", "min_weight": 2000.0, "max_weight": 8000.0, "base_value": 120000, "escape_chance": 0.92},
-                {"name": "Sea Dragon", "min_weight": 500.0, "max_weight": 3000.0, "base_value": 90000, "escape_chance": 0.88}
+                {"name": "Leviathan", "min_weight": 1000.0, "max_weight": 5000.0, "base_value": 45000, "escape_chance": 0.90},
+                {"name": "Kraken", "min_weight": 2000.0, "max_weight": 8000.0, "base_value": 65000, "escape_chance": 0.92},
+                {"name": "Sea Dragon", "min_weight": 500.0, "max_weight": 3000.0, "base_value": 55000, "escape_chance": 0.92}
             ],
             "legendary": [
-                {"name": "Ancient Leviathan", "min_weight": 10000.0, "max_weight": 50000.0, "base_value": 500000, "escape_chance": 0.95},
-                {"name": "Primordial Kraken", "min_weight": 15000.0, "max_weight": 75000.0, "base_value": 750000, "escape_chance": 0.96}
+                {"name": "Ancient Leviathan", "min_weight": 10000.0, "max_weight": 50000.0, "base_value": 180000, "escape_chance": 0.94},
+                {"name": "Primordial Kraken", "min_weight": 15000.0, "max_weight": 75000.0, "base_value": 250000, "escape_chance": 0.95}
             ],
             "mythical": [
-                {"name": "World Serpent", "min_weight": 100000.0, "max_weight": 500000.0, "base_value": 2500000, "escape_chance": 0.98},
-                {"name": "Ocean God", "min_weight": 200000.0, "max_weight": 1000000.0, "base_value": 5000000, "escape_chance": 0.99}
+                {"name": "World Serpent", "min_weight": 100000.0, "max_weight": 500000.0, "base_value": 750000, "escape_chance": 0.96},
+                {"name": "Ocean God", "min_weight": 200000.0, "max_weight": 1000000.0, "base_value": 1200000, "escape_chance": 0.99}
             ],
             "ancient": [
                 {"name": "Fossil Megalodon", "min_weight": 25000.0, "max_weight": 100000.0, "base_value": 1500000, "escape_chance": 0.97},
@@ -217,20 +217,20 @@ def _load_fish_database(self):
                 {"name": "Celestial Whale", "min_weight": 300000.0, "max_weight": 800000.0, "base_value": 6000000, "escape_chance": 0.997}
             ],
             "cosmic": [
-                {"name": "Stellar Whale", "min_weight": 500000.0, "max_weight": 2000000.0, "base_value": 10000000, "escape_chance": 0.9985},
-                {"name": "Galactic Kraken", "min_weight": 1000000.0, "max_weight": 5000000.0, "base_value": 20000000, "escape_chance": 0.9992}
+                {"name": "Stellar Whale", "min_weight": 500000.0, "max_weight": 2000000.0, "base_value": 3500000, "escape_chance": 0.9985},
+                {"name": "Galactic Kraken", "min_weight": 1000000.0, "max_weight": 5000000.0, "base_value": 5500000, "escape_chance": 0.9992}
             ],
             "transcendent": [
-                {"name": "Reality Bender", "min_weight": 1.0, "max_weight": 10000000.0, "base_value": 40000000, "escape_chance": 0.9997},
-                {"name": "Dimension Walker", "min_weight": 0.001, "max_weight": 1000000000.0, "base_value": 100000000, "escape_chance": 0.99995}
+                {"name": "Reality Bender", "min_weight": 1.0, "max_weight": 10000000.0, "base_value": 8000000, "escape_chance": 0.9997},
+                {"name": "Dimension Walker", "min_weight": 0.001, "max_weight": 1000000000.0, "base_value": 15000000, "escape_chance": 0.99995}
             ],
             "void": [
-                {"name": "Void Leviathan", "min_weight": 0.0, "max_weight": 1.0, "base_value": 200000000, "escape_chance": 0.99997},
-                {"name": "Nothingness Fish", "min_weight": -1.0, "max_weight": 0.0, "base_value": 300000000, "escape_chance": 0.99999}
+                {"name": "Void Leviathan", "min_weight": 0.0, "max_weight": 1.0, "base_value": 25000000, "escape_chance": 0.99997},
+                {"name": "Nothingness Fish", "min_weight": -1.0, "max_weight": 0.0, "base_value": 40000000, "escape_chance": 0.99999}
             ],
             "celestial": [
-                {"name": "Moon Fish", "min_weight": 384400.0, "max_weight": 7342000.0, "base_value": 120000000, "escape_chance": 0.9999},
-                {"name": "Solar Flare Eel", "min_weight": 1989000000.0, "max_weight": 1989000000000.0, "base_value": 400000000, "escape_chance": 0.99999}
+                {"name": "Moon Fish", "min_weight": 384400.0, "max_weight": 7342000.0, "base_value": 18000000, "escape_chance": 0.9999},
+                {"name": "Solar Flare Eel", "min_weight": 1989000000.0, "max_weight": 1989000000000.0, "base_value": 50000000, "escape_chance": 0.99999}
             ],
             "mutated": [
                 {"name": "Three-Eyed Bass", "min_weight": 2.0, "max_weight": 15.0, "base_value": 10000, "escape_chance": 0.48},
@@ -316,7 +316,7 @@ def resolve_bait_alias(self, bait_input: str) -> str:
         return None
 
     def apply_rod_multiplier(self, bait_rates, rod_multiplier):
-        """Apply rod multiplier to favor higher rarities - Fixed version"""
+        """Apply rod multiplier to favor higher rarities - NERFED VERSION per balance changes"""
         if rod_multiplier <= 1.0:
             return bait_rates.copy()
 
@@ -330,13 +330,13 @@ def apply_rod_multiplier(self, bait_rates, rod_multiplier):
 
             if rarity in rarity_order:
                 rarity_index = rarity_order.index(rarity)
-                # Apply multiplier effect based on rarity tier
+                # Apply multiplier effect based on rarity tier - MASSIVELY NERFED
                 if rarity_index >= 15:  # Ultra rare fish (subatomic, super, etc.)
-                    multiplier_effect = 1 + ((rod_multiplier - 1) * 0.8)  # 80% of rod power
-                elif rarity_index >= 10:  # High tier fish (divine, cosmic, etc.)
-                    multiplier_effect = 1 + ((rod_multiplier - 1) * 1.2)  # 120% of rod power
-                elif rarity_index >= 6:  # Mid-high tier (epic, legendary, etc.)
-                    multiplier_effect = 1 + ((rod_multiplier - 1) * 1.5)  # 150% of rod power
+                    multiplier_effect = 1 + ((rod_multiplier - 1) * 0.10)  # Only 10% of rod power (was 80%)
+                elif rarity_index >= 10:  # Very rare fish (divine, cosmic, etc.)
+                    multiplier_effect = 1 + ((rod_multiplier - 1) * 0.15)  # Only 15% of rod power (was 120%)
+                elif rarity_index >= 6:  # High tier fish (epic, legendary, etc.)
+                    multiplier_effect = 1 + ((rod_multiplier - 1) * 0.25)  # Only 25% of rod power (was 150%)
                 elif rarity_index >= 3:  # Mid tier (uncommon, rare)
                     multiplier_effect = 1 + ((rod_multiplier - 1) * 1.0)  # Normal rod power
                 else:  # Low tier (junk, tiny, small, common)