Skip to content
Snippets Groups Projects
Commit cf472488 authored by Vrelnir's avatar Vrelnir
Browse files

Merge branch 'fix_schoolLessonsMissed' into 'dev'

fix schoolLessonsMissed being undefined in backComp Time refactor

See merge request Vrelnir/degrees-of-lewdity!2085
parents c020a2cb f6a1a2c8
No related branches found
No related tags found
No related merge requests found
......@@ -4231,6 +4231,25 @@
<<unset $adultShopWhitney>>
<</if>>
<!--
v0.4.0.6 change (87f8e633085bb4be8f4f0d099012b1e0b077242a) that I've moved up here.
the reason is - this variable is used in the edge-case handled below
(the <<pass _passMinutes>> macro that the v0.4 Time refactor sometimes calls ends up reading schoolLessonsMissed.science,
which obviously breaks if this initialization doesn't happen at this point.
If you add any calls to <<pass>> before this line in backComp - it will also break
for any players whose save doesn't have the schoolLessonsMissed paramm yet.
-->
<<if $sciencemissed isnot undefined>>
<<set $schoolLessonsMissed to { science: $sciencemissed, maths: $mathsmissed, english: $englishmissed, history: $historymissed, swimming: $swimmingmissed }>>
<<unset $sciencemissed>>
<<unset $mathsmissed>>
<<unset $englishmissed>>
<<unset $historymissed>>
<<unset $swimmingmissed>>
<</if>>
<!-- v0.4 Time refactor -->
<<if $time isnot undefined and !$timeStamp>>
<<script>>
......@@ -4362,15 +4381,6 @@
<</script>>
<</if>>
<<if $sciencemissed isnot undefined>>
<<set $schoolLessonsMissed to { science: $sciencemissed, maths: $mathsmissed, english: $englishmissed, history: $historymissed, swimming: $swimmingmissed }>>
<<unset $sciencemissed>>
<<unset $mathsmissed>>
<<unset $englishmissed>>
<<unset $historymissed>>
<<unset $swimmingmissed>>
<</if>>
<!-- V0.4.0.5 repair transformationParts object after damage from mid-prayer room or nightmare saves -->
<<if $transformationParts.fox is undefined and $tfFIX is undefined>>
<<set $tfFIX to 1>>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment