Add a variety of marine plants

data/json/effects.json

@@ -2126,10 +2126,10 @@
   },
   {
     "type": "effect_type",
-    "id": "anticoagulant",
+    "id": "anticoagulant_aspirin",
     "max_intensity": 3,
     "rating": "bad",
-    "blood_analysis_description": "Blood Thinner",
+    "blood_analysis_description": "Anticoagulant (Acetylsalicylic Acid)",
     "effect_dur_scaling": [ { "effect_id": "bleed", "modifier": 1.05, "same_bp": false } ]
   },
   {

data/json/furniture_and_terrain/furniture-flora_marine.json

@@ -0,0 +1,96 @@
+[
+  {
+    "type": "furniture",
+    "id": "f_algae_red",
+    "name": "red algae",
+    "description": "One of the thousands of species of grassy reddish marine plants that inhabit intertidal zones the world over.  Its rubbery little fronds don't look particularly edible.",
+    "symbol": ",",
+    "color": "red",
+    "move_cost_mod": 0,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "ORGANIC" ],
+    "examine_action": "harvest_furn",
+    "harvest_by_season": [ { "seasons": [ "spring", "summer", "autumn", "winter" ], "id": "seaweed_harv" } ],
+    "bash": { "str_min": 2, "str_max": 6, "sound": "splat.", "sound_fail": "squelch." }
+  },
+  {
+    "type": "furniture",
+    "id": "f_algae_green",
+    "name": "green algae",
+    "description": "A short patch of grassy green seaweed, wholly unremarkable.",
+    "symbol": ",",
+    "color": "green",
+    "move_cost_mod": 0,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "ORGANIC" ],
+    "examine_action": "harvest_furn",
+    "harvest_by_season": [ { "seasons": [ "spring", "summer", "autumn", "winter" ], "id": "seaweed_harv" } ],
+    "bash": { "str_min": 2, "str_max": 6, "sound": "splat.", "sound_fail": "squelch." }
+  },
+  {
+    "type": "furniture",
+    "id": "f_kelp_sugar",
+    "name": "sugar kelp",
+    "description": "Also known as kombu, this brown algae grows in a single leaflike blade that can reach more than twice the height of a man.  Young fronds make for excellent soup stock and can even be eaten raw.",
+    "symbol": "i",
+    "color": "brown",
+    "move_cost_mod": 0,
+    "required_str": -1,
+    "flags": [ "FLAMMABLE_ASH", "ORGANIC", "SMALL_HIDE", "HARVEST_REQ_CUT1" ],
+    "examine_action": "harvest_furn",
+    "harvest_by_season": [ { "seasons": [ "spring", "summer" ], "id": "kelp_sugar_harv" } ],
+    "bash": { "str_min": 8, "str_max": 16, "sound": "splat.", "sound_fail": "squelch." }
+  },
+  {
+    "type": "furniture",
+    "id": "f_sea_lettuce",
+    "name": "sea lettuce",
+    "description": "Sometimes known as green laver, this leafy algae from the Ulva genus grows in leafy little patches around shallows and tide pools.  Though small, it makes a tasty snack.",
+    "looks_like": "f_algae_green",
+    "symbol": ",",
+    "color": "green",
+    "move_cost_mod": 0,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "ORGANIC" ],
+    "harvest_by_season": [ { "seasons": [ "spring", "summer", "autumn", "winter" ], "id": "sea_lettuce_harv" } ],
+    "bash": { "str_min": 2, "str_max": 6, "sound": "splat.", "sound_fail": "squelch." }
+  },
+  {
+    "type": "furniture",
+    "id": "f_bladderwrack",
+    "name": "bladderwrack",
+    "description": "Named for the air bladders that grow all over its leafy fronds, this leafy seaweed is technically edible and has a long history of use in folk medicine.",
+    "looks_like": "f_algae_green",
+    "symbol": ",",
+    "color": "green",
+    "move_cost_mod": 0,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "ORGANIC" ],
+    "harvest_by_season": [ { "seasons": [ "spring", "summer", "autumn", "winter" ], "id": "bladderwrack_harv" } ],
+    "bash": { "str_min": 2, "str_max": 6, "sound": "splat.", "sound_fail": "squelch." }
+  },
+  {
+    "type": "furniture",
+    "id": "f_sea_anemone",
+    "name": "sea anemone",
+    "description": "This sessile polyp waves its stinging tentacles with the motion of the tides, hoping to capture a tiny fish or crab.  It's wholly inedible and poses no danger to anything bigger than a shrimp.",
+    "symbol": "f",
+    "color": "pink",
+    "move_cost_mod": 0,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "GRAZER_INEDIBLE", "ORGANIC" ],
+    "bash": { "str_min": 2, "str_max": 6, "sound": "splat.", "sound_fail": "squelch." }
+  },
+  {
+    "type": "furniture",
+    "id": "f_sea_sponge",
+    "name": "sea sponge",
+    "description": "An immobile, lumpy little creature that looks nothing like a square kitchen sponge.  Anchored to the sea floor, its porous body passively filters plankton from the water that freely passes through it.",
+    "symbol": "f",
+    "color": "brown",
+    "move_cost_mod": 0,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "GRAZER_INEDIBLE", "ORGANIC" ],
+    "bash": { "str_min": 6, "str_max": 12, "sound": "splat.", "sound_fail": "squelch." }
+  }
+]

data/json/furniture_and_terrain/terrain-liquids.json

@@ -334,37 +334,34 @@
   {
     "type": "terrain",
     "id": "t_lake_bed",
-    "//": "for eventual use with water z levels.  Currently non-functional.",
     "name": "lake bed",
     "description": "You are standing at the bottom of a body of fresh water.  With a watertight container, you could gather fresh water from here.  Not safe to drink as is.",
     "symbol": "~",
     "looks_like": "t_sand",
     "color": "blue",
     "move_cost": 8,
-    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "DEEP_WATER", "WATER_CUBE" ],
+    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "DEEP_WATER", "WATER_CUBE", "GOES_UP" ],
     "connect_groups": "WATER",
     "connects_to": "WATER",
     "examine_action": "water_source"
   },
   {
     "type": "terrain",
     "id": "t_ocean_bed",
-    "//": "for eventual use with water z levels.  Currently non-functional.",
     "name": "ocean bed",
     "description": "You are standing at the bottom of a body of salt water.  With a watertight container, you could gather salt water from here.  Not safe to drink as is.",
     "symbol": "~",
     "looks_like": "t_sand",
     "color": "blue",
     "move_cost": 8,
-    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "DEEP_WATER", "GOES_UP" ],
+    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "DEEP_WATER", "SALT_WATER", "GOES_UP" ],
     "connect_groups": "WATER",
     "connects_to": "WATER",
     "examine_action": "water_source"
   },
   {
     "type": "terrain",
     "id": "t_bulkhead_roof",
-    "//": "for eventual use with water z levels.  Currently non-functional.  Roof for submerged structures.",
     "name": "bulkhead",
     "description": "The top of a submerged structure.  With a watertight container, you could gather fresh water from here.  Not safe to drink as is.",
     "symbol": "#",
@@ -403,7 +400,6 @@
   {
     "type": "terrain",
     "id": "t_lake_bed_concrete",
-    "//": "for eventual use with water z levels.  Currently non-functional.  Cement on the lake floor.",
     "name": "submerged concrete",
     "description": "You are standing at the bottom of a body of fresh water on a pad of concrete.  With a watertight container, you could gather fresh water from here.  Not safe to drink as is.",
     "symbol": "~",
@@ -425,7 +421,6 @@
   {
     "type": "terrain",
     "id": "t_lake_bed_concrete_yellow",
-    "//": "for eventual use with water z levels.  Currently non-functional.  Cement on the lake floor.",
     "name": "submerged concrete",
     "description": "You are standing at the bottom of a body of fresh water on a pad of yellow-painted concrete.  With a watertight container, you could gather fresh water from here.  Not safe to drink as is.",
     "symbol": "#",

data/json/harvest.json

@@ -387,6 +387,26 @@
     "type": "harvest",
     "entries": [ { "drop": "wintergreen_berry", "base_num": [ 1, 4 ] }, { "drop": "wintergreen_leaves", "base_num": [ 1, 2 ] } ]
   },
+  {
+    "id": "seaweed_harv",
+    "type": "harvest",
+    "entries": [ { "drop": "seaweed" } ]
+  },
+  {
+    "id": "kelp_sugar_harv",
+    "type": "harvest",
+    "entries": [ { "drop": "kelp_sugar" } ]
+  },
+  {
+    "id": "bladderwrack_harv",
+    "type": "harvest",
+    "entries": [ { "drop": "bladderwrack" } ]
+  },
+  {
+    "id": "sea_lettuce_harv",
+    "type": "harvest",
+    "entries": [ { "drop": "sea_lettuce" } ]
+  },
   {
     "id": "fish_tiny",
     "type": "harvest",

data/json/items/comestibles/med.json

@@ -144,7 +144,7 @@
       "activation_message": "You take some aspirin.",
       "effects": [ { "id": "pkill1_nsaid", "duration": 9000 } ]
     },
-    "vitamins": [ [ "vit_bloodthinner", 4320 ] ]
+    "vitamins": [ [ "vit_anticoagulant_aspirin", 4320 ] ]
   },
   {
     "id": "ibuprofen",

data/json/items/comestibles/raw_veggy.json

@@ -1180,5 +1180,92 @@
     "flags": [ "RAW" ],
     "vitamins": [ [ "calcium", 9 ], [ "iron", 2 ], [ "vitC", 10 ] ],
     "fun": -5
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "seaweed",
+    "name": { "str_sp": "seaweed" },
+    "weight": "30 g",
+    "color": "green",
+    "spoils_in": "2 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "description": "A handful of slimy seaweed.  It doesn't look edible, but properly dried, it might make for decent kindling.",
+    "material": [ "veggy" ],
+    "volume": "30 ml",
+    "flags": [ "SMOKABLE", "INEDIBLE" ],
+    "smoking_result": "dry_seaweed"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "seaweed_pile",
+    "name": { "str_sp": "pile of seaweed" },
+    "weight": "600 g",
+    "color": "green",
+    "spoils_in": "2 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "description": "A slimy heap of seaweed.  It doesn't look edible, but properly dried, it might make for decent kindling.",
+    "material": [ "veggy" ],
+    "volume": "600 ml",
+    "flags": [ "SMOKABLE", "INEDIBLE" ],
+    "smoking_result": "dry_seaweed_pile"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "sea_lettuce",
+    "name": { "str_sp": "sea lettuce" },
+    "weight": "100 g",
+    "color": "green",
+    "spoils_in": "2 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "calories": 12,
+    "description": "A handful of edible green seaweed.  It makes a good snack as-is, but can be dried or prepared in a number of ways.",
+    "price": 10,
+    "price_postapoc": 10,
+    "material": [ "veggy" ],
+    "volume": "250 ml",
+    "flags": [ "FREEZERBURN", "SMOKABLE" ],
+    "smoking_result": "dry_veggy",
+    "vitamins": [ [ "calcium", 3 ], [ "iron", 3 ], [ "vitC", 1 ] ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "kelp_sugar",
+    "name": { "str_sp": "sugar kelp" },
+    "weight": "100 g",
+    "color": "brown",
+    "spoils_in": "2 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "calories": 17,
+    "description": "A sizable strip of new growth harvested from a sugar kelp.  While these are most often dried, it seems edible enough as is.",
+    "price": 10,
+    "price_postapoc": 10,
+    "material": [ "veggy" ],
+    "volume": "250 ml",
+    "flags": [ "FREEZERBURN", "SMOKABLE" ],
+    "smoking_result": "kombu",
+    "vitamins": [ [ "calcium", 3 ], [ "iron", 3 ], [ "vitC", 1 ] ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "bladderwrack",
+    "name": { "str_sp": "bladderwrack" },
+    "weight": "100 g",
+    "color": "brown",
+    "spoils_in": "2 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "calories": 17,
+    "description": "A leafy bunch of seaweed covered in air bladders.  Many claims are made about its health benefits, but at least as a foodstuff, it's no better or worse than other edible seaweed.",
+    "price": 10,
+    "price_postapoc": 10,
+    "material": [ "veggy" ],
+    "volume": "250 ml",
+    "flags": [ "FREEZERBURN", "SMOKABLE" ],
+    "smoking_result": "dry_veggy",
+    "vitamins": [ [ "calcium", 2 ], [ "iron", 4 ], [ "vitC", 1 ] ]
   }
 ]

data/json/items/comestibles/veggy_dishes.json

@@ -1566,6 +1566,25 @@
     "extend": { "flags": [ "FREEZERBURN" ] },
     "fun": 3
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "kombu",
+    "name": { "str_sp": "kombu" },
+    "weight": "10 g",
+    "color": "brown",
+    "spoils_in": "2 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "calories": 17,
+    "description": "An essential component of Japanese cuisine, this dried sheet of seaweed has hardened to the point of inedibility.  Boiled in water, it should make an excellent broth.",
+    "price": 10,
+    "price_postapoc": 10,
+    "material": [ "veggy" ],
+    "volume": "25 ml",
+    "flags": [ "INEDIBLE" ],
+    "smoking_result": "kombu",
+    "vitamins": [ [ "calcium", 3 ], [ "iron", 3 ], [ "vitC", 1 ] ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "onion_sauteed",

data/json/items/generic.json

@@ -285,6 +285,32 @@
     "to_hit": -2,
     "flags": [ "TRADER_AVOID", "TINDER" ]
   },
+  {
+    "type": "GENERIC",
+    "id": "dry_seaweed",
+    "name": { "str": "dried seaweed", "str_pl": "dried seaweed" },
+    "looks_like": "withered",
+    "description": "A bit of dried seaweed.  It's tough, inedible, and possibly poisonous, but it could be burned or used for crafts.",
+    "weight": "10 g",
+    "color": "green",
+    "symbol": ",",
+    "material": [ "dry_plant" ],
+    "volume": "10 ml",
+    "flags": [ "TRADER_AVOID", "FIREWOOD", "TINDER" ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "dry_seaweed_pile",
+    "name": { "str": "pile of dried seaweed", "str_pl": "pile of dried seaweed" },
+    "looks_like": "withered",
+    "description": "A big heap of dried seaweed.  It's tough, inedible, and possibly poisonous, but it could be burned or used for crafts.",
+    "weight": "200 g",
+    "color": "green",
+    "symbol": ",",
+    "material": [ "dry_plant" ],
+    "volume": "200 ml",
+    "flags": [ "TRADER_AVOID", "FIREWOOD", "TINDER" ]
+  },
   {
     "type": "GENERIC",
     "id": "superglue",