diff --git a/resources/dicts/names/names.json b/resources/dicts/names/names.json
index 712dc812ba..68ab7f66ec 100644
--- a/resources/dicts/names/names.json
+++ b/resources/dicts/names/names.json
@@ -277,7 +277,6 @@
"cave", "caw", "cliff", "crag", "cricket", "drop", "eagle", "echo", "fall", "frost", "goat", "horn", "lichen",
"mound", "peak", "point", "ram", "shatter", "shard", "stone", "steep", "summit", "quake", "whisper",
"whistle"
-
],
"Wetlands": [
"flood", "swamp", "splash", "croak", "duck", "bog", "mud", "skipper", "wade", "lily", "moss", "root", "song", "bug", "glow",
diff --git a/resources/dicts/patrols/beach/med/greenleaf.json b/resources/dicts/patrols/beach/med/greenleaf.json
index 4c7c7d2d01..51f488b2de 100644
--- a/resources/dicts/patrols/beach/med/greenleaf.json
+++ b/resources/dicts/patrols/beach/med/greenleaf.json
@@ -67,7 +67,7 @@
]
},
{
- "text": "Not only {VERB/p_l/do/does} {PRONOUN/p_l/subject} not find anything, p_l wants to murder s_c. {PRONOUN/p_l/subject/CAP}{VERB/p_l/'re/'s} obnoxious, troublesome, childish... and simply not someone p_l enjoys interacting with.",
+ "text": "Not only {VERB/p_l/do/does} {PRONOUN/p_l/subject} not find anything, p_l wants to smother s_c. {PRONOUN/p_l/subject/CAP}{VERB/p_l/'re/'s} obnoxious, troublesome, childish... and simply not someone p_l enjoys interacting with.",
"exp": 0,
"weight": 20,
"stat_trait": ["troublesome", "childish"],
@@ -101,7 +101,7 @@
},
"weight": 20,
"intro_text": "p_l heads out, leading a patrol of medicine cats to go find some of the bounty of greenleaf.",
- "decline_text": "... And {PRONOUN/p_l/subject}{VERB/p_l/'re/'s} called back almost immediately, as one of the elders has started hacking something up.",
+ "decline_text": "...And they're called back almost immediately, as one of the elders has started hacking something up.",
"chance_of_success": 60,
"success_outcomes": [
{
@@ -168,7 +168,7 @@
]
},
{
- "text": "Not only {VERB/p_l/do/does} {PRONOUN/p_l/subject} not find anything, p_l wants to murder s_c. {PRONOUN/s_c/subject/CAP}{VERB/s_c/'re/'s} obnoxious, troublesome, childish... and simply not someone p_l enjoys interacting with.",
+ "text": "Not only {VERB/p_l/do/does} {PRONOUN/p_l/subject} not find anything, p_l wants to smother s_c. {PRONOUN/s_c/subject/CAP}{VERB/s_c/'re/'s} obnoxious, troublesome, childish... and simply not someone p_l enjoys interacting with.",
"exp": 0,
"weight": 20,
"stat_trait": ["troublesome", "childish"],
@@ -201,7 +201,7 @@
},
"weight": 20,
"intro_text": "p_l is on a mission to find herbs. {PRONOUN/p_l/subject/CAP} {VERB/p_l/know/knows} a nice place where mullein grows in a grassy meadow, only a quick trot away from the beach, and it's always good to have some on paw for coughs and sore throats.",
- "decline_text": "A cat grabs p_l's attention before {PRONOUN/p_l/subject} can leave camp.",
+ "decline_text": "Some cat grabs p_l's attention before {PRONOUN/p_l/subject} can leave camp.",
"chance_of_success": 50,
"success_outcomes": [
{
@@ -211,7 +211,7 @@
"herbs": ["mullein"]
},
{
- "text": "Not only is the mullein intact and growing nicely, but there's also a nice patch of plantain growing just nearby. p_l purrs in satisfaction - seems like {PRONOUN/p_l/subject}{VERB/p_l/'ve/'s} caught two prey in one blow on this trip. {PRONOUN/p_l/subject/CAP}'ll remember that plantain for later.",
+ "text": "Not only is the mullein intact and growing nicely, but there's also a nice patch of plantain growing just nearby. p_l purrs in satisfaction - seems like {PRONOUN/p_l/subject}{VERB/p_l/'ve/'s} caught two prey with one blow on this trip. {PRONOUN/p_l/subject/CAP}'ll remember that plantain for later.",
"exp": 10,
"weight": 5,
"herbs": ["mullein"]
@@ -241,7 +241,7 @@
},
"weight": 20,
"intro_text": "p_l needs to go and gather some burdock root. {PRONOUN/p_l/subject/CAP} {VERB/p_l/take/takes} along what warriors {PRONOUN/p_l/subject} can find around camp to help gather and carry the roots back.",
- "decline_text": "A cat grabs p_l's attention before {PRONOUN/p_l/subject} can leave.",
+ "decline_text": "Some cat grabs p_l's attention before {PRONOUN/p_l/subject} can leave.",
"chance_of_success": 50,
"success_outcomes": [
{
@@ -324,7 +324,7 @@
},
"weight": 20,
"intro_text": "p_l wanders off into the territory, keeping an eye out for the purple flowers that grow on betony.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 70,
"success_outcomes": [
{
@@ -340,7 +340,7 @@
"herbs": ["many_herbs", "betony"]
},
{
- "text": "As ever, s_c's keen eyes pick out {PRONOUN/s_c/poss} target quickly, and {PRONOUN/s_c/subject} {VERB/s_c/bring/brings} back a great haul of betony for the herb stores.",
+ "text": "As keen as ever, s_c picks out {PRONOUN/s_c/poss} target quickly, and {PRONOUN/s_c/subject} {VERB/s_c/bring/brings} back a great haul of betony for the herb stores.",
"exp": 10,
"weight": 20,
"stat_skill": ["SENSE,2"],
@@ -421,7 +421,7 @@
]
},
{
- "text": "As ever, s_c's keen eyes pick out {PRONOUN/s_c/poss} target quickly. {PRONOUN/s_c/subject/CAP} {VERB/s_c/point/points} it out to app1, and the two bring back a great haul of betony for the herb stores.",
+ "text": "As keen as ever, s_c picks out {PRONOUN/s_c/poss} target quickly. {PRONOUN/s_c/subject/CAP} {VERB/s_c/point/points} it out to app1, and the two bring back a great haul of betony for the herb stores.",
"exp": 20,
"weight": 20,
"stat_skill": ["SENSE,2"],
@@ -533,7 +533,7 @@
]
},
{
- "text": "As ever, s_c's keen eyes pick out {PRONOUN/s_c/poss} target quickly, and {PRONOUN/s_c/subject} {VERB/s_c/organize/organizes} {PRONOUN/s_c/poss} patrol to bring back a great haul of betony for the herb stores.",
+ "text": "As keen as ever, s_c picks out {PRONOUN/s_c/poss} target quickly, and {PRONOUN/s_c/subject} {VERB/s_c/organize/organizes} {PRONOUN/s_c/poss} patrol to bring back a great haul of betony for the herb stores.",
"exp": 10,
"weight": 20,
"stat_skill": ["SENSE,2"],
@@ -596,7 +596,7 @@
},
"weight": 20,
"intro_text": "The blackberry brambles will be at their peak leaf growth soon, if they aren't there already. p_l heads out to replenish the Clan's stocks.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 70,
"success_outcomes": [
{
@@ -867,7 +867,7 @@
},
"weight": 20,
"intro_text": "With the full sun of greenleaf fueling plant growth everywhere, it's the perfect time to hunt for burdock. p_l heads out to replenish the Clan's stocks.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind, and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind, and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 70,
"success_outcomes": [
{
@@ -1134,7 +1134,7 @@
},
"weight": 20,
"intro_text": "p_l heads out into the sunshine, padding away from camp in a search for one of the most elusive herbs.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 40,
"success_outcomes": [
{
@@ -1288,7 +1288,7 @@
"normal adult": [1, 6]
},
"weight": 20,
- "intro_text": "As p_l looks at the twitching tails and wide eyes of the patrol set up to 'help' {PRONOUN/p_l/object} {VERB/p_l/gather/gathers} catmint, {PRONOUN/p_l/poss} heart sinks. These overly excited warriors don't look like they're going to be useful, and catmint is too important to be silly about collecting. Yes, it smells wonderful. Please get over it.",
+ "intro_text": "As p_l looks at the twitching tails and wide eyes of the patrol set up to 'help' {PRONOUN/p_l/object} gather catmint, {PRONOUN/p_l/poss} heart sinks. These overly excited warriors don't look like they're going to be useful, and catmint is too important to be silly about collecting. Yes, it smells wonderful. Please get over it.",
"decline_text": "{PRONOUN/p_l/subject/CAP}{VERB/p_l/'re/'s} stopped before {PRONOUN/p_l/subject} {VERB/p_l/leave/leaves} camp - these warriors are needed elsewhere. p_l's expedition will have to wait.",
"chance_of_success": 30,
"success_outcomes": [
@@ -1400,7 +1400,7 @@
},
"weight": 20,
"intro_text": "The heat of greenleaf brings warmth to {PRONOUN/p_l/poss} pelt as p_l wanders, aimlessly searching for daisies to harvest their leaves.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 70,
"success_outcomes": [
{
@@ -1730,7 +1730,7 @@
},
"weight": 20,
"intro_text": "Greenleaf's bounty means that finding dandelions shouldn't be any trouble, and p_l heads out to find some.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 70,
"success_outcomes": [
{
@@ -1973,7 +1973,7 @@
},
"weight": 20,
"intro_text": "The thick growth of greenleaf will serve c_n well today, p_l decides, thinking about gathering elder leaves. There's a particular tree in a sheltered dip along a stream {PRONOUN/p_l/subject} {VERB/p_l/want/wants} to check on today.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 60,
"success_outcomes": [
{
@@ -2390,7 +2390,7 @@
},
"weight": 20,
"intro_text": "Greenleaf is truly the best time of year to be a medicine cat, with the world so full of flowers and green growth. p_l heads out to gather fresh goldenrod for the stores.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 70,
"success_outcomes": [
{
@@ -2661,7 +2661,7 @@
},
"weight": 20,
"intro_text": "p_l heads out to find a juniper tree, wanting to restock on its needles.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 70,
"success_outcomes": [
{
@@ -2977,7 +2977,7 @@
},
"weight": 20,
"intro_text": "p_l and app1 head out for lungwort, and p_l starts a lesson on the value of this rare herb for treating yellowcough.",
- "decline_text": "A cat grabs p_l's attention before {PRONOUN/p_l/subject} can leave. p_l heaves a sigh - the expedition is delayed for another time.",
+ "decline_text": "Some cat grabs p_l's attention before {PRONOUN/p_l/subject} can leave. p_l heaves a sigh - the expedition is delayed for another time.",
"chance_of_success": 30,
"success_outcomes": [
{
@@ -3112,7 +3112,7 @@
},
"weight": 20,
"intro_text": "p_l is on a mission to find lungwort now that greenleaf is here. As the only reliable cure for yellowcough, {PRONOUN/p_l/subject}{VERB/p_l/'re/'s} determined that c_n stock up on it.",
- "decline_text": "A cat grabs p_l's attention before {PRONOUN/p_l/subject} can leave camp.",
+ "decline_text": "Some cat grabs p_l's attention before {PRONOUN/p_l/subject} can leave camp.",
"chance_of_success": 30,
"success_outcomes": [
{
@@ -3232,7 +3232,7 @@
},
"weight": 20,
"intro_text": "p_l is on a mission to find lungwort now that greenleaf is here. As the only reliable cure for yellowcough, {PRONOUN/p_l/subject}{VERB/p_l/'re/'s} determined that c_n won't run out of it. {PRONOUN/p_l/subject/CAP} {VERB/p_l/take/takes} along a warrior escort to help.",
- "decline_text": "A cat grabs p_l's attention before {PRONOUN/p_l/subject} can leave.",
+ "decline_text": "Some cat grabs p_l's attention before {PRONOUN/p_l/subject} can leave.",
"chance_of_success": 30,
"success_outcomes": [
{
@@ -3443,7 +3443,7 @@
},
"weight": 20,
"intro_text": "Greenleaf is truly the best time of year to be a medicine cat, with the world so full of flowers and green growth. p_l heads out to gather fresh mallow for the stores.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 70,
"success_outcomes": [
{
@@ -3784,7 +3784,7 @@
},
"weight": 20,
"intro_text": "More marigold would be useful, particularly with greenleaf in full swing. The season will bring the marigold to bloom, and the flowers are just as useful as the leaves to p_l and extremely easy to spot from a distance.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 70,
"success_outcomes": [
{
@@ -4093,7 +4093,7 @@
},
"weight": 20,
"intro_text": "Once mullein starts to tower over the other plants, it's a good time to harvest it.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 70,
"success_outcomes": [
{
@@ -4358,7 +4358,7 @@
},
"weight": 20,
"intro_text": "Greenleaf encourages the oak to reach its full potential, wide and towering, and p_l goes to collect a harvest of its leaves.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 70,
"success_outcomes": [
{
@@ -4688,7 +4688,7 @@
},
"weight": 20,
"intro_text": "As the plantain starts to choke off the paths the Clan uses to get about, fueled by greenleaf, it's a great time to clean up the paths and bring a good harvest home.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 70,
"success_outcomes": [
{
@@ -4938,7 +4938,7 @@
},
"weight": 20,
"intro_text": "With greenleaf bringing the poppies to seed and only so much time before the plants die off in leaf-fall, p_l is keen to go collect as much as possible.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 70,
"success_outcomes": [
{
@@ -5209,7 +5209,7 @@
},
"weight": 20,
"intro_text": "p_l heads out to find ragwort, keeping the particular fractal shape of its furled leaves in {PRONOUN/p_l/poss} mind to distinguish it from every other low-growing patch of greenery.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 70,
"success_outcomes": [
{
@@ -5773,7 +5773,7 @@
},
"weight": 20,
"intro_text": "p_l heads out to find tansy, scenting the air for its sharp smell and eyes on the lookout for tansy's strange, orb-like yellow flowers that greenleaf has brought out in abundance.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind, and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind, and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 70,
"success_outcomes": [
{
@@ -6158,7 +6158,7 @@
},
"weight": 20,
"intro_text": "p_l has finally put enough time aside to go search for thyme.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 70,
"success_outcomes": [
{
@@ -6461,7 +6461,7 @@
},
"weight": 20,
"intro_text": "p_l heads out on what promises to be a fragrant patrol, searching for wild garlic.",
- "decline_text": "{PRONOUN/p_l/poss/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
+ "decline_text": "{PRONOUN/p_l/subject/CAP} {VERB/p_l/have/has} second thoughts about leaving {PRONOUN/p_l/poss} patients behind and {VERB/p_l/decide/decides} to go another day.",
"chance_of_success": 70,
"success_outcomes": [
{