Merge branch 'Patch7' into Patch7

game/script/x10-raymbas-observations.rpy

@@ -4,7 +4,7 @@ image anon neutral megatex flip = im.Flip("highres/anon neutral megatex.png", ho
 image anon shrug megatex flip = im.Flip("highres/anon shrug megatex.png", horizontal=True)
 image anond neutral megatex flip = im.Flip("highres/anond neutral megatex.png", horizontal=True)
 image fang neutral megatex flip = im.Flip("highres/fang neutral megatex.png", horizontal=True)
-image fang flip off happy megatex flip = im.Flip("highres/afng flip off happy megatex.png", horizontal=True)
+image fang flip off happy megatex flip = im.Flip("highres/fang flip off happy megatex.png", horizontal=True)
 image fang very sad megatex flip = im.Flip("highres/fang very sad megatex.png", horizontal=True)
 image naomi neutral megatex flip = im.Flip("highres/naomi neutral megatex.png", horizontal=True)
 
@@ -39,7 +39,39 @@ image fang pbird happy megatex flip = Composite(
    (0, 0), im.Flip("highres/amberpendant1 megatex.png", horizontal=True)
 )
 
+#bluralt
+image anon neutral blur flip = im.Flip("highres/bluralt/anon neutral blur.png", horizontal=True)
+image anon shrug blur flip = im.Flip("highres/bluralt/anon shrug blur.png", horizontal=True)
+image anond neutral blur flip = im.Flip("highres/bluralt/anond neutral blur.png", horizontal=True)
+image fang neutral blur flip = im.Flip("highres/bluralt/fang neutral blur.png", horizontal=True)
+image fang flip off happy blur flip = im.Flip("highres/bluralt/fang flip off happy blur.png", horizontal=True)
+image fang very sad blur flip = im.Flip("highres/bluralt/fang very sad blur.png", horizontal=True)
+image naomi neutral blur flip = im.Flip("highres/bluralt/naomi neutral blur.png", horizontal=True)
 
+image fang pneutral blur = Composite(
+   # (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),
+   (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),
+   (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),
+   (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)
+)
 
 image raymba2 flip = im.Flip("raymba/raymba2.png", horizontal=True)
 image raymba4 flip = im.Flip("raymba/raymba4.png", horizontal=True)
@@ -198,7 +230,7 @@ label chapter_x10:
     play music 'audio/ost/the hunt for more (you)s.ogg' fadein 3 noloop
     scene room anon day:
         blur 8 zoom 1.5 xoffset -100 yoffset -400
-    show anon neutral megatex:
+    show anon neutral blur:
         #xcenter 0.2 yalign 0.5 zoom 2
         xcenter 0.2 yalign 0.5 xsize 1061*2 ysize 1500*2
     show raymbabox
@@ -223,7 +255,7 @@ label chapter_x10:
     A "Naaaah. They aren’t really a thing anymore."
     show anon:
         ease_cubic 1.5 xpos 0.1
-    show anon neutral megatex flip with Dissolve(1)
+    show anon neutral blur flip with Dissolve(1)
 #show anon neutral flip with Dissolve(1)
 
     A "Hmmmm{cps=*.1}...{/cps}"
@@ -321,7 +353,7 @@ label chapter_x10:
     A "Yeah{cps=*.1}...{/cps} Two or three will do."
     pause .5
 
-    show fang neutral megatex behind raymbabox:
+    show fang neutral blur behind raymbabox:
         xcenter -0.5 yalign 0.45 xsize 1412*2 ysize 1500*2
     show fang:
         easein_cubic 1.5 xpos 0.3
@@ -346,7 +378,7 @@ label chapter_x10:
     pause 3.5
 
     stop music fadeout 6
-    show fang neutral megatex flip with Dissolve(1):
+    show fang neutral blur flip with Dissolve(1)
     F "You are such a dweeb, Anon."
     pause 1
 
@@ -385,11 +417,11 @@ label chapter_x10:
     play music 'audio/ost/its_footloose_now.ogg' fadein 4
     scene room anon day:
         blur 8 zoom 1.5 xoffset -100 yoffset -400
-    show anon neutral megatex:
+    show anon neutral blur:
         xzoom 1.0
         xcenter 0.2 yalign 0.5
         xsize 1061*2 ysize 1500*2
-    show fang neutral megatex:
+    show fang neutral blur:
         xzoom -1.0
         xcenter 0.8 yalign 0.45
         xsize 1412*2 ysize 1500*2
@@ -406,10 +438,10 @@ label chapter_x10:
 
     "One such object he lays out on the floor."
 
-    show anon shrug megatex with dissolve:
+    show anon shrug blur with dissolve
 
     A "See? It really ties the room together."
-    show anon neutral megatex with dissolve:
+    show anon neutral blur with dissolve
 
     "Owner has opened another of the boxes he brought in, laid the contents on top."
 
@@ -429,11 +461,11 @@ label chapter_x10:
     "Confirmed.{w=.4} Response to new unit designated ‘Mark 2’."
     pause .5
 
-    show anon neutral megatex:
+    show anon neutral blur:
         easeout_cubic 1 xpos 1.5
         block:
             pause 2
-            "anon neutral megatex flip"
+            "anon neutral blur flip"
             easein_cubic 0.5 xpos 0.9
             pause 1
             easeout_cubic 0.5 xpos -0.5
@@ -441,7 +473,7 @@ label chapter_x10:
     show fang:
         pause 1
         ease_cubic 0.5 xpos 0.3
-        "fang neutral megatex" with dissolve
+        "fang neutral blur" with dissolve
         xzoom 1.0
         pause 1
         easeout_cubic 0.75 xpos 1.5
@@ -527,11 +559,11 @@ label chapter_x10:
     play music 'audio/ost/appreciating her company.ogg' fadein 4
     scene fangroom:
         blur 8 zoom 1.5 xoffset -900 yoffset -400
-    show anon neutral megatex:
+    show anon neutral blur:
         xzoom -1.0
         xcenter 0.8 yalign 0.5 #zoom 2
         xsize 1061*2 ysize 1500*2
-    show fang neutral megatex:
+    show fang neutral blur:
         xzoom 1.0
         xcenter 0.2 yalign 0.45 #zoom 2
         xsize 1412*2 ysize 1500*2
@@ -560,19 +592,19 @@ label chapter_x10:
     "Response from Mark 2:{w=.4} Observation noted.{w=.4} Current owner and ‘Fang’ are currently in need of repair.{w=.4} Conclusion:{w=.4} will ensure that this unit’s new owner receives necessary repairs."
     pause .5
 
-    show anon neutral megatex:
+    show anon neutral blur:
         ease_cubic 1.5 xpos 0.75
     A "Well{cps=*.1}...{/cps} This is it{cps=*.1}...{/cps}"
 
     show fang:
         ease_cubic 1.5 xpos 0.25
-    show fang very sad megatex with Dissolve(1):
+    show fang very sad blur with Dissolve(1)
     F "Anon{cps=*.1}...{/cps}"
     pause .5
 
     A "Hey, it’s only a few years.{w=.4} And it’s not like we won’t talk."
 
-    show fang neutral megatex with Dissolve(1)
+    show fang neutral blur with Dissolve(1)
     F "I know. And I know I said a break and all{cps=*.1}...{/cps}"
     pause .5
     show anon:
@@ -580,7 +612,7 @@ label chapter_x10:
     show fang:
         ease_cubic 1.5 xpos 0.4
     pause .5
-    show fang adorable megatex  with dissolve
+    show fang adorable blur  with dissolve
     pause 1
 
     "Observation:{w=.4} Current owner and ‘Fang’ appear to be attempting to clean each other’s brush units again."
@@ -664,7 +696,7 @@ label chapter_x10:
 
     N "What’s this in the box over here?"
 
-    show naomi neutral megatex behind raymbabox:
+    show naomi neutral blur behind raymbabox:
         xcenter -0.5 yalign 0.45 #zoom 2
         xsize 1036*2 ysize 1500*2
     show naomi:
@@ -707,17 +739,17 @@ label chapter_x10:
     show naomi:
         easeout_cubic 1.5 xpos -0.5
     pause .5
-    show naomi neutral megatex flip with dissolve
+    show naomi neutral blur flip with dissolve
     pause .5
 
     "Observation:{w=.4} Unknown guest has left the room."
     pause .5
 
-    show fang pbird happy megatex flip with dissolve
+    show fang pbird happy blur flip with dissolve
 
     stop music fadeout 6
     F "{cps=*.1}...{/cps}Bitch{cps=*.1}...{/cps}"
-    show fang pneutral megatex flip with Dissolve(1)
+    show fang pneutral blur flip with Dissolve(1)
 
     "Unknown guest designation confirmed."
     pause 1
@@ -800,7 +832,7 @@ label chapter_x10:
 
     F "There’s the flakes in a little cup next to the box there."
 
-    show anond neutral megatex behind raymbabox:
+    show anond neutral blur behind raymbabox:
         xcenter -0.5 yalign 0.5# zoom 2
         xsize 1061*2 ysize 1500*2
 
@@ -972,7 +1004,7 @@ label chapter_x10:
     show raymbashadow as footshadow behind raymba4s:
         ypos -0.7 xcenter 0.05 blur 3
         easein_cubic 1 xpos 0.1
-    show anond neutral megatex behind raymba4s:
+    show anond neutral blur behind raymba4s:
         xcenter 0.05 yanchor 1.0 ypos 0.85 # zoom 3.5
         xsize 1061*3.5 ysize 1500*3.5
         easein_cubic 1 xpos 0.1