Skip to content

Commit

Permalink
Merge pull request CleverRaven#68235 from casswedson/…hunting…
Browse files Browse the repository at this point in the history
replace ... with … where appropriate
  • Loading branch information
Rivet-the-Zombie authored Sep 21, 2023
2 parents a3c0fbb + fc46853 commit dfd91b9
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 34 deletions.
4 changes: 2 additions & 2 deletions data/json/monsters/zed_lieutenant.json
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@
"effect": [
{ "u_adjust_var": "Shadow_Lurking", "adjustment": -1 },
{ "u_spawn_monster": "mon_lieutenant_shadow", "real_count": 1, "min_radius": 10, "max_radius": 15 },
{ "u_message": "You shiver as the night closes in...", "type": "bad", "popup": true }
{ "u_message": "You shiver as the night closes in", "type": "bad", "popup": true }
]
},
{
Expand Down Expand Up @@ -387,7 +387,7 @@
"target_max_radius": 60
},
{ "run_eoc_with": "EOC_KILL_SHADOW", "beta_loc": { "global_val": "Shadow_monster" } },
{ "u_message": "...but it grows more distant for now.", "type": "good" }
{ "u_message": "but it grows more distant for now.", "type": "good" }
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Backrooms/snippets.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
{
"id": "backrooms_unknown_news_1",
"text": {
"str": "\"St. Mary bingo will be hel777 B24G43A23K19T99 assistance with bond. The empty ap... , , , thsi empty abyss, floating on a salt laboratory abbbbbbbooooooooooooooannaannan.\"",
"str": "\"St. Mary bingo will be hel777 B24G43A23K19T99 assistance with bond. The empty ap , , , thsi empty abyss, floating on a salt laboratory abbbbbbbooooooooooooooannaannan.\"",
"//NOLINT(cata-text-style)": "intentional format"
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"id": "EOC_BIOKIN_MATRIX_AWAKENING_FAILURE",
"effect": [
{
"u_message": "You gaze into the strange crystal and the light slowly grows brighter. As it fills your vision, you become aware of the sound of your heartbeat, of the blood rushing through your veins...and then a searing headache crashes through your brain, blotting out all other sensations. You tear your gaze away from the now-dark crystal but the pounding in your head remains.",
"u_message": "You gaze into the strange crystal and the light slowly grows brighter. As it fills your vision, you become aware of the sound of your heartbeat, of the blood rushing through your veinsand then a searing headache crashes through your brain, blotting out all other sensations. You tear your gaze away from the now-dark crystal but the pounding in your head remains.",
"popup": true
},
{ "u_add_effect": "psionic_overload", "duration": "1 hours" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"effect": [
{ "u_adjust_var": "Shadow_Lurking", "adjustment": -1 },
{ "u_spawn_monster": "mon_lieutenant_shadow", "real_count": 1, "min_radius": 10, "max_radius": 15 },
{ "u_message": "You shiver as the night closes in...", "type": "bad", "popup": true }
{ "u_message": "You shiver as the night closes in", "type": "bad", "popup": true }
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Tamable_Wildlife/fish.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"name": { "str": "giant crayfish larva", "str_pl": "giant crayfish larvae" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant crustacean could like you. It swims around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant crustacean could like you. It swims around your legs and seems friendly.",
"pet": "The %s swims around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand Down
48 changes: 24 additions & 24 deletions data/mods/Tamable_Wildlife/insect_spider.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"name": { "str": "plague nymph" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"pet": "The %s skitters around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand All @@ -32,7 +32,7 @@
"name": { "str": "giant cockroach nymph" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"pet": "The %s skitters around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand All @@ -58,7 +58,7 @@
"name": { "str": "giant dragonfly naiad" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"pet": "The %s skitters around your feet."
},
"extend": { "flags": [ "CANPLAY" ] },
Expand All @@ -85,7 +85,7 @@
"name": { "str": "wasp larva", "str_pl": "wasp larvae" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It crawls around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It crawls around your legs and seems friendly.",
"pet": "The %s crawls around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand All @@ -104,7 +104,7 @@
"name": { "str": "acidic ant larva", "str_pl": "acidic ant larvae" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It crawls around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It crawls around your legs and seems friendly.",
"pet": "The %s crawls around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand All @@ -130,7 +130,7 @@
"name": { "str": "ant larva", "str_pl": "ant larvae" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It crawls around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It crawls around your legs and seems friendly.",
"pet": "The %s crawls around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand Down Expand Up @@ -163,7 +163,7 @@
"name": { "str": "locust nymph" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"pet": "The %s skitters around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand All @@ -189,7 +189,7 @@
"name": { "str": "aphid" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"pet": "The %s skitters around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand All @@ -208,7 +208,7 @@
"name": { "str": "praying mantis nymph" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"pet": "The %s skitters around your feet."
},
"extend": { "flags": [ "CANPLAY" ] },
Expand All @@ -235,7 +235,7 @@
"name": { "str": "grasshopper nymph" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"pet": "The %s skitters around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand All @@ -254,7 +254,7 @@
"name": { "str": "giant stag beetle larva", "str_pl": "giant stag beetle larvae" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It crawls around you and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It crawls around you and seems friendly.",
"pet": "The %s crawls around you."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand All @@ -266,7 +266,7 @@
"name": { "str": "giant antlion larva", "str_pl": "giant antlion larvae" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It crawls around you and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It crawls around you and seems friendly.",
"pet": "The %s crawls around you."
},
"extend": { "flags": [ "CANPLAY" ] },
Expand All @@ -286,7 +286,7 @@
"name": { "str": "water strider nymph" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"pet": "The %s skitters around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand All @@ -305,7 +305,7 @@
"name": { "str": "cicada nymph" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"pet": "The %s skitters around your feet."
},
"extend": { "flags": [ "CANPLAY" ] },
Expand All @@ -325,7 +325,7 @@
"name": { "str": "baby woodlouse", "str_pl": "baby woodlice" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"pet": "The %s skitters around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand All @@ -344,7 +344,7 @@
"name": { "str": "giant water tiger" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It swims around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It swims around your legs and seems friendly.",
"pet": "The %s swims around your feet."
},
"extend": { "flags": [ "CANPLAY" ] },
Expand All @@ -364,7 +364,7 @@
"name": { "str": "water scorpion nymph" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It swims around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It swims around your legs and seems friendly.",
"pet": "The %s swims around your feet."
},
"extend": { "flags": [ "CANPLAY" ] },
Expand Down Expand Up @@ -405,7 +405,7 @@
"name": { "str": "jumping spiderling" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.",
"pet": "The %s looks at you with its large eyes and skitters around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand All @@ -424,7 +424,7 @@
"name": { "str": "cellar spiderling" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.",
"pet": "The %s skitters around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand Down Expand Up @@ -471,7 +471,7 @@
"name": { "str": "trapdoor spiderling" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.",
"pet": "The %s looks at you with its large eyes and skitters around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand Down Expand Up @@ -504,7 +504,7 @@
"name": { "str": "web spiderling" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.",
"pet": "The %s skitters around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand Down Expand Up @@ -537,7 +537,7 @@
"name": { "str": "black widow spiderling" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.",
"pet": "The %s skitters around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand Down Expand Up @@ -570,7 +570,7 @@
"name": { "str": "wolf spiderling" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant spider could like you. It skitters around your legs and seems friendly.",
"pet": "The %s skitters around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand Down Expand Up @@ -603,7 +603,7 @@
"name": { "str": "centipede larva", "str_pl": "centipede larvae" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant bug could like you. It skitters around your legs and seems friendly.",
"pet": "The %s skitters around your feet."
},
"extend": { "flags": [ "CANPLAY" ] },
Expand Down
8 changes: 4 additions & 4 deletions data/mods/Tamable_Wildlife/mollusk.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"name": { "str": "snail larva", "str_pl": "snail larvae" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a mollusk could like you.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a mollusk could like you.",
"pet": "The %s slides slowly around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand All @@ -18,7 +18,7 @@
"name": { "str": "big snail" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant mollusk could like you.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant mollusk could like you.",
"pet": "The %s slides slowly around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand All @@ -44,7 +44,7 @@
"name": { "str": "slug larva", "str_pl": "slug larvae" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a mollusk could like you.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a mollusk could like you.",
"pet": "The %s slides slowly around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand All @@ -56,7 +56,7 @@
"name": { "str": "big slug" },
"petfood": {
"food": [ "BUGFOOD" ],
"feed": "The %s seems to... uhh, like you? Well, as certainly as you could tell a giant mollusk could like you.",
"feed": "The %s seems to uhh, like you? Well, as certainly as you could tell a giant mollusk could like you.",
"pet": "The %s slides slowly around your feet."
},
"extend": { "flags": [ "CANPLAY" ] }
Expand Down

0 comments on commit dfd91b9

Please sign in to comment.