diff --git a/scenes/act2.md b/scenes/act2.md index b8c17b2..9794e83 100644 --- a/scenes/act2.md +++ b/scenes/act2.md @@ -146,7 +146,7 @@ n: ROUND TWO: *FIGHT!* [Oh no they all hate us!](#act2a_social) -[Oh no the redhead is hot!](#act2a_perv) +[Were you *ogling* the redhead?](#act2a_perv) [Hey, let's talk about the meaning of life.](#act2a_meaning) @@ -167,8 +167,6 @@ _.a2_attack_1 = "alone"; # act2a_perv -b: And we were totally ogling them! - b: They're more attractive than us, which means if we even *look* at them, then-- b: WE'RE CREEPS @@ -258,7 +256,7 @@ _.a2_attack_2 = "alone"; b: DON'T BE A CREEP. IT'S AGAINST THE LAW! -b: Creep Law, Section 74.5: (1) Any Person who checks out (a) that sweet ass (b) that bulge (2) shall be hereby referred to as +b: Creep Law, Section 74.5: (1) Any Person who checks out (a) that sweet booty (b) those juicy thighs (2) shall be hereby referred to as b: "A BIG DISGUSTING TRASH PERVERT" @@ -595,7 +593,7 @@ h: *I am loved. I am good. I am smart. I am beautiful. I am special.* [You know affirmations were *disproven?*](#act2d_disproven) -[omg you can't credit random stories to indigenous folk](#act2d_racist) +[omg don't credit random stories to indigenous folk](#act2d_racist) # act2d_disproven @@ -754,7 +752,7 @@ b: How do you think *I* feel, human?! b: I'm trying my best to be your guard-dog, but you keep seeing me as some Big Bad Wolf! -b: So I try even *harder* to alert you to danger! More danger! Louder danger! +b: So I try even *harder* to alert you to danger! *More* danger! *Louder* danger! b: But no matter how hard I try to protect you, you *still* think I'm your enemy! @@ -787,9 +785,13 @@ r: Looks like you're caught in a fight with yourself, kid. `publish("act2-party-action", ["twist2"]);` -h2: (nods) +h2: Was it that obvious? -r: You're not alone, friend. Anxiety's super common. +r: You were, uh, mumbling at your hoodie. + +h2: oh god i'm such a mess. + +r: Hey. You're not alone, friend. Anxiety's super common. {{if _.act1_ending=="fight"}} r: Heck, just yesterday, I heard someone on campus had a nervous breakdown and smashed their phone! @@ -799,15 +801,13 @@ r: Heck, just yesterday, I heard someone on campus had a nervous breakdown and s r: Heck, just yesterday, I heard someone curled up into an armadillo ball and cried in public! {{/if}} -h2: huh imagine that. - r: Listen: I know what it's like to have that animal in your head. -r: We all do. That's why we're here! I throw these parties every weekend so we can forget our worries, forget that animal. +r: We *all* do. That's why we're here! I throw these parties every weekend so we can forget our worries, forget that animal. h2: but my anxiety... -r: Don't worry, kid. I used to be like you. But then I found a little trick to get that negative voice to be quiet forever... +r: Don't worry, kid. I used to be like you. But then I found a little trick to get that negative voice to shut up forever... ``` Game.clearText(); @@ -1093,7 +1093,7 @@ h2: ok bye ciao adios r: The animal might have won today, but come back, and I'll mix something even stronger for you! -h2: sayōnara au revoir auf wiedersehen zài jiàn +h2: au revoir sayōnara auf wiedersehen zài jiàn r: You and me, kid, we'll show that beast who's boss! diff --git a/scenes/act3.md b/scenes/act3.md index 385540a..fba97d8 100644 --- a/scenes/act3.md +++ b/scenes/act3.md @@ -40,9 +40,9 @@ r: The animal's started whining, hasn't it? r: *Oh nooooo it's dangerous, don't do iiiiit.* -r: But that's why we need to do thrilling, death-defying stunts! Party hard! Carpe diem! Snort coke off a hooker's butt, #YOLO! +r: But that's exactly why we must do thrilling, death-defying stunts! Party hard! Carpe diem! Snort coke off a hooker's ass, #YOLO! -r: To show that animal we don't give two *dicks* about its bitching! Jump. +r: Let's show that animal we don't give two *dicks* about its bitching! Jump. h2: Uh, but sometimes, um... fear has a point... @@ -53,17 +53,17 @@ publish("hunter-roof", ["front_pissed"]); r: ... -r: I'm sorry, did you fall for that "mindfulness" fad that claims feeling bad is *good?* +r: I'm sorry, did you fall for that McMindfulness fad that claims feeling bad is *good?* r: Pleasure is the opposite of pain. There-fucking-fore, you can use pleasure to fight pain! -r: How goddamn stupid are those California Buddhists to not see that?! +r: How do those Silicon Valley pseudo-Buddhists not see this shit?! r: Kid, I know that *you* know that animal *hurts* people like us. It *tortures* people like us. -r: It's not your friend. It's a rabid beast, and rabid beasts need to be tranquilized, +r: It's not our friend. It's a rabid beast, which needs to be *tranquilized*, -r: Or have a bullet put in its fucking skull. +r: Or have a *bullet put in its fucking skull*. r: Otherwise, you're going to let it win. @@ -71,6 +71,9 @@ h2: No. You're wrong. ``` publish('hong-next'); +music('battle_dark', {volume:1.0}, function(){ + music('battle_dark_loop'); +}); ``` h2: I'm not going to let it win. @@ -83,13 +86,11 @@ r: Fuck yeah! I believe in you, babe! Kill it! <3 - # act3a ``` Game.clearText(); publish("act3-out"); -music('battle_dark', {volume:1.0}); ``` (...1500) diff --git a/scenes/act4.md b/scenes/act4.md index 49d5de7..41859bf 100644 --- a/scenes/act4.md +++ b/scenes/act4.md @@ -871,12 +871,14 @@ a: I- I mean- it's, it's okay if not, I just... # act4d_recognition +h2: Yeah you were on the couch! At the first party I went to, + {{if _.a2_ending=="fight"}} -h2: Yeah it was the first party, where I had that panic attack and punched the host! +h2: The one where I had that panic attack and punched the host. {{/if}} {{if _.a2_ending=="flight"}} -h2: Yeah it was the first party, where I had that panic attack and ran out crying! +h2: The one where I had that panic attack and ran out crying. {{/if}} b: Hang on human, we might be making them uncomfortable. diff --git a/scripts/act3/Act3_BG.js b/scripts/act3/Act3_BG.js index 4616ee9..8cc4b75 100644 --- a/scripts/act3/Act3_BG.js +++ b/scripts/act3/Act3_BG.js @@ -189,7 +189,7 @@ function BG_Rooftop(){ // JUMP OFF subscribe("start-jump-anim", function(){ self.hongSprite.gotoFrame(4); - self.hunterSprite.gotoFrameByName("front_evil"); + self.hunterSprite.gotoFrameByName("front_badass"); }), subscribe("hong-next", function(){ self.hongSprite.nextFrame(); diff --git a/scripts/act3/Act3_SceneSetup.js b/scripts/act3/Act3_SceneSetup.js index 9ba1bb7..c3bf8f5 100644 --- a/scripts/act3/Act3_SceneSetup.js +++ b/scripts/act3/Act3_SceneSetup.js @@ -1,6 +1,7 @@ Loader.addSounds([ { id:"music_party2", src:"sounds/music/party2.mp3" }, - { id:"music_battle_dark", src:"sounds/music/battle_dark_FIRST.mp3" } + { id:"music_battle_dark", src:"sounds/music/battle_dark_FIRST.mp3" }, + { id:"music_battle_dark_loop", src:"sounds/music/battle_dark_LOOP.mp3" } ]); SceneSetup.act3 = function(){ @@ -14,7 +15,7 @@ SceneSetup.act3 = function(){ _.CHAPTER = 3; // Music - music('party2', {volume:0.6}); + music('party2', {volume:0.4}); // Background var bg = new BG_Rooftop(); diff --git a/scripts/game/Sounds.js b/scripts/game/Sounds.js index c433810..946de11 100644 --- a/scripts/game/Sounds.js +++ b/scripts/game/Sounds.js @@ -48,7 +48,7 @@ window.voice = function(name, options){ } window.CURRENT_MUSIC = null; -window.music = function(song, options){ +window.music = function(song, options, onend){ options = options || {}; options.volume = options.volume===undefined ? 1 : options.volume; @@ -86,4 +86,9 @@ window.music = function(song, options){ } + // IF AN ON-END (used basically once in this whole game) + if(onend){ + song.on('end', onend); + } + }; \ No newline at end of file diff --git a/scripts/main.js b/scripts/main.js index eaa0e6a..ff59554 100644 --- a/scripts/main.js +++ b/scripts/main.js @@ -36,7 +36,7 @@ subscribe("START_GAME", function(){ // Act 2 _ = {"CHAPTER":1,"attack_harm_ch1":3,"attack_alone_ch1":2,"attack_bad_ch1":1,"whitebread":true,"partyinvite":"ignore","subtweet":true,"serialkiller":true,"act1g":"dont","act1_ending":"flight","INTERMISSION_STAGE":1}; - Game.goto("act2"); + Game.goto("act3"); //Game.goto("act4"); //Game.goto("intro"); diff --git a/sounds/music/battle_dark_FIRST.mp3 b/sounds/music/battle_dark_FIRST.mp3 index cc9f3fd..6c0a058 100644 Binary files a/sounds/music/battle_dark_FIRST.mp3 and b/sounds/music/battle_dark_FIRST.mp3 differ diff --git a/sounds/music/battle_dark_FIRST_test.mp3 b/sounds/music/battle_dark_FIRST_test.mp3 new file mode 100644 index 0000000..9970fe4 Binary files /dev/null and b/sounds/music/battle_dark_FIRST_test.mp3 differ diff --git a/sounds/music/battle_dark_LOOP.mp3 b/sounds/music/battle_dark_LOOP.mp3 new file mode 100644 index 0000000..e51bd6a Binary files /dev/null and b/sounds/music/battle_dark_LOOP.mp3 differ