More fishy quests

Iapetus-11 · Jun 16, 2024 · bdaa58e · bdaa58e
1 parent 3ae2350
commit bdaa58e
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 7 deletions.
diff --git a/bot/data/text/en.json b/bot/data/text/en.json
@@ -2145,6 +2145,22 @@
           "fished_tropical_fish": {
             "title": "Fish up {target} tropical fish {emoji}",
             "progress": "{value}/{target} tropical fish fished... {encouragement}"
+          },
+          "fished_pufferfish": {
+            "title": "Fish up {target} pufferfish {emoji}",
+            "progress": "{value}/{target} pufferfish fished... {encouragement}"
+          },
+          "fished_rainbow_trout": {
+            "title": "Fish up {target} rainbow trout {emoji}",
+            "progress": "{value}/{target} rainbow trout fished... {encouragement}"
+          },
+          "fished_gold_fish": {
+            "title": "Fish up {target} gold fish {emoji}",
+            "progress": "{value}/{target} gold fish fished... {encouragement}"
+          },
+          "fished_emerald_fish": {
+            "title": "Fish up {target} emerald fish {emoji}",
+            "progress": "{value}/{target} emerald fish fished... {encouragement}"
           }
         },
         "completed": "Quest completed: {quest_title}!",

diff --git a/common/data/data.json b/common/data/data.json
@@ -2578,7 +2578,7 @@
     "mined_emeralds": {
       "targets": {
         "start": 50,
-        "stop": 110,
+        "stop": 100,
         "step": 10,
         "reward_eval": "value * 1.5"
       },
@@ -2590,9 +2590,9 @@
     "fished_cod": {
       "targets": {
         "start": 10,
-        "stop": 55,
+        "stop": 50,
         "step": 5,
-        "reward_eval": "value * 15"
+        "reward_eval": "value * 10"
       },
       "difficulty_eval_multi": "ceil(pickaxe_level / 5)",
       "acceptance_eval": "value > target",
@@ -2602,9 +2602,9 @@
     "fished_salmon": {
       "targets": {
         "start": 10,
-        "stop": 55,
+        "stop": 50,
         "step": 5,
-        "reward_eval": "value * 15"
+        "reward_eval": "value * 10"
       },
       "difficulty_eval_multi": "ceil(pickaxe_level / 5)",
       "acceptance_eval": "value > target",
@@ -2614,14 +2614,62 @@
     "fished_tropical_fish": {
       "targets": {
         "start": 4,
-        "stop": 22,
+        "stop": 20,
         "step": 2,
         "reward_eval": "value * 15"
       },
       "difficulty_eval_multi": "ceil(pickaxe_level / 5)",
       "acceptance_eval": "value > target",
       "reward_emoji": "emerald",
       "emoji": "fish.salmon"
+    },
+    "fished_pufferfish": {
+      "targets": {
+        "start": 3,
+        "stop": 15,
+        "step": 1,
+        "reward_eval": "value * 20"
+      },
+      "difficulty_eval_multi": "ceil(pickaxe_level / 3)",
+      "acceptance_eval": "value > target",
+      "reward_emoji": "emerald",
+      "emoji": "fish.pufferfish"
+    },
+    "fished_rainbow_trout": {
+      "targets": {
+        "start": 3,
+        "stop": 10,
+        "step": 1,
+        "reward_eval": "value * 25"
+      },
+      "difficulty_eval_multi": "1",
+      "acceptance_eval": "value > target",
+      "reward_emoji": "emerald",
+      "emoji": "fish.rainbow_trout"
+    },
+    "fished_gold_fish": {
+      "targets": {
+        "start": 2,
+        "stop": 5,
+        "step": 1,
+        "reward_eval": "value * 30"
+      },
+      "difficulty_eval_multi": "1",
+      "acceptance_eval": "value > target",
+      "reward_emoji": "emerald",
+      "emoji": "fish.gold_fish"
+    },
+    "fished_emerald_fish": {
+      "targets": {
+        "start": 1,
+        "stop": 3,
+        "step": 1,
+        "reward_eval": "value * 35"
+      },
+      "difficulty_eval_multi": "1",
+      "acceptance_eval": "value > target",
+      "reward_emoji": "emerald",
+      "emoji": "fish.emerald_fish"
     }
   }
 }
diff --git a/common/models/data.py b/common/models/data.py
@@ -287,7 +287,11 @@ def normalize(self) -> "NormalizedQuest":
         if isinstance(self.targets, list):
             targets = self.targets
         else:
-            for value in range(self.targets.start, self.targets.stop, self.targets.step):
+            for value in range(
+                self.targets.start,
+                self.targets.stop + self.targets.step,
+                self.targets.step,
+            ):
                 reward = eval(self.targets.reward_eval)
                 targets.append(Quest.TargetChoice(value=value, reward=reward))