Adds ocean creatures. Part 1: Infrastructure + Fish. (CleverRaven#70202)

* Initial commit. Infrastracture. * monster stash * first attempt at pelagic vs ocean shore creatures * Proper handling of ocean vs pelagic. * added a bunch of fish (JSON linted) * added a bunch of fish (json linted, and fixed) * Proper handling of ocean vs pelagic + added a bunch of fish. * Update player_activity.cpp * Small eoc doc fixes * Invalidate non-adjacent containers for ALL and DRAGGED (CleverRaven#70172) This also changes it to not update the container_base_loc's position for ALL and DRAGGED, which made it so pressing X would exit out to a 1-9 location instead of ALL or DRAGGED Co-authored-by: andrei <[email protected]> * Allow spawning items with flags (CleverRaven#70168) * First * Update npctalk.cpp * Update npctalk.cpp * Update src/npctalk.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [Sky Island] Teleporting items back home (CleverRaven#70200) * Update EOCs.json * Update EOCs.json * Update EOCs.json * Update EOCs.json * Update EOCs.json * Add ```gains_proficiency``` event (CleverRaven#70194) * create gains_proficiency event * add event trigger * Update EFFECT_ON_CONDITION.md * updated memorial test * retrigger checks * [MoM] Add ability for pyrokinetics to cauterize their wounds (CleverRaven#70132) * Initial commit * Bleeding that's too heavy cannot be stopped * Add infection chance * Add missing types * Fix infection intensity * Fix practice recipe * Reduce capacity of test battery a bit The value being this large resulted in an integer overflow in pocket_data::max_contains_volume(). Reduce it until there's no more integer overflow. * Proper handling of ocean vs pelagic + added a bunch of fish. * reversed gitignore accidental change * reversed gitignore accidental change * shark rebalance * Update data/json/monsters/fish.json Co-authored-by: Jianxiang Wang (王健翔) <[email protected]> * Update data/json/monsters/fish.json Co-authored-by: Jianxiang Wang (王健翔) <[email protected]> * Update data/json/monsters/fish.json Co-authored-by: Jianxiang Wang (王健翔) <[email protected]> * small changes to resolve issues * small changes to resolve issues * Update wilderness.json to fix bass typo * Update fish.json * Update data/json/monsters/fish.json Co-authored-by: Karol1223 <[email protected]> * removed roe names --------- Co-authored-by: Ramza13 <[email protected]> Co-authored-by: Anton Simakov <[email protected]> Co-authored-by: Kamayana <[email protected]> Co-authored-by: andrei <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: gettingusedto <[email protected]> Co-authored-by: Francisco Machado <[email protected]> Co-authored-by: Standing-Storm <[email protected]> Co-authored-by: ehughsbaird <[email protected]> Co-authored-by: Jianxiang Wang (王健翔) <[email protected]> Co-authored-by: Karol1223 <[email protected]>
Procyonae · Dec 20, 2023 · a2a8907 · a2a8907
1 parent 85926f2
commit a2a8907
Show file tree

Hide file tree

Showing 8 changed files with 492 additions and 29 deletions.
diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
@@ -522,6 +522,76 @@
     "copy-from": "egg_fish",
     "rot_spawn": "GROUP_EGG_SALMON"
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_cod",
+    "name": { "str_sp": "roe" },
+    "copy-from": "egg_fish",
+    "rot_spawn": "GROUP_EGG_COD"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_haddock",
+    "name": { "str_sp": "roe" },
+    "copy-from": "egg_fish",
+    "rot_spawn": "GROUP_EGG_HADDOCK"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_bluefin_tuna",
+    "name": { "str_sp": "roe" },
+    "copy-from": "egg_fish",
+    "rot_spawn": "GROUP_EGG_BLUEFIN_TUNA"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_halibut",
+    "name": { "str_sp": "roe" },
+    "copy-from": "egg_fish",
+    "rot_spawn": "GROUP_EGG_HALIBUT"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_pollock",
+    "name": { "str_sp": "roe" },
+    "copy-from": "egg_fish",
+    "rot_spawn": "GROUP_EGG_POLLOCK"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_flounder",
+    "name": { "str_sp": "roe" },
+    "copy-from": "egg_fish",
+    "rot_spawn": "GROUP_EGG_FLOUNDER"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_mackerel",
+    "name": { "str_sp": "roe" },
+    "copy-from": "egg_fish",
+    "rot_spawn": "GROUP_EGG_MACKEREL"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_bluefish",
+    "name": { "str_sp": "roe" },
+    "copy-from": "egg_fish",
+    "rot_spawn": "GROUP_EGG_BLUEFISH"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_blackfish",
+    "name": { "str_sp": "roe" },
+    "copy-from": "egg_fish",
+    "rot_spawn": "GROUP_EGG_BLACKFISH"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_porgy",
+    "name": { "str_sp": "roe" },
+    "copy-from": "egg_fish",
+    "rot_spawn": "GROUP_EGG_PORGY"
+  },
   {
     "type": "COMESTIBLE",
     "id": "egg_kokanee_salmon",

diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json
@@ -311,6 +311,56 @@
     "type": "monstergroup",
     "monsters": [ { "monster": "mon_fry_salmon" } ]
   },
+  {
+    "name": "GROUP_EGG_COD",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_fry_cod" } ]
+  },
+  {
+    "name": "GROUP_EGG_HADDOCK",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_fry_haddock" } ]
+  },
+  {
+    "name": "GROUP_EGG_BLUEFIN_TUNA",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_fry_bluefin_tuna" } ]
+  },
+  {
+    "name": "GROUP_EGG_HALIBUT",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_fry_halibut" } ]
+  },
+  {
+    "name": "GROUP_EGG_POLLOCK",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_fry_pollock" } ]
+  },
+  {
+    "name": "GROUP_EGG_FLOUNDER",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_fry_flounder" } ]
+  },
+  {
+    "name": "GROUP_EGG_MACKEREL",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_fry_mackerel" } ]
+  },
+  {
+    "name": "GROUP_EGG_BLUEFISH",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_fry_bluefish" } ]
+  },
+  {
+    "name": "GROUP_EGG_BLACKFISH",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_fry_blackfish" } ]
+  },
+  {
+    "name": "GROUP_EGG_PORGY",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_fry_porgy" } ]
+  },
   {
     "name": "GROUP_EGG_KOKANEE_SALMON",
     "type": "monstergroup",

diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json
@@ -342,7 +342,7 @@
       { "monster": "mon_fish_sbass", "weight": 10, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
       { "monster": "mon_fish_perch", "weight": 10, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
       { "monster": "mon_fish_salmon", "weight": 6, "cost_multiplier": 8, "pack_size": [ 4, 6 ] },
-      { "monster": "mon_fish_lbass", "weight": 10, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_lbass", "weight": 6, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
       { "monster": "mon_fish_pbass", "weight": 10, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
       { "monster": "mon_fish_bluegill", "weight": 10, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
       { "monster": "mon_fish_whitefish", "weight": 10, "cost_multiplier": 2, "pack_size": [ 4, 6 ] },
@@ -378,6 +378,44 @@
       { "group": "GROUP_MUTAFROGS_RIVER", "weight": 8, "starts": "7 days" }
     ]
   },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_OCEAN_SHORE",
+    "default": "mon_null",
+    "is_animal": true,
+    "monsters": [
+      { "monster": "mon_ocean_zhark", "weight": 2, "cost_multiplier": 25, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_eel", "weight": 6, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_pbass", "weight": 10, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_bluefish", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_blackfish", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_porgy", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_flounder", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_mackerel", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_salmon", "weight": 6, "cost_multiplier": 8, "pack_size": [ 4, 6 ] }
+    ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_OCEAN_DEEP",
+    "default": "mon_null",
+    "is_animal": true,
+    "monsters": [
+      { "monster": "mon_ocean_zhark", "weight": 4, "cost_multiplier": 25, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_cod", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_haddock", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_bluefin_tuna", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_halibut", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_pollock", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_flounder", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_mackerel", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_salmon", "weight": 6, "cost_multiplier": 8, "pack_size": [ 4, 6 ] },
+      { "monster": "mon_fish_pbass", "weight": 5, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_bluefish", "weight": 3, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_blackfish", "weight": 3, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_fish_porgy", "weight": 3, "cost_multiplier": 8, "pack_size": [ 1, 3 ] }
+    ]
+  },
   {
     "type": "monstergroup",
     "name": "GROUP_SWAMP",

diff --git a/data/json/monsters/fish.json b/data/json/monsters/fish.json
@@ -1233,5 +1233,176 @@
     "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ],
     "path_settings": { "max_dist": 5 },
     "flags": [ "SEES", "SMELLS", "AQUATIC" ]
+  },
+  {
+    "id": "mon_fish_mackerel",
+    "type": "MONSTER",
+    "copy-from": "mon_fish_medium",
+    "name": { "str_sp": "atlantic mackerel" },
+    "description": "An Atlantic mackerel, known for its distinctive striped pattern.",
+    "volume": "3000 ml",
+    "weight": "1600 g",
+    "reproduction": { "baby_egg": "egg_mackerel", "baby_count": 3, "baby_timer": 20 }
+  },
+  {
+    "id": "mon_fry_mackerel",
+    "type": "MONSTER",
+    "copy-from": "mon_fry",
+    "upgrades": { "half_life": 14, "into": "mon_fish_mackerel" },
+    "name": { "str_sp": "mackerel fry" }
+  },
+  {
+    "id": "mon_fish_flounder",
+    "type": "MONSTER",
+    "copy-from": "mon_fish_medium",
+    "name": { "str_sp": "flounder" },
+    "description": "A flatfish, the flounder, also known as a fluke, likes to stay camouflaged against the ocean floor.",
+    "volume": "2500 ml",
+    "weight": "1400 g",
+    "reproduction": { "baby_egg": "egg_flounder", "baby_count": 2, "baby_timer": 22 }
+  },
+  {
+    "id": "mon_fry_flounder",
+    "type": "MONSTER",
+    "copy-from": "mon_fry",
+    "upgrades": { "half_life": 14, "into": "mon_fish_flounder" },
+    "name": { "str_sp": "flounder fry" }
+  },
+  {
+    "id": "mon_fish_blackfish",
+    "type": "MONSTER",
+    "copy-from": "mon_fish_small",
+    "name": { "str_sp": "black sea bass" },
+    "description": "A small, robust fish, the black sea bass is known for its dark, mottled color and meaty texture.",
+    "volume": "1500 ml",
+    "weight": "600 g",
+    "reproduction": { "baby_egg": "egg_blackfish", "baby_count": 2, "baby_timer": 15 }
+  },
+  {
+    "id": "mon_fry_blackfish",
+    "type": "MONSTER",
+    "copy-from": "mon_fry",
+    "upgrades": { "half_life": 14, "into": "mon_fish_blackfish" },
+    "name": { "str_sp": "black sea bass fry" }
+  },
+  {
+    "id": "mon_fish_porgy",
+    "type": "MONSTER",
+    "copy-from": "mon_fish_small",
+    "name": { "str_sp": "scup" },
+    "description": "Also known as porgy, the scup is a small fish commonly found in Atlantic coastal waters, recognizable by its silver body with blue and purple tinges.",
+    "volume": "1300 ml",
+    "weight": "550 g",
+    "reproduction": { "baby_egg": "egg_porgy", "baby_count": 3, "baby_timer": 16 }
+  },
+  {
+    "id": "mon_fry_porgy",
+    "type": "MONSTER",
+    "copy-from": "mon_fry",
+    "upgrades": { "half_life": 14, "into": "mon_fish_porgy" },
+    "name": { "str_sp": "scup (porgy) fry" }
+  },
+  {
+    "id": "mon_fish_bluefish",
+    "type": "MONSTER",
+    "copy-from": "mon_fish_small",
+    "name": { "str_sp": "bluefish" },
+    "description": "The bluefish, a moderately proportioned marine fish, is known for its aggressive nature and sharp teeth.  It sports a distinct blue-green coloration.",
+    "volume": "1600 ml",
+    "weight": "700 g",
+    "reproduction": { "baby_egg": "egg_bluefish", "baby_count": 2, "baby_timer": 18 }
+  },
+  {
+    "id": "mon_fry_bluefish",
+    "type": "MONSTER",
+    "copy-from": "mon_fry",
+    "upgrades": { "half_life": 14, "into": "mon_fish_bluefish" },
+    "name": { "str_sp": "bluefish fry" }
+  },
+  {
+    "id": "mon_fish_cod",
+    "type": "MONSTER",
+    "copy-from": "mon_fish_large",
+    "name": { "str_sp": "Atlantic cod" },
+    "description": "A large, white-meat fish known for its mild flavor and flaky texture.  Highly prized in both commercial and recreational fishing.",
+    "volume": "35000 ml",
+    "weight": "22 kg",
+    "reproduction": { "baby_egg": "egg_cod", "baby_count": 3, "baby_timer": 19 }
+  },
+  {
+    "id": "mon_fry_cod",
+    "type": "MONSTER",
+    "copy-from": "mon_fry",
+    "upgrades": { "half_life": 14, "into": "mon_fish_cod" },
+    "name": { "str_sp": "cod fry" }
+  },
+  {
+    "id": "mon_fish_haddock",
+    "type": "MONSTER",
+    "copy-from": "mon_fish_large",
+    "name": { "str_sp": "haddock" },
+    "description": "A popular food fish, the haddock is recognized by its dark lateral line and a black blotch above the pectoral fin.",
+    "volume": "25500 ml",
+    "weight": "11 kg",
+    "reproduction": { "baby_egg": "egg_haddock", "baby_count": 3, "baby_timer": 18 }
+  },
+  {
+    "id": "mon_fry_haddock",
+    "type": "MONSTER",
+    "copy-from": "mon_fry",
+    "upgrades": { "half_life": 14, "into": "mon_fish_haddock" },
+    "name": { "str_sp": "haddock fry" }
+  },
+  {
+    "id": "mon_fish_bluefin_tuna",
+    "type": "MONSTER",
+    "copy-from": "mon_fish_huge",
+    "name": { "str_sp": "Atlantic bluefin tuna" },
+    "description": "One of the largest and fastest fish in the waters of New England, the bluefin tuna is a streamlined predator with a dark blue back and silvery sides.",
+    "volume": "125000 ml",
+    "weight": "98 kg",
+    "reproduction": { "baby_egg": "egg_bluefin_tuna", "baby_count": 1, "baby_timer": 22 }
+  },
+  {
+    "id": "mon_fry_bluefin_tuna",
+    "type": "MONSTER",
+    "copy-from": "mon_fry",
+    "upgrades": { "half_life": 14, "into": "mon_fish_bluefin_tuna" },
+    "name": { "str_sp": "bluefin tuna fry" }
+  },
+  {
+    "id": "mon_fish_halibut",
+    "type": "MONSTER",
+    "copy-from": "mon_fish_huge",
+    "name": { "str_sp": "Atlantic halibut" },
+    "description": "The largest flatfish in the ocean, known for its dense, firm texture and mild flavor.",
+    "volume": "75000 ml",
+    "weight": "42 kg",
+    "reproduction": { "baby_egg": "egg_halibut", "baby_count": 2, "baby_timer": 20 }
+  },
+  {
+    "id": "mon_fry_halibut",
+    "type": "MONSTER",
+    "copy-from": "mon_fry",
+    "upgrades": { "half_life": 14, "into": "mon_fish_halibut" },
+    "name": { "str_sp": "halibut fry" }
+  },
+  {
+    "id": "mon_fish_pollock",
+    "type": "MONSTER",
+    "copy-from": "mon_fish_large",
+    "name": { "str_sp": "pollock" },
+    "looks_like": "mon_fish_cod",
+    "description": "A member of the cod family, pollock is a versatile fish known for its white, delicate meat and mild taste.",
+    "volume": "28000 ml",
+    "weight": "17 kg",
+    "reproduction": { "baby_egg": "egg_pollock", "baby_count": 3, "baby_timer": 17 }
+  },
+  {
+    "id": "mon_fry_pollock",
+    "type": "MONSTER",
+    "copy-from": "mon_fry",
+    "upgrades": { "half_life": 14, "into": "mon_fish_pollock" },
+    "name": { "str_sp": "pollock fry" }
   }
 ]