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.

Sign up for GitHub

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

Jump to bottom

Pronoun fix #170

Merged
merged 2 commits into from
Jul 31, 2024
Merged

Pronoun fix #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1baf91
Pronoun fix
ebutbetter Jul 17, 2024
05061bb
dialogue-bug fixes
ebutbetter Jul 18, 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
10 changes: 5 additions & 5 deletions resources/dicts/lifegen_talk/general_no_kit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3196,7 +3196,7 @@
[
"[t_c is trying to push {PRONOUN/t_c/self} to {PRONOUN/t_c/poss} paws, legs trembling like weak, spindly sticks underneath {PRONOUN/t_c/object}.]",
"I can walk ... Don't need help ... AH --",
"[{PRONOUN/t_c/poss/CAP} legs collapse, sending {PRONOUN/t_c/poss} slamming back into their nest as an exasperated r_m rushes over to help {PRONOUN/t_c/object}.]"
"[{PRONOUN/t_c/poss/CAP} legs collapse, sending {PRONOUN/t_c/object} slamming back into {PRONOUN/t_c/poss} nest as an exasperated r_m rushes over to help {PRONOUN/t_c/object}.]"
]
],

Expand Down Expand Up @@ -9162,7 +9162,7 @@
"silly"
],
[
"[You sit happily in the sun in the clearing, you watch as cats go about their day. t_c sits beside you, following your line of sight. {PRONOUN/t_c/subject/CAP} {VERB/t_c/chickle/chuckles} to {PRONOUN/t_c/self} as {PRONOUN/t_c/subject} {VERB/t_c/point/points} to a group of kittens playing across the clearing.]",
"[You sit happily in the sun in the clearing, you watch as cats go about their day. t_c sits beside you, following your line of sight. {PRONOUN/t_c/subject/CAP} {VERB/t_c/chuckle/chuckles} to {PRONOUN/t_c/self} as {PRONOUN/t_c/subject} {VERB/t_c/point/points} to a group of kittens playing across the clearing.]",
"Who knew they could be so cute when they weren't bugging me. Kittens, they're strange aren't they, love? I can see us with our own some day actually...",
"[{PRONOUN/t_c/subject/CAP} {VERB/t_c/begin/begins} to blush madly and you try to hide your laughter as t_c abruptly gets up and shuffles away. You bounce to your paws and chase after {PRONOUN/t_c/object}.]",
"y_c! No! Please I didn't mean it like that! Someone help meeeee!!!!"
Expand Down Expand Up @@ -12713,9 +12713,9 @@
"[You're about to slink back to your nest, defeated, when you overhear {PRONOUN/t_c/object} talking with plike_r_c across camp.]",
"{PRONOUN/t_c/subject/CAP}{VERB/t_c/'re/'s} sloppy and green. Too hard on {PRONOUN/t_c/self} ... No one's gonna take {PRONOUN/t_c/object} seriously.",
"That's how my mentor described me as an apprentice. I hope y_c never has to feel that way.",
"The kid is coming into {PRONOUN/y_c/object} own so fast ... I can barely keep up.",
"The kid is coming into {PRONOUN/y_c/poss} own so fast ... I can barely keep up.",
"A smart little cat, that one is.",
"[{PRONOUN/t_c/subject/CAP} {VERB/t_c/smile/smiles} and {VERB/t_c/shake/shakes} {PRONOUN/t_c/object} head, forcing you to dart out of earshot before {PRONOUN/t_c/subject} can catch you eavesdropping.]"
"[{PRONOUN/t_c/subject/CAP} {VERB/t_c/smile/smiles} and {VERB/t_c/shake/shakes} {PRONOUN/t_c/poss} head, forcing you to dart out of earshot before {PRONOUN/t_c/subject} can catch you eavesdropping.]"
]
],
"brooding_mentorAJ": [
Expand Down Expand Up @@ -20252,7 +20252,7 @@
],
[
"[You're sleeping peacefully in your nest when a trickle of air wakes you.]",
"[The familiar sensation has you lift your head with a small start, blinking at seeing an amused t_c. {PRONOUN/t_c/subject/CAP} smiles softly at you.]",
"[The familiar sensation has you lift your head with a small start, blinking at seeing an amused t_c. {PRONOUN/t_c/subject/CAP} {VERB/t_c/smile/smiles} softly at you.]",
"[The vibration of {PRONOUN/t_c/poss} purr is soothing, and you bunt your head against {PRONOUN/t_c/object} with a smile of your own.]",
"[What a nice way to wake up!]"
]
Expand Down
2 changes: 1 addition & 1 deletion scripts/screens/TalkScreen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2993,7 +2993,7 @@ def adjust_txt(self, text, cat):
if cat.inheritance.get_children() is None or len(cat.inheritance.get_children()) == 0:
return ""
kit = Cat.fetch_cat(choice(cat.inheritance.get_children()))
if kit.moons < 12 or kit.outside or kit.dead or kit.ID == cat.ID or\
if kit.moons < 12 or kit.outside or kit.dead or kit.ID == cat.ID or kit.ID == you.ID or\
(cluster and x not in get_cluster(kit.personality.trait)) or (rel and (kit.ID not in cat.relationships) or\
(r == "plike" and cat.relationships[kit.ID].platonic_like < 20) or\
(r == "plove" and cat.relationships[kit.ID].platonic_like < 50) or\
Expand Down
Loading