Skip to content

Commit

Permalink
Merge pull request #3400 from flamedash2358/development
Browse files Browse the repository at this point in the history
  • Loading branch information
@selkirks
selkirks authored Feb 3, 2025
2 parents 5b0f446 + 1059ad7 commit df28a6a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions resources/lang/en/patrols/plains/border/greenleaf.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@
"dead_cats":["r_c"],
"history_text": {
"scar": "Killing a juvenile coyote and being driven off by its parents left its scars on r_c.",
"reg_death": "r_c died to keep coyotes away from c_n's borders.",
"reg_death": "m_c died to keep coyotes away from c_n's borders.",
"lead_death": "keeping coyotes away from c_n's borders"
},
"relationships": [
Expand Down Expand Up @@ -818,7 +818,7 @@
],
"history_text": {
"scar": "Killing a juvenile coyote and being driven off by its parents left its scars on r_c.",
"reg_death": "r_c died to keep coyotes away from c_n's borders.",
"reg_death": "m_c died to keep coyotes away from c_n's borders.",
"lead_death": "keeping coyotes away from c_n's borders"
},
"relationships": [
Expand Down Expand Up @@ -1037,7 +1037,7 @@
],
"history_text": {
"scar": "Mauling a juvenile coyote and being driven off by its parents left its scars on r_c.",
"reg_death": "r_c died from injuries sustained keeping coyotes away from c_n's borders.",
"reg_death": "m_c died from injuries sustained keeping coyotes away from c_n's borders.",
"lead_death": "from injuries sustained keeping coyotes away from c_n's borders"
},
"relationships": [
Expand Down Expand Up @@ -1102,7 +1102,7 @@
],
"history_text": {
"scar": "Killing a juvenile coyote and being driven off by its parents left its scars on r_c.",
"reg_death": "r_c died from injuries sustained keeping coyotes away from c_n's borders.",
"reg_death": "m_c died from injuries sustained keeping coyotes away from c_n's borders.",
"lead_death": "from injuries sustained keeping coyotes away from c_n's borders"
},
"relationships": [
Expand Down Expand Up @@ -1237,7 +1237,7 @@
],
"history_text": {
"scar": "A coyote encounter left its scars on r_c.",
"reg_death": "r_c died from injuries sustained keeping coyotes away from c_n's borders.",
"reg_death": "m_c died from injuries sustained keeping coyotes away from c_n's borders.",
"lead_death": "from injuries sustained keeping coyotes away from c_n's borders"
}
},
Expand All @@ -1261,7 +1261,7 @@
"dead_cats":["r_c"],
"history_text": {
"scar": "Killing a juvenile coyote and being driven off by its parents left its scars on r_c.",
"reg_death": "r_c died from injuries sustained keeping coyotes away from c_n's borders.",
"reg_death": "m_c died from injuries sustained keeping coyotes away from c_n's borders.",
"lead_death": "from injuries sustained keeping coyotes away from c_n's borders"
},
"relationships": [
Expand Down Expand Up @@ -1290,7 +1290,7 @@
],
"history_text": {
"scar": "Killing a juvenile coyote and being driven off by its parents left its scars on r_c.",
"reg_death": "r_c died from injuries sustained keeping coyotes away from c_n's borders.",
"reg_death": "m_c died from injuries sustained keeping coyotes away from c_n's borders.",
"lead_death": "from injuries sustained keeping coyotes away from c_n's borders"
},
"relationships": [
Expand Down Expand Up @@ -4786,4 +4786,4 @@
}
]
}
]
]
16 changes: 8 additions & 8 deletions resources/lang/en/patrols/plains/border/leaf-fall.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -637,8 +637,8 @@
}
],
"history_text": {
"scar": "A subadult coyote scarred r_c's pelt.",
"reg_death": "r_c was killed by trying to fight a subadult coyote with a small patrol.",
"scar": "A subadult coyote scarred m_c's pelt.",
"reg_death": "m_c was killed by trying to fight a subadult coyote with a small patrol.",
"lead_death": "trying to fight a subadult coyote with a small patrol"
},
"relationships": [
Expand Down Expand Up @@ -667,7 +667,7 @@
],
"history_text": {
"scar": "Driving off coyotes left its scars on r_c.",
"reg_death": "r_c died from injuries sustained in keeping coyotes away from c_n's borders.",
"reg_death": "m_c died from injuries sustained in keeping coyotes away from c_n's borders.",
"lead_death": "from injuries gotten keeping coyotes away from c_n's borders"
},
"relationships": [
Expand Down Expand Up @@ -957,8 +957,8 @@
}
],
"history_text": {
"scar": "A subadult coyote scarred r_c's pelt.",
"reg_death": "r_c died from injuries sustained keeping coyotes away from c_n's borders.",
"scar": "A subadult coyote scarred m_c's pelt.",
"reg_death": "m_c died from injuries sustained keeping coyotes away from c_n's borders.",
"lead_death": "from injuries sustained keeping coyotes away from c_n's borders"
},
"relationships": [
Expand Down Expand Up @@ -1088,8 +1088,8 @@
}
],
"history_text": {
"scar": "A coyote encounter left its scars on r_c.",
"reg_death": "r_c died from injuries sustained keeping coyotes away from c_n's borders.",
"scar": "A coyote encounter left its scars on m_c.",
"reg_death": "m_c died from injuries sustained keeping coyotes away from c_n's borders.",
"lead_death": "from injuries sustained keeping coyotes away from c_n's borders"
}
},
Expand Down Expand Up @@ -3668,4 +3668,4 @@
}
]
}
]
]

0 comments on commit df28a6a

Please sign in to comment.