diff --git a/scenes/act1.md b/scenes/act1.md index 3b7d0e6..ea05024 100644 --- a/scenes/act1.md +++ b/scenes/act1.md @@ -1386,7 +1386,7 @@ n: NOW THAT THEIR ENERGY IS ZERO, YOU CAN DIRECTLY CONTROL THEIR ACTIONS n: PICK YOUR ENDING MOVE -`bb({mouth:"normal", eyes:"narrow"});` +`//bb({mouth:"normal", eyes:"narrow"});` n: *FINISH THEM* diff --git a/scenes/act2.md b/scenes/act2.md index 9794e83..3ec9ac9 100644 --- a/scenes/act2.md +++ b/scenes/act2.md @@ -207,16 +207,16 @@ b: ... b: *GASP* -b: I MUST WARN YOU... +b: I MUST WARN YOU ABOUT... -[*LOUDER!*](#act2b_louder) +[The same fear, *LOUDER!*](#act2b_louder) {{if _.a2_first_danger=="social"}} -[About a *different* social danger!](#act2b_different_social) +[A *different* social danger!](#act2b_different_social) {{/if}} {{if _.a2_first_danger=="perv" || _.a2_first_danger=="meaning"}} -[About a *different* moral danger!](#act2b_different_moral) +[A *different* moral danger!](#act2b_different_moral) {{/if}} [You're ignoring danger! That's dangerous!](#act2b_ignore) @@ -256,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 booty (b) those juicy thighs (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 thick thighs (2) shall be hereby referred to as b: "A BIG DISGUSTING TRASH PERVERT" @@ -351,22 +351,22 @@ b: ... b: Oh thank goodness human, I think you can hear me again! -b: I SHALL WARN YOU... +b: I SHALL WARN YOU ABOUT... {{if _.a2_first_choice=="louder"}} -[*EVEN LOUDER!*](#act2c_louder) +[The same fear, *EVEN LOUDER!*](#act2c_louder) {{/if}} {{if _.a2_first_choice!="louder"}} -[*LOUDER!*](#act2c_louder) +[The same fear, *LOUDER!*](#act2c_louder) {{/if}} {{if _.a2_first_danger=="social"}} -[About *another* social danger!](#act2c_different_social) +[*Another* social danger!](#act2c_different_social) {{/if}} {{if _.a2_first_danger=="perv" || _.a2_first_danger=="meaning"}} -[About *another* moral danger!](#act2c_different_moral) +[*Another* moral danger!](#act2c_different_moral) {{/if}} [Did you check that punch before drinking?](#act2c_punch) @@ -841,27 +841,27 @@ publish("hp_show"); (...3500) -[Oh my God.](#act2g_oh) `Game.OVERRIDE_CHOICE_LINE=true` +[Oh my God.](#act2g_1) `Game.OVERRIDE_CHOICE_LINE=true` -[This is a bad coping mechanism.](#act2g_please) `Game.OVERRIDE_CHOICE_LINE=true` +[This is a bad coping mechanism.](#act2g_2) `Game.OVERRIDE_CHOICE_LINE=true` -[We don't know what's in that drink.](#act2g_we) `Game.OVERRIDE_CHOICE_LINE=true` +[Don't take drinks from strangers.](#act2g_3) `Game.OVERRIDE_CHOICE_LINE=true` -# act2g_oh +# act2g_1 b: O-- (#act2g) -# act2g_please +# act2g_2 b: T-- (#act2g) -# act2g_we +# act2g_3 -b: W-- +b: D-- (#act2g) diff --git a/scenes/act3.md b/scenes/act3.md index fba97d8..938464f 100644 --- a/scenes/act3.md +++ b/scenes/act3.md @@ -16,7 +16,7 @@ h2: DARE! r: Haha! Good. -r: Ok. You see that swimming pool down there? +r: Ok. You see that baby-blue swimming pool down there? ``` publish('hong-next'); @@ -28,8 +28,6 @@ h2: Yeah? Ten floors down? r: Jump in. -(...999) - `publish('hong-next')` h2: ... @@ -42,7 +40,7 @@ r: *Oh nooooo it's dangerous, don't do iiiiit.* 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: Let's 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 in. h2: Uh, but sometimes, um... fear has a point... diff --git a/scenes/act4.md b/scenes/act4.md index 41859bf..a08ad42 100644 --- a/scenes/act4.md +++ b/scenes/act4.md @@ -178,7 +178,7 @@ b: I want to protect your need for physical safety, b: But, gosh, there's so many dangerous things in the world! {{if _.a4_fears_discussed==1}} -b: I dunno, what do *you* think, human? +b: I dunno, enough of *me* choosing what to say next. What do *you* say, human? {{/if}} {{if _.a4_fears_discussed==2}} @@ -413,7 +413,7 @@ b: I want to make sure you get your social needs met, the human need to belong.. b: But, I worry: will we ever be loved? *Can* we ever be loved? {{if _.a4_fears_discussed==1}} -b: I dunno, what do *you* think, human? +b: I dunno, enough of *me* choosing what to say next. What do *you* say, human? {{/if}} {{if _.a4_fears_discussed==2}} @@ -580,7 +580,7 @@ b: And don't tell me we're *not* messed up. We almost jumped off a *roof*. {{/if}} {{if _.a4_fears_discussed==1}} -b: I dunno, what do *you* think, human? +b: I dunno, enough of *me* choosing what to say next. What do *you* say, human? {{/if}} {{if _.a4_fears_discussed==2}} @@ -976,7 +976,7 @@ publish("act4-out-3"); (...1001) -h: Huh. I wonder what was going on in their head. +h: Huh. That was weird. I wonder what was going on in their head. h: Anyway, you were saying? diff --git a/scenes/credits.md b/scenes/credits.md index d3ac012..3bf7c79 100644 --- a/scenes/credits.md +++ b/scenes/credits.md @@ -1,6 +1,6 @@ # credits -`music('credits', {NO_LOOP:true, volume:0.55});` +`music('credits', {NO_LOOP:true, volume:0.45});` (...1884) diff --git a/scenes/intermission.md b/scenes/intermission.md index 23fddff..47f78a5 100644 --- a/scenes/intermission.md +++ b/scenes/intermission.md @@ -16,7 +16,7 @@ Game.FORCE_CANT_SKIP = true; publish("show_stats"); ``` -n2: FEARS YOU USED: +n2: FEARS THIS ROUND: i: #harm# *BEING HARMED:* {{_.INTERMISSION_STAGE==1 ? _.attack_harm_ch1 : _.attack_harm_ch2}} diff --git a/scripts/main.js b/scripts/main.js index ff59554..52ee531 100644 --- a/scripts/main.js +++ b/scripts/main.js @@ -35,11 +35,11 @@ subscribe("START_GAME", function(){ $("#about").style.display = "block"; // 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("act3"); + //_ = {"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("act4"); - //Game.goto("intro"); + Game.goto("intro"); }); diff --git a/sprites/act2/act2_end.png b/sprites/act2/act2_end.png new file mode 100644 index 0000000..62776b0 Binary files /dev/null and b/sprites/act2/act2_end.png differ diff --git a/sprites/act2/battle_bb.png b/sprites/act2/battle_bb.png index 327a958..ebc3e83 100644 Binary files a/sprites/act2/battle_bb.png and b/sprites/act2/battle_bb.png differ diff --git a/sprites/act2/battle_hong.png b/sprites/act2/battle_hong.png index 6ad3ad3..d187296 100644 Binary files a/sprites/act2/battle_hong.png and b/sprites/act2/battle_hong.png differ diff --git a/sprites/act2/dee.png b/sprites/act2/dee.png new file mode 100644 index 0000000..a4abaf3 Binary files /dev/null and b/sprites/act2/dee.png differ diff --git a/sprites/act2/dum.png b/sprites/act2/dum.png new file mode 100644 index 0000000..69ea25b Binary files /dev/null and b/sprites/act2/dum.png differ diff --git a/sprites/act2/hunter.png b/sprites/act2/hunter.png new file mode 100644 index 0000000..5ce829e Binary files /dev/null and b/sprites/act2/hunter.png differ diff --git a/sprites/act2/party_bg_sprite.png b/sprites/act2/party_bg_sprite.png new file mode 100644 index 0000000..6fa88f5 Binary files /dev/null and b/sprites/act2/party_bg_sprite.png differ diff --git a/sprites/act2/party_hong.png b/sprites/act2/party_hong.png new file mode 100644 index 0000000..379f6f2 Binary files /dev/null and b/sprites/act2/party_hong.png differ diff --git a/sprites/act2_old/act2_end.png b/sprites/act2_old/act2_end.png new file mode 100644 index 0000000..62776b0 Binary files /dev/null and b/sprites/act2_old/act2_end.png differ diff --git a/sprites/act2_old/battle_bb.png b/sprites/act2_old/battle_bb.png new file mode 100644 index 0000000..327a958 Binary files /dev/null and b/sprites/act2_old/battle_bb.png differ diff --git a/sprites/act2_old/battle_hong.png b/sprites/act2_old/battle_hong.png new file mode 100644 index 0000000..6ad3ad3 Binary files /dev/null and b/sprites/act2_old/battle_hong.png differ diff --git a/sprites/act2_old/dee.png b/sprites/act2_old/dee.png new file mode 100644 index 0000000..a4abaf3 Binary files /dev/null and b/sprites/act2_old/dee.png differ diff --git a/sprites/act2_old/dum.png b/sprites/act2_old/dum.png new file mode 100644 index 0000000..69ea25b Binary files /dev/null and b/sprites/act2_old/dum.png differ diff --git a/sprites/act2/hong_bb_outro.png b/sprites/act2_old/hong_bb_outro.png similarity index 100% rename from sprites/act2/hong_bb_outro.png rename to sprites/act2_old/hong_bb_outro.png diff --git a/sprites/act2_old/hunter.png b/sprites/act2_old/hunter.png new file mode 100644 index 0000000..5ce829e Binary files /dev/null and b/sprites/act2_old/hunter.png differ diff --git a/sprites/act2/party_action.png b/sprites/act2_old/party_action.png similarity index 100% rename from sprites/act2/party_action.png rename to sprites/act2_old/party_action.png diff --git a/sprites/act2/party_bg.png b/sprites/act2_old/party_bg.png similarity index 100% rename from sprites/act2/party_bg.png rename to sprites/act2_old/party_bg.png diff --git a/sprites/act2_old/party_bg_sprite.png b/sprites/act2_old/party_bg_sprite.png new file mode 100644 index 0000000..6fa88f5 Binary files /dev/null and b/sprites/act2_old/party_bg_sprite.png differ diff --git a/sprites/act2_old/party_hong.png b/sprites/act2_old/party_hong.png new file mode 100644 index 0000000..379f6f2 Binary files /dev/null and b/sprites/act2_old/party_hong.png differ diff --git a/sprites/act2/special/special.png b/sprites/act2_old/special.png similarity index 100% rename from sprites/act2/special/special.png rename to sprites/act2_old/special.png diff --git a/sprites/act2/special/0.png b/sprites/act2_old/special/0.png similarity index 100% rename from sprites/act2/special/0.png rename to sprites/act2_old/special/0.png diff --git a/sprites/act2/special/1.png b/sprites/act2_old/special/1.png similarity index 100% rename from sprites/act2/special/1.png rename to sprites/act2_old/special/1.png diff --git a/sprites/act2/special/2.png b/sprites/act2_old/special/2.png similarity index 100% rename from sprites/act2/special/2.png rename to sprites/act2_old/special/2.png diff --git a/sprites/act2_old/special/special.png b/sprites/act2_old/special/special.png new file mode 100644 index 0000000..6fed8a6 Binary files /dev/null and b/sprites/act2_old/special/special.png differ