clean up

game/script/1.first-two-days-anon-meets-fang.rpy

@@ -708,7 +708,6 @@ label chapter_1:
 
     N "{cps=*0.5}What was your old school like?{/cps}"
 
-    # TODO: vetoed, needs replacing
     play music 'audio/effects/hungryBeast.ogg' fadein 10
 
     show dimmer_darker behind anon with Dissolve(1)
@@ -781,7 +780,6 @@ label chapter_1:
     I "I thought I had found a decent spot in the corner when disaster struck."
 
     #TODO: confirm if 2D flipping is OK when done for comedy occasionally
-    #TODO: SFX of some kind
     show naser neutral behind anon with easeinleft:
         xalign -0.6 yalign 0.1
     stop ambient fadeout 0.5
@@ -975,7 +973,7 @@ label chapter_1:
     show naomi sad flip with dissolve
     pause 0.5
 
-    I "Dinner and a show?{w=0.5} Sign me the fuck up." #TODO: Anon "signs the fuck up" twice
+    I "Dinner and a show?{w=0.5} Sign me the fuck up."
 
     show naomi neutral flip with Dissolve(.25)
 
@@ -1437,8 +1435,6 @@ label chapter_1:
 
     I "The lights dim and the curtains are drawn open."
 
-    stop music fadeout 1.0  # TODO: was there meant to be music playing before this?
-
     scene fang band playing with Dissolve(2.0)
 
     I "Onstage is a trio of people my age."
@@ -1652,10 +1648,10 @@ label chapter_1:
 
     stop ambient fadeout 0.2
     show spears angry flip with Fade(.1, 0, .25, color="#fff")
-    play sound "audio/effects/spearYellVoice.ogg"
+    play sound "audio/effects/spearYellVoice.ogg"  # TODO: volume boost, renpy volume multiplier sucks and makes this clip
     with vpunch
 
-    Sp "{b}{cps=*0.5}WHOSE SORRY ASS AM I GOING TO HAVE TO SUPLEX!{/cps}{/b}" # TODO: volume boost, renpy volume multiplier sucks and makes this clip
+    Sp "{b}{cps=*0.5}WHOSE SORRY ASS AM I GOING TO HAVE TO SUPLEX!{/cps}{/b}"
 
     pause 0.5
 
@@ -1917,6 +1913,7 @@ label chapter_1:
 
     show trish at sleft
 
+    play sound 'audio/effects/slapstickPunch.ogg' volume .75
     T "DON’T CUT ME OFF YOU GRAY PIECE OF SHIT!" with vpunch
 
     show naser unimpressed flip with dissolve
@@ -1951,7 +1948,6 @@ label chapter_1:
 
     I "He just holds a hand out to her forehead."
 
-    # 0.5
     show trish:
         easeout_quart 0.2 xalign 0.46
         pause 0.3
@@ -1960,7 +1956,6 @@ label chapter_1:
         linear 0.5 xalign 0.45
         pause 0.4
         repeat
-    # 1.45
     show naser:
         easeout_quart 0.2 xalign 1.475
         pause 0.3
@@ -1970,7 +1965,8 @@ label chapter_1:
         pause 0.4
         repeat
 
-    play sound 'audio/effects/punch.ogg'
+    #play sound 'audio/effects/punch.ogg'
+    play sound '<from .25>audio/effects/slapstickSuperPunch.ogg' volume .7
     T "GET YOUR HANDS OFF ME!!" with vpunch
 
     Nas "Trish,{w=0.2} I’m not going to fight you again."
@@ -1979,6 +1975,7 @@ label chapter_1:
 
     Nas "Believe me,{w=0.3} I had no idea the concert would have turned out like that."
 
+    play sound 'audio/effects/punch.ogg'
     T "{b}LIAR!!{/b}" with vpunch
 
     Nas "I just wanted to make sure you guys had an actual audience-"
@@ -2059,14 +2056,13 @@ label chapter_1:
 
     A "I,{w=0.3} uhh{cps=*0.1}...{/cps}"
 
-    #TODO: play sound "audio/PANoise.ogg"
+    #TODO: PA noise
     pause 1
 
     show naomi shocked flip
 
     play sound 'audio/effects/slapstickPunch.ogg'
     Sp "ANON MOUS,{w=0.4} IF YOU ARE NOT IN MY OFFICE WITHIN TEN MINUTES I SWEAR ON MY DEAR FAMILY I WILL PERSONALLY MOUNT YOU ON MY WALL." with vpunch
-    #TODO: play sound "audio/PANoise.ogg"
 
     pause 1
 
@@ -2112,7 +2108,6 @@ label chapter_1:
 
     I "Just as I reach the office the sound of clinking glass draws my attention to the apricot asspain and some pink raptor."
 
-    # TODO: music here for Reed's intro?
     show naomi angry with Dissolve(0.25)
 
     N "Is that contraband,{w=0.3} Reed?"