Combat Capable Mounts (#62014)

* First attempt * astyle * Second Attempt * Apply suggestions from code review Co-authored-by: David Seguin <[email protected]> * Update character.cpp * Melian Mantis Stallion * Update src/character.cpp Co-authored-by: mqrause <[email protected]> * Update changeling.json * Combat Mounts attack enemy monsters * astyle * Revert "Combat Mounts attack enemy monsters" This reverts commit 2d19982240c1c10a42989cacceddf264d11b23f7. * Update data/mods/Xedra_Evolved/monsters/changeling.json Co-authored-by: TheShadowFerret <[email protected]> * Quest to get a mount * fig and pomegranates * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/mtype.h * Fruits and requirements Update terrain-flora.json * Apply suggestions from code review * fixes * Update data/mods/Xedra_Evolved/furniture_and_terrain/furniture.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update furniture.json * npc * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update furniture.json * Update boann.json * Update data/mods/Xedra_Evolved/monsters/changeling.json * Update data/mods/Xedra_Evolved/monsters/changeling.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update boann.json * Update data/mods/Xedra_Evolved/npc/boann.json * Island * Update boann.json * Update overmap_terrain.json * Update overmap_specials.json * Revert "Update overmap_specials.json" This reverts commit 9f48ead. Update overmap_special.json Update furniture.json * Fixes * fixes * Finally fixed * Update boann.json * Apply suggestions from code review Update terrain-flora.json --------- Co-authored-by: David Seguin <[email protected]> Co-authored-by: mqrause <[email protected]> Co-authored-by: TheShadowFerret <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · Apr 9, 2023 · e9ab834 · e9ab834
1 parent 123606c
commit e9ab834
Show file tree

Hide file tree

Showing 14 changed files with 716 additions and 1 deletion.
diff --git a/data/mods/Xedra_Evolved/furniture_and_terrain/furniture.json b/data/mods/Xedra_Evolved/furniture_and_terrain/furniture.json
@@ -66,6 +66,47 @@
       ]
     }
   },
+  {
+    "type": "furniture",
+    "id": "xe_f_throne",
+    "name": "throne",
+    "symbol": "#",
+    "description": "An ornate wooden throne, with four legs, a seat, and a back.  It's good to be king, if just for a while.  It appears to have been joined without any nails.",
+    "color": "brown",
+    "move_cost_mod": 1,
+    "coverage": 40,
+    "comfort": 1,
+    "floor_bedding_warmth": -1500,
+    "bonus_fire_warmth_feet": 1000,
+    "required_str": 8,
+    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "CAN_SIT", "ALIGN_WORKBENCH" ],
+    "bash": {
+      "str_min": 6,
+      "str_max": 20,
+      "sound": "smash!",
+      "sound_fail": "whump.",
+      "items": [ { "item": "splinter", "count": [ 15, 30 ] } ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "xe_f_balefire",
+    "name": "Balefire",
+    "description": "A giant blue white fire produces a cool light and almost no heat.",
+    "symbol": "O",
+    "required_str": -1,
+    "move_cost_mod": -1,
+    "color": "light_blue",
+    "coverage": 30,
+    "light_emitted": 55,
+    "flags": [ "TRANSPARENT", "NOITEM", "BLOCKSDOOR" ],
+    "bash": {
+      "str_min": 20,
+      "str_max": 30,
+      "sound_fail": "smash!",
+      "items": [ { "item": "glass_shard", "count": [ 8, 12 ] }, { "item": "scrap_dreamdross", "count": [ 2, 10 ] } ]
+    }
+  },
   {
     "type": "furniture",
     "id": "f_bat_roost",

diff --git a/data/mods/Xedra_Evolved/furniture_and_terrain/terrain-flora.json b/data/mods/Xedra_Evolved/furniture_and_terrain/terrain-flora.json
@@ -0,0 +1,169 @@
+[
+  {
+    "type": "terrain",
+    "id": "t_tree_fig",
+    "name": "fig tree",
+    "looks_like": "t_tree",
+    "description": "This tree is Ficus carica, a species of small tree in the flowering plant family Moraceae, native to the Mediterranean region, together with western and southern Asia.  If you examined the branches more closely, you could probably find a few mature ones in autumn.",
+    "symbol": "7",
+    "color": [ "light_green", "light_green", "red", "brown" ],
+    "//": "barren in winter, fruits in autumn",
+    "move_cost": 0,
+    "coverage": 80,
+    "flags": [ "FLAMMABLE_ASH", "NOITEM", "SUPPORTS_ROOF", "TREE", "REDUCE_SCENT" ],
+    "transforms_into": "t_tree_fig_harvested",
+    "examine_action": "harvest_ter_nectar",
+    "harvest_by_season": [ { "seasons": [ "autumn" ], "id": "fig_harv" } ],
+    "bash": {
+      "str_min": 80,
+      "str_max": 180,
+      "sound": "crunch!",
+      "sound_fail": "whack!",
+      "ter_set": "t_dirt",
+      "items": [
+        { "item": "stick_long", "count": [ 3, 10 ] },
+        { "item": "splinter", "count": [ 10, 25 ] },
+        { "item": "leaves", "count": [ 50, 150 ] }
+      ]
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_tree_fig_harvested",
+    "name": "fig tree",
+    "looks_like": "t_tree_dead",
+    "description": "This tree is Ficus carica, a species of small tree in the flowering plant family Moraceae, native to the Mediterranean region, together with western and southern Asia.  There do not appear to be any ripe apples now.",
+    "symbol": "7",
+    "color": [ "light_green", "light_green", "light_green", "brown" ],
+    "//": "barren in winter, no fruits anymore",
+    "move_cost": 0,
+    "coverage": 80,
+    "flags": [ "FLAMMABLE_ASH", "NOITEM", "SUPPORTS_ROOF", "TREE", "REDUCE_SCENT", "HARVESTED" ],
+    "examine_action": "harvested_plant",
+    "transforms_into": "t_tree_fig",
+    "bash": {
+      "str_min": 80,
+      "str_max": 180,
+      "sound": "crunch!",
+      "sound_fail": "whack!",
+      "ter_set": "t_dirt",
+      "items": [
+        { "item": "stick_long", "count": [ 3, 10 ] },
+        { "item": "splinter", "count": [ 10, 25 ] },
+        { "item": "leaves", "count": [ 50, 150 ] }
+      ]
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_tree_pomegranate",
+    "name": "fig tree",
+    "looks_like": "t_tree",
+    "description": "This tree is Punica granatum is a fruit-bearing deciduous shrub in the family Lythraceae, subfamily Punicoideae, that grows between 5 and 10 m (16 and 33 ft) tall.  If you examined the branches more closely, you could probably find a few mature ones in autumn.",
+    "symbol": "7",
+    "color": [ "light_green", "light_green", "red", "brown" ],
+    "//": "barren in winter, fruits in autumn",
+    "move_cost": 0,
+    "coverage": 80,
+    "flags": [ "FLAMMABLE_ASH", "NOITEM", "SUPPORTS_ROOF", "TREE", "REDUCE_SCENT" ],
+    "transforms_into": "t_tree_pomegranate_harvested",
+    "examine_action": "harvest_ter_nectar",
+    "harvest_by_season": [ { "seasons": [ "autumn" ], "id": "pomegranate_harv" } ],
+    "bash": {
+      "str_min": 80,
+      "str_max": 180,
+      "sound": "crunch!",
+      "sound_fail": "whack!",
+      "ter_set": "t_dirt",
+      "items": [
+        { "item": "stick_long", "count": [ 3, 10 ] },
+        { "item": "splinter", "count": [ 10, 25 ] },
+        { "item": "leaves", "count": [ 50, 150 ] }
+      ]
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_tree_pomegranate_harvested",
+    "name": "fig tree",
+    "looks_like": "t_tree_dead",
+    "description": "This tree is Punica granatum is a fruit-bearing deciduous shrub in the family Lythraceae, subfamily Punicoideae, that grows between 5 and 10 m (16 and 33 ft) tall.  There do not appear to be any ripe apples now.",
+    "symbol": "7",
+    "color": [ "light_green", "light_green", "light_green", "brown" ],
+    "//": "barren in winter, no fruits anymore",
+    "move_cost": 0,
+    "coverage": 80,
+    "flags": [ "FLAMMABLE_ASH", "NOITEM", "SUPPORTS_ROOF", "TREE", "REDUCE_SCENT", "HARVESTED" ],
+    "examine_action": "harvested_plant",
+    "transforms_into": "t_tree_pomegranate",
+    "bash": {
+      "str_min": 80,
+      "str_max": 180,
+      "sound": "crunch!",
+      "sound_fail": "whack!",
+      "ter_set": "t_dirt",
+      "items": [
+        { "item": "stick_long", "count": [ 3, 10 ] },
+        { "item": "splinter", "count": [ 10, 25 ] },
+        { "item": "leaves", "count": [ 50, 150 ] }
+      ]
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_tree_hawthorn",
+    "name": "hawthorn tree",
+    "looks_like": "t_tree",
+    "description": "Crataegus monogyna, known as common hawthorn, one-seed hawthorn, or single-seeded hawthorn, is a species of flowering plant in the rose family Rosaceae.",
+    "symbol": "7",
+    "color": [ "light_green", "light_green", "i_light_green", "brown" ],
+    "//": "berries in autum and in winter, harvestable petals in spring",
+    "move_cost": 0,
+    "coverage": 80,
+    "flags": [ "FLAMMABLE_ASH", "NOITEM", "SUPPORTS_ROOF", "TREE", "REDUCE_SCENT" ],
+    "examine_action": "harvest_ter_nectar",
+    "harvest_by_season": [
+      { "seasons": [ "spring" ], "id": "hawthorn_petal_harv" },
+      { "seasons": [ "autumn", "winter" ], "id": "hawthorn_berry_harv" }
+    ],
+    "transforms_into": "t_tree_hawthorn_harvested",
+    "bash": {
+      "str_min": 80,
+      "str_max": 180,
+      "sound": "crunch!",
+      "sound_fail": "whack!",
+      "ter_set": "t_dirt",
+      "items": [
+        { "item": "stick_long", "count": [ 3, 10 ] },
+        { "item": "splinter", "count": [ 10, 25 ] },
+        { "item": "leaves", "count": [ 50, 150 ] }
+      ]
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_tree_hawthorn_harvested",
+    "looks_like": "t_tree_harvested",
+    "description": "Crataegus monogyna, known as common hawthorn, one-seed hawthorn, or single-seeded hawthorn, is a species of flowering plant in the rose family Rosaceae.  It looks like the tree has been picked clean of hawthorns.",
+    "name": "hawthorn tree",
+    "symbol": "7",
+    "color": [ "light_green", "light_green", "light_green", "brown" ],
+    "move_cost": 0,
+    "coverage": 80,
+    "flags": [ "FLAMMABLE_ASH", "NOITEM", "SUPPORTS_ROOF", "TREE", "REDUCE_SCENT", "HARVESTED" ],
+    "examine_action": "harvested_plant",
+    "transforms_into": "t_tree_hawthorn",
+    "bash": {
+      "str_min": 80,
+      "str_max": 180,
+      "sound": "crunch!",
+      "sound_fail": "whack!",
+      "ter_set": "t_dirt",
+      "items": [
+        { "item": "stick_long", "count": [ 3, 10 ] },
+        { "item": "splinter", "count": [ 10, 25 ] },
+        { "item": "leaves", "count": [ 50, 150 ] }
+      ]
+    }
+  }
+]
diff --git a/data/mods/Xedra_Evolved/harvest.json b/data/mods/Xedra_Evolved/harvest.json
@@ -13,5 +13,15 @@
       { "drop": "fae_fur", "type": "skin", "mass_ratio": 0.04 },
       { "drop": "fat", "type": "flesh", "mass_ratio": 0.04 }
     ]
+  },
+  {
+    "id": "fig_harv",
+    "type": "harvest",
+    "entries": [ { "drop": "fig", "base_num": [ 2, 5 ], "scale_num": [ 0, 0.5 ] } ]
+  },
+  {
+    "id": "pomegranate_harv",
+    "type": "harvest",
+    "entries": [ { "drop": "pomegranate", "base_num": [ 2, 5 ], "scale_num": [ 0, 0.5 ] } ]
   }
 ]
diff --git a/data/mods/Xedra_Evolved/items/comestibles/raw_fruit.json b/data/mods/Xedra_Evolved/items/comestibles/raw_fruit.json
@@ -0,0 +1,63 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "hawthorn_petals",
+    "name": { "str_sp": "hawthorn petals" },
+    "weight": "90 g",
+    "color": "light_green",
+    "spoils_in": "10 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "quench": 2,
+    "calories": 17,
+    "description": "A small salads worth of hawthorn petals.",
+    "price": 100,
+    "price_postapoc": 50,
+    "material": [ "veggy" ],
+    "volume": "850 ml",
+    "charges": 5,
+    "flags": [ "FREEZERBURN", "SMOKABLE", "RAW" ],
+    "smoking_result": "dry_veggy",
+    "vitamins": [ [ "vitC", 4 ], [ "calcium", 1 ], [ "iron", 2 ] ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "hawthorn_berries",
+    "name": { "str_sp": "hawthorn berries" },
+    "weight": "40 g",
+    "color": "red",
+    "spoils_in": "2 days 12 hours",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "quench": 2,
+    "calories": 140,
+    "description": "Dense clusters of edible red berries grow enormously during autumn, but try not to eat the seeds as they contain cyanide.  Too tart to be very enjoyable they are often used in jams and jellies.",
+    "price": 110,
+    "price_postapoc": 100,
+    "material": [ "fruit" ],
+    "volume": "250 ml",
+    "fun": 0,
+    "flags": [ "SMOKABLE", "EDIBLE_FROZEN" ],
+    "smoking_result": "dry_fruit",
+    "vitamins": [ [ "vitC", 16 ], [ "calcium", 1 ] ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "fig",
+    "name": { "str": "fig" },
+    "weight": "40 g",
+    "color": "yellow",
+    "spoils_in": "5 days",
+    "comestible_type": "FOOD",
+    "symbol": ",",
+    "calories": 30,
+    "description": "Figs are a unique fruit resembling a teardrop.  They’re about the size of your thumb, filled with hundreds of tiny seeds, and have an edible purple or green peel.  The flesh of the fruit is pink and has a mild, sweet taste.  The scientific name for the fig is Ficus carica.",
+    "price": 120,
+    "price_postapoc": 300,
+    "material": [ "fruit" ],
+    "volume": "500 ml",
+    "fun": 5,
+    "flags": [ "SMOKABLE" ],
+    "smoking_result": "dry_fruit"
+  }
+]