From 55ef285011ad1513d74455dd8c79b64c20866f40 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 9 Nov 2022 23:46:37 -0600 Subject: [PATCH 1/6] Night snippets --- .../Xedra_Evolved/effects/effect_on_condition.json | 7 +++++++ .../snippets/effect_on_condition.json | 14 ++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 data/mods/Xedra_Evolved/snippets/effect_on_condition.json diff --git a/data/mods/Xedra_Evolved/effects/effect_on_condition.json b/data/mods/Xedra_Evolved/effects/effect_on_condition.json index b7ca7ae2ce29a..0a8e8dd44fea0 100644 --- a/data/mods/Xedra_Evolved/effects/effect_on_condition.json +++ b/data/mods/Xedra_Evolved/effects/effect_on_condition.json @@ -10,5 +10,12 @@ { "u_message": "The spiders in your veins itch!", "type": "bad" }, { "u_add_effect": "formication", "duration": "10 minutes", "target_part": "RANDOM" } ] + }, + { + "type": "effect_on_condition", + "id": "xe_night_messages", + "recurrence": [ "8 hours", "72 hours" ], + "condition": { "and": [ { "one_in_chance": 3 }, { "not": "is_day" }, "u_can_see", { "is_weather": "clear" }, "u_is_outside" ] }, + "effect": [ { "u_message": "XE_NIGHT_MESSAGES_1", "snippet": true } ] } ] diff --git a/data/mods/Xedra_Evolved/snippets/effect_on_condition.json b/data/mods/Xedra_Evolved/snippets/effect_on_condition.json new file mode 100644 index 0000000000000..452efc72f5d7e --- /dev/null +++ b/data/mods/Xedra_Evolved/snippets/effect_on_condition.json @@ -0,0 +1,14 @@ +[ + { + "type": "snippet", + "category": "XE_NIGHT_MESSAGES_1", + "text": [ + "The clopping of hooves pass you by with a swift breeze, you never see anything except for local flora brushed by the wind.", + "As you are walking you suddenly hear a woman singing mournfully. As you look around trying to see where the sound is coming from you slowly realize that if you take more than a step and a half in any direction the song fades away. Eventually you are unable to find it again.", + "Winged shadows cross the ground, but when you look into the sky you can't seem to see any movement or shapes at all.", + "There is a bright red star with a dark heart that looks like a pupil, staring down on you from the sky above. Is that star in the sky every night? Is it coming closer to the planet?", + "A helicopter passes by overhead. All it's running lights have been blacked out and you suspect the rotors have been muffled. If it hadn't passed right over you, you'd have never known it was there.", + "Something roars in the night, similar sounding to one of the Kaiju you heard destroying a nearby town during the Cataclys." + ] + } +] From 0a9c5f882234529e882db7e3d10b8761ac6d9b37 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 10 Nov 2022 10:43:35 -0600 Subject: [PATCH 2/6] Update data/mods/Xedra_Evolved/snippets/effect_on_condition.json --- data/mods/Xedra_Evolved/snippets/effect_on_condition.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/snippets/effect_on_condition.json b/data/mods/Xedra_Evolved/snippets/effect_on_condition.json index 452efc72f5d7e..c212632821c05 100644 --- a/data/mods/Xedra_Evolved/snippets/effect_on_condition.json +++ b/data/mods/Xedra_Evolved/snippets/effect_on_condition.json @@ -4,7 +4,7 @@ "category": "XE_NIGHT_MESSAGES_1", "text": [ "The clopping of hooves pass you by with a swift breeze, you never see anything except for local flora brushed by the wind.", - "As you are walking you suddenly hear a woman singing mournfully. As you look around trying to see where the sound is coming from you slowly realize that if you take more than a step and a half in any direction the song fades away. Eventually you are unable to find it again.", + "As you are walking you suddenly hear a woman singing mournfully. As you look around trying to see where the sound is coming from you slowly realize that if you take more than a step and a half in any direction the song fades away. Eventually you are unable to find it again.", "Winged shadows cross the ground, but when you look into the sky you can't seem to see any movement or shapes at all.", "There is a bright red star with a dark heart that looks like a pupil, staring down on you from the sky above. Is that star in the sky every night? Is it coming closer to the planet?", "A helicopter passes by overhead. All it's running lights have been blacked out and you suspect the rotors have been muffled. If it hadn't passed right over you, you'd have never known it was there.", From be6905197bab4de498ad67db6ba04d2764346837 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 10 Nov 2022 14:26:45 -0600 Subject: [PATCH 3/6] Apply suggestions from code review Co-authored-by: NetSysFire <59517351+NetSysFire@users.noreply.github.com> --- data/mods/Xedra_Evolved/snippets/effect_on_condition.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Xedra_Evolved/snippets/effect_on_condition.json b/data/mods/Xedra_Evolved/snippets/effect_on_condition.json index c212632821c05..51e6a32a77e7c 100644 --- a/data/mods/Xedra_Evolved/snippets/effect_on_condition.json +++ b/data/mods/Xedra_Evolved/snippets/effect_on_condition.json @@ -3,12 +3,12 @@ "type": "snippet", "category": "XE_NIGHT_MESSAGES_1", "text": [ - "The clopping of hooves pass you by with a swift breeze, you never see anything except for local flora brushed by the wind.", + "The clopping of hooves pass you by with a swift breeze, yet you did not see anything except for local flora brushed by the wind.", "As you are walking you suddenly hear a woman singing mournfully. As you look around trying to see where the sound is coming from you slowly realize that if you take more than a step and a half in any direction the song fades away. Eventually you are unable to find it again.", "Winged shadows cross the ground, but when you look into the sky you can't seem to see any movement or shapes at all.", "There is a bright red star with a dark heart that looks like a pupil, staring down on you from the sky above. Is that star in the sky every night? Is it coming closer to the planet?", "A helicopter passes by overhead. All it's running lights have been blacked out and you suspect the rotors have been muffled. If it hadn't passed right over you, you'd have never known it was there.", - "Something roars in the night, similar sounding to one of the Kaiju you heard destroying a nearby town during the Cataclys." + "Something roars in the night, similar sounding to one of the Kaiju you heard destroying a nearby town during the Cataclysm." ] } ] From 1062a57c1d244ba34073ecde29932e0a4f4eea55 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 10 Nov 2022 22:24:34 -0600 Subject: [PATCH 4/6] Day snippets --- .../effects/effect_on_condition.json | 9 ++++++++- .../snippets/effect_on_condition.json | 16 +++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/data/mods/Xedra_Evolved/effects/effect_on_condition.json b/data/mods/Xedra_Evolved/effects/effect_on_condition.json index 0a8e8dd44fea0..80ff962d8067d 100644 --- a/data/mods/Xedra_Evolved/effects/effect_on_condition.json +++ b/data/mods/Xedra_Evolved/effects/effect_on_condition.json @@ -15,7 +15,14 @@ "type": "effect_on_condition", "id": "xe_night_messages", "recurrence": [ "8 hours", "72 hours" ], - "condition": { "and": [ { "one_in_chance": 3 }, { "not": "is_day" }, "u_can_see", { "is_weather": "clear" }, "u_is_outside" ] }, + "condition": { "and": [ { "one_in_chance": 6 }, { "not": "is_day" }, "u_can_see", { "is_weather": "clear" }, "u_is_outside" ] }, "effect": [ { "u_message": "XE_NIGHT_MESSAGES_1", "snippet": true } ] + }, + { + "type": "effect_on_condition", + "id": "xe_day_messages", + "recurrence": [ "8 hours", "72 hours" ], + "condition": { "and": [ { "one_in_chance": 6 }, "is_day" , "u_can_see", { "is_weather": "clear" }, "u_is_outside" ] }, + "effect": [ { "u_message": "XE_DAY_MESSAGES_1", "snippet": true } ] } ] diff --git a/data/mods/Xedra_Evolved/snippets/effect_on_condition.json b/data/mods/Xedra_Evolved/snippets/effect_on_condition.json index 51e6a32a77e7c..4a1caea21651f 100644 --- a/data/mods/Xedra_Evolved/snippets/effect_on_condition.json +++ b/data/mods/Xedra_Evolved/snippets/effect_on_condition.json @@ -8,7 +8,21 @@ "Winged shadows cross the ground, but when you look into the sky you can't seem to see any movement or shapes at all.", "There is a bright red star with a dark heart that looks like a pupil, staring down on you from the sky above. Is that star in the sky every night? Is it coming closer to the planet?", "A helicopter passes by overhead. All it's running lights have been blacked out and you suspect the rotors have been muffled. If it hadn't passed right over you, you'd have never known it was there.", - "Something roars in the night, similar sounding to one of the Kaiju you heard destroying a nearby town during the Cataclysm." + "Something roars in the night, similar sounding to one of the Kaiju you heard destroying a nearby town during the Cataclysm.", + "The night suddenly goes dead silent." + ] + }, + { + "type": "snippet", + "category": "XE_DAY_MESSAGES_1", + "text": [ + "You realize that all of your empty pockets have been turned inside out. How long ago this happened you can't say.", + "You hear a tinkling sound on the wind.", + "A horn plays somewhere far in the distance; deep, mournful, and low.", + "Suddenly you smell rotten wood and tobacco.", + "You hear a distant explosion. You can't tell if it came from one of the tendrils of smoke at the edge of your vision or if it's new.", + "A single shot fires in the distance then silence.", + "The birds are no longer singing here. It's quiet, scary quiet." ] } ] From 43fa4ec102ccd212128dce696befc2855861cf02 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 11 Nov 2022 23:18:52 -0600 Subject: [PATCH 5/6] Update effect_on_condition.json --- data/mods/Xedra_Evolved/snippets/effect_on_condition.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/snippets/effect_on_condition.json b/data/mods/Xedra_Evolved/snippets/effect_on_condition.json index 4a1caea21651f..02129d2e8244f 100644 --- a/data/mods/Xedra_Evolved/snippets/effect_on_condition.json +++ b/data/mods/Xedra_Evolved/snippets/effect_on_condition.json @@ -22,7 +22,8 @@ "Suddenly you smell rotten wood and tobacco.", "You hear a distant explosion. You can't tell if it came from one of the tendrils of smoke at the edge of your vision or if it's new.", "A single shot fires in the distance then silence.", - "The birds are no longer singing here. It's quiet, scary quiet." + "The birds are no longer singing here. It's quiet, scary quiet.", + "A rare plane leaves contrails high in the sky. You wonder where it could be coming from and where it could possibly be going." ] } ] From beb99e8d9fa4c9d2055b51357afaba00adbc0296 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 12 Nov 2022 00:51:21 -0600 Subject: [PATCH 6/6] Update effect_on_condition.json --- data/mods/Xedra_Evolved/effects/effect_on_condition.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/effects/effect_on_condition.json b/data/mods/Xedra_Evolved/effects/effect_on_condition.json index 80ff962d8067d..bddf6c20f8835 100644 --- a/data/mods/Xedra_Evolved/effects/effect_on_condition.json +++ b/data/mods/Xedra_Evolved/effects/effect_on_condition.json @@ -22,7 +22,7 @@ "type": "effect_on_condition", "id": "xe_day_messages", "recurrence": [ "8 hours", "72 hours" ], - "condition": { "and": [ { "one_in_chance": 6 }, "is_day" , "u_can_see", { "is_weather": "clear" }, "u_is_outside" ] }, + "condition": { "and": [ { "one_in_chance": 6 }, "is_day", "u_can_see", { "is_weather": "clear" }, "u_is_outside" ] }, "effect": [ { "u_message": "XE_DAY_MESSAGES_1", "snippet": true } ] } ]