Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some patrol fixes #2602

Merged
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
31ff07d
pronoun fixes for forest border patrols (any)
j-gynn Jul 31, 2024
2a57851
more checks
j-gynn Aug 1, 2024
091e7b2
proofread
j-gynn Aug 1, 2024
172d06f
assorted fixes from sort of everywhere
j-gynn Aug 1, 2024
0f32b8f
more assorted fixes from sort of everywhere
j-gynn Aug 1, 2024
9864fd0
uncommitting the test file my bad
j-gynn Aug 1, 2024
de04d72
an inexplicable question mark yeeted
j-gynn Aug 1, 2024
fb1f7c9
Update resources/dicts/relationship_events/normal_interactions/platon…
j-gynn Aug 1, 2024
b240faa
Requested fixes
j-gynn Aug 2, 2024
b92e765
Merge remote-tracking branch 'origin/pronounify-all-the-things' into …
j-gynn Aug 2, 2024
d44bcc3
Did somebody say "even more fixes?"
j-gynn Aug 2, 2024
b48ea43
buuugfix
j-gynn Aug 2, 2024
7ccc95b
Merge branch 'refs/heads/development' into pronounify-all-the-things
j-gynn Aug 19, 2024
fc7857e
new_cat.json corrected
j-gynn Aug 19, 2024
fe1ae9c
more fixes
j-gynn Aug 19, 2024
46799f3
patrols/hunting.json and most of medcat.json fixed
j-gynn Aug 24, 2024
b652f80
fixed pronoun tag error oops
j-gynn Aug 24, 2024
927167d
Apply suggestions from code review
j-gynn Aug 24, 2024
ed5b7b2
Update resources/dicts/events/death/general.json
j-gynn Aug 24, 2024
f90cbfd
revision fixes
j-gynn Aug 24, 2024
122c3ff
Update resources/dicts/patrols/plains/hunting/greenleaf.json
j-gynn Aug 24, 2024
fbf22c9
All text is correctly capitalised for first-letter-of-sentence shenan…
j-gynn Sep 4, 2024
e9e11e7
finished checking training.json
j-gynn Sep 4, 2024
afe2997
Merge branch 'refs/heads/development' into pronounify-all-the-things
j-gynn Sep 4, 2024
48621c4
more pronoun checks. i am so burnt out.
j-gynn Sep 4, 2024
7f4ac3f
Merge branch 'development' into pronounify-all-the-things
scribblecrumb Sep 23, 2024
c2b5e6b
Update resources/dicts/patrols/wetlands/hunting/any.json
scribblecrumb Sep 23, 2024
3f3e2dd
fixing missing caps
scribblecrumb Sep 23, 2024
71880e3
Merge remote-tracking branch 'upstream/development' into pr/2602
scribblecrumb Sep 23, 2024
ef2f290
hopefully fixing pronoun test
scribblecrumb Sep 23, 2024
56e5b34
pronoun tag fix
scribblecrumb Sep 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/dicts/events/ceremonies/ceremony-master.json
Original file line number Diff line number Diff line change
Expand Up @@ -1147,7 +1147,7 @@
"arrogant",
"rebellious"
],
"Right after {PRONOUN/m_c/poss} medicine cat apprentice ceremony, m_c declares that {PRONOUN/m_c/subject} won't hesitate to tell (mentor) if {PRONOUN/(mentor)/subject}{VERB/(mentor)/'re/'s} being a mousebrain. All the other cats immediately gasp and look to (mentor)'s reaction. They relax as {PRONOUN/(mentor)/subject} only {VERB/(mentor)/laugh/laughs} and says that m_c better prove that {PRONOUN/m_c/subject} {VERB/m_c/have/has} the skills to back that up."
"Right after {PRONOUN/m_c/poss} medicine cat apprentice ceremony, m_c declares that {PRONOUN/m_c/subject} won't hesitate to tell (mentor) if {PRONOUN/(mentor)/subject}{VERB/(mentor)/'re/'s} being a mouse-brain. All the other cats immediately gasp and look to (mentor)'s reaction. They relax as {PRONOUN/(mentor)/subject} only {VERB/(mentor)/laugh/laughs} and says that m_c better prove that {PRONOUN/m_c/subject} {VERB/m_c/have/has} the skills to back that up."
],
"med_app_27": [
[
Expand Down
2 changes: 1 addition & 1 deletion resources/dicts/events/death/beach.json
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@
],
"tags": [],
"weight": 20,
"event_text": "m_c couldn't speak, yell for help, or beg StarClan to give {PRONOUN/m_c/subject} a sign they were still with {PRONOUN/m_c/object}, {PRONOUN/m_c/poss} tongue having swelled up inside {PRONOUN/m_c/poss} dried mouth. As m_c collapses, feeling {PRONOUN/m_c/poss} body internally shut down because of dehydration and heat exhaustion, {PRONOUN/m_c/subject} pray that {PRONOUN/m_c/poss} clanmates locate m_c's body before {PRONOUN/m_c/subject} {VERB/m_c/become/becomes} unrecognizable under the sun.",
"event_text": "m_c couldn't speak, yell for help, or beg StarClan to give {PRONOUN/m_c/subject} a sign they were still with {PRONOUN/m_c/object}, {PRONOUN/m_c/poss} tongue having swelled up inside {PRONOUN/m_c/poss} dried mouth. As m_c collapses, feeling {PRONOUN/m_c/poss} body internally shut down because of dehydration and heat exhaustion, {PRONOUN/m_c/subject} pray that {PRONOUN/m_c/poss} Clanmates locate m_c's body before {PRONOUN/m_c/subject} {VERB/m_c/become/becomes} unrecognizable under the sun.",
"m_c": {
"age": [
"adolescent"
Expand Down
6 changes: 3 additions & 3 deletions resources/dicts/events/death/general.json
Original file line number Diff line number Diff line change
Expand Up @@ -4394,7 +4394,7 @@
},
"history": [{
"cats": ["m_c"],
"reg_death": "m_c was killed by an o_c_n apprentice.",
"reg_death": "m_c was killed by a o_c_n apprentice.",
"lead_death": "fought an apprentice from o_c_n"
}],
"other_clan": {
Expand All @@ -4413,7 +4413,7 @@
],
"tags": [],
"weight": 20,
"event_text": "m_c died trying to save an o_c_n apprentice.",
"event_text": "m_c died trying to save a o_c_n apprentice.",
"m_c": {
"age": [
"young adult",
Expand Down Expand Up @@ -5917,7 +5917,7 @@
"sub_type": ["war", "murder"],
"tags": [],
"weight": 20,
"event_text": "r_c stands back and watches as the o_c_n deputy kills m_c. r_c could probably have prevented it, but instead {PRONOUN/r_c/subject} turn and pretend {PRONOUN/r_c/subject} saw nothing.",
"event_text": "r_c stands back and watches as the o_c_n deputy kills m_c. r_c could probably have prevented it. Instead {PRONOUN/r_c/subject} turn and pretend {PRONOUN/r_c/subject} saw nothing.",
j-gynn marked this conversation as resolved.
Show resolved Hide resolved
"m_c": {
"status": ["apprentice", "warrior", "deputy", "leader"],
"not_skill": ["FIGHTER,2"],
Expand Down
2 changes: 1 addition & 1 deletion resources/dicts/events/injury/beach.json
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
"history": [
{
"cats": ["m_c"],
"scar": "m_c was scarred as a kit, when a pelican tried to carry {PRONOUN/m_c/object} off.",
"scar": "m_c was scarred as a kit when a pelican tried to carry {PRONOUN/m_c/object} off.",
"reg_death": "m_c died from {PRONOUN/m_c/poss} wounds after a pelican tried to carry {PRONOUN/m_c/object} off."
}
],
Expand Down
8 changes: 4 additions & 4 deletions resources/dicts/events/injury/general.json
Original file line number Diff line number Diff line change
Expand Up @@ -7009,9 +7009,9 @@
"cats": [
"m_c"
],
"scar": "m_c was scarred after falling into an o_c_n trap.",
"reg_death": "m_c died after falling into an o_c_n trap.",
"lead_death": "died after falling into an o_c_n trap"
"scar": "m_c was scarred after falling into a o_c_n trap.",
"reg_death": "m_c died after falling into a o_c_n trap.",
"lead_death": "died after falling into a o_c_n trap"
}
],
"other_clan": {
Expand All @@ -7033,7 +7033,7 @@
"war"
],
"weight": 20,
"event_text": "During a skirmish, m_c bounds into battle against an o_c_n warrior, protecting r_c from a powerful blow. m_c bears the brunt of the strike, and r_c helps them back to camp.",
"event_text": "During a skirmish, m_c bounds into battle against a o_c_n warrior, protecting r_c from a powerful blow. m_c bears the brunt of the strike, and r_c helps them back to camp.",
"m_c": {
"status": [
"apprentice",
Expand Down
12 changes: 6 additions & 6 deletions resources/dicts/events/misc/general.json
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@
"location": ["any"],
"season": ["newleaf"],
"weight": 5,
"event_text": "m_c sits still as r_c helps remove some leftover Leaf-bare fluff from the back of {PRONOUN/m_c/poss} neck.",
"event_text": "m_c sits still as r_c helps remove some leftover leaf-bare fluff from the back of {PRONOUN/m_c/poss} neck.",
"m_c": {
"age": ["young adult", "adult", "senior adult","senior"],
"relationship_status": ["mates"]
Expand Down Expand Up @@ -1828,7 +1828,7 @@
"location": ["any"],
"season": ["any"],
"weight": 15,
"event_text": "m_c was seen chasing a kittypet off of the territory.",
"event_text": "m_c was seen chasing a kittypet off of the territory.",
"m_c": {
"age": ["adolescent", "young adult", "adult", "senior adult", "senior"]
},
Expand Down Expand Up @@ -2079,7 +2079,7 @@
"location": ["any"],
"season": ["any"],
"weight": 10,
"event_text":"m_c was seen chasing a rogue off of the territory.",
"event_text": "m_c was seen chasing a rogue off of the territory.",
"m_c": {
"age": ["adolescent", "young adult", "adult", "senior adult", "senior"],
"status": ["apprentice", "warrior", "deputy", "leader", "medicine cat"]
Expand Down Expand Up @@ -2550,7 +2550,7 @@
"season": ["leaf-bare"],
"sub_type": ["war"],
"weight": 10,
"event_text": "m_c hopes to find the herbs that c_n needs in the war, and goes to look for them even in this Leaf-bare's harsh weather.",
"event_text": "m_c hopes to find the herbs that c_n needs in the war, and goes to look for them even in this leaf-bare's harsh weather.",
"m_c": {
"age":["any"],
"status": ["medicine cat apprentice", "medicine cat"]
Expand Down Expand Up @@ -3687,7 +3687,7 @@
"season": ["any"],
"tags": ["skill_trait_required"],
"weight": 5,
"event_text": "m_c thinks starclan is trying to warn {PRONOUN/m_c/object} about r_c.",
"event_text": "m_c thinks StarClan is trying to warn {PRONOUN/m_c/object} about r_c.",
"m_c": {
"age": ["adolescent", "young adult", "adult", "senior adult", "senior"],
"status": ["medicine cat"],
Expand All @@ -3712,7 +3712,7 @@
"season": ["leaf-bare"],
"sub_type": ["accessory"],
"weight": 10,
"event_text": "m_c finds a stray acc_singular in its last moments of life leading them to a new herb gathering spot before {PRONOUN/m_c/subject} {VERB/m_c/have/has} never found before. It gives a final flutter before it gently decends to the ground. Is it a sign from star clan, or a coincidence? m_c doesnt know but {PRONOUN/m_c/subject} {VERB/m_c/decide/decides} to keep it with {PRONOUN/m_c/object} in its honor.",
"event_text": "m_c finds a stray acc_singular in its last moments of life leading them to a new herb gathering spot before {PRONOUN/m_c/subject} {VERB/m_c/have/has} never found before. It gives a final flutter before it gently decends to the ground. Is it a sign from StarClan, or a coincidence? m_c doesnt know but {PRONOUN/m_c/subject} {VERB/m_c/decide/decides} to keep it with {PRONOUN/m_c/object} in its honor.",
"new_accessory": ["BLACK CICADA", "CICADA WINGS", "ROSY MOTH WINGS", "MORPHO BUTTERFLY", "MONARCH BUTTERFLY"],
"m_c": {
"age": ["adolescent", "young adult", "adult", "senior adult", "senior"],
Expand Down
2 changes: 1 addition & 1 deletion resources/dicts/events/war.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"o_c_n's surprise attacks on c_n have been increasing significantly lately.",
"c_n's surprise attacks on o_c_n have been increasing significantly lately.",
"Even small sparks of disagreement between o_c_n and c_n can set off a huge battle.",
"c_n's cats can't stop themselves from instinctively unsheathing their claws upon encountering an o_c_n cat."
"c_n's cats can't stop themselves from instinctively unsheathing their claws upon encountering a o_c_n cat."
]
},
"conclusion_events": [
Expand Down
6 changes: 3 additions & 3 deletions resources/dicts/lead_ceremony_df.json
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@
"stubbornness", "authority"]
},
{
"text": "r_c dips {PRONOUN/r_c/poss} head in greeting. Energy surges through m_c's pelt as {PRONOUN/m_c/subject} {VERB/m_c/receive/receives} a life for [virtue]. {PRONOUN/r_c/subject/CAP} {VERB/r_c/reassure/reassures} m_c that {PRONOUN/m_c/subject} {VERB/m_c/are/is} almost done.",
"text": "r_c dips {PRONOUN/r_c/poss} head in greeting. Energy surges through m_c's pelt as {PRONOUN/m_c/subject} {VERB/m_c/receive/receives} a life for [virtue]. {PRONOUN/r_c/subject/CAP} {VERB/r_c/reassure/reassures} m_c that {PRONOUN/m_c/subject} {VERB/m_c/are/is} almost done.",
"virtue": ["ambition", "bravery", "certainty", "clear judgement", "confidence", "courage", "determination", "endurance", "farsightedness", "instincts", "strength", "ferocity", "cunning", "shamelessness", "zealotry", "bloodlust", "restless energy",
"stubbornness", "authority"]
}
Expand Down Expand Up @@ -601,7 +601,7 @@
"stubbornness", "authority"]
},
{
"text": "r_c only watches the new leader with a rather forlorn look before giving {PRONOUN/r_c/object} a life for [virtue]. m_c didn't even have a chance to talk to the dark forest cat before {PRONOUN/r_c/subject} vanished into smoke.",
"text": "r_c only watches the new leader with a rather forlorn look before giving {PRONOUN/r_c/object} a life for [virtue]. m_c didn't even have a chance to talk to the Dark Forest cat before {PRONOUN/r_c/subject} vanished into smoke.",
"virtue": ["ambition", "bravery", "certainty", "clear judgment", "confidence", "courage",
"determination", "endurance", "farsightedness", "instincts", "strength", "ferocity", "cunning", "shamelessness", "zealotry", "bloodlust", "restless energy",
"stubbornness", "authority"]
Expand Down Expand Up @@ -886,7 +886,7 @@
"rank": ["warrior", "deputy"],
"life_giving": [
{
"text": "Such a theatric attitude had no place in the Dark Forest. But the gloom-covered spirit of r_c gives m_c a life for [virtue] with silent contempt in {PRONOUN/r_c/poss} eyes regardless of {PRONOUN/r_c/poss} feelings on the matter.",
"text": "Such a theatric attitude had no place in the Dark Forest. But the gloom-covered spirit of r_c gives m_c a life for [virtue] with silent contempt in {PRONOUN/r_c/poss} eyes regardless of {PRONOUN/r_c/poss} feelings on the matter.",
"virtue": ["ambition", "bravery", "certainty", "clear judgment", "confidence", "courage",
"determination", "endurance", "farsightedness", "instincts", "strength", "ferocity", "cunning", "shamelessness", "zealotry", "bloodlust", "restless energy",
"stubbornness", "authority"]
Expand Down
2 changes: 1 addition & 1 deletion resources/dicts/lead_ceremony_sc.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"rank": [],
"life_giving": [
{
"text": "Suddenly, the mist at the edge of the clearing takes shape. Dozens of wispy, starry spirits emerge, quickly surrounding m_c. \"We grant you your remaining [life_num] lives.\" Individually, each voice is distant, but together, the force of their words shakes m_c to {PRONOUN/m_c/poss} core. \"Use them well, with our blessing.\" And in a heartbeat, they were gone.",
"text": "Suddenly, the mist at the edge of the clearing takes shape. Dozens of wispy, starry spirits emerge, quickly surrounding m_c. \"We grant you your remaining [life_num] lives.\" Individually, each voice is distant, but together, the force of their words shakes m_c to {PRONOUN/m_c/poss} core. \"Use them well, with our blessing.\" And in a heartbeat, they were gone.",
"virtue": []
}
]
Expand Down
14 changes: 7 additions & 7 deletions resources/dicts/patrols/beach/border/any.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"max_cats": 6,
"min_max_status": {},
"weight": 20,
"intro_text": "As the patrol is marking the border lines, a gang of rogues bursts from the beach grass! An ambush!",
"intro_text": "As the patrol is marking the border lines, a gang of rogues burst from the beach grass! An ambush!",
"decline_text": "The patrol turns tail and races away! The borders are left open for the rogues to muddy.",
"chance_of_success": 10,
"success_outcomes": [
Expand Down Expand Up @@ -72,7 +72,7 @@
}
},
{
"text": "Taken by surprise, the patrol scatters and loses cohesion. The rogues are quick to take advantage of the confusion, and r_c is badly wounded, forcing the patrol to retreat.",
"text": "Taken by surprise, the patrol scatters and loses cohesion. The rogues are quick to take advantage of the confusion and r_c is badly wounded, forcing the patrol to retreat.",
"exp": 0,
"weight": 10,
"injury": [
Expand Down Expand Up @@ -101,12 +101,12 @@
"max_cats": 1,
"min_max_status": {},
"weight": 20,
"intro_text": "As the patrol is marking the border lines, a gang of rogues bursts from the beach grass! An ambush!",
"intro_text": "As r_c is marking the border lines, a gang of rogues burst from the beach grass! An ambush!",
"decline_text": "r_c turns tail and races away! The rogues have {PRONOUN/r_c/object} far outnumbered; warning the Clan is more important than playing the hero.",
"chance_of_success": 10,
"success_outcomes": [
{
"text": "Stunned for a moment, r_c is nearly caught in the teeth of the first rogue, but {PRONOUN/r_c/subject} {VERB/r_c/manage/manages} to dodge and weave through the onslaught of attacks, eventually escaping the fray and pelting towards camp with yowls of warning bursting from {PRONOUN/r_c/poss} lungs.",
"text": "Stunned for a moment, r_c is nearly caught in the teeth of the first rogue, but {PRONOUN/r_c/subject} {VERB/r_c/manage/manages} to dodge and weave through the onslaught of attacks. Eventually, r_c escapes the fray and pelts towards camp with yowls of warning bursting from {PRONOUN/r_c/poss} lungs.",
"exp": 30,
"weight": 20,
"relationships": [
Expand Down Expand Up @@ -183,7 +183,7 @@
"max_cats": 6,
"min_max_status": {},
"weight": 20,
"intro_text": "As the patrol is marking the border lines, a gang of rogues stalks out of the beach grass to confront the Clan cats!",
"intro_text": "As the patrol is marking the border lines, a gang of rogues stalk out of the beach grass to confront the Clan cats!",
"decline_text": "The patrol turns tail and races away! The borders are left open for the rogues to muddy.",
"chance_of_success": 10,
"success_outcomes": [
Expand Down Expand Up @@ -504,7 +504,7 @@
"weight": 20
},
{
"text": "r_c gets wet in the rain, but otherwise the patrol is successful.",
"text": "r_c gets wet in the rain, but otherwise, the patrol is successful.",
"exp": 20,
"weight": 5
},
Expand Down Expand Up @@ -573,7 +573,7 @@
"weight": 20
},
{
"text": "r_c gets wet in the rain, but otherwise the patrol is successful.",
"text": "r_c gets wet in the rain, but otherwise, the patrol is successful.",
"exp": 20,
"weight": 5
},
Expand Down
Loading
Loading