Check linear - FIS-48 FIS-49

src/api/commands/groups/fishing/go.ts

@@ -37,8 +37,9 @@ export const go = new Command(
         inventory.location = nextLoc.id;
         await updateInventory(inventory);
 
-        if (getFishing(id, user.id)) {
+        let fisher;
-            stopFishing(id, user.id, false);
+        if (fisher = getFishing(id, user.id)) {
+            stopFishing(id, user.id, fisher.channel, false);
             return `You ${prefix}${reel.aliases[0]}ed your LURE in and went to ${nextLoc.name}.`;
         }
 

src/api/commands/groups/index.ts

@@ -22,6 +22,7 @@ import { yeet } from "./inventory/yeet";
 import { tree } from "./fishing/tree";
 import { pick } from "./fishing/pick";
 import { fid } from "./util/fid";
+import { chance } from "./util/chance";
 // import { give } from "./inventory/give";
 
 interface ICommandGroup {
@@ -59,7 +60,7 @@ commandGroups.push(inventoryGroup);
 const utilGroup: ICommandGroup = {
     id: "util",
     displayName: "Utility",
-    commands: [data, setcolor, memory, autofish, pokedex, fid]
+    commands: [data, setcolor, memory, autofish, pokedex, fid, chance]
 };
 
 commandGroups.push(utilGroup);

src/api/commands/groups/inventory/eat.ts

@@ -108,15 +108,21 @@ export const eat = new Command(
 
         if (foundObject.id == "sand") {
             if (res) {
-                if (res.and)
+                if (res.and) {
                     return `Our friend ${part.name} ate of his/her ${foundObject.name} ${res.and}`;
+                } else {
+                    return `Our friend ${part.name} ate of his/her ${foundObject.name}.`;
+                }
             } else {
                 return `Our friend ${part.name} ate of his/her ${foundObject.name}.`;
             }
         } else {
             if (res) {
-                if (res.and)
+                if (res.and) {
                     return `Our friend ${part.name} ate his/her ${foundObject.name} ${res.and}`;
+                } else {
+                    return `Our friend ${part.name} ate his/her ${foundObject.name}.`;
+                }
             } else {
                 return `Our friend ${part.name} ate his/her ${foundObject.name}.`;
             }

src/api/commands/groups/inventory/inventory.ts

@@ -5,7 +5,7 @@ import prisma from "@server/data/prisma";
 
 export const inventory = new Command(
     "inventory",
-    ["inventory", "inv", "i"],
+    ["inventory", "inv", "items", "i"],
     "Look at your inventory",
     "inventory",
     "command.inventory.inventory",
@@ -37,32 +37,28 @@ export const inventory = new Command(
 
             const items = inv.items as TInventoryItems;
 
-            return `Contents of ${decidedUser.name}'s inventory: ${
+            return `Contents of ${decidedUser.name}'s inventory: ${items
-                items
                     .map(
                         (item: IItem) =>
-                            `${item.emoji || "📦"}${item.name}${
+                            `${item.emoji || "📦"}${item.name}${item.count ? ` (x${item.count})` : ""
-                                item.count ? ` (x${item.count})` : ""
                             }`
                     )
                     .join(", ") || "(none)"
-            }`;
+                }`;
         } else {
             const inv = await getInventory(user.inventoryId);
             if (!inv)
                 return `Apparently, you have no inventory. Not sure if that can be fixed, and I don't know how you got this message.`;
             const items = inv.items as TInventoryItems;
 
-            return `Contents of ${part.name}'s inventory: ${
+            return `Contents of ${part.name}'s inventory: ${items
-                items
                     .map(
                         (item: IItem) =>
-                            `${item.emoji || "📦"}${item.name}${
+                            `${item.emoji || "📦"}${item.name}${item.count ? ` (x${item.count})` : ""
-                                item.count ? ` (x${item.count})` : ""
                             }`
                     )
                     .join(", ") || "(none)"
-            }`;
+                }`;
         }
     }
 );

src/api/commands/groups/util/autofish.ts

@@ -12,18 +12,17 @@ export const autofish = new Command(
         const fishing = getFishing(props.id, props.part.id);
 
         if (!fishing) {
-            startFishing(props.id, props.part.id, true, true);
+            startFishing(props.id, props.part.id, props.channel, true, true);
             return `Our friend ${props.user.name} casts LURE into a water with AUTOFISH enabled. (${props.prefix}${reel.aliases[0]} to disable)`;
         } else {
             return `Your lure is already in the water (since ${(
                 (Date.now() - fishing.t) /
                 1000 /
                 60
-            ).toFixed(2)} minutes ago).${
+            ).toFixed(2)} minutes ago).${fishing.autofish
-                fishing.autofish
                     ? ` (AUTOFISH is enabled)`
                     : ` (${props.prefix}${reel.aliases[0]} in first to start AUTOFISH)`
-            }`;
+                }`;
         }
     }
 );

src/api/commands/groups/util/chance.ts

@@ -0,0 +1,16 @@
+import { addBack } from "@server/backs";
+import Command from "@server/commands/Command";
+import { getFishingChance } from "@server/fish/fishers";
+
+export const chance = new Command(
+    "chance",
+    ["chance"],
+    "Set own user color",
+    "chance",
+    "command.util.chance",
+    async ({ id, command, args, prefix, part, user }) => {
+        const chance = await getFishingChance(user.id);
+        return `Fishing chance: ${chance.chance} | Timestamp: ${chance.t}`;
+    },
+    false
+);

src/api/fish/fishers.ts

@@ -21,7 +21,7 @@ export async function tick() {
 
         let winner =
             Object.values(fishers)[
-                Math.floor(Math.random() * Object.values(fishers).length)
+            Math.floor(Math.random() * Object.values(fishers).length)
             ];
 
         if (!winner) return;
@@ -53,18 +53,20 @@ export async function tick() {
                 winner.autofish,
                 winner.autofish_t
             );
+
+            // Save to sack
             const animal = randomFish(inventory.location);
             addItem(inventory.fishSack as TFishSack, animal);
             await updateInventory(inventory);
+
             const size = getSizeString(animal.size);
+            const p = prefixes[0];
+            const emoji = animal.emoji || "🐟";
+
             addBack(winner.id, {
                 m: "sendchat",
                 channel: winner.channel,
-                message: `Our good friend @${user.id} caught a ${size} ${
+                message: `Our good friend @${user.id} caught a ${size} ${emoji}${animal.name}! ready to ${p}eat or ${p}fish again${winner.autofish ? " (AUTOFISH is enabled)" : ""}`,
-                    animal.emoji || "🐟"
-                }${animal.name}! ready to ${prefixes[0]}eat or ${
-                    prefixes[0]
-                }fish again${winner.autofish ? " (AUTOFISH is enabled)" : ""}`,
                 isDM: winner.isDM,
                 id: winner.userID
             });

src/api/items/behavior/items/fish.ts

@@ -5,25 +5,40 @@ export const fish: IBehaviorDefinition = {
     id: "fish",
     bhv: {
         async eat(obj, props) {
-            const color = new CosmicColor(
+            const r = Math.random();
-                Math.floor(Math.random() * 255),
-                Math.floor(Math.random() * 255),
-                Math.floor(Math.random() * 255)
-            );
 
-            addBack(props.id, {
+            const fish = obj as IFish;
-                m: "color",
-                id: props.part.id,
-                color: color.toHexa()
-            });
 
-            return {
+            console.log(fish)
-                success: true,
+            console.log(fish.rarity);
-                shouldRemove: true,
+
-                and: `and it made him/her turn ${color
+            // 50%
-                    .getName()
+            if (r < 0.5) {
-                    .toLowerCase()}.`
+                const color = new CosmicColor(
-            };
+                    Math.floor(Math.random() * 255),
+                    Math.floor(Math.random() * 255),
+                    Math.floor(Math.random() * 255)
+                );
+
+                addBack(props.id, {
+                    m: "color",
+                    id: props.part.id,
+                    color: color.toHexa()
+                });
+
+                return {
+                    success: true,
+                    shouldRemove: true,
+                    and: `and it made him/her turn ${color
+                        .getName()
+                        .toLowerCase()}.`
+                };
+            } else {
+                return {
+                    success: true,
+                    shouldRemove: true
+                }
+            }
         }
     }
 };