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

Bugfix: More Text Fixes #2722

Merged
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
76fe046
thoughts/alive/kitten.json fixes
keplerstelescope Sep 21, 2024
13910f3
lots of thoughts/alive/general.json fixes
keplerstelescope Sep 22, 2024
ddefe45
Merge branch 'ClanGenOfficial:development' into patch-1
keplerstelescope Sep 22, 2024
e69925a
thoughts/alive/general.json fixes
keplerstelescope Sep 22, 2024
9ca59aa
formatting. sigh
keplerstelescope Sep 22, 2024
10c69fe
formatting!!!! :D
keplerstelescope Sep 22, 2024
ac8d75a
formatting
keplerstelescope Sep 22, 2024
49cc6e0
alphabetizing kit trait thoughts
keplerstelescope Sep 22, 2024
6d74fb7
relationship_events/become_mates_poly.json pronoun fix
keplerstelescope Sep 22, 2024
1c1731c
backstories.json fix
keplerstelescope Sep 22, 2024
23711ea
events_module/relationship/pregnancy_events.py comment edit
keplerstelescope Sep 22, 2024
870b277
Merge pull request #1 from keplerstelescope/development
keplerstelescope Sep 22, 2024
d1a298e
scripts/events.py fix
keplerstelescope Sep 22, 2024
fd50adf
patrols/forest/training/any.json fix
keplerstelescope Sep 23, 2024
812062c
patrols/forest/training/any.json fixes
keplerstelescope Sep 23, 2024
c7c12b9
okay it shouldn't crash this time
keplerstelescope Sep 23, 2024
feea6e7
missed a verb
keplerstelescope Sep 23, 2024
ffd6193
thank you pronoun test check i owe you my life
keplerstelescope Sep 23, 2024
a5c41c5
found another typo
keplerstelescope Sep 23, 2024
8c7dc5c
patrols/forest/training/greenleaf.json tiny edit
keplerstelescope Sep 23, 2024
a0f3939
patrols/forest/training/leaf-fall.json
keplerstelescope Sep 23, 2024
033ad48
patrols/forest/training/newleaf.json fix
keplerstelescope Sep 23, 2024
a70260b
cat/pelts.py fix
keplerstelescope Sep 23, 2024
0e27582
cat/pelts.py fix for the fix
keplerstelescope Sep 23, 2024
745cbad
patrols/general/border.json fix
keplerstelescope Sep 23, 2024
e779def
another patrols/general/border.json fix
keplerstelescope Sep 23, 2024
a76a5a2
cat/pelts.py fix for the fix for the fix
keplerstelescope Sep 23, 2024
cdaf5eb
patrols/forest/training/greenleaf.json update
keplerstelescope Sep 23, 2024
360bd3d
Update leaf-fall.json
keplerstelescope Sep 23, 2024
85e8e50
Update newleaf.json
keplerstelescope Sep 23, 2024
96881ca
Update border.json
keplerstelescope Sep 23, 2024
67827d9
Update general.json
keplerstelescope Sep 24, 2024
a7a85c9
Update border.json
keplerstelescope Sep 24, 2024
824393e
Merge branch 'development' into more-misc-fixes
scribblecrumb Sep 24, 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
4 changes: 2 additions & 2 deletions resources/dicts/backstories.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"kittypet1", "kittypet2", "kittypet3", "kittypet4", "refugee3", "tragedy_survivor3", "guided1", "refugee6"
],
"former_clancat_backstories": [
"otherclan1", "otherclan2", "otherclan3", "ostracized_warrior", "disgraced1", "disgraced2", "disgraced3", "retired_leader", "refugee1", "tragedy_survivor1", "medicine_cat", "guided4", "refugee5"
"otherclan1", "otherclan2", "otherclan3", "otherclan4", "ostracized_warrior", "disgraced1", "disgraced2", "disgraced3", "retired_leader", "refugee1", "tragedy_survivor1", "medicine_cat", "guided4", "refugee5"
],
"healer_backstories": [
"medicine_cat", "wandering_healer1", "wandering_healer2"
Expand All @@ -137,4 +137,4 @@
"outsider": "outsider1"
}

}
}
176 changes: 85 additions & 91 deletions resources/dicts/patrols/forest/training/any.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions resources/dicts/patrols/forest/training/greenleaf.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"all apprentices": [-1, -1]
},
"weight": 20,
"intro_text": "p_l thinks r_c is, well, really, just - uh, just swell, and {PRONOUN/p_l/subject} {VERB/p_l/think/thinks} r_c might like {PRONOUN/p_l/object} too. {PRONOUN/p_l/subject}{VERB/p_l/'ve/'s} been building up {PRONOUN/p_l/poss} confidence, and {PRONOUN/p_l/subject}{VERB/p_l/'re/'s} going to ask {PRONOUN/r_c/object} to spend some time together, just the two of them, this afternoon!",
"intro_text": "p_l thinks r_c is, well, really, just - uh, just swell, and {PRONOUN/p_l/subject} {VERB/p_l/think/thinks} r_c might like {PRONOUN/p_l/object} too. {PRONOUN/p_l/subject/CAP}{VERB/p_l/'ve/'s} been building up {PRONOUN/p_l/poss} confidence, and {PRONOUN/p_l/subject}{VERB/p_l/'re/'s} going to ask {PRONOUN/r_c/object} to spend some time together, just the two of them, this afternoon!",
"decline_text": "Unfortunately, r_c is sent on an afternoon border patrol before p_l can say anything.",
"chance_of_success": 60,
"relationship_constraint": ["romantic_20", "not_mates"],
Expand All @@ -39,7 +39,7 @@
]
},
{
"text": "All p_l's bravery is rewarded when r_c says yes! The pair head out for their romantic stroll, the buzz of excitement in their hearts merging with the buzz of life in the green-lit forest, shyly sharing glances between one another.",
"text": "All of p_l's bravery is rewarded when r_c says yes! The pair head out for their romantic stroll, the buzz of excitement in their hearts merging with the buzz of life in the green-lit forest, shyly sharing glances between one another.",
"exp": 20,
"weight": 5,
"relationships": [
Expand Down
10 changes: 5 additions & 5 deletions resources/dicts/patrols/forest/training/leaf-fall.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"all apprentices": [-1, -1]
},
"weight": 20,
"intro_text": "p_l thinks r_c is, well, really, just - uh, just swell, and {PRONOUN/p_l/subject} {VERB/p_l/think/thinks} r_c might like {PRONOUN/p_l/object} too. {PRONOUN/p_l/subject}{VERB/p_l/'ve/'s} been building up {PRONOUN/p_l/poss} confidence, and {PRONOUN/p_l/subject}{VERB/p_l/'re/'s} going to ask {PRONOUN/r_c/object} to spend some time together, just the two of them, this afternoon!",
"intro_text": "p_l thinks r_c is, well, really, just - uh, just swell, and {PRONOUN/p_l/subject} {VERB/p_l/think/thinks} r_c might like {PRONOUN/p_l/object} too. {PRONOUN/p_l/subject/CAP}{VERB/p_l/'ve/'s} been building up {PRONOUN/p_l/poss} confidence, and {PRONOUN/p_l/subject}{VERB/p_l/'re/'s} going to ask {PRONOUN/r_c/object} to spend some time together, just the two of them, this afternoon!",
"decline_text": "Unfortunately, r_c is sent on an afternoon border patrol before p_l can say anything.",
"chance_of_success": 60,
"relationship_constraint": ["romantic_20", "not_mates"],
Expand Down Expand Up @@ -171,7 +171,7 @@
"max_cats": 6,
"min_max_status": {
"apprentice": [2, 4],
"normal adult": [2,4]
"normal adult": [2, 4]
},
"weight": 20,
"intro_text": "The leaves drift high in sunset piles beneath the shedding trees, and as the patrol wanders familiar forest paths, app1 gets swallowed up.",
Expand Down Expand Up @@ -219,15 +219,15 @@
"max_cats": 6,
"min_max_status": {
"apprentice": [2, 4],
"normal adult": [2,2]
"normal adult": [2, 2]
},
"weight": 20,
"intro_text": "The leaves drift high in sunset piles beneath the shedding trees, and as the patrol wanders familiar forest paths, app1 gets swallowed up.",
"decline_text": "app1 reappears soon enough, a bright red leaf plastered to {PRONOUN/app1/poss} forehead.",
"chance_of_success": 60,
"success_outcomes": [
{
"text": "app1 leaps out of the leaf drift, sending p_l falling into r_c as {PRONOUN/app1/subject} {VERB/app1/leap/leaps} onwards to bowl app2 into yet more leaves. The two apprentices descend into furious mock combat, yowling with excitement, as p_l gazes up at r_c in bewilderment.",
"text": "app1 leaps out of the leaf drift, sending p_l falling into r_c as {PRONOUN/app1/subject} {VERB/app1/leap/leaps} onwards to bowl app2 into yet more leaves. The two apprentices descend into furious mock combat, yowling with excitement, as r_c gazes up at p_l in bewilderment.",
"exp": 10,
"weight": 20,
"relationships": [
Expand Down Expand Up @@ -274,7 +274,7 @@
"max_cats": 6,
"min_max_status": {
"apprentice": [2, 2],
"normal adult": [2,4]
"normal adult": [2, 4]
},
"weight": 20,
"intro_text": "The leaves drift high in sunset piles beneath the shedding trees, and as the patrol wanders familiar forest paths, app1 gets swallowed up.",
Expand Down
8 changes: 4 additions & 4 deletions resources/dicts/patrols/forest/training/newleaf.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"all apprentices": [-1, -1]
},
"weight": 20,
"intro_text": "p_l thinks r_c is, well, really, just - uh, just swell, and {PRONOUN/p_l/subject} {VERB/p_l/think/thinks} r_c might like {PRONOUN/p_l/object} too. {PRONOUN/p_l/subject}{VERB/p_l/'ve/'s} been building up {PRONOUN/p_l/poss} confidence, and {PRONOUN/p_l/subject}{VERB/p_l/'re/'s} going to ask {PRONOUN/r_c/object} to spend some time together, just the two of them, this afternoon!",
"intro_text": "p_l thinks r_c is, well, really, just - uh, just swell, and {PRONOUN/p_l/subject} {VERB/p_l/think/thinks} r_c might like {PRONOUN/p_l/object} too. {PRONOUN/p_l/subject/CAP}{VERB/p_l/'ve/'s} been building up {PRONOUN/p_l/poss} confidence, and {PRONOUN/p_l/subject}{VERB/p_l/'re/'s} going to ask {PRONOUN/r_c/object} to spend some time together, just the two of them, this afternoon!",
"decline_text": "Unfortunately, r_c is sent on an afternoon border patrol before p_l can say anything.",
"chance_of_success": 60,
"relationship_constraint": ["romantic_20", "not_mates"],
Expand Down Expand Up @@ -119,13 +119,13 @@
"all apprentices": [-1, -1]
},
"weight": 20,
"intro_text": "p_l trots up, full of a disproportionate amount of excitement for the bland, overcast afternoon, tail tip twitching. Does r_c want to come out with {PRONOUN/p_l/object}? {PRONOUN/p_l/subject/cap} lean in close - there's a special spot {PRONOUN/p_l/subject}{VERB/p_l/'ve/'s} been meaning to show {PRONOUN/r_c/subject}.",
"intro_text": "p_l trots up, full of a disproportionate amount of excitement for the bland, overcast afternoon, tail tip twitching. Does r_c want to come out with {PRONOUN/p_l/object}? {PRONOUN/p_l/subject/CAP} {VERB/p_l/lean/leans} in close - there's a special spot {PRONOUN/p_l/subject}{VERB/p_l/'ve/'s} been meaning to show {PRONOUN/r_c/object}.",
"decline_text": "Unfortunately, r_c is sent on an afternoon border patrol before either cat can head out of camp.",
"chance_of_success": 80,
"relationship_constraint": ["romantic_70", "mates"],
"success_outcomes": [
{
"text": "This is p_l's absolutely favorite spot in the territory in newleaf, {PRONOUN/p_l/subject} {VERB/p_l/explain/explains}, brushing along r_c's side as the two cats pad whisker-close. It's just the perfect place to wind down, a beautiful, bubbling, calm stream, and {PRONOUN/p_l/subject} thought it'd be good for r_c to take some time just to breathe, just to relax, just to get to be {PRONOUN/r_c/self}. All the more special for being there together.",
"text": "This is p_l's absolute favorite spot in the territory in newleaf, {PRONOUN/p_l/subject} {VERB/p_l/explain/explains}, brushing along r_c's side as the two cats pad whisker-close. It's just the perfect place to wind down, a beautiful, bubbling, calm stream, and {PRONOUN/p_l/subject} thought it'd be good for r_c to take some time just to breathe, just to relax, just to get to be {PRONOUN/r_c/self}. All the more special for being there together.",
"exp": 20,
"weight": 20,
"relationships": [
Expand All @@ -139,7 +139,7 @@
]
},
{
"text": "Yes, the place is magical - a beautiful, bubbling, calm stream, and the clouds clear and the light sparkles along it, making the forest shine with reflections. But as lovely as p_l's little secret is, it's improved beyond measure with the addition of r_c.",
"text": "Yes, the place is magical - a beautiful, bubbling, calm stream, and the clouds clear and the light sparkles along it, making the forest shine with reflections. But as lovely as p_l's little secret is, it's improved beyond measure with the addition of r_c.",
"exp": 20,
"weight": 5,
"relationships": [
Expand Down
6 changes: 3 additions & 3 deletions resources/dicts/patrols/general/border.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
]
},
{
"text": "r_c would give their life to protect c_n, and as {PRONOUN/r_c/subject} {VERB/r_c/charge/charges} past the huge dog to lead it far, far from c_n, {PRONOUN/r_c/subject} {VERB/r_c/accept/accepts} it. Fear gives {PRONOUN/r_c/object} speed, but it only takes one successful hit. Miraculously {PRONOUN/r_c/subject} {VERB/r_c/fly/flies} out of the dog's jaws while it shakes {PRONOUN/r_c/object}, landing safely. r_c is injured, desperate, and terrified - but {PRONOUN/r_c/subject}{VERB/r_c/'re/'s} alive.",
"text": "r_c would give {PRONOUN/r_c/poss} life to protect c_n, and as {PRONOUN/r_c/subject} {VERB/r_c/charge/charges} past the huge dog to lead it far, far from c_n, {PRONOUN/r_c/subject} {VERB/r_c/accept/accepts} it. Fear gives {PRONOUN/r_c/object} speed, but it only takes one successful hit. Miraculously {PRONOUN/r_c/subject} {VERB/r_c/fly/flies} out of the dog's jaws while it shakes {PRONOUN/r_c/object}, landing safely. r_c is injured, desperate, and terrified - but {PRONOUN/r_c/subject}{VERB/r_c/'re/'s} alive.",
"exp": 0,
"weight": 10,
"injury": [
Expand Down Expand Up @@ -2400,7 +2400,7 @@

},
{
"text": "p_l spins around just in time to see an impressively viscous kittypet lunging at {PRONOUN/p_l/object}. Once {PRONOUN/p_l/subject}{VERB/p_l/'ve/'s} recovered from {PRONOUN/p_l/poss} momentary shock, p_l easily overpowers the kittypet, who's snarling something about the dog being {PRONOUN/n_c:0/poss} 'friend'. The odd pair quickly run off, leaving behind a slightly dazed - and very confused - p_l.",
"text": "p_l spins around just in time to see an impressively vicious kittypet lunging at {PRONOUN/p_l/object}. Once {PRONOUN/p_l/subject}{VERB/p_l/'ve/'s} recovered from {PRONOUN/p_l/poss} momentary shock, p_l easily overpowers the kittypet, who's snarling something about the dog being {PRONOUN/n_c:0/poss} 'friend'. The odd pair quickly run off, leaving behind a slightly dazed - and very confused - p_l.",
"exp": 2,
"weight": 15,
"new_cat": [
Expand Down Expand Up @@ -2447,7 +2447,7 @@
],
"antag_success_outcomes": [
{
"text": "p_l ignores the voice, swiping {PRONOUN/p_l/poss} claws across the dog's face. Out of the corner of {PRONOUN/p_l/poss} eye, {PRONOUN/p_l/subject} sees a kittypet halt in {PRONOUN/n_c:0/poss} tracks, letting out a cry of dismay. It only takes another snarl from p_l for both kittypet and dog to flee.",
"text": "p_l ignores the voice, swiping {PRONOUN/p_l/poss} claws across the dog's face. Out of the corner of {PRONOUN/p_l/poss} eye, {PRONOUN/p_l/subject} {VERB/p_l/see/sees} a kittypet halt in {PRONOUN/n_c:0/poss} tracks, letting out a cry of dismay. It only takes another snarl from p_l for both kittypet and dog to flee.",
"exp": 5,
"new_cat": [
["kittypet", "meeting", "exists"]
Expand Down
4 changes: 2 additions & 2 deletions resources/dicts/relationship_events/become_mates_poly.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
],
"r_c_mates": [
"m_c and r_c see each other in a different light; after r_c talked with [r_c_mates], m_c and r_c have become mates.",
"m_c and r_c see each other in a different light; after r_c talked with {PRONOUN/m_c/poss} (r_c_mate/mates), they have become mates."
"m_c and r_c see each other in a different light; after r_c talked with {PRONOUN/r_c/poss} (r_c_mate/mates), they have become mates."
],
"both_mates": [
"m_c and r_c talked with their mates, and announced that they are now mates."
Expand All @@ -50,4 +50,4 @@
"m_c confessed {PRONOUN/m_c/poss} feelings to r_c, but was rejected."
]
}
}
}
Loading