Skip to content

Commit

Permalink
Merge branch 'master' into aphids-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
SuddenEyePuncture committed Jun 6, 2021
2 parents 52c2c3e + a7f512a commit 7f0e6ea
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 17 deletions.
4 changes: 1 addition & 3 deletions data/json/items/comestibles/other.json
Expand Up @@ -88,16 +88,14 @@
"type": "COMESTIBLE",
"id": "honeydew",
"name": { "str": "honeydew" },
"description": "It's a sugar-rich sticky substance, produced by aphids from plant's sap. Ants and bees love it.",
"description": "A sugar-rich sticky substance, produced by aphids from plant sap. Ants and bees love it.",
"weight": "22 g",
"color": "green",
"symbol": "~",
"material": [ "honey" ],
"quench": 4,
"healthy": 0,
"calories": 67,
"charges": 16,
"stim": 0,
"fun": 2 ,
"comestible_type": "FOOD" ,
"flags": ["NUTRIENT_OVERRIDE"],
Expand Down
26 changes: 12 additions & 14 deletions data/json/monsters/insect_spider.json
Expand Up @@ -1899,7 +1899,7 @@
"id": "mon_mantis_small",
"type": "MONSTER",
"name": { "str": "huge praying mantis" },
"description": "A green mutant insect with sharp grappling spikes on it's front legs. It's a little smaller than an adult person.",
"description": "A green mutant insect with sharp grappling spikes on its front legs. It's a little smaller than an adult person.",
"copy-from": "mon_mantis_giant",
"proportional": { "hp": 0.5, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.67 },
"volume": "60 L",
Expand All @@ -1910,8 +1910,8 @@
{
"id": "mon_mantis_giant",
"type": "MONSTER",
"name": { "str": "giant praying mantis", "str_pl": "giant praying mantises" },
"description": "An enormous green creature grown about a size of a bear. It dances weirdly and ready to chop your head off in any moment.",
"name": { "str": "giant praying mantis" },
"description": "An enormous green creature grown about a size of a bear. It dances weirdly and looks ready to chop your head off at any moment.",
"default_faction": "mantis",
"bodytype": "insect",
"species": [ "INSECT" ],
Expand Down Expand Up @@ -1944,8 +1944,8 @@
{
"id": "mon_mantis_mega",
"type": "MONSTER",
"name": { "str": "great mantis", "str_pl": "great mantises" },
"description": "This ferocious creature is lurking through the land. It's probably capable of killing a moose with it's powerful arms.",
"name": { "str": "great mantis" },
"description": "This ferocious creature is lurking through the land. It's probably capable of killing a moose with its powerful arms.",
"copy-from": "mon_mantis_giant",
"proportional": { "hp": 20, "speed": 0.25, "vision_day": 2 },
"volume": "625 L",
Expand All @@ -1970,7 +1970,7 @@
"id": "mon_mole_cricket",
"type": "MONSTER",
"name": { "str": "giant mole cricket" },
"description": "An enormous underground bug. It's a common garden pest. Beware ear-splitting screech and strong shovel-like front legs.",
"description": "An enormous underground bug. Beware the ear-splitting screech and strong shovel-like front legs.",
"default_faction": "insect",
"bodytype": "insect",
"species": [ "INSECT" ],
Expand All @@ -1987,7 +1987,6 @@
"melee_dice": 4,
"melee_dice_sides": 6,
"melee_cut": 10,
"dodge": 0,
"armor_bash": 15,
"armor_cut": 18,
"armor_bullet": 20,
Expand All @@ -2005,7 +2004,7 @@
"id": "mon_lady_bug_giant",
"type": "MONSTER",
"name": { "str": "giant lady bug" },
"description": "A red lady bug covered in black spots about a size of a horse. Despite cute looks it is a ferocious predator capable of killing swarms of ants and aphids.",
"description": "A lady beetle roughly the size of a horse. Its forewings are red with black spots, a distinctive appearance traditionally associated with good luck and adored by children. Despite cute looks it is a ferocious predator capable of killing swarms of ants and aphids.",
"default_faction": "ladybug",
"bodytype": "insect",
"species": [ "INSECT" ],
Expand Down Expand Up @@ -2057,7 +2056,7 @@
"id": "mon_grasshopper_giant",
"type": "MONSTER",
"name": { "str": "giant grasshopper", "str_pl": "giant grasshoppers" },
"description": "A huge green grasshopper about a size of a big dog with long and strong back legs. It hops, it hops and never stops.",
"description": "A huge green grasshopper about the size of a big dog, with long and strong back legs. It hops, it hops and never stops.",
"default_faction": "insect",
"bodytype": "insect",
"species": [ "INSECT" ],
Expand Down Expand Up @@ -2088,8 +2087,8 @@
{
"id": "mon_antlion_larva",
"type": "MONSTER",
"name": { "str": "giant antlion larva", "str_pl": "giant antlion larvae" },
"description": "This huge grub has powerful mandibles and a hungry look. It hides in dirt and waits for pray to come clother.",
"name": { "str": "giant antlion larva" },
"description": "This huge grub has powerful mandibles and a hungry look. It hides in the dirt and awaits its prey.",
"default_faction": "antlion",
"bodytype": "insect",
"species": [ "INSECT" ],
Expand All @@ -2106,7 +2105,6 @@
"melee_dice": 1,
"melee_dice_sides": 8,
"melee_cut": 6,
"dodge": 0,
"armor_bash": 4,
"armor_cut": 10,
"armor_bullet": 10,
Expand Down Expand Up @@ -2162,7 +2160,7 @@
"id": "mon_strider_small",
"type": "MONSTER",
"name": { "str": "big water strider" },
"description": "This water bug is a few times bigger, than a reguar one. It's moves are fast and fluid.",
"description": "This water bug is several times larger than a regular one. It's moves are fast and fluid.",
"copy-from": "mon_strider_giant",
"proportional": { "hp": 0.5, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.50 },
"volume": "3 L",
Expand All @@ -2174,7 +2172,7 @@
"id": "mon_strider_giant",
"type": "MONSTER",
"name": { "str": "giant water strider" },
"description": "This water glider is about as big as a domestic cat. It's legs are more fin-like and a swollen body is mostly submerged underwater.",
"description": "This water glider is about as big as a domestic cat. Its legs are more fin-like and a swollen body is mostly submerged underwater.",
"default_faction": "strider",
"bodytype": "insect",
"species": [ "INSECT" ],
Expand Down

0 comments on commit 7f0e6ea

Please sign in to comment.