diff --git a/scenes/act4.md b/scenes/act4.md index 8b0e5bd..0acc08a 100644 --- a/scenes/act4.md +++ b/scenes/act4.md @@ -1011,7 +1011,7 @@ h2: Just remembering a friendly face, is all. `publish("al-shire", ["panic"]);` {{if _.TOP_FEAR=="harm"}} -s: AHHHHH I KNEW IT! THEY'RE A DANGEROUS CRAZY PSYCHO! +s: AHHHHH I KNEW IT! THEY'RE A DANGEROUS PANIC-DRIVEN PSYCHO! {{/if}} {{if _.TOP_FEAR=="alone"}} diff --git a/scenes/act4_test.md b/scenes/act4_test.md index e16ea65..f84e409 100644 --- a/scenes/act4_test.md +++ b/scenes/act4_test.md @@ -2,7 +2,7 @@ ``` SceneSetup.act4(); -Game.FORCE_CANT_SKIP = true; +/*Game.FORCE_CANT_SKIP = true;*/ ``` (...1001) @@ -215,56 +215,83 @@ music('campus', {volume:0.5, fade:1}); `Game.WORDS_HEIGHT_BOTTOM = 221;` +`publish("act4", ["alshire", 0]);` + a: W-wo-would you mind if I sat with you for lunch? +`publish("act4", ["alshire", 1]);` + {{if _.TOP_FEAR=="harm"}} -s: They were sitting alone for lunch? They must be a psycho loner serial killer! +s: *This* is your crush? Why are they sitting alone like a psycho serial killer? {{/if}} {{if _.TOP_FEAR=="alone"}} -s: Ack, do you know how pathetic we sound? How desperate, how *needy*? +s: Asking your crush if you can sit with them? Do you know how *needy* we sound?! {{/if}} {{if _.TOP_FEAR=="bad"}} -s: They were enjoying peace and quiet, then we interrupted them! We're such a burden! +s: *This* is your crush? We interrupted their peace and quiet! We're such a burden! {{/if}} +`publish("act4", ["alshire", 2]);` + a: I- I mean- it's, it's okay if not, I just... +`publish("act4", ["alshire", 3]);` + `Game.OVERRIDE_CHOICE_SPEAKER = "h2"` -[Wait, didn't I see you at the party?](#act4d_recognition) +[Wait, didn't I see you at the party?](#act4d_recognition) `publish("act4", ["hong_to_alshire",1])` -[Yeah, of course! Come here.](#act4d_yes) +[Yeah, of course! Come here.](#act4d_yes) `publish("act4", ["hong_to_alshire",2])` -[Sorry, I need alone time right now.](#act4d_no) +[Sorry, I need alone time right now.](#act4d_no) `publish("act4", ["hong_to_alshire",8])` # act4d_recognition -h2: Yeah you were on the couch! At the first party I went to, +`publish("act4", ["hong_to_alshire",2]);` + +h2: Yeah you were on the couch! At the first party I went to... + +`publish("act4", ["hong_to_alshire",10]);` {{if _.a2_ending=="fight"}} -h2: The one where I had that panic attack and punched the host. +h2: Where I had that panic attack and punched the host. {{/if}} {{if _.a2_ending=="flight"}} -h2: The one where I had that panic attack and ran out crying. +h2: Where I had that panic attack and ran out crying. {{/if}} -b: Hang on human, we might be making them uncomfortable. +``` +publish("act4", ["hong_to_alshire", 0]); +publish("act4", ["bb_to_alshire", _.INJURED ? 3 : 1]); +``` + +b: Hang on human, we may be making them uncomfortable. + +``` +publish("act4", ["hong_to_alshire", 3]); +publish("act4", ["bb_to_alshire", _.INJURED ? 2 : 0]); +``` h2: Ah, I don't mean to put you on the spot! +`publish("act4", ["hong_to_alshire",4]);` + h2: Just remembering a friendly face, is all. -`publish("al-shire", ["panic"]);` +``` +publish("act4", ["hong_to_alshire",5]); +publish("act4", ["alshire", 4]); +``` {{if _.TOP_FEAR=="harm"}} -s: AHHHHH I KNEW IT! THEY'RE A DANGEROUS CRAZY PSYCHO! +s: AHHHHH I KNEW IT! THEY'RE A DANGEROUS PANIC-DRIVEN PSYCHO! {{/if}} {{if _.TOP_FEAR=="alone"}} -s: SEE HOW MUCH WE SUCK AT MAKING FRIENDS?! THE FIRST IMPRESSION WE MADE IS "WITNESSED MY TRAUMA". WE SUCK! +s: AAHHH THE FIRST IMPRESSION WE MADE WAS "WITNESSED MY TRAUMA"! THAT MEANS THEY HATE US! {{/if}} {{if _.TOP_FEAR=="bad"}} @@ -275,48 +302,70 @@ s: AAAHHH WE MADE SOMEONE REMEMBER A TRAUMATIC EVENT. OUR MERE PRESENCE HURTS OT # act4d_yes +``` +publish("act4", ["hong_to_alshire", 5]); +publish("act4", ["bb_to_alshire", _.INJURED ? 3 : 1]); +``` + b: Hang on human, they seem uncomfortable. +``` +publish("act4", ["hong_to_alshire", 6]); +publish("act4", ["bb_to_alshire", _.INJURED ? 2 : 0]); +``` + h2: Ah, no pressure of course! +`publish("act4", ["hong_to_alshire", 4]);` + h2: Just saying, you can sit here if you want to. -`publish("al-shire", ["panic"]);` +``` +publish("act4", ["hong_to_alshire", 5]); +publish("act4", ["alshire", 4]); +``` {{if _.TOP_FEAR=="harm"}} s: THEY'RE BEING *TOO* FRIENDLY! LIKE TED BUNDY, THE SERIAL KILLER! {{/if}} {{if _.TOP_FEAR=="alone"}} -s: THEY'RE JUST ACTING NICE. NO ONE *REALLY* WANTS TO BE OUR FRIEND. +s: THEY'RE JUST ACTING NICE! NO ONE *REALLY* WANTS TO BE CLOSE TO US! {{/if}} {{if _.TOP_FEAR=="bad"}} -s: GAH, WE ALWAYS MAKE OTHERS FEEL UNCOMFORTABLE! WE'RE TERRIBLE! +s: AHHH WE ALWAYS MAKE OTHERS FEEL AWKWARD! WE'RE A STAIN UPON THE EARTH! {{/if}} (#act4e) # act4d_no -b: Hang on human, we might be making them uncomfortable. +``` +publish("act4", ["hong_to_alshire", 9]); +publish("act4", ["bb_to_alshire", _.INJURED ? 3 : 1]); +``` + +b: Hang on human, we may be making them uncomfortable. + +``` +publish("act4", ["hong_to_alshire", 3]); +publish("act4", ["bb_to_alshire", _.INJURED ? 2 : 0]); +``` h2: Ah, I didn't mean to come off as rude! -{{if _.INJURED}} -h2: It's just that, well, I jumped off a roof and almost killed myself. -{{/if}} +`publish("act4", ["hong_to_alshire", 6]);` -{{if !_.INJURED}} -h2: It's just that, well, I almost jumped off a roof. -{{/if}} +h2: I just need some time to process my emotions. Please don't take it as a personal rejection. -h2: Please don't take it as a personal rejection, I just need quiet time to process some emotions. - -`publish("al-shire", ["panic"]);` +``` +publish("act4", ["hong_to_alshire", 7]); +publish("act4", ["alshire", 4]); +``` {{if _.TOP_FEAR=="harm"}} -s: HOLY COW I KNEW IT, THEY *ARE* A DANGEROUS PSYCHO! +s: "PROCESS" EMOTIONS? LIKE A *ROBOT?!* THEY'RE TALKING LIKE A PSYCHO SERIAL KILLER! {{/if}} {{if _.TOP_FEAR=="alone"}} @@ -324,7 +373,7 @@ s: WE'VE BEEN PERSONALLY REJECTED! WE'LL NEVER BE LOVED! {{/if}} {{if _.TOP_FEAR=="bad"}} -s: WE INTERRUPTED SOMEONE'S EMOTIONAL PROCESSING! NOW THEY'LL BE TRAUMATIZED FOREVER AND IT'S ALL OUR FAULT! +s: WE INTERRUPTED THEIR EMOTIONAL PROCESSING! NOW THEY'LL BE TRAUMATIZED FOREVER AND IT'S ALL OUR FAULT! {{/if}} (#act4e) @@ -340,6 +389,7 @@ s: RUN RUN RUN RUN RUN RUN RUN RUN RUN RUN RUN RUN RUN RUN RUN ``` Game.clearText(); +publish("act4", ["hong_to_alshire", 0]); publish("act4", ["alshire", 10]); ``` @@ -360,47 +410,88 @@ Game.WORDS_HEIGHT_BOTTOM = -1; /* reset */ h: Huh. That was weird. I wonder what was going on in their head. +`publish("act4", ["hong_closer", 2]);` + h: Anyway, you were saying? +``` +publish("act4", ["hong_closer", 1]); +publish("act4", ["bb_closer", 6]); +``` + b: Uh, I forget? Something about teams and work? +``` +publish("act4", ["bb_closer", 0]); +publish("act4", ["hong_closer", 3]); +``` + h: ¯\_(ツ)_/¯ -b: They say you should "make peace" with your emotions, as if your emotions are some kind of *war criminals*. +``` +publish("act4", ["hong_closer", 1]); +publish("act4", ["bb_closer", 4]); +``` + +b: They say you should "make peace" with your emotions, as if your emotions are *war criminals*. + +`publish("act4", ["bb_closer", 7]);` b: But I want us to make *more* than mere peace! I want us to be *allies!* +`publish("act4", ["bb_closer", 3]);` + b: I want to be a good guard-dog. Just like how hunger & thirst are alarms for your physical needs, +`publish("act4", ["bb_closer", 8]);` + b: I want to be the alarm for your emotional needs – your needs for safety, belonging, goodness. +`publish("act4", ["bb_closer", 1]);` + b: But... I suck at my job, so I need you to train me. +`publish("act4", ["bb_closer", 5]);` + b: Help me help you. +`publish("act4", ["bb_closer", 6]);` + b: Teaching an old dog new tricks *will* take a while. Maybe *years.* +`publish("act4", ["bb_closer", 4]);` + b: And sometimes I'll relapse, I'll slip into my old habits. +`publish("act4", ["bb_closer", 2]);` + b: I'll bark at shadows. I'll scare you with words. I might even show you some intrusive images of... things. +`publish("act4", ["bb_closer", 9]);` + b: I'm sorry! I'm a battered shelter dog! Battered dogs poop on your bed sometimes! +`publish("act4", ["bb_closer", 4]);` + b: But if you're patient with me... and just stay and sit with me... +`publish("act4", ["bb_closer", 8]);` + b: Maybe you can tame this wolf. +`publish("act4", ["bb_closer", 0]);` + `Game.clearText();` (...1000) `Game.OVERRIDE_CHOICE_SPEAKER = "h"` -[Good dog.](#act4f-pat-bb) `Game.OVERRIDE_CHOICE_SPEAKER = "h"` +[Good dog.](#act4f-pat-bb) `Game.OVERRIDE_CHOICE_SPEAKER = "h"; publish("act4", ["hong_closer", 2]);` `Game.OVERRIDE_CHOICE_SPEAKER = "b"` -[Good human.](#act4f-pat-hong) `Game.OVERRIDE_CHOICE_SPEAKER = "b"` +[Good human.](#act4f-pat-hong) `Game.OVERRIDE_CHOICE_SPEAKER = "b"; publish("act4", ["bb_closer", 8]);` # act4f-pat-hong @@ -411,31 +502,34 @@ music(null,{fade:0.5}); sfx("youbothwin"); ``` -`publish("end-pat", ["pat-hong-1"])` +``` +publish("act4", ["hong_closer", 4]); +publish("act4", ["bb_closer", 13]); +``` (...501) -`publish("end-pat", ["pat-hong-2"])` +`publish("act4", ["bb_closer", 14]);` (...501) -`publish("end-pat", ["pat-hong-1"])` +`publish("act4", ["bb_closer", 13]);` (...501) -`publish("end-pat", ["pat-hong-2"])` +`publish("act4", ["bb_closer", 14]);` (...501) -`publish("end-pat", ["pat-hong-1"])` +`publish("act4", ["bb_closer", 13]);` (...501) -`publish("end-pat", ["pat-hong-2"])` +`publish("act4", ["bb_closer", 14]);` (...6501) -`publish("end-pat", ["pat-hong-3"])` +`publish("act4", ["bb_closer", 15]);` (...1001) @@ -450,31 +544,34 @@ music(null,{fade:0.5}); sfx("youbothwin"); ``` -`publish("end-pat", ["pat-bb-1"])` +``` +publish("act4", ["hong_closer", 4]); +publish("act4", ["bb_closer", 10]); +``` (...501) -`publish("end-pat", ["pat-bb-2"])` +`publish("act4", ["bb_closer", 11]);` (...501) -`publish("end-pat", ["pat-bb-1"])` +`publish("act4", ["bb_closer", 10]);` (...501) -`publish("end-pat", ["pat-bb-2"])` +`publish("act4", ["bb_closer", 11]);` (...501) -`publish("end-pat", ["pat-bb-1"])` +`publish("act4", ["bb_closer", 10]);` (...501) -`publish("end-pat", ["pat-bb-2"])` +`publish("act4", ["bb_closer", 11]);` (...6501) -`publish("end-pat", ["pat-bb-3"])` +`publish("act4", ["bb_closer", 12]);` (...1001) @@ -484,7 +581,8 @@ sfx("youbothwin"); ``` Game.FORCE_CANT_SKIP = false; -publish("end-pat", ["freak-out"]) +publish("act4", ["bb_closer", 16]); +publish("act4", ["hong_closer", 5]); ``` {{if _.fifteencigs}} @@ -501,8 +599,10 @@ b: AAAAA YOU'RE EATING MORE WHITE BREAD AAAAA ``` publish("act4", ["bb_closer", 18]); +publish("act4", ["hong_closer", 6]); sfx("yaps", {volume:0.6}); Game.FORCE_CANT_SKIP = true; +Game.WORDS_HEIGHT_BOTTOM = 205; ``` b: YAP YAP YAP YAP YAP diff --git a/scripts/act4/Act4_BG.js b/scripts/act4/Act4_BG.js index b81ff6a..afc4857 100644 --- a/scripts/act4/Act4_BG.js +++ b/scripts/act4/Act4_BG.js @@ -377,7 +377,8 @@ function BG_Act4(){ self.createAnimation("break_hp", _animSequence( 1,4, 1/12, true) ); // ALSHIRE - self.createAnimation("alshire", _animSequence( 6,9, 1/12, true) ); + self.createAnimation("alshire", _animSequence( 4,5, 1/10, true) ); + self.createAnimation("alshire", _animSequence( 6,9, 1/15, true) ); self.createAnimation("alshire", _animSequence( 11,22, 1/30, false) ); // BB @@ -431,9 +432,7 @@ function BG_Act4(){ if(STAGE==2){ self.break_hp.visible = false; self.bb_to_alshire.visible = true; - if(_.INJURED){ - self.bb_to_alshire.gotoFrame(2); // CONE! - } + self.bb_to_alshire.gotoFrame(_.INJURED ? 2 : 0); // CONE? ALPHAS[16] = 0; // BB } @@ -478,6 +477,14 @@ function BG_Act4(){ self.break_hp_cone.y = self.break_hp.y; // ENDINGS YAP YAP YAP + if(self.bb_closer.currentFrame>=13 && self.bb_closer.currentFrame<=15){ + self.bb_closer_coneb.gotoFrame(27); + self.bb_closer_cone.gotoFrame(26); + } + if(self.bb_closer.currentFrame==16){ + self.bb_closer_coneb.gotoFrame(31); // blank + self.bb_closer_cone.gotoFrame(17); + } if(self.bb_closer.currentFrame>=18 && self.bb_closer.currentFrame<=21){ self.bb_closer_coneb.gotoFrame(31); // blank self.bb_closer_cone.gotoFrame(self.bb_closer.currentFrame + 4); // CONE @@ -602,6 +609,7 @@ function BG_Act4(){ // Show Alshire sprites self.alshire.visible = true; + self.alshire.gotoFrame(23); self.hong_to_alshire.visible = true; // WHOOSH @@ -641,19 +649,6 @@ function BG_Act4(){ self.hong_closer.visible = true; }) - /* - subscribe("outside-hong", function(frame){ - if(_.INJURED) frame += "-injured"; - if(self.outsideHongSprite.doesFrameNameExist(frame)){ - self.outsideHongSprite.gotoFrameByName(frame); - } - }), - subscribe("al-shire", function(frame){ - self.alShireSprite.gotoFrameByName(frame); - }), - subscribe("end-pat", function(frame){ - self.talk2Sprite.gotoFrameByName(frame); - })*/ ); self.kill = function(){ diff --git a/scripts/act4/Act4_Beebee.js b/scripts/act4/Act4_Beebee.js index 91e36dc..2b84b1f 100644 --- a/scripts/act4/Act4_Beebee.js +++ b/scripts/act4/Act4_Beebee.js @@ -117,6 +117,12 @@ function Act4_Beebee(){ _subscriptions.push( subscribe("bb", self.gotoFrames) ); _subscriptions.push( subscribe("DONE_SPEAKING", self.whenDoneSpeaking) ); + // Hide cone? + if(!_.INJURED){ + self.layers.coneb.visible = false; + self.layers.cone.visible = false; + } + // Draw! var ticker = 0; self.characterSpeakerID = "b"; diff --git a/scripts/game/Game.js b/scripts/game/Game.js index 1b1a909..318ec74 100644 --- a/scripts/game/Game.js +++ b/scripts/game/Game.js @@ -933,6 +933,9 @@ Game.resetScene = function(){ Game.scene = {}; Game.scene.children = []; + // Misc + Game.WORDS_HEIGHT_BOTTOM = -1; + }; Game.resetScene(); diff --git a/scripts/main.js b/scripts/main.js index dc40273..dcd37db 100644 --- a/scripts/main.js +++ b/scripts/main.js @@ -45,7 +45,7 @@ subscribe("START_GAME", function(){ //Game.goto("act3"); // Act 4 - _ = {"CHAPTER":3,"attack_harm_ch1":3,"attack_alone_ch1":2,"attack_bad_ch1":1,"whitebread":true,"partyinvite":"ignore","subtweet":true,"serialkiller":true,"act1g":"dont","badnews":true,"factcheck":false,"act1_ending":"fight","INTERMISSION_STAGE":2,"attack_harm_ch2":2,"attack_alone_ch2":1,"attack_bad_ch2":3,"a2_first_danger":"social","a2_attack_1":"alone","a2_first_choice":"ignore","a2_second_danger":"ignore","a2_attack_2":"harm","a2_attack_3":"harm","SPECIAL_ATTACK":"alone","a2_ending":"fight","act3_bb_body":4,"a3_ending":"walkaway","INJURED":true}; + _ = {"CHAPTER":3,"attack_harm_ch1":3,"attack_alone_ch1":2,"attack_bad_ch1":1,"whitebread":true,"partyinvite":"ignore","subtweet":true,"serialkiller":true,"act1g":"dont","badnews":true,"factcheck":false,"act1_ending":"fight","INTERMISSION_STAGE":2,"attack_harm_ch2":2,"attack_alone_ch2":1,"attack_bad_ch2":3,"a2_first_danger":"social","a2_attack_1":"alone","a2_first_choice":"ignore","a2_second_danger":"ignore","a2_attack_2":"harm","a2_attack_3":"harm","SPECIAL_ATTACK":"alone","a2_ending":"fight","act3_bb_body":4,"a3_ending":"walkaway","INJURED":false}; Game.goto("act4"); //Game.goto("intro"); diff --git a/sprites/act4/al_shire.png b/sprites/act4/al_shire.png index 5219768..c510542 100644 Binary files a/sprites/act4/al_shire.png and b/sprites/act4/al_shire.png differ diff --git a/sprites/act4/hong_to_alshire.png b/sprites/act4/hong_to_alshire.png index 30168dd..64c386d 100644 Binary files a/sprites/act4/hong_to_alshire.png and b/sprites/act4/hong_to_alshire.png differ