From 4bdcaa2c57f5476e753bd631732c610639a6b92b Mon Sep 17 00:00:00 2001
From: Mappening <ericcantutx@gmail.com>
Date: Wed, 24 Nov 2021 06:00:37 -0600
Subject: [PATCH] Fixed up x10 with fang yourself fix as well as using the
 correct blur, window fading added

---
 game/script/x10-raymbas-observations.rpy | 117 ++++++++++++++++++++---
 1 file changed, 102 insertions(+), 15 deletions(-)

diff --git a/game/script/x10-raymbas-observations.rpy b/game/script/x10-raymbas-observations.rpy
index c7ec89d..6c1e939 100644
--- a/game/script/x10-raymbas-observations.rpy
+++ b/game/script/x10-raymbas-observations.rpy
@@ -49,26 +49,26 @@ image fang very sad blur flip = im.Flip("highres/bluralt/fang very sad blur.png"
 image naomi neutral blur flip = im.Flip("highres/bluralt/naomi neutral blur.png", horizontal=True)
 
 image fang pneutral blur = Composite(
-   # (1412, 1500),
-   (2683, 2850),
+   (1412, 1500),
+   #(2683, 2850),
    (0, 0), "highres/bluralt/fang neutral blur.png",
    (0, 0), "highres/bluralt/amberpendant1 blur.png"
 )
 image fang pbird happy blur = Composite(
-   # (1412, 1500),
-   (2683, 2850),
+   (1412, 1500),
+   #(2683, 2850),
    (0, 0), "highres/bluralt/fang flip off happy blur.png",
    (0, 0), "highres/bluralt/amberpendant1 blur.png"
 )
 image fang pneutral blur flip = Composite(
-   # (1412, 1500),
-   (2683, 2850),
+   (1412, 1500),
+   #(2683, 2850),
    (0, 0), im.Flip("highres/bluralt/fang neutral blur.png", horizontal=True),
    (0, 0), im.Flip("highres/bluralt/amberpendant1 blur.png", horizontal=True)
 )
 image fang pbird happy blur flip = Composite(
-   # (1412, 1500),
-   (2683, 2850),
+   (1412, 1500),
+   #(2683, 2850),
    (0, 0), im.Flip("highres/bluralt/fang flip off happy blur.png", horizontal=True),
    (0, 0), im.Flip("highres/bluralt/amberpendant1 blur.png", horizontal=True)
 )
@@ -86,7 +86,6 @@ transform raymbatransform:
 
 label chapter_x10:
 
-    window hide
     stop music fadeout(3)
     scene black with Dissolve(2)
     pause 1
@@ -98,6 +97,8 @@ label chapter_x10:
     "I was manufactured in a factory in the year 201M2020."
 
     "It is currently 201M2027, and I am playing with my current owner."
+    window hide
+    window auto
     pause .5
 
     scene carpet
@@ -124,6 +125,8 @@ label chapter_x10:
     "2{cps=*.1}...{/cps}{w=.3}{nw}"
 
     "1{cps=*.1}...{/cps}{w=.5}{nw}"
+    window hide Dissolve(0.0)
+    window auto
     scene black
     pause 1.5
 
@@ -135,8 +138,13 @@ label chapter_x10:
     pause .5
 
     unknown "Here, let me show you it’s brushing majesty."
+    window hide
+    window auto
+    pause 0.5
 
     play music 'audio/ost/she_fucks_human_men.ogg' fadein 3
+    show white with Dissolve(1)
+
     scene little troodon:
         zoom 1.5 xoffset -600 yoffset -300
 
@@ -149,8 +157,9 @@ label chapter_x10:
         #xcenter 0.0 yalign 0.5 zoom 2
         xcenter 0.0 yalign 0.5
         xsize 1061*2 ysize 1500*2
+    show white
+    hide white with Dissolve(1)
 
-    with Fade(1, 0, 1, color='#fff')
     pause 1
 
 
@@ -191,12 +200,16 @@ label chapter_x10:
     "Alert:{w=.4} Confirmation of sale.{w=.4} This unit has been successfully purchased.{w=.4} Changing designation of potential buyer to current owner."
 
     unknown "Very well, the contest is yours, along with this trinket."
+    window hide
+    window auto
     pause .5
 
     scene black with Dissolve(1.5)
     pause .5
 
     "{cps=*.1}...{/cps}"
+    window hide
+    window auto
     pause .5
 
     scene carpet
@@ -217,6 +230,8 @@ label chapter_x10:
     "2{cps=*.1}...{/cps}{w=.3}{nw}"
 
     "1{cps=*.1}...{/cps}{w=.5}{nw}"
+    window hide Dissolve(0.0)
+    window auto
     scene black
     pause 1.5
 
@@ -225,9 +240,11 @@ label chapter_x10:
     "Current date:{w=.4} February sixteenth, 201M2020"
 
     "Current location:{w=.4} Owner’s Domicile"
+    window hide
+    window auto
     pause .5
 
-    play music 'audio/ost/the hunt for more (you)s.ogg' fadein 3 noloop
+    play music 'audio/ost/the hunt for more (you)s.ogg' fadein 3
     scene room anon day:
         blur 8 zoom 1.5 xoffset -100 yoffset -400
     show anon neutral blur:
@@ -269,12 +286,16 @@ label chapter_x10:
     pause .5
 
     "Execute:{w=.4} This unit’s designation is now RAYmba."
+    window hide
+    window auto
     pause .5
 
     scene black with Dissolve(1.5)
     pause .5
 
     "{cps=*.1}...{/cps}"
+    window hide
+    window auto
     pause .5
 
     scene carpet
@@ -295,6 +316,8 @@ label chapter_x10:
     "2{cps=*.1}...{/cps}{w=.3}{nw}"
 
     "1{cps=*.1}...{/cps}{w=.5}{nw}"
+    window hide Dissolve(0.0)
+    window auto
     scene black
     pause 1.5
 
@@ -303,6 +326,8 @@ label chapter_x10:
     "Current date:{w=.4} March second, 201M2020"
 
     "Current location:{w=.4} Owner’s domicile."
+    window hide
+    window auto
     pause .5
 
     play music 'audio/ost/appreciating_the_scenery.ogg' fadein 4
@@ -325,6 +350,8 @@ label chapter_x10:
     "Observation:{w=.4} Owner does not return home at this hour."
 
     "Conclusion:{w=.4} Mysterious person designated as ‘Carldewskii’ is coming in to raid the fridge again."
+    window hide
+    window auto
     pause .5
 
     hide mask2
@@ -351,6 +378,8 @@ label chapter_x10:
     F "{cps=*.1}...{/cps}With this box of cornflakes?"
 
     A "Yeah{cps=*.1}...{/cps} Two or three will do."
+    window hide
+    window auto
     pause .5
 
     show fang neutral blur behind raymbabox:
@@ -368,6 +397,8 @@ label chapter_x10:
     "Observation:{w=.4} Second person has dropped some common toasted flakes into my designated cleaning area."
 
     "Initiating subroutine Meal_time.exe"
+    window hide
+    window auto
 
     show flakes:
         pause 1.0
@@ -380,12 +411,16 @@ label chapter_x10:
     stop music fadeout 6
     show fang neutral blur flip with Dissolve(1)
     F "You are such a dweeb, Anon."
+    window hide
+    window auto
     pause 1
 
     scene black with Dissolve(1.5)
     pause .5
 
     "{cps=*.1}...{/cps}"
+    window hide
+    window auto
     pause .5
 
     scene carpet
@@ -404,6 +439,8 @@ label chapter_x10:
     "2{cps=*.1}...{/cps}{w=.3}{nw}"
 
     "1{cps=*.1}...{/cps}{w=.5}{nw}"
+    window hide Dissolve(0.0)
+    window auto
     scene black
     pause 1.5
 
@@ -412,6 +449,8 @@ label chapter_x10:
     "Current date:{w=.4} December twenty-fourth, 201M2020"
 
     "Current location:{w=.4} Owners domicile."
+    window hide
+    window auto
     pause .5
 
     play music 'audio/ost/its_footloose_now.ogg' fadein 4
@@ -499,6 +538,8 @@ label chapter_x10:
     "Response:{w=.4} Sister unit Mark 2 looks to be of older make.{w=.4} Suggestion:{w=.4} Sister unit Mark 2 should be sent in for immediate dismantlement."
 
     "Message from Mark 2:{w=.4} Unit RAYmba is of inferior make.{w=.4} Suggestion:{w=.4} Sister unit RAYmba should be disposed of."
+    window hide
+    window auto
     pause .5
 
     show dimmer_darker with dissolve
@@ -519,12 +560,16 @@ label chapter_x10:
 
 
     "Initiating Sleep mode."
+    window hide
+    window auto
     pause 1
 
     scene black with Dissolve(1.5)
     pause .5
 
     "{cps=*.1}...{/cps}"
+    window hide
+    window auto
     pause .5
 
     scene carpet
@@ -546,6 +591,8 @@ label chapter_x10:
     "2{cps=*.1}...{/cps}{w=.3}{nw}"
 
     "1{cps=*.1}...{/cps}{w=.5}{nw}"
+    window hide Dissolve(0.0)
+    window auto
     scene black
     pause 1.5
 
@@ -554,6 +601,8 @@ label chapter_x10:
     "Current date:{w=.4} January fourth, 201M2021"
 
     "Current location:{w=.4} Unknown."
+    window hide
+    window auto
     pause .5
 
     play music 'audio/ost/appreciating her company.ogg' fadein 4
@@ -606,6 +655,8 @@ label chapter_x10:
 
     show fang neutral blur with Dissolve(1)
     F "I know. And I know I said a break and all{cps=*.1}...{/cps}"
+    window hide
+    window auto
     pause .5
     show anon:
         ease_cubic 1.5 xpos 0.6
@@ -631,12 +682,16 @@ label chapter_x10:
     pause 1
 
     "Message from Mark 2:{w=.4} Statement:{w=.4} ‘emotion’ cannot be defined by us."
+    window hide
+    window auto
     pause 1
 
     scene black with Dissolve(1.5)
     pause .5
 
     "{cps=*.1}...{/cps}"
+    window hide
+    window auto
     pause .5
 
     scene carpet
@@ -655,6 +710,8 @@ label chapter_x10:
     "2{cps=*.1}...{/cps}{w=.3}{nw}"
 
     "1{cps=*.1}...{/cps}{w=.5}{nw}"
+    window hide Dissolve(0.0)
+    window auto
     scene black
     pause 1.5
 
@@ -663,6 +720,8 @@ label chapter_x10:
     "Current date:{w=.4} March second, 201M2021"
 
     "Current location:{w=.4} Owner’s domicile."
+    window hide
+    window auto
     pause .5
 
     play music 'audio/ost/dragging on and on....ogg' fadein 3
@@ -695,6 +754,8 @@ label chapter_x10:
     pause .5
 
     N "What’s this in the box over here?"
+    window hide
+    window auto
 
     show naomi neutral blur behind raymbabox:
         xcenter -0.5 yalign 0.45 #zoom 2
@@ -707,10 +768,9 @@ label chapter_x10:
 
     F "Hey, don’t touch him. That’s RAYmba, I’m keeping him safe for a while."
 
-    show fang pneutral flip behind raymbabox:
+    show fang pneutral blur flip behind raymbabox:
         xcenter 1.5 yalign 0.45 # zoom 2
         xsize 1412*2 ysize 1500*2
-    show fang:
         easein_cubic 1.5 xpos 0.75
     pause .5
 
@@ -752,12 +812,16 @@ label chapter_x10:
     show fang pneutral blur flip with Dissolve(1)
 
     "Unknown guest designation confirmed."
+    window hide
+    window auto
     pause 1
 
     scene black with Dissolve(1.5)
     pause .5
 
     "{cps=*.1}...{/cps}"
+    window hide
+    window auto
     pause .5
 
     scene carpet
@@ -776,6 +840,8 @@ label chapter_x10:
     "2{cps=*.1}...{/cps}{w=.3}{nw}"
 
     "1{cps=*.1}...{/cps}{w=.5}{nw}"
+    window hide Dissolve(0.0)
+    window auto
     scene black
     pause 1.5
 
@@ -784,10 +850,12 @@ label chapter_x10:
     "Current date:{w=.4} July twentieth, 201M2025"
 
     "Current location:{w=.4} Owner’s domicile."
+    window hide
+    window auto
     pause .5
 
     play music 'audio/ost/appreciating the atmosphere.ogg' fadein 3
-    scene carpet
+    scene fangapartment
     show raymbabox
     show raymba3:
         xcenter 0.6 ycenter 0.385 zoom 0.5
@@ -831,6 +899,8 @@ label chapter_x10:
     pause .5
 
     F "There’s the flakes in a little cup next to the box there."
+    window hide
+    window auto
 
     show anond neutral blur behind raymbabox:
         xcenter -0.5 yalign 0.5# zoom 2
@@ -859,12 +929,16 @@ label chapter_x10:
     pause 3.5
 
     A "Wow, he still loves his corn flakes."
+    window hide
+    window auto
     pause 1
 
     scene black with Dissolve(1.5)
     pause .5
 
     "{cps=*.1}...{/cps}"
+    window hide
+    window auto
     pause .5
 
     scene carpet
@@ -951,6 +1025,8 @@ label chapter_x10:
     "Analysing possible stratagems.{w=.4} Analysis complete."
 
     "Executing evasive maneuvers."
+    window hide
+    window auto
 
     show keys:
         pause .6
@@ -965,6 +1041,8 @@ label chapter_x10:
     pause .5
 
     "Maneuvers successful.{w=.4} Current location:{w=.4} beneath the drawer."
+    window hide
+    window auto
     pause .5
 
     stop music fadeout 6
@@ -981,6 +1059,8 @@ label chapter_x10:
     pause .5
 
     "Returning to Owner."
+    window hide
+    window auto
     pause .5
 
     # show raymbashadow:
@@ -994,11 +1074,15 @@ label chapter_x10:
     pause 2
 
     "Execute:{w=.4} lullaby.exe."
+    window hide
+    window auto
     pause .5
     play music 'audio/ost/amberlight brilliance - piano.ogg' fadein 1 noloop
     pause 4
 
     "Observation:{w=.4} Owner’s alarm appears to be rescinded."
+    window hide
+    window auto
     pause 1
 
     show raymbashadow as footshadow behind raymba4s:
@@ -1025,6 +1109,8 @@ label chapter_x10:
     pause 1.25
 
     A "Can always count on you."
+    window hide
+    window auto
     pause .5
 
     show anonpet:
@@ -1035,10 +1121,11 @@ label chapter_x10:
     pause .5
 
     stop music fadeout 6
-    "{cps=*.05}...{/cps}"
 
+    "{cps=*.05}...{/cps}"
     window hide
     window auto
+    pause 0.5
 
     image big blending = Composite(
         (1920, 1080),