Fishing Seaweed & Caskets

game/plugin/skills/fishing/src/org/apollo/game/plugin/skills/fishing/Fish.kt

@@ -19,7 +19,14 @@ enum class Fish(val id: Int, val level: Int, val experience: Double, catchSuffix
     LOBSTER(id = 377, level = 40, experience = 90.0),
     BASS(id = 363, level = 46, experience = 100.0),
     SWORDFISH(id = 371, level = 50, experience = 100.0),
-    SHARK(id = 383, level = 76, experience = 110.0, catchSuffix = "a shark!");
+    SHARK(id = 383, level = 76, experience = 110.0, catchSuffix = "a shark!"),
+
+    /*
+     * Junk 'fish'
+     */
+    SEAWEED(id = 401, level = 16, experience = 1.0),
+    CASKET(id = 405, level = 16, experience = 1.0)
+    ;
 
     /**
      * The name of this fish, formatted so it can be inserted into a message.

game/plugin/skills/fishing/src/org/apollo/game/plugin/skills/fishing/FishingSpot.kt

@@ -22,7 +22,7 @@ enum class FishingSpot(val npc: Int, private val first: Option, private val seco
 
     NET_HARPOON(
         npc = 313,
-        first = Option.of(tool = FishingTool.BIG_NET, primary = MACKEREL, secondary = COD),
+        first = Option.of(tool = FishingTool.BIG_NET, primary = MACKEREL, secondary = COD, junk = arrayOf(SEAWEED, CASKET)),
         second = Option.of(tool = FishingTool.HARPOON, primary = BASS, secondary = SHARK)
     ),
 
@@ -77,14 +77,19 @@ enum class FishingSpot(val npc: Int, private val first: Option, private val seco
         /**
          * A [FishingSpot] [Option] that can provide a two different types of fish.
          */
-        private data class Pair(override val tool: FishingTool, val primary: Fish, val secondary: Fish) : Option() {
+        private class Pair(override val tool: FishingTool, val primary: Fish, val secondary: Fish, vararg val junk: Fish) : Option() {
             override val level = Math.min(primary.level, secondary.level)
 
             override fun sample(level: Int): Fish {
-                return if (level < secondary.level || rand(100) < WEIGHTING) {
-                    primary
-                } else {
-                    secondary
+                if (junk.isNotEmpty() && rand(100) < JUNK_WEIGHTING) {
+                    val valid = junk.filter { level >= it.level }
+                    if (valid.isNotEmpty()) {
+                        return valid[rand(valid.size)]
+                    }
+                }
+                return when {
+                    level < secondary.level || rand(100) < WEIGHTING -> primary
+                    else -> secondary
                 }
             }
 
@@ -93,6 +98,11 @@ enum class FishingSpot(val npc: Int, private val first: Option, private val seco
                  * The weighting factor that causes the lower-level fish to be returned more frequently.
                  */
                 private const val WEIGHTING = 70
+
+                /**
+                 * The weighting factor that causes a junk item to be fished more frequently.
+                 */
+                private const val JUNK_WEIGHTING = 5
             }
         }
 
@@ -106,6 +116,13 @@ enum class FishingSpot(val npc: Int, private val first: Option, private val seco
                     else -> Pair(tool, secondary, primary)
                 }
             }
+
+            fun of(tool: FishingTool, primary: Fish, secondary: Fish, junk: Array<Fish>): Option {
+                return when {
+                    primary.level < secondary.level -> Pair(tool, primary, secondary, *junk)
+                    else -> Pair(tool, secondary, primary, *junk)
+                }
+            }
         }
     }