diff --git a/game/03-JavaScript/time.js b/game/03-JavaScript/time.js
index 2b37d3b3977352c891203e28a0b664980e70117e..0c2d9864de3cbcbbb14695a13ec627a15e5760e0 100644
--- a/game/03-JavaScript/time.js
+++ b/game/03-JavaScript/time.js
@@ -401,6 +401,9 @@ function yearPassed() {
V.mathsproject = "none";
V.englishPlay = "none";
+ delete V.yearly;
+ V.yearly = clone(setup.weeklyObject);
+
return fragment;
}
diff --git a/game/04-Variables/variables-static.twee b/game/04-Variables/variables-static.twee
index 48f7c05de22aca01bc70f0852070436897277831..d60d2c89ba2a2d61dcd803cea9fb008fddd8aaca 100644
--- a/game/04-Variables/variables-static.twee
+++ b/game/04-Variables/variables-static.twee
@@ -881,4 +881,5 @@
prison: {},
livestock: {},}>>
<<set setup.weeklyObject to {theft: {}, sewers: {}}>>
+ <<set setup.yearlyObject to {}>>
<</widget>>
diff --git a/game/overworld-forest/loc-cabin/christmas.twee b/game/overworld-forest/loc-cabin/christmas.twee
index ccceea69e198188b32271552c6c26df65420c668..4c89e29ca8b24f23f4470343a9e641d34ae0d37d 100644
--- a/game/overworld-forest/loc-cabin/christmas.twee
+++ b/game/overworld-forest/loc-cabin/christmas.twee
@@ -1,7 +1,8 @@
:: Eden Jacket
<<set $outside to 0>><<set $location to "cabin">><<effects>>
-Snow covers the ground around the cabin, painting the scenery a pure white. A distinctive winter chill settles in you, causing you to shiver. When you find Eden, <<hes>> as busy as always.
+<<if Weather.isSnow>>Snow covers the ground around the cabin, painting the scenery a pure white. <</if>>
+A distinctive winter chill settles in you, causing you to shiver. When you find Eden, <<hes>> as busy as always.
You call <<him>> over and hand <<him>> the hunting jacket. "Merry Christmas," you say.
<br><br>
Eden looks taken aback. "Is it Christmas already?" <<he>> asks. Taking the hunting jacket, <<he>> turns it over and inspects it, then goes to the cabin mirror and tries it on. Looks like you bought the right size.
@@ -166,7 +167,10 @@ The two of you bask in the peaceful stillness of the night. In the glow of the f
You smile in response, and <<he>> gently weaves <<his>> hand through your hair, returning your gaze with <<his>> own.
<br><br>
-"You're the best thing that's ever happened to me," <<he>> whispers, as <<he>> kisses your forehead. Snow covers the ground around the cabin, but you no longer feel the biting chill. Instead, the warmth of Eden's love surrounds you as you lie pressed against <<his>> chest.
+"You're the best thing that's ever happened to me," <<he>> whispers, as <<he>> kisses your forehead.
+<<if Weather.isSnow>>Snow covers the ground around the cabin, but you no longer feel the biting chill.
+<<else>>You no longer feel the biting chill.<</if>>
+Instead, the warmth of Eden's love surrounds you as you lie pressed against <<his>> chest.
<br><br>
<<link [[Next|Eden Cabin]]>><<endevent>><</link>>
diff --git a/game/overworld-forest/loc-cabin/intro.twee b/game/overworld-forest/loc-cabin/intro.twee
index ddc2efedce8b3272d6a0981871026f1e9e90010d..3b3e4e0f5feec339311254466bf1be2d7e401b7b 100644
--- a/game/overworld-forest/loc-cabin/intro.twee
+++ b/game/overworld-forest/loc-cabin/intro.twee
@@ -367,7 +367,7 @@ You prepare the food and place it on the table in front of <<him>>. <<He>> takes
"We've got lots of work to do today. A little rain won't stop us."
<<elseif Weather.is("heavyClouds")>>
"The clouds are grumbling. Hope they don't burst before we're done for the day."
-<<elseif Weather.precipitation is "snow">>
+<<elseif Weather.isFreezing>>
"It's cold today. Best keep active."
<</if>>
<br><br>
diff --git a/game/overworld-forest/loc-lake/ivory/main.twee b/game/overworld-forest/loc-lake/ivory/main.twee
index 7853df7443082e7dea80f95c65a19c97ec4a2b95..eb76f6d0d6c1de09e4e7324225fa689a0ca288f2 100644
--- a/game/overworld-forest/loc-lake/ivory/main.twee
+++ b/game/overworld-forest/loc-lake/ivory/main.twee
@@ -1142,7 +1142,11 @@ The shape behind it flickers. The claws vanish, replaced by supple skin. You loo
:: Christmas Mirror Reach
<<effects>>
-<<generateWraith 1 true>><<rainWraith>><<set $pronoun to C.npc["Ivory Wraith"].gender>>
+<<generateWraith 1 true>>
+<<freezePlayerStats>>
+<<set Weather.Temperature.set(-15)>>
+<<rainWraith>>
+<<set $pronoun to C.npc["Ivory Wraith"].gender>>
You reach forward, taking the hand in yours. <<takeHandholdingVirginity "Ivory Wraith" "consensual">>
<br><br>
The skin ripples, changing between a ghastly pale and a normal tone.
@@ -1249,6 +1253,7 @@ Your descent is beautiful.
:: Christmas Mirror End
<<set $location to "home">><<set $outside to 0>><<effects>>
+<<unfreezePlayerStats>>
You cry out, and shoot up. You're in your bed, sweating, and breathing heavily.
<br><br>
You rub the tiredness out of your eyes. You catch a glimpse of yourself in the mirror. You look pale. <<trauma 4>><<gtrauma>>
diff --git a/game/overworld-forest/loc-lake/ivory/widgets.twee b/game/overworld-forest/loc-lake/ivory/widgets.twee
index 983e4d59edd569e4e918411e3d12752d05df7573..3438e26b4ca1acd576a58cc0088d204929be5bbe 100644
--- a/game/overworld-forest/loc-lake/ivory/widgets.twee
+++ b/game/overworld-forest/loc-lake/ivory/widgets.twee
@@ -258,7 +258,6 @@
<<widget "rainWraith">>
<<if Weather.precipitation is "none">>
<<set Weather.set("heavyPrecipitation")>>
-
<<if _args[0]>>
<<if $outside is 1>>
<<if Weather.precipitation is "snow">>
@@ -308,7 +307,6 @@
"The fog relents."
)>>
<</if>>
- <<set Weather.set("lightClouds")>>
<</if>>
<</widget>>
diff --git a/game/overworld-town/loc-alley/residential.twee b/game/overworld-town/loc-alley/residential.twee
index 8c4bea6f2b16997c95ec19a895cb23f78675a588..ac065f4a2619c312f027024507b4d61667895a58 100644
--- a/game/overworld-town/loc-alley/residential.twee
+++ b/game/overworld-town/loc-alley/residential.twee
@@ -13,7 +13,7 @@ You are in an alleyway in the residential district.
<<elseif Time.dayState is "dusk">>
<<if Weather.precipitation is "rain">>
People hurry through the rain.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isSnow>>
Paths have been well-trodden through the snow.
<<else>>
You hear voices all around.
@@ -29,7 +29,7 @@ You are in an alleyway in the residential district.
<<elseif Time.dayState is "dawn">>
<<if Weather.precipitation is "rain">>
People brave the rain, on their way to work or elsewhere.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
People brave the cold, on their way to work or elsewhere.
<<else>>
There are already a lot of pedestrians and cyclists around.
@@ -391,7 +391,7 @@ You are in the thicket in the residential district.
<<if Time.dayState is "night">>
<<if Weather.precipitation is "rain">>
Large drops of cold water fall from the canopy.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isSnow>>
The branches bow above, weighed down by snow.
<<else>>
The branches wave in the cool breeze.
diff --git a/game/overworld-town/loc-beach/main.twee b/game/overworld-town/loc-beach/main.twee
index 26c45d208bcdc2662d1add943d059fd53c8c9f90..e159996b1eae98c0c48351e742a0b87f8092e11c 100644
--- a/game/overworld-town/loc-beach/main.twee
+++ b/game/overworld-town/loc-beach/main.twee
@@ -7,7 +7,7 @@ You are on the beach.
It is awash with visitors, children build sandcastles and play in the water while their parents bask in the sun. A group of students are playing volleyball.
<<elseif Weather.precipitation is "rain">>
The beach itself is mostly deserted due to the rain, but the violent waves have attracted surfers.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isSnow>>
The snow has kept most away from the beach, but the violent waves have attracted surfers.
<<elseif Weather.overcast>>
The clouds have driven away most would-be visitors, but there are still people strolling along the water's edge.
@@ -17,7 +17,7 @@ You are on the beach.
It is a popular destination for joggers, some have dogs with them. A few families are setting up windbreakers. A group of students are playing volleyball.
<<elseif Weather.precipitation is "rain">>
The beach itself is mostly deserted due to the rain, but the violent waves have attracted surfers.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isSnow>>
The snow has kept most away from the beach, but the violent waves have attracted surfers.
<<elseif Weather.overcast>>
It is a popular destination for joggers, some have dogs with them. Fog blocks your view of the ocean.
@@ -27,7 +27,7 @@ You are on the beach.
Families are leaving as the sun sets. A group of students are playing volleyball.
<<elseif Weather.precipitation is "rain">>
The beach itself is mostly deserted due to the rain, but the violent waves have attracted surfers.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isSnow>>
The snow has kept most away from the beach, but the violent waves have attracted surfers.
<<elseif Weather.overcast>>
It is mostly deserted, but some people are strolling along the water's edge.
@@ -35,11 +35,7 @@ You are on the beach.
<<elseif Time.dayState is "night">>
<<if !Weather.overcast>>
It appears deserted, save for a group of students who are drinking around a fire.
- <<elseif Weather.precipitation is "rain">>
- It appears deserted.
- <<elseif Weather.precipitation is "snow">>
- It appears deserted.
- <<elseif Weather.overcast>>
+ <<else>>
It appears deserted.
<</if>>
<</if>>
diff --git a/game/overworld-town/loc-cafe/main.twee b/game/overworld-town/loc-cafe/main.twee
index fb713bb20a50dd8edd1d46a6439c123e710c8764..f788f059de8b4eee7c23474f896e1cb857287964 100644
--- a/game/overworld-town/loc-cafe/main.twee
+++ b/game/overworld-town/loc-cafe/main.twee
@@ -5,7 +5,7 @@ You are in the Ocean Breeze Cafe.
<<if $openinghours is 1>>
<<if Weather.precipitation is "rain">>
No one is sitting outside due to the rain, but the cafe proper is crowded.
- <<elseif Weather.isSnow>>
+ <<elseif Weather.isFreezing>>
No one is sitting outside due to the cold, but the cafe proper is crowded.
<<elseif !Weather.overcast>>
Most of the tables are full.
diff --git a/game/overworld-town/loc-domus-homes/work.twee b/game/overworld-town/loc-domus-homes/work.twee
index 3982df71b32d400e1cb7102ee511672c4bcad812..b3ed8862844e8174e0a9809a91a724465e70c40a 100644
--- a/game/overworld-town/loc-domus-homes/work.twee
+++ b/game/overworld-town/loc-domus-homes/work.twee
@@ -2277,7 +2277,7 @@ You walk quickly to the corner shop.
<br>
Stood dripping in the doorway, you're not sure if <<hes>> serious.
<br>
-<<elseif Weather.precipitation is "snow">>
+<<elseif Weather.isFreezing>>
It's empty. People are probably hiding from the cold.
<<else>>
It's empty. People are probably indoors watching the game.
@@ -2488,7 +2488,7 @@ You present the order slip to the <<person>> behind the counter.
<<elseif $phase is 1>>
You carry the crate back to the house. It's heavier than it looks
<<if Weather.precipitation is "rain">>and the rain beating down on you really isn't helping.
- <<elseif Weather.precipitation is "snow">>and the icy ground isn't helping.
+ <<elseif Weather.isSnow>>and the icy ground isn't helping.
<<elseif !Weather.overcast>>and with the sun beating down, you work up quite a sweat.
<<else>>but you manage.
<</if>>
diff --git a/game/overworld-town/loc-home/event-widgets.twee b/game/overworld-town/loc-home/event-widgets.twee
index c14751e0c29466c95354aa2c269f6143d396f30f..0ed177fb75b592e9b86154763d4af297273f5540 100644
--- a/game/overworld-town/loc-home/event-widgets.twee
+++ b/game/overworld-town/loc-home/event-widgets.twee
@@ -2,8 +2,9 @@
<<widget "homeevent">>
<<rng>>
- <<if Time.monthName is "December" and Time.monthDay is 1>>
+ <<if Weather.precipitation === "snow" && $weatherObj.snow lte 20 && Time.month gte 10 && $yearly.firstSnow>>
<<npc Bailey>><<generatey2>><<generatey3>><<generatey4>>
+ <<set $yearly.firstSnow to true>>
You hear excited voices. Several orphans cluster around the window. It's snowing.
<br><br>
"I want to make a snowman."
diff --git a/game/overworld-town/loc-park/robin.twee b/game/overworld-town/loc-park/robin.twee
index cda3f87c9fc9b1484dba8623bb24c63d6e1969a5..693d12f423cd73148d31814a2795a09e856a437c 100644
--- a/game/overworld-town/loc-park/robin.twee
+++ b/game/overworld-town/loc-park/robin.twee
@@ -209,33 +209,7 @@ You take your time with the mug, letting it warm your hands as you sip away at t
<br><br>
<<robinChocolateOfferHelp>>
<</if>>
- <<elseif $rng gte 21>>
- <<if _robin.trauma gte 40>>
- "I need some more milk. I'm sorry. I know it's heavy, but could you buy some more?" <<He>> shivers even through <<his>> warm attire. "Harvest street has some." <<He>> hands you £5 and a large bottle. "That should be enough."
- <<else>>
- "I need to start heating another pot of milk. I don't like asking because it's heavy, but could you buy some more? You'll need to go to Harvest Street for the fresh stuff." <<He>> hands you £5 and a large bottle. "That should be enough to fill it."
- <</if>>
- <br><br>
- <<if $breastfeedingdisable is "f" and $lactating is 1 and $promiscuity gte 35 and $awareness gte 100>>
- A thought strikes as you pass the toilets. There's a closer source of fresh milk.
- <br><br>
-
- <<link [[Milk yourself|Robin Milk Masturbation]]>><<set $masturbationstart to 1>><</link>><<promiscuous3>>
- <br>
- <<else>>
- You leave the park, and follow the road to Harvest Street.
- <br><br>
- <</if>>
- <<link [[Buy the milk|Robin Milk Buy]]>><</link>>
- <br>
- <<set $skulduggerydifficulty to 400>>
- <<link [[Steal the milk|Robin Milk Steal]]>><<crimeUp 5 "petty">><</link>><<skulduggerydifficulty>><<crime "petty">>
- <br>
- <<if $promiscuity gte 15>>
- <<link [[Flirt for cheaper milk|Robin Milk Seduction]]>><</link>><<promiscuous2>>
- <br>
- <</if>>
- <<else>>
+ <<elseif $rng gte 41 and Weather.isSnow>>
<<if _robin.trauma gte 40>>
"I think I'm okay right now, but could you please stay with me?" Robin asks you as <<he>> fidgets.
<<else>>
@@ -274,6 +248,32 @@ You take your time with the mug, letting it warm your hands as you sip away at t
<br><br>
<<robinChocolateOfferHelp>>
<</if>>
+ <<else>>
+ <<if _robin.trauma gte 40>>
+ "I need some more milk. I'm sorry. I know it's heavy, but could you buy some more?" <<He>> shivers even through <<his>> warm attire. "Harvest street has some." <<He>> hands you £5 and a large bottle. "That should be enough."
+ <<else>>
+ "I need to start heating another pot of milk. I don't like asking because it's heavy, but could you buy some more? You'll need to go to Harvest Street for the fresh stuff." <<He>> hands you £5 and a large bottle. "That should be enough to fill it."
+ <</if>>
+ <br><br>
+ <<if $breastfeedingdisable is "f" and $lactating is 1 and $promiscuity gte 35 and $awareness gte 100>>
+ A thought strikes as you pass the toilets. There's a closer source of fresh milk.
+ <br><br>
+
+ <<link [[Milk yourself|Robin Milk Masturbation]]>><<set $masturbationstart to 1>><</link>><<promiscuous3>>
+ <br>
+ <<else>>
+ You leave the park, and follow the road to Harvest Street.
+ <br><br>
+ <</if>>
+ <<link [[Buy the milk|Robin Milk Buy]]>><</link>>
+ <br>
+ <<set $skulduggerydifficulty to 400>>
+ <<link [[Steal the milk|Robin Milk Steal]]>><<crimeUp 5 "petty">><</link>><<skulduggerydifficulty>><<crime "petty">>
+ <br>
+ <<if $promiscuity gte 15>>
+ <<link [[Flirt for cheaper milk|Robin Milk Seduction]]>><</link>><<promiscuous2>>
+ <br>
+ <</if>>
<</if>>
<</if>>
diff --git a/game/overworld-town/loc-school/english-play.twee b/game/overworld-town/loc-school/english-play.twee
index c49ee130eb0d0ac191fece58f5426ea2ea3b6d79..70642819770faa0021a010436472edc964b8046c 100644
--- a/game/overworld-town/loc-school/english-play.twee
+++ b/game/overworld-town/loc-school/english-play.twee
@@ -909,7 +909,7 @@ By the time you're done, the school has started to close. You head outside with
You emerge onto Oxford Street. There's an eclectic mix of buildings, but most notable is the school.
<<if Weather.precipitation is "rain">>
The street is busy despite the rain.
-<<elseif Weather.precipitation is "snow">>
+<<elseif Weather.isFreezing>>
The street is busy despite the cold.
<<else>>
Students are hanging out nearby.
diff --git a/game/overworld-town/loc-school/main.twee b/game/overworld-town/loc-school/main.twee
index 39dcdf29c625da4f939177c9ef072ff3279ffcf0..6c4f634468af1a4d3f19351d358de4b5f76e421a 100644
--- a/game/overworld-town/loc-school/main.twee
+++ b/game/overworld-town/loc-school/main.twee
@@ -34,7 +34,7 @@
You are in the courtyard in front of the school.
<<if Weather.precipitation is "rain">>
It is empty, bar rivulets of rainwater.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isSnow>>
It is empty, the snow coating the ground lending to a picturesque stillness.
<<else>>
It is empty.
diff --git a/game/overworld-town/loc-school/widgets-events.twee b/game/overworld-town/loc-school/widgets-events.twee
index 4c9757f906df749256cbcc8df6cdcc8ed42bc1cd..48d380e3e7725feed7ea6c3d179d47384327c020 100644
--- a/game/overworld-town/loc-school/widgets-events.twee
+++ b/game/overworld-town/loc-school/widgets-events.twee
@@ -1412,7 +1412,7 @@
<<if Weather.precipitation is "rain">>
sheltered from the rain by an alcove.
<<elseif Weather.precipitation is "snow">>
- sheltered from the rain by an alcove.
+ sheltered from the snow by an alcove.
<<else>>
<<if Time.dayState is "night">>
watching bats swoop overhead.
diff --git a/game/overworld-town/loc-sea/main.twee b/game/overworld-town/loc-sea/main.twee
index 60db9a72a77c56494a24347e5d9e88db9411254a..a01ffce5aed7324dbef9ad5ddb4979725bc119b5 100644
--- a/game/overworld-town/loc-sea/main.twee
+++ b/game/overworld-town/loc-sea/main.twee
@@ -5,7 +5,7 @@ You are swimming in the sea along the beach.
<<if Time.dayState is "day">>
<<if Weather.precipitation is "rain">>
The beach itself is mostly deserted due to the rain, but the violent waves have attracted surfers.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
The cold has kept most away, but the violent waves have attracted surfers.
<<elseif !Weather.overcast>>
It is awash with visitors, children build sandcastles and play in the water while their parents bask in the sun. A group of students are playing volleyball.
@@ -15,7 +15,7 @@ You are swimming in the sea along the beach.
<<elseif Time.dayState is "dawn">>
<<if Weather.precipitation is "rain">>
The beach itself is mostly deserted due to the rain, but the violent waves have attracted surfers.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
The cold has kept most away, but the violent waves have attracted surfers.
<<elseif !Weather.overcast>>
It is a popular destination for joggers, some have dogs with them. A few families are setting up windbreakers. A group of students are playing volleyball.
@@ -25,7 +25,7 @@ You are swimming in the sea along the beach.
<<elseif Time.dayState is "dusk">>
<<if Weather.precipitation is "rain">>
The beach itself is mostly deserted due to the rain, but the violent waves have attracted surfers.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
The cold has kept most away, but the violent waves have attracted surfers.
<<elseif !Weather.overcast>>
Families are leaving as the sun sets. A group of students are playing volleyball.
@@ -33,11 +33,7 @@ You are swimming in the sea along the beach.
It is mostly deserted, but some people are strolling along the water's edge.
<</if>>
<<elseif Time.dayState is "night">>
- <<if Weather.precipitation is "rain">>
- It appears deserted.
- <<elseif Weather.precipitation is "snow">>
- It appears deserted
- <<elseif !Weather.overcast>>
+ <<if !Weather.overcast && Weather.precipitation === "none">>
It appears deserted, save for a group of students who are drinking around a fire.
<<else>>
It appears deserted.
diff --git a/game/overworld-town/loc-street/barb.twee b/game/overworld-town/loc-street/barb.twee
index 3a20c5a577ade4c3b05cf03c445debb6ae6eadf7..301aec25164547190828ce414dc22cbfb60430fc 100644
--- a/game/overworld-town/loc-street/barb.twee
+++ b/game/overworld-town/loc-street/barb.twee
@@ -5,7 +5,7 @@ You are on Barb Street. Silver blocks of flats tower all around, most separated
<<if Time.dayState is "day">>
<<if Weather.precipitation is "rain">>
The few braving the rain walk quickly.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
Pedestrians fill the pavements, walking brisk against the cold.
<<else>>
Pedestrians fill the pavements, but the sound of traffic dominates.
@@ -13,7 +13,7 @@ You are on Barb Street. Silver blocks of flats tower all around, most separated
<<elseif Time.dayState is "dawn">>
<<if Weather.precipitation is "rain">>
Rain cascades over the buildings, dripping over hurried bodies.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isSnow>>
The night-settled snow has already been trodden away by heavy footfalls.
<<else>>
The street is already busy, even so early.
@@ -21,7 +21,7 @@ You are on Barb Street. Silver blocks of flats tower all around, most separated
<<elseif Time.dayState is "dusk">>
<<if Weather.precipitation is "rain">>
People hurry through the rain, eager to be inside.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
People hurry through the cold, eager to be inside.
<<else>>
The sun has long since disappeared behind the towers, but the street remains busy.
@@ -29,7 +29,7 @@ You are on Barb Street. Silver blocks of flats tower all around, most separated
<<elseif Time.dayState is "night">>
<<if Weather.precipitation is "rain">>
Lights from high windows pierce the dark rain.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isSnow>>
Lights from high windows illuminate the snow.
<<else>>
Voices and occasional shouting emerge from nearby buildings despite the hour.
diff --git a/game/overworld-town/loc-street/cliff.twee b/game/overworld-town/loc-street/cliff.twee
index 3d10d9da94f4950a40e92b2ec605e11fa2aacc44..e6aa6bd6200ee973f11fdb443de58f27ba1e98f0 100644
--- a/game/overworld-town/loc-street/cliff.twee
+++ b/game/overworld-town/loc-street/cliff.twee
@@ -17,7 +17,7 @@ There's a path leading down to the beach.
<<if Time.dayState is "day">>
<<if Weather.precipitation is "rain">>
Wind howls in from the sea.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
Wind howls in from the sea.
<<else>>
A gentle breeze blows in from the sea.
@@ -25,7 +25,7 @@ There's a path leading down to the beach.
<<elseif Time.dayState is "dawn">>
<<if Weather.precipitation is "rain">>
Rain sweeps in from the sea.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
Icy wind howls in from the sea.
<<else>>
There's a lot of traffic. People are driving to work.
@@ -33,7 +33,7 @@ There's a path leading down to the beach.
<<elseif Time.dayState is "dusk">>
<<if Weather.precipitation is "rain">>
Rain sweeps in from the sea, soddening people on their way home from work.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
Icy wind sweeps in from the sea, chilling people on their way home from work.
<<else>>
There's a lot of traffic. People are driving home from work.
@@ -41,7 +41,7 @@ There's a path leading down to the beach.
<<elseif Time.dayState is "night">>
<<if Weather.precipitation is "rain">>
The sea roars below.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
The sea murmers below.
<<else>>
The street is dark and quiet. Only the ocean can be heard.
diff --git a/game/overworld-town/loc-street/connudatus.twee b/game/overworld-town/loc-street/connudatus.twee
index 7621b54f9ee9d1054a70c0e3ba2a8b74833fbabb..a873cca9de4ef4b7f7a2e8a0bd94e8c47c06b6c0 100644
--- a/game/overworld-town/loc-street/connudatus.twee
+++ b/game/overworld-town/loc-street/connudatus.twee
@@ -5,7 +5,7 @@ You are on Connudatus Street. The numerous clubs, bars and restaurants make it t
<<if Time.dayState is "day">>
<<if Weather.precipitation is "rain">>
Shoppers huddle around roofed stalls.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
The street is crowded by shoppers, well-wrapped against the cold.
<<else>>
The street is crowded with shoppers.
@@ -13,7 +13,7 @@ You are on Connudatus Street. The numerous clubs, bars and restaurants make it t
<<elseif Time.dayState is "dawn">>
<<if Weather.precipitation is "rain">>
Vendors are setting up their stalls, getting the roofs up quick to escape the rain.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
Well-wrapped vendors are setting up their stalls.
<<else>>
Vendors are setting up their stalls.
@@ -21,7 +21,7 @@ You are on Connudatus Street. The numerous clubs, bars and restaurants make it t
<<elseif Time.dayState is "dusk">>
<<if Weather.precipitation is "rain">>
Vendors are taking down their stalls, hurrying to be out of the rain.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
Vendors are taking down their stalls, eager to be out of the cold.
<<else>>
Vendors are taking down their stalls. The restaurants are packed.
@@ -29,7 +29,7 @@ You are on Connudatus Street. The numerous clubs, bars and restaurants make it t
<<elseif Time.dayState is "night">>
<<if Weather.precipitation is "rain">>
The nightlife is in full swing, undeterred by the rain.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
The nightlife is in full swing, undeterred by the cold.
<<else>>
The nightlife is in full swing. Neon lights glow above.
diff --git a/game/overworld-town/loc-street/domus.twee b/game/overworld-town/loc-street/domus.twee
index a937957f5c62edaa1cebb337e0af84f638b468a0..779ff53687f3e90cffc08003d1c8a0fcec68948b 100644
--- a/game/overworld-town/loc-street/domus.twee
+++ b/game/overworld-town/loc-street/domus.twee
@@ -5,7 +5,7 @@ You are on Domus Street. The orphanage is here. The street is dominated by small
<<if Time.dayState is "day">>
<<if Weather.precipitation is "rain">>
People walk quickly, driven by the rain.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
People walk brisk against the cold.
<<else>>
People tend to their gardens and go about their business all along the street.
@@ -13,7 +13,7 @@ You are on Domus Street. The orphanage is here. The street is dominated by small
<<elseif Time.dayState is "dawn">>
<<if Weather.precipitation is "rain">>
It's busy. People are on their way to work, wearing raincoats or carrying umbrellas.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
It's busy. People are on their way to work, bundled against the cold.
<<else>>
It's busy. People are on their way to work.
@@ -21,7 +21,7 @@ You are on Domus Street. The orphanage is here. The street is dominated by small
<<elseif Time.dayState is "dusk">>
<<if Weather.precipitation is "rain">>
People return to their homes, eager to be out of the rain.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
People return to their homes, eager to be out of the cold.
<<else>>
People return to their homes, tired after a long day.
@@ -29,7 +29,7 @@ You are on Domus Street. The orphanage is here. The street is dominated by small
<<else>>
<<if Weather.precipitation is "rain">>
The street is dark, and drenched with the patter of rain.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
The street is dark and silent in the snow.
<<else>>
The street is dark and silent, save the occasional engine.
diff --git a/game/overworld-town/loc-street/elk.twee b/game/overworld-town/loc-street/elk.twee
index 0421641627b1f481457ed2052a8a118c4a44b6c2..a0de313cde33c22abc6a3f7936cef160848c7622 100644
--- a/game/overworld-town/loc-street/elk.twee
+++ b/game/overworld-town/loc-street/elk.twee
@@ -5,7 +5,7 @@ You are on Elk Street. There are roads leading to several large industrial compl
<<if Time.dayState is "day">>
<<if Weather.precipitation is "rain">>
Water pings off metal all around.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
The sound of machinery is muffled by the snow.
<<else>>
You hear the sound of machinery all around.
diff --git a/game/overworld-town/loc-street/harvest.twee b/game/overworld-town/loc-street/harvest.twee
index 4840447b390dc51566dff15514f4e3287d05534e..1f5e4da8adbe903be47a2295ff1239343d2a0e13 100644
--- a/game/overworld-town/loc-street/harvest.twee
+++ b/game/overworld-town/loc-street/harvest.twee
@@ -13,7 +13,7 @@ You are on Harvest Street. There's a road leading out of town, and many of the b
<<elseif Time.dayState is "dawn">>
<<if Weather.precipitation is "rain">>
Heavy vehicles from outside town slosh through pools of water.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isSnow>>
Some of the heavy vehicles arriving from outside town are capped with snow.
<<else>>
Vehicles are already arriving from outside town.
@@ -21,7 +21,7 @@ You are on Harvest Street. There's a road leading out of town, and many of the b
<<elseif Time.dayState is "dusk">>
<<if Weather.precipitation is "rain">>
Rainwater falls from gutters in great curtains.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
Workers bundle against the cold.
<<else>>
The sun sets, but it will be a while before the workers here are done for the day.
@@ -29,7 +29,7 @@ You are on Harvest Street. There's a road leading out of town, and many of the b
<<elseif Time.dayState is "night">>
<<if Weather.precipitation is "rain">>
Pools fill at the edge of the road, splattering their contents over the pavement when a vehicle passes.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isSnow>>
Even at night the traffic keeps the road free of snow.
<<else>>
Even at night the street is busy.
diff --git a/game/overworld-town/loc-street/high.twee b/game/overworld-town/loc-street/high.twee
index bf4521375e2501d715fd72f4284890f91588bfe8..aeb1d2d56eb8c9f1d288c1d198e918242a71e607 100644
--- a/game/overworld-town/loc-street/high.twee
+++ b/game/overworld-town/loc-street/high.twee
@@ -5,7 +5,7 @@ You are on the High Street, centre of the town's commercial activity. The shoppi
<<if Time.dayState is "day">>
<<if Weather.precipitation is "rain">>
The street is busy despite the rain.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
The street is busy despite the cold.
<<else>>
The street is packed with people, walking in all directions.
@@ -16,7 +16,7 @@ You are on the High Street, centre of the town's commercial activity. The shoppi
<<elseif Time.dayState is "dawn">>
<<if Weather.precipitation is "rain">>
Customers are already hurrying into shops.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
Some shops are open already, lights on against the gloom.
<<else>>
Some shops are open already.
@@ -27,7 +27,7 @@ You are on the High Street, centre of the town's commercial activity. The shoppi
<<elseif Time.dayState is "dusk">>
<<if Weather.precipitation is "rain">>
Some shops are closing, staff locking up and hurrying to be out of the rain.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
Some shops are closed, but others remain open, lighting up parts of the street.
<<else>>
Some shops are closed, but others remain open.
@@ -38,7 +38,7 @@ You are on the High Street, centre of the town's commercial activity. The shoppi
<<elseif Time.dayState is "night">>
<<if Weather.precipitation is "rain">>
A few people still brave the rain, despite almost everything being closed.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
A few people still brave the cold, despite almost everything being closed.
<<else>>
A few people still walk down the street, despite almost everything being closed.
diff --git a/game/overworld-town/loc-street/mer.twee b/game/overworld-town/loc-street/mer.twee
index 589c8e7f4b6af92254abbea8caccfeb2e7033b99..6600aad3393fb5d7ef4d9dbf007888337495a61d 100644
--- a/game/overworld-town/loc-street/mer.twee
+++ b/game/overworld-town/loc-street/mer.twee
@@ -13,7 +13,7 @@ You are on Mer Street. The street is dominated by the docks and shipping industr
<<elseif Time.dayState is "dawn">>
<<if Weather.precipitation is "rain">>
Mist from the sea occasinally sprays over the road.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
You see movement on the dock, workers braving the morning chill.
<<else>>
You can already hear activity from the dock.
diff --git a/game/overworld-town/loc-street/nightingale.twee b/game/overworld-town/loc-street/nightingale.twee
index 46376817bf4bbaf882f25ba64113ec86d94d34fd..8cf4924e7882eef32d3dd3efa86a8196ef80f229 100644
--- a/game/overworld-town/loc-street/nightingale.twee
+++ b/game/overworld-town/loc-street/nightingale.twee
@@ -11,7 +11,7 @@ You are on Nightingale Street. It is dominated by the civic hospital but there a
<<elseif Time.dayState is "dawn">>
<<if Weather.precipitation is "rain">>
The car park fills with vehicles, their occupants hurrying to their workplaces.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
The car park fills with vehicles, their occupants hurrying to their workplaces.
<<else>>
People are arriving at their workplaces.
@@ -19,7 +19,7 @@ You are on Nightingale Street. It is dominated by the civic hospital but there a
<<elseif Time.dayState is "dusk">>
<<if Weather.precipitation is "rain">>
People hurry through the rain, heading home for the day.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isSnow>>
People trudge through the snow, heading home for the day.
<<else>>
People are heading home for the day.
@@ -27,7 +27,7 @@ You are on Nightingale Street. It is dominated by the civic hospital but there a
<<elseif Time.dayState is "night">>
<<if Weather.precipitation is "rain">>
The hospital lights up the rain.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isSnow>>
The snow is lit by an oasis of light around the hospital.
<<else>>
There's an oasis of light around the hospital.
diff --git a/game/overworld-town/loc-street/oxford.twee b/game/overworld-town/loc-street/oxford.twee
index 7b8003571016b5a9fa4220b73c7064ad52fb5752..438ff5e34929ed1a5d9c3713540d318ebaf67481 100644
--- a/game/overworld-town/loc-street/oxford.twee
+++ b/game/overworld-town/loc-street/oxford.twee
@@ -6,7 +6,7 @@ You are on Oxford Street. There's an eclectic mix of buildings, but most notable
<<if Time.dayState is "day">>
<<if Weather.precipitation is "rain">>
The street is busy despite the rain.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
The street is busy despite the cold.
<<else>>
<<if Time.hour gte 7 and Time.hour lte 16>>
@@ -26,7 +26,7 @@ You are on Oxford Street. There's an eclectic mix of buildings, but most notable
<<if Time.dayState is "day">>
<<if Weather.precipitation is "rain">>
The street is busy despite the rain.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
The street is busy despite the cold.
<<else>>
Many cars and pedestrians are passing by.
@@ -34,7 +34,7 @@ You are on Oxford Street. There's an eclectic mix of buildings, but most notable
<<elseif Time.dayState is "dawn">>
<<if Weather.precipitation is "rain">>
People hurry to work, eager to escape the rain.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
People hurry to work, eager to be out of the cold.
<<else>>
People are arriving at their workplaces.
@@ -42,7 +42,7 @@ You are on Oxford Street. There's an eclectic mix of buildings, but most notable
<<elseif Time.dayState is "dusk">>
<<if Weather.precipitation is "rain">>
People hurry home, eager to be out of the rain.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
People hurry home, eager to be out of the cold.
<<else>>
People are heading home for the day.
@@ -50,7 +50,7 @@ You are on Oxford Street. There's an eclectic mix of buildings, but most notable
<<elseif Time.dayState is "night">>
<<if Weather.precipitation is "rain">>
People are passing through despite the rain and hour.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isSnow>>
People are passing through, braving the dark snow.
<<else>>
Due to its central location, people pass through even at this hour.
diff --git a/game/overworld-town/loc-street/wolf.twee b/game/overworld-town/loc-street/wolf.twee
index 2a95aa28463859eab96b529b42430ad8e35f97cb..7f6083bfc2314cc9eabb2874ade80f9d0503f9ed 100644
--- a/game/overworld-town/loc-street/wolf.twee
+++ b/game/overworld-town/loc-street/wolf.twee
@@ -21,7 +21,7 @@ You are on Wolf Street. The nearby forest bleeds into the town here, particularl
<<elseif Time.dayState is "dusk">>
<<if Weather.precipitation is "rain">>
It strikes a forbidding silhouette against the dark rain.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isSnow>>
The coating of snow does not detract from its forbidding silhouette.
<<else>>
It strikes a forbidding silhouette against the darkening sky.
@@ -32,8 +32,6 @@ You are on Wolf Street. The nearby forest bleeds into the town here, particularl
<<if $hallucinations gte 2>>
But you feel it watching.
<</if>>
- <<elseif Weather.precipitation is "snow">>
- It's almost pitch-black.
<<else>>
It's almost pitch-black.
<</if>>
diff --git a/game/overworld-town/special-eden/main.twee b/game/overworld-town/special-eden/main.twee
index 69f6476c9583d71cfdf12ebd3c4e49e562764e5d..37eaaf5abd5ba6b898eb15fe086e0876a6279aa7 100644
--- a/game/overworld-town/special-eden/main.twee
+++ b/game/overworld-town/special-eden/main.twee
@@ -306,7 +306,7 @@ You arrive at the park.
<<if Weather.precipitation is "rain">>
A few people are out, walking around the puddles that dot the paths.
Even this smattering makes Eden uncomfortable.
- <<elseif Weather.precipitation is "snow">>
+ <<elseif Weather.isFreezing>>
Many people are out, walking their dogs or jogging, wrapped up warm against the cold.
Eden steers you away whenever possible.
<<else>>
diff --git a/game/overworld-town/special-kylar/abduction.twee b/game/overworld-town/special-kylar/abduction.twee
index 097a08c7dc775878430098f0dc25a29f578f0393..e72324b59942dbe9b82c9b9fab865d5094d33f29 100644
--- a/game/overworld-town/special-kylar/abduction.twee
+++ b/game/overworld-town/special-kylar/abduction.twee
@@ -160,7 +160,7 @@ You are in a small room. You see the sky through a thin window near the ceiling.
<</if>>
<<elseif Weather.precipitation is "rain">>
The bottom is obscured by pooled rainwater.
-<<elseif Weather.precipitation is "snow">>
+<<elseif Weather.isSnow>>
Stacked snow almost blocks the view.
<<else>>
<<if Time.dayState is "night">>
diff --git a/img/misc/locations/meadow/base.png b/img/misc/locations/meadow/base.png
index bb6cdfad349a3e197caaf57bbe64ee8729e899a0..83de7cbd51094a5cb116add5dca8fcf054ffa017 100644
Binary files a/img/misc/locations/meadow/base.png and b/img/misc/locations/meadow/base.png differ
diff --git a/img/misc/locations/meadow/wind.png b/img/misc/locations/meadow/wind.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a0dff5a7fa2c0488aef6f24c78ee9cf41b89de1
Binary files /dev/null and b/img/misc/locations/meadow/wind.png differ
diff --git a/modules/05-object-extensions.js b/modules/05-object-extensions.js
index 3c4d6926645853578cb2b2bf68635288910ad7ca..bf5f5dbf9ab401bbf7afc430f4132f88bc591149 100644
--- a/modules/05-object-extensions.js
+++ b/modules/05-object-extensions.js
@@ -9,10 +9,10 @@
*
* * Examples:
* // Use optional arrayBehaviour
- * obj1.mergeDeep(obj2, { arrayBehaviour: 'merge-deduplicate' });
+ * obj1.mergeDeep(obj2, "merge-deduplicate" });
*
* // Use filter to exclude number properties
- * obj1.mergeDeep(obj2, (key, value) => typeof value !== 'number');
+ * obj1.mergeDeep(obj2, (key, value) => typeof value !== "number");
*/
const ObjectAssignDeep = (function () {