Merge pull request 'Remove double-fade transitions in 13C&D, restructure Nio's second photoshoot scene slightly' (#96) from Bowie/SnootGame:remove-double-fade into Monster-Update-6

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/96

game/script/13C.fang-and-anon-go-to-beach-and-prom.rpy

@@ -213,6 +213,7 @@ label chapter_13C:
     play sound 'audio/effects/cameraMult.ogg'
     pause .275
     scene black with Fade(.1, 1, 2, color="#fff")
+
     scene home fang night blurred with dissolve
     pause 0.1
     scene home fang night lessblurred with dissolve
@@ -224,7 +225,9 @@ label chapter_13C:
         xalign 0.7
     show fang c prom happy at sleft:
         xalign -0.1
-    with fade
+    with Dissolve(1)
+    pause .5
+
     "The searing strobe lights finally end and I can {i}feel{/i} my early onset of blindness."
 
     FM "These photos need to have a special album all their own. Honey! We need another photo album!"

game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy

@@ -43,11 +43,13 @@ label chapter_13D:
     F "Best thing to do is get it over with."
 
     FM "That’s right.{w=0.2} Alright everyone, group together, this one’s going on Christmas postcards for sure!"
-
-    #photo op
     pause .5
 
-    scene black with dissolve
+    "Kill me."
+
+    F "Later."
+
+    scene black with Dissolve(1)
     pause .5
     
     play sound 'audio/effects/camera.ogg'
@@ -129,25 +131,16 @@ label chapter_13D:
     with Fade(.1, 0, .4, color="#fff")
  
     pause .25
-    scene home fang night with fade
-    show anon prom neutral:
-        xalign -0.1 yalign 0.1
-    show fang d prom neutral behind anon:
-        xalign 0.1 yalign 0.1
-    show naser prom neutral flip:
-        xalign 0.9 yalign 0.1
-    show naomi prom neutral flip:
-        xalign 1.1 yalign 0.1
-    with fade
-    "Kill me."
 
-    F "Later."
-
-    "The onslaught of flashes continues as the four of us are directed to stand and pose together in every possible combination."
     play sound 'audio/effects/cameraMult.ogg'
     pause .275
     scene black with Fade(.1, 1, 2, color="#fff")
+    pause .5
     
+    "The onslaught of flashes continues as the four of us are directed to stand and pose together in every possible combination."
+    
+    "After a millenia Fang’s mother is satisfied, or her camera ran out of storage."
+    pause .5
 
     scene home fang night blurred with dissolve
     pause 0.1
@@ -156,6 +149,7 @@ label chapter_13D:
     scene home fang night barelyblurred with dissolve
     pause 0.1
 
+    scene home fang night
     show anon prom neutral:
         xalign -0.1 yalign 0.1
     show fang d prom neutral behind anon:
@@ -164,9 +158,8 @@ label chapter_13D:
         xalign 0.9 yalign 0.1
     show naomi prom neutral flip:
         xalign 1.1 yalign 0.1
-    with fade
-
-    "After a millenia Fang’s mother is satisfied, or her camera ran out of storage."
+    with Dissolve(1)
+    pause .5
 
     "Naser and Fang both crash onto the couch rubbing their photo-bleached eyes, Even Naomi is holding her eyes closed."