Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaysoleson
jaysoleson committed Jun 30, 2024
2 parents 74cffac + 4c0bd62 commit c91674b
Show file tree
Hide file tree
Showing 46 changed files with 1,411 additions and 41 deletions.
18 changes: 18 additions & 0 deletions changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
<strong>v0.7.2: </strong>
- Dialogue Focus: Dialogue may now focus on certain events happening within the Clan
- Cats' faith to StarClan or the Dark Forest is now displayed
- Toggle for faithless cats
- Customize skill
- Adjust some clusters
- Affair success now takes into account relationships
- New moon events
- New Dark Forest background for dialogue
- Connecting dialogue
- New accessories
- New menu art
- Shunned and Forgiven rates in game_config
- New patrol arts
- New patrols
- New favoriting assortment system
- New Moonstone

<strong>v0.7.1: </strong>
- You can now talk to UR (Unknown Residence) cats when dead, or with the GHOST skill
- Switch MCs to a dead cat
Expand Down
60 changes: 60 additions & 0 deletions resources/dicts/lifegen_talk/apprentice.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3269,5 +3269,65 @@
[
"[t_c races around camp, playfully chasing some of {PRONOUN/t_c/poss} fellow apprentices as they wait to head out for training.]"
]
],
"neurotic_warriorapprentice_SQ1": [
[
"they_neurotic",
"they_apprentice",
"you_elder"
],
[
"[t_c cautiously pads into the elders' den.]",
"Is there anything I can help with in here? Moss, fresh-kill, or even, um, ticks?",
"I...I just want to make sure I'm being helpful enough."
]
],
"neurotic_warriorapprentice_SQ2": [
[
"they_neurotic",
"they_apprentice",
"from_your_apprentice",
"you_warrior",
"platonic_like"
],
[
"[You tell t_c that you're planning to take {PRONOUN/t_c/object} to explore some of the more distant reaches of c_nClan's territory tomorrow.]",
"[{PRONOUN/t_c/subject/CAP} {VERB/t_c/nod/nods}, but from the way {PRONOUN/t_c/subject} {VERB/t_c/don't/doesn't} meet your eyes, it's clear {PRONOUN/t_c/subject} {VERB/t_c/'re/'s} uneasy.]",
"[You ask t_c if it would help for you to walk {PRONOUN/t_c/object} through what to expect tomorrow, and {PRONOUN/t_c/poss} eyes widen.]",
"I... yeah, I think it would. Is that okay?",
"[You spend a bit going step-by-step through your plans for the places you're going tomorrow, and what {PRONOUN/t_c/subject} should expect to see at each location. When you're finished, t_c seems much more relaxed.]",
"Thank you, y_c. I really, really appreciate it."
]
],
"neurotic_warriorapprentice_SQ3": [
[
"they_neurotic",
"they_apprentice",
"you_apprentice"
],
[
"[Under m_n's oversight, you and t_c are practicing a simple battle technique where you dodge out of the way of an attack, and then lunge forward while your opponent is following through with their failed blow.]",
"[t_c springs out of the way of your swipes, but when it comes time for a counterattack, {PRONOUN/t_c/subject} {VERB/t_c/remain/remains} at least a tail-length away, batting at empty air.]",
"[You remind t_c that the goal is to hit {PRONOUN/t_c/poss} opponent. m_n points out that everyone's claws are sheathed, so no one is going to get hurt.]",
"R-right! I've got it!",
"[t_c nods, {PRONOUN/t_c/poss} fur fluffing at the attention, but when you resume the drill, {PRONOUN/t_c/poss}attacks haven't gotten any closer.]",
"[{PRONOUN/t_c/subject/CAP}'ll get it eventually, right?]"
]
],
"neurotic_warriorapprentice_SQ4": [
[
"they_neurotic",
"they_apprentice",
"you_warrior",
"you_apprentice",
"platonic_like",
"comfort"
],
[
"[You and t_c have been assigned to the same night patrol. The darkness presses into your pelts as you depart.]",
"[t_c stares upwards, wide-eyed, as haunting calls resonate from above.]",
"It's so... different out here at night.",
"[t_c presses against you and doesn't pull away until you're back at camp.]"
]
]
}
44 changes: 44 additions & 0 deletions resources/dicts/lifegen_talk/choice_dialogue.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3374,5 +3374,49 @@
"ignore": [
"[You don't care what t_c does. You have to worry about yourself.]"
]
},
"neurotic_skill_SQ1": {
"tags": [
"neurotic",
"no_kit",
"they_song",
"neutral",
"newleaf",
"greenleaf"
],
"intro": [
"[Beneath the gentle drumming of raindrops against the ground, you hear t_c softly humming.]",
"[{PRONOUN/t_c/subject/CAP} {VERB/t_c/tip/tips} {PRONOUN/t_c/poss} head back and forth, {PRONOUN/t_c/poss} eyes closed.]"
],
"intro_choices": {
"choice1": {
"text": "[Leave {PRONOUN/t_c/object} alone.]",
"next_scene": "alone"
},
"choice2": {
"text": "[Compliment {PRONOUN/t_c/poss} singing.]",
"next_scene": "compliment"
},
"choice3": {
"text": "[Ask {PRONOUN/t_c/object} to stop.]",
"next_scene": "stop"
}
},
"alone": [
"[You slip away. Knowing t_c, {PRONOUN/t_c/poss} song is for {PRONOUN/t_c/object} and {PRONOUN/t_c/object} alone.]"
],
"compliment": [
"[t_c's melody ends mid-note as {PRONOUN/t_c/subject} {VERB/t_c/jump/jumps}, {PRONOUN/t_c/poss} eyes flying open.]",
"O-oh, hi, y_c. You really like it?",
"I, um, really only sing or hum when it's raining, so it's harder to hear me.",
"I don't want to bother anyone, and I don't think I'm good or anything...",
"But thank you! You're, um, really kind."
],
"stop": [
"[t_c's melody ends mid-note as {PRONOUN/t_c/subject} {VERB/t_c/jump/jumps}, {PRONOUN/t_c/poss} eyes flying open.]",
"Oh, y_c! I'm sorry... I didn't realize you were there, or that anyone could hear me over the rain...",
"But, um, of course I'll stop! I don't want to annoy anyone.",
"[t_c smiles nervously and scurries away.]"
]
}
}
186 changes: 186 additions & 0 deletions resources/dicts/lifegen_talk/deputy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2348,5 +2348,191 @@
"[You can smell the blood as a border patrol gets back to camp. They must have gotten in a fight.]",
"[t_c breezes past you several times as they deal with the situation. They smell panicked.]"
]
],
"neurotic_deputy_SQ1": [
[
"they_neurotic",
"they_deputy",
"you_warrior",
"you_apprentice"
],
[
"Um, y_c? Do you have any preferences for who you'd like to be paired with on patrol?",
"I'm trying to organize it so that everyone's happy with their groups and patrol times.",
"It's kind of hard to figure out, but I don't want anyone to be upset with their assignments...",
"...or, um, upset with me."
]
],
"neurotic_deputy_SQ2": [
[
"they_neurotic",
"they_deputy",
"you_mediator",
"you_mediator_apprentice"
],
[
"Hey, y_c, I'm organizing patrols for tomorrow. Have you noticed any conflicts that I should keep in mind?",
"I don't want to put anyone together who's having a disagreement, you know? That could lead to an awkward situation at best...",
"...or something worse, like... like the two fighting, or them distracting the patrol from actual threats...",
"...or their bickering attracting Twolegs, or an o_cClan patrol noticing and thinking we're all unorganized and weak, or...",
"[You inform t_c of a few cats who probably wouldn't work well together right now, but assure {PRONOUN/t_c/object} that if {PRONOUN/t_c/subject} {VERB/t_c/make/makes} a mistake, it won't end in death and chaos.]"
]
],
"neurotic_deputy_SQ3": [
[
"they_neurotic",
"they_deputy",
"you_leader",
"respect"
],
[
"Hey, y_c? Thank you for trusting me enough to be your deputy.",
"I don't really think I'm the best cat for the job, but... um...",
"...your trust means a lot. I'm doing everything I can to make sure I've earned it."
]
],
"neurotic_deputy_SQ4": [
[
"they_neurotic",
"they_deputy",
"you_leader",
"respect",
"you_injured"
],
[
"[As you rest, half-asleep in the medicine cat den, you hear hesitant pawsteps approaching. After a moment, t_c's whisper breaks the silence.]",
"Hey, y_c. I just wanted to let you know that I'm handling the Clan while you're recovering.",
"I know you probably assumed that, but I... I guess I wanted to make sure you knew?",
"I really hope you're better soon. You're much better at all of this than me.",
"[t_c forces a laugh.]",
"But... take your time, and don't worry. I'm doing okay."
]
],
"neurotic_deputy_SQ5": [
[
"they_neurotic",
"they_deputy",
"you_warrior",
"you_elder",
"you_queen",
"you_medicine_cat",
"you_mediator",
"trust",
"platonic_like"
],
[
"I don't know if I can be leader, y_c. I don't even like thinking about the idea.",
"Making decisions for the whole Clan? Listening to every opinion and balancing it? Keeping the Clan safe?",
"Everyone says l_n chose me for a reason, but what if {PRONOUN/t_n/subject} chose wrong?"
]
],
"neurotic_deputy_SQ6": [
[
"they_neurotic",
"they_deputy",
"you_warrior",
"platonic_love",
"respect",
"littermate"
],
[
"I don't know how to say this, but you're not... upset that l_n made me deputy, right?",
"I've been thinking about that a lot recently, and I just wanted to say...",
"...Ever since we were kits, I thought that this would be you."
]
],
"neurotic_deputy_SQ7": [
[
"they_neurotic",
"they_deputy",
"you_warrior",
"you_leader",
"you_apprentice"
],
[
"Um, y_c, would you be willing to join the border patrol this afternoon?",
"The dawn patrol saw signs of Twolegs on the territory, so I want every group who leaves camp to have one or two more members than usual.",
"I don't think you'll actually run into any trouble, but taking precautions can't hurt!"
]
],
"neurotic_deputy_SQ8": [
[
"they_neurotic",
"they_deputy",
"no_kit",
"platonic_like"
],
[
"[You find t_c sitting alone on the edge of camp, an uneaten piece of fresh-kill between {PRONOUN/t_c/poss} front paws.]",
"I heard r_w complaining about going on the dawn patrol this morning.",
"Do you happen to know... {VERB/r_w/were/was} {PRONOUN/r_w/subject} just frustrated about the patrol, or {VERB/r_w/are/is} {PRONOUN/r_w/subject} upset with me?",
"It's kind of hard to detangle the two, sometimes."
]
],
"deputyshunned_H1": [
[
"they_shunned",
"they_deputy",
"no_kit",
"you_any"
],
[
"Quite a choice to come up to me, isn't it?",
"Oh, whatever, I learned my lesson. There is no need to act like I didn't.",
"Sometimes you just have to recognize that you failed and take that failure in stride."
]
],
"deputyshunned_H2": [
[
"they_shunned",
"they_deputy",
"they_leader",
"you_kitten"
],
[
"Hello, little one. Where are your parents?",
"Hm. You shouldn't be running around idly, that is how you get hurt.",
"... Shoo."
]
],
"deputyshunned_H3": [
[
"they_shunned",
"they_deputy",
"you_any",
"platonic_like"
],
[
"Your bravery never failed to surprise me, even now.",
"Are you not afraid of the repercussions you will get? Speaking to me?",
"... You are one strange cat."
]
],
"deputyshunned_H4": [
[
"they_shunned",
"they_deputy",
"you_any",
"no_kit",
"hate"
],
[
"[t_c looks down upon you with a scowl, baring teeth.]",
"Must you bother me when I have no duty, nothing to lose? You may think being shunned will stop me but...",
"I'm not afraid to admit that it does the opposite."
]
],
"deputyshunned_H5": [
[
"they_shunned",
"they_deputy",
"you_any",
"no_kit",
"neutral"
],
[
"[t_c closes {PRONOUN/t_c/poss} eyes. {PRONOUN/t_c/subject/CAP} must be ignoring you.]",
"[... Or the whole Clan.]"
]
]
}
35 changes: 35 additions & 0 deletions resources/dicts/lifegen_talk/elder.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1212,5 +1212,40 @@
"*Sigh* Can't you see I have more important things to do, y_c?",
"Go back to catching mice, or whatever."
]
],
"eldershunned_H1": [
[
"they_shunned",
"they_elder",
"you_any"
],
[
"To shun me in my old age... How dare they? Such little respect."
]
],
"eldershunned_H2": [
[
"they_shunned",
"they_elder",
"you_any",
"you_younger",
"dislike"
],
[
"My bones might be croaking and my health might be deteriorating, but that won't stop me from hurting you, youngling."
]
],
"eldershunned_H3": [
[
"they_shunned",
"they_elder",
"you_any"
],
[
"Ughh, finally, I was granted peace and quiet away from these offending o_cClan members.",
"And yet you still bother me.",
"Scram!"
]
]

}
Loading

0 comments on commit c91674b

Please sign in to comment.