diff --git a/scenes/act1-end.md b/scenes/act1-end.md new file mode 100644 index 0000000..4937e29 --- /dev/null +++ b/scenes/act1-end.md @@ -0,0 +1,12 @@ +# act1_end + +`SceneSetup.act1_end()` + +n: TOTAL FEARS USED + +n: *BEING HARMED:* 3 + +n: *BEING UNLOVED:* 1 + +n: *BEING A BAD PERSON:* 4 + diff --git a/scenes/test-outro.md b/scenes/test-outro.md deleted file mode 100644 index ea84029..0000000 --- a/scenes/test-outro.md +++ /dev/null @@ -1,47 +0,0 @@ -# act1i - -n: *FINISH THEM* - -[< FIGHT: Destroy your phone! >](#act1i_phone) `Game.OVERRIDE_CHOICE_LINE=true` - -[< FLIGHT: Curl up in a ball and cry! >](#act1i_cry) `Game.OVERRIDE_CHOICE_LINE=true` - -# act1i_phone - -b: Your phone's giving you a panic attack! - -`Game.OVERRIDE_TEXT_SPEED = 1.5;` - -b: Punish it! Destroy your phone! Kill it! - -``` -Game.OVERRIDE_TEXT_SPEED = 2.5; -bb({body:"flail"}); -_.act1_ending = "fight"; -``` - -b: KILL IT KILL IT KILL IT KILL IT KILL IT KILL IT KILL IT KILL IT KILL IT KILL IT KILL IT KILL IT KILL I-- - -(#act1j) - -# act1i_cry - -b: The whole world is filled with danger! - -`Game.OVERRIDE_TEXT_SPEED = 1.5;` - -b: Do like the armadillo! Curl up into a ball for self-defense! - -``` -Game.OVERRIDE_TEXT_SPEED = 2.5; -bb({body:"flail"}); -_.act1_ending = "flight"; -``` - -b: CURL UP AND CRY CURL UP AND CRY CURL UP AND CRY CURL UP AND CRY CURL UP AND CRY CURL UP AND CRY CURL UP AND CR-- - -(#act1j) - -# act1j - -`SceneSetup.act1_outro()` \ No newline at end of file diff --git a/scenes/test.md b/scenes/test.md deleted file mode 100644 index 803fccc..0000000 --- a/scenes/test.md +++ /dev/null @@ -1,31 +0,0 @@ -# act1 - -`SceneSetup.act1()` - -(...300) - -n: AND THIS IS YOU, THAT HUMAN'S ANXIETY - -[You're eating alone for lunch! Again!](#act1a_alone) - -[You're not studying while eating!](#act1a_study) - -[That white bread's bad for you!](#act1a_bread) - -# act1a_alone - -`publish("hp_show")` - -`attack("20p", "alone")` - -n: YOU USED *FEAR OF BEING UNLOVED* - -n: IT'S SUPER EFFECTIVE - -`bb({eyes:"narrow", mouth:"normal"})` - -b: I am best protector! - -n: GOOD LUCK - -`hong({eyes:"annoyed", mouth:"smile"}, 0.05)` \ No newline at end of file diff --git a/scripts/act1/Act1_Outro_BG.js b/scripts/act1/Act1_Outro_BG.js index 26722f9..95530b5 100644 --- a/scripts/act1/Act1_Outro_BG.js +++ b/scripts/act1/Act1_Outro_BG.js @@ -189,9 +189,9 @@ function BG_Act1_Outro(){ } // NEXT SCENE? - /*if(frame==26){ - Game.goto("act1"); - }*/ + if(frameTicker>=270/30){ + Game.goto("act1_end"); + } }; @@ -338,6 +338,7 @@ function BG_Act1_Outro(){ ////////////////////////////////////////////////////////////////////////////// // Kill! + _subscriptions = []; self.kill = function(){ _subscriptions.forEach(unsubscribe); }; diff --git a/scripts/act1/Act1_SceneSetup.js b/scripts/act1/Act1_SceneSetup.js index ddabce0..2334f64 100644 --- a/scripts/act1/Act1_SceneSetup.js +++ b/scripts/act1/Act1_SceneSetup.js @@ -34,4 +34,10 @@ SceneSetup.act1_outro = function(){ var bg = new BG_Act1_Outro(); Game.scene.children.push(bg); +}; +SceneSetup.act1_end = function(){ + + Game.resetScene(); + music(null); + }; \ No newline at end of file diff --git a/scripts/main.js b/scripts/main.js index a2a6ed5..e18deda 100644 --- a/scripts/main.js +++ b/scripts/main.js @@ -1,7 +1,8 @@ // Load assets Loader.addScenes([ "scenes/intro.md", - "scenes/act1.md" + "scenes/act1.md", + "scenes/act1-end.md" ]); Loader.load().then(function(){ @@ -28,10 +29,10 @@ subscribe("START_GAME", function(){ $("#loading").style.display = "none"; Game.start(); - /*SceneSetup.act1(); + SceneSetup.act1(); music('battle', {volume:0.5}); hong({body:"phone1"}); - Game.goto("act1g");*/ - Game.goto("intro"); + Game.goto("act1i"); + //Game.goto("intro"); }); \ No newline at end of file