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

[BUGFIX] various text fixes #2712

Merged
merged 23 commits into from
Sep 22, 2024
Merged

[BUGFIX] various text fixes #2712

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
c351677
soo many fixes
selkirks Sep 20, 2024
c8831d5
more fixes (mostly capitlizations)
selkirks Sep 20, 2024
ac80a24
fix scar issue
selkirks Sep 20, 2024
02be4d7
Update resources/dicts/thoughts/alive/general.json
selkirks Sep 21, 2024
7e2a11a
Update resources/dicts/patrols/beach/med/leaf-fall.json
selkirks Sep 21, 2024
870fd87
Update resources/dicts/patrols/general/medcat.json
selkirks Sep 21, 2024
0bc537a
Update resources/dicts/patrols/mountainous/training/leaf-fall.json
selkirks Sep 21, 2024
aca79e7
Update resources/dicts/relationship_events/normal_interactions/dislik…
selkirks Sep 21, 2024
b35e443
Update resources/dicts/thoughts/alive/general.json
selkirks Sep 21, 2024
7183dd9
remove unecessary code
selkirks Sep 21, 2024
35d1e21
Merge branch 'misc-fix' of https://github.com/selkirks/clangen into m…
selkirks Sep 21, 2024
999931d
clearing -> cleaning
selkirks Sep 21, 2024
0a372cb
hyphenate freshkill
selkirks Sep 21, 2024
e871270
event text fixes
selkirks Sep 21, 2024
6bd0999
more event fixes
selkirks Sep 21, 2024
9f518e9
even more text fixes
selkirks Sep 21, 2024
32b0cd1
even more text fixes
selkirks Sep 21, 2024
4db28ed
more text fixes
selkirks Sep 21, 2024
7a0fa77
fix hide and seek
selkirks Sep 21, 2024
68bc21a
leafbare fixes
selkirks Sep 21, 2024
d080f56
fix season constraint thoughts
selkirks Sep 21, 2024
3a3f69c
Merge branch 'development' into misc-fix
selkirks Sep 21, 2024
24fd595
remvoe duplicate event
selkirks Sep 21, 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/death/beach.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion resources/dicts/events/injury/general.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6874,7 +6874,7 @@
"newleaf"
],
"weight": 20,
"event_text": "Camp was supposed to be safe, but m_c found bees trying to form a hive in a corner of camp. Annoyed by {PRONOUN/m_c/poss} buzzing, m_c attacks them, and got swarmed by bees.",
"event_text": "Camp was supposed to be safe, but m_c found bees trying to form a hive in a corner of camp. Annoyed by their buzzing, m_c attacked them, and got swarmed by bees.",
"m_c": {
"age": [
"any"
Expand Down
2 changes: 1 addition & 1 deletion resources/dicts/events/misc/general.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2160,7 +2160,7 @@
"location": ["any"],
"season": ["any"],
"weight": 10,
"event_text": "m_c pulls r_c to the side, quietly asking {PRONOUN/r_c/object} abou {PRONOUN/r_c/poss} crush on a fellow Clanmate.",
"event_text": "m_c pulls r_c to the side, quietly asking {PRONOUN/r_c/object} about {PRONOUN/r_c/poss} crush on a fellow Clanmate.",
"m_c":{
"status":["mediator", "mediator apprentice"]
},
Expand Down
2 changes: 1 addition & 1 deletion resources/dicts/names/names.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
"Cloudy", "Cotton", "Crocus", "Crow", "Dandelion", "Day", "Doe", "Dove", "Egg", "Ember", "Fig", "Fire", "Flame",
"Flare", "Flurry", "Freeze", "Frost", "Frozen", "Ghost", "Glint", "Gossamer", "Grackle", "Hawthorn", "Heather",
"Hickory", "Hollyhock", "Ibis", "Ice", "Icicle", "Icy", "Jasmine", "Larkspur", "Log", "Lyre", "Magpie", "Midnight",
"Mist", "Morel", "Mulberry", "Night", "Oleander", "Orchid", "Otter", "Owl", "Pebble", "Plox", "Pipit", "Plume",
"Mist", "Morel", "Mulberry", "Night", "Oleander", "Orchid", "Otter", "Owl", "Pebble", "Phlox", "Pipit", "Plume",
"Privet", "Rime", "Rock", "Rue", "Saffron", "Scale", "Scrub", "Shade", "Shadow", "Shatter", "Smoke", "Snapdragon",
"Snow", "Snowy", "Soot", "Spindle", "Stag", "Stone", "Storm", "Sun", "Swan", "Teasel", "Tree", "Twig", "Twilight",
"Verbena", "Vervain", "Violet", "Vole", "Warbler", "Wisp"
Expand Down
4 changes: 2 additions & 2 deletions resources/dicts/patrols/beach/med/leaf-bare.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2643,7 +2643,7 @@
]
},
{
"text": "When the failed patrol arrives back at camp, r_c is shivering and cold. Digging into the leaf-bare ground in a search for bulbs that weren't there was both unproductive and senseless. Luckily r_c's clanmates help to keep the chill from getting worse.",
"text": "When the failed patrol arrives back at camp, r_c is shivering and cold. Digging into the leaf-bare ground in a search for bulbs that weren't there was both unproductive and senseless. Luckily r_c's Clanmates help to keep the chill from getting worse.",
"exp": 0,
"weight": 20,
"relationships": [
Expand Down Expand Up @@ -2832,7 +2832,7 @@
]
},
{
"text": "When the failed patrol arrives back at camp, r_c is shivering and cold. Digging into the leaf-bare ground in a search for bulbs that weren't there was both unproductive and senseless. With r_c's clanmates by {PRONOUN/r_c/poss} side, the chill was prevented from seeping in.",
"text": "When the failed patrol arrives back at camp, r_c is shivering and cold. Digging into the leaf-bare ground in a search for bulbs that weren't there was both unproductive and senseless. With r_c's Clanmates by {PRONOUN/r_c/poss} side, the chill was prevented from seeping in.",
"exp": 0,
"weight": 20,
"relationships": [
Expand Down
2 changes: 1 addition & 1 deletion resources/dicts/patrols/beach/med/leaf-fall.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5463,7 +5463,7 @@
"weight": 5
},
{
"text": "It takes little intelligence to recognize deathberries but a great deal to collect {PRONOUN/s_c/object} anyway. If s_c can dry {PRONOUN/s_c/object} out, these berries will be sufficient for c_n for years to come. By using {PRONOUN/s_c/poss} weight to snap off one of the bush's branches and then carefully carrying it back to camp, s_c manages to bring {PRONOUN/s_c/object} safely home.",
"text": "It takes little intelligence to recognize deathberries but a great deal to collect them anyway. If s_c can dry them out, these berries will be sufficient for c_n for years to come. By using {PRONOUN/s_c/poss} weight to snap off one of the bush's branches and then carefully carrying it back to camp, s_c manages to bring them safely home.",
selkirks marked this conversation as resolved.
Show resolved Hide resolved
"exp": 30,
"weight": 20,
"stat_skill": ["CLEVER,1"]
Expand Down
4 changes: 2 additions & 2 deletions resources/dicts/patrols/general/border.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,7 @@
}
],
"history_text": {
"scar": "m_c was scarred when {PRONOUN/p_l/subject} tried to sneak across the o_c_n border."
"scar": "m_c was scarred when {PRONOUN/m_c/subject} tried to sneak across the o_c_n border."
},
"relationships": [
{
Expand Down Expand Up @@ -1258,7 +1258,7 @@
}
],
"history_text": {
"scar": "m_c was scarred when {PRONOUN/p_l/subject} tried to sneak across the o_c_n border."
"scar": "m_c was scarred when {PRONOUN/m_c/subject} tried to sneak across the o_c_n border."
},
"relationships": [
{
Expand Down
4 changes: 2 additions & 2 deletions resources/dicts/patrols/general/hunting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3733,7 +3733,7 @@
]
},
{
"text": "However much s_c dislikes r_c, feeding the clan is more important. They manage to get through the patrol without any major disputes - and catch a decent amount of prey, too.",
"text": "However much s_c dislikes r_c, feeding the Clan is more important. They manage to get through the patrol without any major disputes - and catch a decent amount of prey, too.",
"exp": 10,
"weight": 40,
"prey": ["medium"],
Expand Down Expand Up @@ -3831,7 +3831,7 @@
}
],
"history_text": {
"scar": "m_c was scarred when a clanmate lashed out at {PRONOUN/m_c/object} while they were bickering on patrol.",
"scar": "m_c was scarred when a Clanmate lashed out at {PRONOUN/m_c/object} while they were bickering on patrol.",
"reg_death": "m_c died after a small injury progressed to something worse.",
"lead_death": "died after a small injury progressed to something worse"
}
Expand Down
8 changes: 4 additions & 4 deletions resources/dicts/patrols/general/medcat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
"herbs": ["random_herbs"]
},
{
"text": "The sunlight feels great, however r_c presses on, wanting to be able to take care of {PRONOUN/r_c/poss} clanmates.",
"text": "The sunlight feels great, however r_c presses on, wanting to be able to take care of {PRONOUN/r_c/poss} Clanmates.",
"exp": 20,
"weight": 20,
"stat_trait":[
Expand Down Expand Up @@ -350,7 +350,7 @@
]
},
{
"text": "s_c laid in the patch of sun, huffing, {PRONOUN/s_c/subject} deserved a nice break, away from all {PRONOUN/s_c/poss} clanmates. {PRONOUN/s_c/subject/CAP} could always just say {PRONOUN/s_c/subject} failed to find any herbs after all.",
"text": "s_c laid in the patch of sun, huffing, {PRONOUN/s_c/subject} deserved a nice break, away from all {PRONOUN/s_c/poss} Clanmates. {PRONOUN/s_c/subject/CAP} could always just say {PRONOUN/s_c/subject} failed to find any herbs after all.",
selkirks marked this conversation as resolved.
Show resolved Hide resolved
"exp": 0,
"weight": 20,
"stat_trait":[
Expand Down Expand Up @@ -563,7 +563,7 @@
]
},
{
"text": "p_l eyes go wide, fur puffing up, and tell r_c that {PRONOUN/r_c/poss} dream is a warning of death and destruction, thoroughly freaking r_c out and bringing unease to the patrol.",
"text": "p_l's eyes go wide, fur puffing up, and tells r_c that {PRONOUN/r_c/poss} dream is a warning of death and destruction, thoroughly freaking r_c out and bringing unease to the patrol.",
selkirks marked this conversation as resolved.
Show resolved Hide resolved
"exp": 0,
"weight": 20,
"art": "gen_train_argueMM",
Expand Down Expand Up @@ -1024,7 +1024,7 @@
]
},
{
"text": "p_l eyes go wide, fur puffing up, and tells the apprentice that {PRONOUN/app1/poss}'s dream is a warning of death and destruction, thoroughly freaking app1 out.",
"text": "p_l's eyes go wide, fur puffing up, and tells the apprentice that {PRONOUN/app1/poss}'s dream is a warning of death and destruction, thoroughly freaking app1 out.",
selkirks marked this conversation as resolved.
Show resolved Hide resolved
"exp": 0,
"weight": 20,
"art": "gen_train_argueMA",
Expand Down
2 changes: 1 addition & 1 deletion resources/dicts/patrols/general/training.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9357,7 +9357,7 @@
]
},
{
"text": "s_c would love to be as strong as silverpelt, to be able to move the souls of dead cats so easily...",
"text": "s_c would love to be as strong as Silverpelt, to be able to move the souls of dead cats so easily...",
"exp": 30,
"weight": 20,
"can_have_stat": ["not_pl_rc"],
Expand Down
2 changes: 1 addition & 1 deletion resources/dicts/patrols/mountainous/training/leaf-fall.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@
]
},
{
"text": "s_c can't help but be overly fascinated as p_l speaks about how a warrior was so powerful that they needed to tear a hole in silverpelt just to be able to stop them. s_c hopes to one day be that powerful.",
"text": "s_c can't help but be overly fascinated as p_l speaks about how a warrior was so powerful that they needed to tear a hole in Silverpelt just to be able to stop them. s_c hopes to one day be that powerful.",
selkirks marked this conversation as resolved.
Show resolved Hide resolved
"exp": 30,
"weight": 20,
"can_have_stat": ["not_pl_rc"],
Expand Down
2 changes: 1 addition & 1 deletion resources/dicts/patrols/other_clan_hostile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3582,7 +3582,7 @@
]
},
{
"text": "The hatred between them is no secret - r_c has said, in the past, that the world would be better off without p_l in it. But when o_c_n puts that to the test, battling against the border patrol, r_c puts {PRONOUN/r_c/poss} back to p_l like {PRONOUN/r_c/subject} would any of {PRONOUN/r_c/poss} other clanmates, fighting just as fiercely to protect {PRONOUN/p_l/poss} flank. Maybe p_l is insufferable, but fox-dung if {PRONOUN/r_c/subject}'ll let o_c_n take them!",
"text": "The hatred between them is no secret - r_c has said, in the past, that the world would be better off without p_l in it. But when o_c_n puts that to the test, battling against the border patrol, r_c puts {PRONOUN/r_c/poss} back to p_l like {PRONOUN/r_c/subject} would any of {PRONOUN/r_c/poss} other Clanmates, fighting just as fiercely to protect {PRONOUN/p_l/poss} flank. Maybe p_l is insufferable, but fox-dung if {PRONOUN/r_c/subject}'ll let o_c_n take them!",
"exp": 50,
"weight": 5,
"relationships": [
Expand Down
2 changes: 1 addition & 1 deletion resources/dicts/relationship_events/normal_interactions/comfortable/decrease.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"m_c feels a chill after noticing r_c is nearby.",
"Watching r_c stalk silently around camp makes m_c feel uneasy.",
"m_c doesn't like the way r_c seems to overwhelm the camp with {PRONOUN/r_c/poss} presence.",
"Even though r_c is a respectable clanmate, m_c can't help but think {PRONOUN/r_c/subject} might be up to no good..."
"Even though r_c is a respectable Clanmate, m_c can't help but think {PRONOUN/r_c/subject} might be up to no good..."
],
"random_trait_constraint": [
"bloodthirsty",
Expand Down
2 changes: 1 addition & 1 deletion resources/dicts/relationship_events/normal_interactions/dislike/decrease.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"interactions": [
"m_c realized that {PRONOUN/m_c/subject} {VERB/m_c/were/was} too harsh in {PRONOUN/m_c/poss} judgment of r_c.",
"m_c spends some time with r_c and they both end up understanding each other a little better.",
"m_c is rethinking how {PRONOUN/m_c/subject} feel about r_c and gives {PRONOUN/r_c/object} another chance.",
"m_c is rethinking how {PRONOUN/m_c/subject} {verb/m_c/feel/feels} about r_c and gives {PRONOUN/r_c/object} another chance.",
"m_c didn't see r_c at all today and admittedly was a little dissapointed.",
"m_c and r_c apologized over something petty they both did to each other."
]
Expand Down
6 changes: 3 additions & 3 deletions resources/dicts/relationship_events/normal_interactions/dislike/increase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@
"m_c finds r_c to be an eyesore.",
"m_c daydreams about killing r_c...",
"m_c doesn't even pretend to hide how much {PRONOUN/m_c/subject} hate r_c.",
"m_c lunged at r_c but was held back by a clanmate.",
"m_c lunged at r_c but was held back by a Clanmate.",
"m_c hopes r_c ends up in the Dark Forest.",
"m_c prayed to StarClan for r_c's downfall to come quick."
]
Expand All @@ -410,9 +410,9 @@
"m_c accuses r_c of not putting the Clan first.",
"m_c accused r_c of leading the Clan toward the Dark Forest.",
"m_c wonders what stupid decision r_c will make next that'll harm the Clan.",
"m_c said aloud how {PRONOUN/m_c/subject} couldn't wait for m_c to die so that someone better could become leader.",
"m_c said aloud how {PRONOUN/m_c/subject} couldn't wait for r_c to die so that someone better could become leader.",
"m_c told r_c {PRONOUN/r_c/subject} should just retire already.",
"r_c wonders how easy it'd be to convince the rest of the clan to agree exiling r_c is a good move...",
"m_c wonders how easy it'd be to convince the rest of the Clan to agree exiling r_c is a good move...",
selkirks marked this conversation as resolved.
Show resolved Hide resolved
"r_c overheard m_c trying to convince the rest of the Clan to ditch r_c and make a new Clan without {PRONOUN/r_c/object}.",
"m_c believes r_c isn't doing {PRONOUN/r_c/poss} job good enough."
],
Expand Down
2 changes: 1 addition & 1 deletion resources/dicts/relationship_events/normal_interactions/platonic/decrease.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"m_c realized r_c was only pretending to pay attention to {PRONOUN/m_c/object} when {PRONOUN/m_c/subject} {VERB/m_c/was/were} talking.",
"m_c tried to talk to r_c but gave up, seeing how clearly {PRONOUN/r_c/subject} wanted to be doing anything else.",
"m_c overheard r_c talking about {PRONOUN/m_c/object}, but when pressed for details, r_c denied mentioning {PRONOUN/m_c/object} at all.",
"m_c got up and walked away when m_c sat nearby.",
"m_c got up and walked away when r_c sat nearby.",
"m_c blatantly ignored r_c.",
"Lately, m_c's had some choice words for r_c about how {PRONOUN/m_c/subject}{VERB/m_c/'ve/'s} been acting.",
"m_c asked another cat to pass a message to r_c rather doing it {PRONOUN/m_c/self}.",
Expand Down
2 changes: 1 addition & 1 deletion resources/dicts/thoughts/alive/alive_outside/general.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"Takes stock of {PRONOUN/m_c/poss} surroundings",
"Wonders if {PRONOUN/m_c/subject} will even find {PRONOUN/m_c/poss} way home",
"Replays events in {PRONOUN/m_c/poss} mind, wondering what {PRONOUN/m_c/subject} could have done differently",
"Questions if {PRONOUN/m_c/subject} will even find {PRONOUN/m_c/poss} way to StarClan when {PRONOUN/m_c/subject} pass",
"Questions if {PRONOUN/m_c/subject} will even find {PRONOUN/m_c/poss} way to StarClan when {PRONOUN/m_c/subject} {verb/m_c/pass/passes}",
"Thought {PRONOUN/m_c/subject} saw one of {PRONOUN/m_c/poss} Clanmates, but realized it was just a loner",
"Worries {PRONOUN/m_c/poss} Clan thinks {PRONOUN/m_c/subject}{VERB/m_c/'re/'s} a runaway traitor",
"Wonders how {PRONOUN/m_c/subject} will survive without {PRONOUN/m_c/poss} Clanmates",
Expand Down
Loading