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

[CONTENT] Leader deputy patrols #2985

Open
wants to merge 9 commits into
base: development
Choose a base branch
from

Conversation

j-gynn
Copy link
Collaborator

@j-gynn j-gynn commented Nov 7, 2024

About The Pull Request

Adds two new training patrols, both for a 2 cat, leader and deputy situation. One is platonic, one is romantic. I personally send my leader and deputy together a lot and I think it's a bit of missed coverage that there's nothing specific to them. Every outcome has art attached & I have attempted to use the relationship log (development bug ticket incoming!).

Why This Is Good For ClanGen

More patrols are betterer!

Proof of Testing

image
image

Changelog/Credits

Two new leader-deputy patrols.

@scribblecrumb
Copy link
Collaborator

It looks like a lot of other miscellaneous changes were made to other patrols, were any outcomes/patrols removed? And if so, the reasoning?

@j-gynn
Copy link
Collaborator Author

j-gynn commented Nov 10, 2024

Ugh. my autoformatter strikes again. As far as I'm aware, these should all be whitespace related - no content changes.

"values": ["platonic", "comfort"],
"amount": 5,
"log": [
"Had a good patrol with {PRONOUN/m_c/poss} deputy",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My dear friend, ur missing periods on all these logs

@j-gynn j-gynn requested a review from scribblecrumb December 17, 2024 15:06
# Conflicts:
#	resources/dicts/patrols/general/training.json
"mutual": true,
"values": ["platonic", "trust", "comfort"],
"amount": 5,
"log": "m_c had a great play-fighting session with r_c when they were out on patrol together"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing period at the end of this log

"art": "gen_train_warrior_rainy"
},
{
"text": "Both r_c and p_l are positively bursting with things to discuss. Unfortunately, neither is particularly in the mood to sympathise with the other nor help solve their problems, so it descends into a prolonged kvetch. Whilst not inherently a bad thing, it does mean that both are a bit grumpy with each other by the time they return to camp.",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"sympathise" should be "sympathize"

"art": "fst_hunt_heat"
},
{
"text": "p_l is halfway through laying out the background of a particularly thorny problem when they are interrupted by another Clanmate springing through the undergrowth towards them. They're needed urgently back at camp! They race back as fast as their paws can take them, only to find that the so-called \"urgent issue\" is absurdly petty. p_l's claws dig into the earth, {PRONOUN/p_l/poss} annoyance poorly concealed.",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most of this text needs to be pronoun tagged

"mutual": true,
"values": ["platonic", "trust", "comfort"],
"amount": -10,
"log": "m_c feels like {PRONOUN/m_c/subject} was completely ignored when {PRONOUN/m_c/subject} tried to talk about important events with r_c on patrol."
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'was' should be verb tagged

"values": ["platonic", "romantic", "comfort", "trust"],
"amount": 10,
"log": [
"Spent some time sunning with {PRONOUN/m_c/poss} mate r_c while on patrol",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

log needs period

"amount": 10,
"log": [
"Spent some time sunning with {PRONOUN/m_c/poss} mate r_c while on patrol",
"Spent some time sunning with {PRONOUN/m_c/poss} mate r_c while on patrol"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

log needs period

]
},
{
"patrol_id": "gen_train_leaderdeputy_romance_1",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

patrol needs a "relationship_constraint": ["mates"],

@j-gynn j-gynn requested a review from selkirks December 20, 2024 16:59
},

"weight": 40,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm assuming these blocks aren't actually changed and just Github funkiness, right?

"mutual": false,
"values": ["respect", "trust"],
"amount": 10,
"log": "m_c was impressed by r_c's resourceful solutions to Clanmates' problems that were discussed while out on patrol"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing period

"mutual": false,
"values": ["respect", "trust"],
"amount": 10,
"log": "m_c was grateful for r_c's support when {PRONOUN/r_c/subject} allowed {PRONOUN/m_c/object} to vent"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing period

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants