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

Life and death update #2719

Merged
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
0dde90f
Update leader_life.json
Yzzuwyzzuf Sep 14, 2024
de2f8b0
Update leader_life.json
Yzzuwyzzuf Sep 14, 2024
2d97905
Update general.json
Yzzuwyzzuf Sep 14, 2024
b766360
Update general.json
Yzzuwyzzuf Sep 14, 2024
9bb003f
Update general.json
Yzzuwyzzuf Sep 14, 2024
dc84cbe
Update general.json
Yzzuwyzzuf Sep 14, 2024
d0d7f78
Update leader_death.json
Yzzuwyzzuf Sep 14, 2024
ce9f2f5
Update leader_life.json
Yzzuwyzzuf Sep 14, 2024
4de1782
Merge branch 'ClanGenOfficial:development' into Ondeath-lines
Yzzuwyzzuf Sep 18, 2024
46664bf
Update pregnancy.json
Yzzuwyzzuf Sep 18, 2024
fe7b729
Update general.json
Yzzuwyzzuf Sep 18, 2024
42a72a3
Update general.json
Yzzuwyzzuf Sep 18, 2024
d9d6972
Update general.json
Yzzuwyzzuf Sep 22, 2024
a184bf7
Update exiled.json
Yzzuwyzzuf Sep 22, 2024
3043aef
Update general.json
Yzzuwyzzuf Sep 22, 2024
6de0043
Merge branch 'ClanGenOfficial:development' into life-and-death-update
Yzzuwyzzuf Sep 22, 2024
6da4b02
Update general.json
Yzzuwyzzuf Sep 22, 2024
7c86aa1
Update general.json
Yzzuwyzzuf Sep 22, 2024
142ca7b
Update elder.json
Yzzuwyzzuf Sep 22, 2024
a4ae2bd
Update exiled.json
Yzzuwyzzuf Sep 22, 2024
0c984cc
Update exiled.json
Yzzuwyzzuf Sep 22, 2024
d63287a
Update pregnancy.json
Yzzuwyzzuf Sep 22, 2024
e538cbb
Update pregnancy.json
Yzzuwyzzuf Sep 22, 2024
2765b39
Update pregnancy.json
Yzzuwyzzuf Sep 22, 2024
0a6c621
Update pregnancy.json
Yzzuwyzzuf Sep 22, 2024
49c864d
Update pregnancy.json
Yzzuwyzzuf Sep 22, 2024
d9d040d
Update resources/dicts/conditions/pregnancy.json
Yzzuwyzzuf Sep 23, 2024
361e142
Update pregnancy.json
Yzzuwyzzuf Sep 23, 2024
7dc40f9
Update pregnancy.json
Yzzuwyzzuf Sep 23, 2024
89fdf59
Update pregnancy.json
Yzzuwyzzuf Sep 23, 2024
7c4f4e1
Update exiled.json
Yzzuwyzzuf Sep 23, 2024
4c82c3a
Update general.json
Yzzuwyzzuf Sep 23, 2024
c73a4b6
Update resources/dicts/thoughts/dead/starclan/general.json
Yzzuwyzzuf Sep 23, 2024
e6239dc
Update general.json
Yzzuwyzzuf Sep 23, 2024
f504af5
Update general.json
Yzzuwyzzuf Sep 23, 2024
efc56ae
Update leader_life.json
Yzzuwyzzuf Sep 23, 2024
c1593a6
Update pregnancy.json
Yzzuwyzzuf Sep 23, 2024
135ef41
Update resources/dicts/conditions/pregnancy.json
Yzzuwyzzuf Sep 23, 2024
0e48dfd
Update leader_life.json
Yzzuwyzzuf Sep 23, 2024
143a588
Update general.json
Yzzuwyzzuf Sep 23, 2024
ec5d4b3
Update pregnancy.json
Yzzuwyzzuf Sep 23, 2024
e87c2d7
Update resources/dicts/conditions/pregnancy.json
Yzzuwyzzuf Sep 23, 2024
51d57dc
Update pregnancy.json
Yzzuwyzzuf Sep 23, 2024
ee0dff0
Update pregnancy.json
Yzzuwyzzuf 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
46 changes: 37 additions & 9 deletions resources/dicts/conditions/pregnancy.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"announcement": [
"m_c announced that {PRONOUN/m_c/subject} {VERB/m_c/are/is} expecting kits."
"m_c announced that {PRONOUN/m_c/subject} {VERB/m_c/are/is} expecting kits.",
"m_c had been secretive for a while now and nobody could even begin to guess what about... until today, that is when m_c announced {PRONOUN/m_c/poss} pregnancy!",
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
"The entire Clan could see the signs way before m_c did. Everyone urged {PRONOUN/m_c/object} to visit the medicine den to no avail. The Clan nearly gave up until finally, m_c announced {PRONOUN/m_c/poss} pregnancy.",
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
"m_c's been worried sick over a recent illness {PRONOUN/m_c/subject} couldn't quite explain until a recent visit to the medicine den made everything all clear. m_c's pregnant!"
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
],
"litter_guess": [
"m_c hopes the litter will be small - {PRONOUN/m_c/subject} {VERB/m_c/feel/feels} overwhelmed at the idea of a big litter.",
Expand All @@ -16,7 +19,15 @@
"All the old tales about queens fighting to the death to protect {PRONOUN/m_c/poss} babies suddenly make sense to m_c. {PRONOUN/m_c/subject/CAP} {VERB/m_c/feel/feels} up to fighting the sun itself, powered by the love {PRONOUN/m_c/subject} {VERB/m_c/feel/feels} for {PRONOUN/m_c/poss} yet-to-arrive litter.",
"m_c feels like {PRONOUN/m_c/subject}{VERB/m_c/'re/'s} eating enough at each meal to feed the whole Clan - {PRONOUN/m_c/subject}{VERB/m_c/'re/'s} predicting a big litter. Or perhaps one very plump kit.",
"m_c has begun hoarding little trinkets, stashing bits of fluff and feather and shiny smooth rocks into {PRONOUN/m_c/poss} birthing nest to stock it with kitten toys.",
"m_c invites {PRONOUN/m_c/poss} friends to feel {PRONOUN/m_c/poss} litter kick - surely these kittens are going to be talented warriors, because, well - ow."
"m_c invites {PRONOUN/m_c/poss} friends to feel {PRONOUN/m_c/poss} litter kick - surely these kittens are going to be talented warriors, because, well - ow.",
"m_c thinks {PRONOUN/m_c/subject}'ll have a small litter.",
"m_c hopes {PRONOUN/m_c/subject}'ll have a small litter. No way could {PRONOUN/m_c/subject} handle too many kits.",
"m_c thinks {PRONOUN/m_c/subject}'ll have a large litter.",
"m_c hopes {PRONOUN/m_c/subject}'ll have a large litter. m_c always wanted a big family after all.",
"m_c is unsure how many kits {PRONOUN/m_c/subject}'ll have, nor {VERB/m_c/do/does} {PRONOUN/m_c/subject} care. As long as they're happy and healthy, that's all that matters.",
"m_c dosen't know or care how many kits {PRONOUN/m_c/subject}'ll have.",
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
"m_c, citing mothers' intuition, claims {PRONOUN/m_c/subject} know {PRONOUN/m_c/subject}'ll have a small litter.",
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
"m_c, citing mothers' intuition, claims {PRONOUN/m_c/subject} know {PRONOUN/m_c/subject}'ll have a big litter."
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
],


Expand All @@ -29,7 +40,10 @@
" Pregnancy sucks. m_c gives in and moves into the nursery.",
" It's time to settle into the nursery and make sure everything is perfectly prepared.",
" {PRONOUN/m_c/subject/CAP}{VERB/m_c/'re/'s} scolded into taking up a nest in the nursery, despite {PRONOUN/m_c/poss} best protests.",
" {PRONOUN/m_c/subject/CAP}{VERB/m_c/'re/'s} keen to move into the nursery quickly, as though by doing so {PRONOUN/m_c/poss} litter will get the message and appear sooner."
" {PRONOUN/m_c/subject/CAP}{VERB/m_c/'re/'s} keen to move into the nursery quickly, as though by doing so {PRONOUN/m_c/poss} litter will get the message and appear sooner.",
" Despite {PRONOUN/m_c/object} protests, {PRONOUN/m_c/subject} has no choice but to settle in the nursery as nobody wants to let {PRONOUN/m_c/object} work til the kits arrive.",
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
" {PRONOUN/m_c/subject/CAP} couldn't settle into the nursery fast enough.",
" So many things could happen to m_c and {PRONOUN/m_c/poss} kits if {PRONOUN/m_c/subject} kept working, no way did {PRONOUN/m_c/subject} want anything to happen to them so into the nursery {PRONOUN/m_c/subject} go."
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
],
"minor_severity": [
" {PRONOUN/m_c/subject/CAP} won't be moving into the nursery just yet.",
Expand All @@ -38,7 +52,11 @@
" {PRONOUN/m_c/subject/CAP} {VERB/m_c/aren't/isn't} keen on being confined to the nursery just yet.",
" Life goes on for now - {PRONOUN/m_c/subject}'ll move into the nursery, but not this moon.",
" {PRONOUN/m_c/subject/CAP}{VERB/m_c/'re/'s} still full of energy and moving to the nursery would feel stifling - maybe next moon.",
" Surely it's not time to move into the nursery, though."
" Surely it's not time to move into the nursery, though.",
" {PRONOUN/m_c/subject/CAP} couldn't imagine being trapped in the nursery yet though and insists {PRONOUN/m_c/subject} can keep working.",
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
" {PRONOUN/m_c/subject/CAP} dare any cat to force {PRONOUN/m_c/object} into that stuffy old nursery and, to {PRONOUN/m_c/object} delight, no cat wanted to. Maybe next moon but not now.",
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
" {PRONOUN/m_c/object/CAP} wouldn't dare settle down and let others work while {PRONOUN/m_c/subject} rested! Things continue as usual for now.",
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
" Theres so much that needs to be done though! {PRONOUN/m_c/subject/CAP} just can't settle down yet!"
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
],
"comment": [
"both the minor and major severity strings will appear in conjunction with either a litter guess or an announcement. Write them accordingly!",
Expand Down Expand Up @@ -68,7 +86,8 @@
"r_c has been impatient for the end of m_c's pregnancy, so when {PRONOUN/r_c/subject} {VERB/r_c/hear/hears} m_c has gone into labor, {PRONOUN/r_c/subject} {VERB/r_c/drop/drops} what {PRONOUN/r_c/subject}{VERB/r_c/'re/'s} doing and {VERB/r_c/sprint/sprints} for the nursery, where m_c is bringing a {insert} into the world.",
"m_c is so, so grateful that {PRONOUN/m_c/poss} adorable {insert} is here - both thrilled to meet them, and thrilled that r_c can take a turn parenting while m_c finally takes a little break from the stuffy air of the nursery.",
"m_c and r_c were so busy worrying about and looking forward to the birth that it's only now that they look at their {insert} that they wonder what to name them.",
"With r_c purring against {PRONOUN/m_c/poss} back, m_c feels like {PRONOUN/m_c/subject}{VERB/m_c/'re/'s} going to explode with love, looking at {PRONOUN/m_c/poss} tiny new {insert}."
"With r_c purring against {PRONOUN/m_c/poss} back, m_c feels like {PRONOUN/m_c/subject}{VERB/m_c/'re/'s} going to explode with love, looking at {PRONOUN/m_c/poss} tiny new {insert}.",
"While on a walk in the territory with r_c, m_c unexpectedly had {PRONOUN/m_c/object} {insert} with help from {PRONOUN/m_c/poss} mate."

],
"dead_mate": [
Expand All @@ -90,7 +109,11 @@
"m_c secretly had a {insert} with r_c.",
"m_c hopes that {PRONOUN/m_c/poss} {insert} doesn't look too much like r_c, otherwise questions might follow.",
"r_c goes to visit m_c in the nursery with {PRONOUN/m_c/poss} new {insert}, on a completely innocent mission to deliver food to the new parent.",
"The newly arrived {insert} that m_c has just given birth to looks suspiciously like r_c. "
"The newly arrived {insert} that m_c has just given birth to looks suspiciously like r_c. ",
"No one wanted to ruin such a happy occasion but... it didn't take a genius to notice how m_c's {insert} looked suspiciously like r_c when they shouldn't...",
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
"m_c can see it, m_c's mate can see it, r_c can see it, everyone in c_n can see the new {insert} look too much like r_c to be coincidence...",
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
"Ever since the birth, rumor's gone around that m_c's {insert} belong to r_c's and not {PRONOUN/m_c/poss} mate and while no one has confirmed anything, no one really has to when you just look at them...",
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
"m_c's mate is such a wonderful cat deserving of being a parent... so why does m_c's {insert} look more like r_c instead?"
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
],
"death": [
"Later, as the medicine cat wails with m_c's blood streaked through their pelt and a warrior comes to move the body for the vigil, no one knows what to do with the {insert}.",
Expand All @@ -101,7 +124,8 @@
"However, m_c is too far gone for the herbs {PRONOUN/m_c/subject}{VERB/m_c/'re/'s} given to choke down to fix this blood loss. The cats are helpless as m_c slowly slips to StarClan.",
"Later - hours later, eons later - the {insert} mews. Outside, m_c's body cools, the toll of birth too much for {PRONOUN/m_c/object}.",
"Though all looks fine, the Clan will wake tomorrow to discover m_c's body cold in the nursery, {PRONOUN/m_c/poss} {insert} mewing in vain for their parent.",
"Though birth is always considered a difficult and risky event, no one thought they'd lose m_c to it. Not after the {insert} was all born and seemed fine... they thought the blood loss was under control."
"Though birth is always considered a difficult and risky event, no one thought they'd lose m_c to it. Not after the {insert} was all born and seemed fine... they thought the blood loss was under control.",
"Everyone knew m_c was the most excited of everyone to meet {PRONOUN/m_c/poss} kits... It was a cruel twist of fate however, as m_c's body lay cooling leaving the {insert} without {PRONOUN/m_c/object}."
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
],
"difficult_birth": [
"The birth was stressful and m_c lost a lot of blood.",
Expand All @@ -112,7 +136,9 @@
"m_c wasn't expecting this birth to be so intensely painful.",
"Though everyone says giving birth is difficult, m_c feels like this one has been worse than most.",
"This will all be worth it, m_c groans, promises {PRONOUN/m_c/self} as the pains of afterbirth rock {PRONOUN/m_c/poss} exhausted and bleeding body.",
"m_c chokes down the herbs given to {PRONOUN/m_c/object}, retching at the taste but knowing {PRONOUN/m_c/subject} {VERB/m_c/need/needs} them to stop the blood loss. "
"m_c chokes down the herbs given to {PRONOUN/m_c/object}, retching at the taste but knowing {PRONOUN/m_c/subject} {VERB/m_c/need/needs} them to stop the blood loss.",
"m_c wonders if {PRONOUN/m_c/poss} body will ever recover from the painful birth and blood loss.",
"It took the medicine cat everything they had but m_c just about pulled through."
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
],
"outside_alone": [
"Rumors reach the Clan that m_c gave birth to a {insert}."
Expand All @@ -123,7 +149,9 @@
],
"outside_death": [
"Some say m_c didn't make it.",
"Some say m_c would have needed a medicine cat to survive."
"Some say m_c would have needed a medicine cat to survive.",
"Hopefully those kits have someone to care for them since m_c apparently didn't make it...",
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
"If only m_c had a medicine cat with {PRONOUN/m_c/object}..."
],
"lead_death": [
"m_c lost one of {PRONOUN/m_c/poss} nine lives, but gave birth to a {insert}.",
Expand Down
34 changes: 9 additions & 25 deletions resources/dicts/thoughts/dead/darkforest/exiled.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@
"id": "exiled_df_dead_thoughts",
"thoughts": [
"Thinks of the disapproving glares of {PRONOUN/m_c/poss} ex-Clanmates while {PRONOUN/m_c/subject} {VERB/m_c/train/trains}",
"Is watching {PRONOUN/m_c/poss} old Clan with scorn, hoping for an opportunity to get back at them",
"Wants to make {PRONOUN/m_c/poss} old leader pay for exiling {PRONOUN/m_c/object}"
"Will never forget the looks of scorn on {PRONOUN/m_c/poss} Clanmates faces",
"Resents the Clan that exiled {PRONOUN/m_c/object}"
]
},
{
"id": "exiled_df_evil",
"thoughts": [
"Is imagining the tree {PRONOUN/m_c/subject}{VERB/m_c/'re/'s} clawing at is one of {PRONOUN/m_c/poss} ex-Clanmates",
"Trains extra hard, waiting for an opportunity to get {PRONOUN/m_c/poss} revenge",
"Is the first to volunteer for training",
"Knows {PRONOUN/m_c/subject} {VERB/m_c/were/was} right to do what {PRONOUN/m_c/subject} did",
"Wants to make {PRONOUN/m_c/poss} old leader pay for exiling {PRONOUN/m_c/object}",
"Is watching {PRONOUN/m_c/poss} old Clan with scorn, hoping for an opportunity to get back at them",
"Is cursing {PRONOUN/m_c/poss} old Clan"
],
"main_trait_constraint": [
Yzzuwyzzuf marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -29,13 +30,11 @@
{
"id": "exiled_df_kind",
"thoughts": [
"Truly believes {PRONOUN/m_c/subject}{VERB/m_c/'re/'s} misunderstood",
"Is sobbing quietly",
"Has lost all hope",
"Wants nothing more then to fade away",
"Is begging a shadowy cat for mercy to no avail",
"Is deeply regretting what {PRONOUN/m_c/subject} did to get exiled and end up here",
"Is reflecting on what {PRONOUN/m_c/subject} did and why {PRONOUN/m_c/subject} ended up in the Dark Forest"
"Truly believes {PRONOUN/m_c/subject}{VERB/m_c/'re/'s} misunderstood",
"Wonders if what {PRONOUN/m_c/subject} did was truly right...",
"Is begging StarClan for forgiveness",
"Wishes {PRONOUN/m_c/subject} could apologize to c_n for everything {PRONOUN/m_c/subject}{VERB/m_c/'ve/'s} done",
"Is deeply regretting what {PRONOUN/m_c/subject} did to get exiled and end up here"
],
"main_trait_constraint": [
"compassionate",
Expand All @@ -47,20 +46,5 @@
"wise",
"sincere"
]
},
{
"id": "exiled_df_sneaky",
"thoughts": [
"Isn't surprised in the slightest as to why {PRONOUN/m_c/subject} ended up here",
"Narrowly avoided encountering another shadowy cat",
"Talked {PRONOUN/m_c/poss} way out of a training session"
],
"main_trait_constraint": [
"sneaky",
"arrogant",
"shameless",
"wise",
"cunning"
]
}
]
Loading