added gp/hr and xp/hr to fish profit command

Author: PrettyNeet

bot/commands/fish_profit.py

@@ -30,13 +30,13 @@ async def select_callback(self, interaction: discord.Interaction, select: discor
             return
 
         df = pd.DataFrame(self.fish_prices)
-        df_sorted = df.sort_values(by="Profit", ascending=False)
+        df_sorted = df.sort_values(by="GP/hr", ascending=False)
 
         if format_choice == "markdown":
-            table_header = f"{'Fish':<12} {'Raw Price':<12} {'Cooked Price':<12} {'Profit':<12}\n{'-'*12} {'-'*12} {'-'*12} {'-'*12}\n"
+            table_header = f"{'Fish':<12} {'Raw Price':<12} {'Cooked Price':<12} {'Profit':<12} {'XP/hr':<12} {'GP/hr':<12}\n{'-'*12} {'-'*12} {'-'*12} {'-'*12} {'-'*12} {'-'*12}\n"
             table_rows = ""
             for index, row in df_sorted.iterrows():
-                table_rows += f"{row['Fish']:<12} {row['Raw Price']:<12} {row['Cooked Price']:<12} {int(row['Profit']):<12}\n"
+                table_rows += f"{row['Fish']:<12} {row['Raw Price']:<12} {row['Cooked Price']:<12} {int(row['Profit']):<12} {row['XP/hr']:<12} {row['GP/hr']:<12}\n"
             table = f"```{table_header}{table_rows}```"
             await self.interaction.followup.send(content=f"{self.interaction.user.mention} Here are the results:\n{table}")
 
@@ -50,6 +50,8 @@ async def select_callback(self, interaction: discord.Interaction, select: discor
                         f"**Raw Price:** {row['Raw Price']}\n"
                         f"**Cooked Price:** {row['Cooked Price']}\n"
                         f"**Profit:** {int(row['Profit'])}\n"
+                        f"**XP/hr:** {row['XP/hr']}\n"
+                        f"**GP/hr:** {row['XP/hr']}\n"
                     ),
                     inline=False
                 )
@@ -63,21 +65,27 @@ def __init__(self, bot):
     @app_commands.command(name="fish_profit", description="Calculate the potential profit from cooking fish.")
     async def fish_profit(self, interaction: discord.Interaction):
         prices = fetch_latest_prices()
+        cooking_rate = 1435
 
         profit_results = []
         for fish_name, info in fish.items():
             raw_id_str = str(info["raw_id"])
             cooked_id_str = str(info["cooked_id"])
+            fish_xp_each = info["xp_each"]
             raw_price = prices[raw_id_str]["high"]
             cooked_price = prices[cooked_id_str]["high"]
 
             if raw_price and cooked_price:
                 profit_fish = cooked_price - raw_price
+                xphr = cooking_rate * fish_xp_each
+                gphr = cooking_rate * profit_fish
                 profit_results.append({
                     "Fish": fish_name,
                     "Raw Price": raw_price,
                     "Cooked Price": cooked_price,
-                    "Profit": profit_fish
+                    "Profit": profit_fish,
+                    "XP/hr": xphr,
+                    "GP/hr": gphr
                 })
 
         view = FormatSelectView(bot=self.bot, interaction=interaction, fish_prices=profit_results)

bot/utils/calculations.py

@@ -62,7 +62,7 @@ def calculate_custom_profit(prices, herbs, farming_level, patches, weiss, trollh
                 if "Hosidius" in protected_names and kourend:
                     expected_yield_protected = generate_estimated_yield(
                         farming_level, low_cts, high_cts, harvest_lives, item_bonus, kourend_bonus, attas_bonus)
-                else:
+                else:  # change logic to check for kandarin patches (Catherby)
                     expected_yield_protected = generate_estimated_yield(
                         farming_level, low_cts, high_cts, harvest_lives, item_bonus, kandarin_bonus, attas_bonus)
                 total_yield_protected += expected_yield_protected

data/items.py

@@ -17,11 +17,11 @@
 }
 
 fish = {
-    "Tuna": {"raw_id": 359, "cooked_id": 361},
-    "Lobster": {"raw_id": 377, "cooked_id": 379},
-    "Swordfish": {"raw_id": 371, "cooked_id": 373},
-    "Monkfish": {"raw_id": 7944, "cooked_id": 7946},
-    "Shark": {"raw_id": 383, "cooked_id": 385},
-    "Anglerfish": {"raw_id": 13439, "cooked_id": 13441},
-    "Manta Ray": {"raw_id": 389, "cooked_id": 391}
+    "Tuna": {"raw_id": 359, "cooked_id": 361, "xp_each": 100},
+    "Lobster": {"raw_id": 377, "cooked_id": 379, "xp_each": 120},
+    "Swordfish": {"raw_id": 371, "cooked_id": 373, "xp_each": 140},
+    "Monkfish": {"raw_id": 7944, "cooked_id": 7946, "xp_each": 150},
+    "Shark": {"raw_id": 383, "cooked_id": 385, "xp_each": 210},
+    "Anglerfish": {"raw_id": 13439, "cooked_id": 13441, "xp_each": 230},
+    "Manta Ray": {"raw_id": 389, "cooked_id": 391, "xp_each": 216.3}
 }