Remove merge comment & unrelated ch7-review.txt

ch7-review.txt

@@ -1,39 +0,0 @@
-chapter 7:
-
-Opening
->opening scene needs the CG of Fang's ass when Anon is gawping as she leans over the amp, it's in the art channel somewhere
-
-Tarot Reading
->swapping Anon and Stella's places (and directions) in the tarot reading scene would solve the issue with "OPPAI" being flipped to "IAPPO"
->whoosh SFX plays after Stella has left the scene, I suggest putting it in front of the `moveoutright` statement so it plays as that movement occurs
->the screenshake effect when Anon trips ends with a slightly misaligned screen and you can see some transparency around the edges 
->Anon does an odd screenwrap teleport when he falls over, you could check out when anon trips over gardening tools in chapter 5 for some ideas
-
-Showtime (general)
->there's some script duplication at the start of both branches, I would pull this segment out of both branches and just stick it in front of where the real divergence occurs
-
-Showtime (leave cables)
->this scene needs a soft transition like `with fade` after "We've got sweet music to play." since at the moment all the characters just appear
->IMO this scene should not be taking place in Moe's backroom since it's supposed to be on a stage inside the main restaurant, looks to me like this is an oversight from the original game. You have a few options:
->>A) ask for someone to source and process a stage background
->>B) re-use the CG from the failed concert (potentially controversial)
->>C) use the Moe's Pizza background with the `dimmer_darker` effect behind the characters
->ask for an applause loop to insert at the appropriate point
->if you use option B, return to a BG with the character sprites when it hits "The bandmates' faces light up" so you can show them all happy and sheit
->Reed is falling off the right side of the screen a bit
-
-Showtime (fix cables)
->see comment about the background
->Reed is getting too cosy with Fang
->Summertime Synth only plays for a couple of lines, I would move the `stop music fadeout` much further down. When Trish leaves would be a good time.
->the line where Trish says "You are not the only person in the world!" was changed to "We exist too, you know!" in the script doc
-NOTE: For the above point I should have mentioned earlier, there are occasionally updated lines or segments that we have to watch out for - first thing I do when I'm reworking a chapter is to look for any changes in this google doc https://docs.google.com/document/d/1-T0SNGgRkypzXshZ16JqdKqaHL4fKUIR5XWsz0YTH_A
->
-
-Post Showtime (leave cables)
->the fanghug sprite after "Before I could react I was swept up in a blur of feathers" is suspended in midair, try a `yalign` of 0.0 or 0.1
-
-Cleaning Up
->Reed appears very close to the right screen edge again. For situations like this where the quick and dirty location definitions are jank (`rright`?) you can specify the positioning with a custom `xalign`. This usually takes a bit of trial and error.
->Trish overlaps quite a lot with Reed when she appears
->personally I would not have gone for the heartbeat as well as the music

game/script.rpy

@@ -336,15 +336,6 @@ image fang surprised flip = im.Flip("fang/basic set/fang surprised.png", horizon
 image trish surprised flip = im.Flip("trish/trish surprised.png", horizontal=True)
 image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True)
 
-#double surprised
-#<<<<<<< B's
-#image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True)
-#=======
-#image naser surprised flip = im.Flip("naser/naserintermediaryshocked.png", horizontal=True)
-#image naser surprised = "naser/naserintermediaryshocked.png"
-#
-#>>>>>>> N's
-
 #other flips
 image spears happy flip = im.Flip("spears/spears happy.png", horizontal=True)
 image fang flip off happy flip = im.Flip("fang/emotive set/fang flip off happy.png", horizontal=True)