ALPHA

vg-mjg · Jul 4, 2020 · 4ef02a1 · 4ef02a1
1 parent 4f22e49
commit 4ef02a1
Show file tree

Hide file tree

Showing 89 changed files with 181 additions and 2,491 deletions.
diff --git a/errors.txt b/errors.txt
@@ -2,9 +2,9 @@
 errors listed below, and try again.
 
 
-File "game/script.rpy", line 1452: expected ':' not found.
-    label credits
-                 ^
+File "game/script.rpy", line 24: could not parse statement.
+    play music "audio/detectivekeiku.mp3" with fadein 1.0 with fadeout 1.0
+                                          ^
 
 Ren'Py Version: Ren'Py 7.3.5.606
-Fri Jul  3 14:30:27 2020
+Sat Jul  4 13:18:15 2020
diff --git a/game/artwork/VN1f.png b/game/artwork/VN1f.png
diff --git a/game/artwork/VN2f.png b/game/artwork/VN2f.png
diff --git a/game/artwork/VN3f.png b/game/artwork/VN3f.png
diff --git a/game/artwork/VN4f.png b/game/artwork/VN4f.png
diff --git a/game/audio/KO.mp3 b/game/audio/KO.mp3
diff --git a/game/audio/baseball.mp3 b/game/audio/baseball.mp3
diff --git a/game/audio/bell.mp3 b/game/audio/bell.mp3
diff --git a/game/audio/bogdanoff.mp3 b/game/audio/bogdanoff.mp3
diff --git a/game/audio/cicadasounds.mp3 b/game/audio/cicadasounds.mp3
diff --git a/game/audio/clock.mp3 b/game/audio/clock.mp3
diff --git a/game/audio/contemplation.mp3 b/game/audio/contemplation.mp3
diff --git a/game/audio/counselling.mp3 b/game/audio/counselling.mp3
diff --git a/game/audio/crickets.mp3 b/game/audio/crickets.mp3
diff --git a/game/audio/detectivekeiku.mp3 b/game/audio/detectivekeiku.mp3
diff --git a/game/audio/doubt.mp3 b/game/audio/doubt.mp3
diff --git a/game/audio/dream.mp3 b/game/audio/dream.mp3
diff --git a/game/audio/fencingwithnana.mp3 b/game/audio/fencingwithnana.mp3
diff --git a/game/audio/fencingwithnana.ogg b/game/audio/fencingwithnana.ogg
diff --git a/game/audio/futureisinourhands.mp3 b/game/audio/futureisinourhands.mp3
diff --git a/game/audio/hinatacitydate.mp3 b/game/audio/hinatacitydate.mp3
diff --git a/game/audio/hinatadate1.mp3 b/game/audio/hinatadate1.mp3
diff --git a/game/audio/hinatadate2.mp3 b/game/audio/hinatadate2.mp3
diff --git a/game/audio/hinatadate3.mp3 b/game/audio/hinatadate3.mp3
diff --git a/game/audio/keikubirthdayparty.mp3 b/game/audio/keikubirthdayparty.mp3
diff --git a/game/audio/keikunanatrain.mp3 b/game/audio/keikunanatrain.mp3
diff --git a/game/audio/keikunanatrain2.mp3 b/game/audio/keikunanatrain2.mp3
diff --git a/game/audio/keikunanatrain3.mp3 b/game/audio/keikunanatrain3.mp3
diff --git a/game/audio/meetupatthetournament.mp3 b/game/audio/meetupatthetournament.mp3
diff --git a/game/audio/nanadate1.mp3 b/game/audio/nanadate1.mp3
diff --git a/game/audio/nanadate2.mp3 b/game/audio/nanadate2.mp3
diff --git a/game/audio/nantokanare.mp3 b/game/audio/nantokanare.mp3
diff --git a/game/audio/ostsetup.txt b/game/audio/ostsetup.txt
@@ -0,0 +1,59 @@
+detectivekeiku plays in the opening scene. Cut when you get to the opening credits. 
+doubt plays in the scene right after the opening credits scene. The ony where Keiku is reading over Watsons case file. Cut at the "the next afternoon"
+counselling plays in the first day at school, when Keiku goes to counselling. Trigger when the bg changes to a class room. Cut when the background changes to the school hall, around the line "(Ahhhhhh! That dub hag!)"
+sliceoflice plays when Keiku joins the mahjong club. Specifically at the line "Sure, you can join. Do you have the form?"
+fencingwithnana plays when the first game of mahjong starts. At the line "Okay. This is just like the online games of mahjong I've played. There's no need to be nervous." Cut at "Ron! That's mangan, 12000 points!"
+sliceoflife plays when the first hanchan ends. Starts at the line "Even though I came fourth, and even though I seriously embarrassed myself, that was pretty fun." Cut at the bg change to Keikus room at night
+contemplation plays at keikus room at night. Starts at "they seemed like a strange bunch." cut at " z z z "
+counselling plays at "Another boring day at school has gone by." Cut when the player gets the option to choose which route they're going on 
+yuidate1 plays after the player chooses to date Yui and Yui picks up the phone. Specifically the line "...what?". Cut when the player goes to Keikus bedroom at night. Then play crickets noises. 
+hinatadate1 plays after Hinata is chosen and she picks up her phone. Specifically the line "Hello, who is it?" Cut when BG transitions to Keikus room and play crickets
+thud sfx plays after the line "(Just moving it this short distance is a pain in the backside.)" 
+xeniadate1 plays after Xenia is chosen and she picks up the phone, specifically the line "Hello, Xenia here." Cut when BG transitions to Keikus room at night.
+thud sfx plays on the line "Does Xenia have wobbly floorboards or something? I feel like I could tip over."
+fencingwithnana plays when Nana says "Yo! Who's this?" and cuts at the line "We're going again!" 
+thud sfx plays bwetween "But today that's going to be her downfall." and when nana says "What!" 
+woosh sfx plays after "It's a javelin!"
+nanadate1 plays at "I feel so sweaty. I'm all out of breath. I think I've even got a bruise or two." Cut when bg transitions to Keikus room at night. Play crickets.
+clock sfx plays in the classroom. just before the line "Class is going so slowly today. I want it to end already." Cut at "*time passes*"
+bell sfx plays at *Bing Bong* *Bing bong* 
+sliceoflice plays when the bg changes to the mahjong club room, just before "Ah, Keiku, you're here." cuts at "We're just going to look at a series of mahjong problems to solve."
+wwyd plays when the first wwyd question is presented to the player. Cut at the bg change to Keikus room at night. Play crickets.
+dream plays at "Yawwwn." in the dream scene if the player has that flag ticked.
+sliceoflice plays at "Yawwwwwwwn" when Keiku wakes up in the scene after dream 
+yakumandealin sfx plays at "Wait, what the hell is written on her locker?" for the the Yui date 2. Cut boy in the windmill here.
+yuidate2 starts playing at "Let's watch that then." On yuis second date.Cut at the change to Keikus bedroom at night. and play crickets.
+xeniadate2 plays at "two cages and 100 balls for me and my friend please." Cut when bg changes to Keikus room play crickets."
+hinatadate2 plays at the BG change to the school gardens, right after "Off to the gardens then." cut when BG fades to black and goes to Keikus beroom at night play crickets
+nanadate2 plays at "Ah, Keiku!" after the bg changes to the library. Fade out when BG changes to Keikus room at night."
+meetupatthetournament plays at "(Ah, that tournament is happening today.)" Cut when you get to "Ehe, just leave it to me."
+tournament plays at "(Oh wow, it's starting, this is so exciting.)" cut at "(I’ll discard this worthless Xia tile. That’ll be safe.)"
+yakumandealin plays at "RON NYAA! Kokushi musou! That'll be 48,000 points, please."
+wcdonalds plays at "What were the odds! Who wouldn’t have discarded the xia against a double riichi?" Fade out at "It's getting a little late, but I think I'm going to hang around the city a bit."
+yuicitydate plays when Keiku and Yui go to the arcade. "They're still around. I know a great one in this area." cut at bg change to Keikus room night.
+KO sfx plays at the line "K.O." on the Yui arcade date. 
+thud sfx plays when Keiku falls over. Right after she shouts "This is way too fast!" 
+yuidate3 plays at "*knock knock*" on Yuis third date scene. Fade out when the bg fades to black.
+
+keikunanatrain plays at the bg change to the camping store on the Xenia city date section. Cut at the BG change to Keikus room at sunset. (I know it says keikunanatrain we're using this song twice)
+thud sfx plays after "Excellent. Let me just climb over this gate and we can get going."
+cicadasounds plays at the backgound change to forest at night. Cut at the BG change to the lake 
+xenialakedate plays when the background changes to the lake with a full moon. Cut when the BG fades to black.
+
+futureisinourhands plays at "THE FUTURE IS IN OUR HAAAAAAAAANDS" Cut at the ... after AAAAAAA"
+nantokanare plays at "Y-yaseeeeeee" cut at "Great stuff, Keiku. See how much fun it is to just belt it out?"
+youwashock plays at "YOU ARE SHOCK" cut at bg fade to train night time.
+keikunanatrain plays after the bg fades to the train at night. Cut when the BG changes to Keikus room at night.
+keikunanatrain2 plays at "Time to get up and go." Cut at "Ah, shit!"
+thud plays between "WOOOOO!" and "Ah, shit!"
+keikunanatrain3 plays at "Alright, then" when Keiku is carrying Nana. Cut out when bg fades to black 
+
+hinatacitydate plays at the bg change to the zoo. Cut at the BG change to Keikus bedroom at night.
+hinatadate3 plays when the bg changes to Hinatas garden around "Keiku, I'm so glad you came. Come inside with me." Cut when bg fades to black 
+
+keikubirthdayparty plays at "Surprise Keiku! Happy birthday!"  cut after credits 
+
+bogdanoff plays when the bogdanoffs bg pops up 
+
+
+
diff --git a/game/audio/sliceoflife.mp3 b/game/audio/sliceoflife.mp3
diff --git a/game/audio/thud.mp3 b/game/audio/thud.mp3
diff --git a/game/audio/tournament.mp3 b/game/audio/tournament.mp3
diff --git a/game/audio/trainnoise.mp3 b/game/audio/trainnoise.mp3
diff --git a/game/audio/wcdonalds.mp3 b/game/audio/wcdonalds.mp3
diff --git a/game/audio/woosh.mp3 b/game/audio/woosh.mp3
diff --git a/game/audio/wwyd.mp3 b/game/audio/wwyd.mp3
diff --git a/game/audio/xeniadate1.mp3 b/game/audio/xeniadate1.mp3
diff --git a/game/audio/xenialakedate.mp3 b/game/audio/xenialakedate.mp3
diff --git a/game/audio/yakumandealin.mp3 b/game/audio/yakumandealin.mp3
diff --git a/game/audio/youwashock.mp3 b/game/audio/youwashock.mp3
diff --git a/game/audio/yuicitydate.mp3 b/game/audio/yuicitydate.mp3
diff --git a/game/audio/yuidate1.mp3 b/game/audio/yuidate1.mp3
diff --git a/game/audio/yuidate2.mp3 b/game/audio/yuidate2.mp3
diff --git a/game/audio/yuidate3.mp3 b/game/audio/yuidate3.mp3
diff --git a/game/cache/bytecode.rpyb b/game/cache/bytecode.rpyb
diff --git a/game/cache/pyanalysis.rpyb b/game/cache/pyanalysis.rpyb
diff --git a/game/cache/screens.rpyb b/game/cache/screens.rpyb
diff --git a/game/gui.rpyc b/game/gui.rpyc
diff --git a/game/hinata.rpy b/game/hinata.rpy
@@ -1,5 +1,6 @@
 label hinata_date1:
     scene bg schoolfront  with fade
+    play music "audio/hinatadate1.mp3" fadeout 1.0 fadein 1.0
     show hat
     k "(I think I’ll text Hinata. She seemed like a nice person.)"
     "*abababa* *abababa*"
@@ -17,6 +18,7 @@ label hinata_date1:
     k "1, 2, 3!"
     k "(What the hell, even with two people this is so heavy!)"
     k "(Just moving it this short distance is a pain in the backside.)"
+    play sound "audio/thud.mp3"
 #    {Play some sort of thud sound effect for the sound of the mulch bag being dropped}
     k "Phew. Shouldn’t this be a job for the boys in your club?"
     h "Club? There’s no club. It’s actually just me."
@@ -79,6 +81,7 @@ label hinata_date2:
     show hat
     k "(Off to the gardens then.)"
     scene bg garden with fade
+    play music "audio/hinatadate2.mp3" fadeout 1.0 fadein 1.0
 #    {play https://www.youtube.com/watch?v=2DuvYC3zENI /// is this good? I’m not sure. Does it fit the somewhat melancholy conversation they’re having?}
 #        {it should be good enough}
     show hat at left1
@@ -170,6 +173,7 @@ label hinata_date2:
     k "I feel the same way. Anyway, I’ll see you tomorrow at the tournament."
     h "Yep. See you tomorrow!"
     scene bg keikunight with fade
+    play music "audio/crickets.mp3" fadeout 1.0 fadein 1.0
     show hat
     k "That was a nice afternoon."
     k "It felt good to confide in someone like that."
@@ -183,7 +187,7 @@ label hinata_date2:
 
 
 label hinata_date3:
-    scene bg maccastable with fade
+    scene bg maccastable
     show xenia at left1
     x "Well, I’ll have to take my leave now."
     show nana at right1
@@ -207,6 +211,7 @@ label hinata_date3:
 
 #    {Play https://www.youtube.com/watch?v=fPSCYZW8LjI&list=PL3-XFrU0Gj6labD69JOO6I1mjKaun2-Q-&index=17 }
     scene bg zoo with fade
+    play music "audio/hinatacitydate.mp3" fadeout 1.0 fadein 1.0
     show hat at left1
     show hinata at righthinata
     k "Hinata, do you have a particular favourite animal?"
@@ -260,6 +265,7 @@ label hinata_date3:
     h "Great. Meet me at my place tomorrow morning, then. I’ll text you the address."
     scene bg keikunight with fade
     #{Cut music, play crickets.}
+    play music "audio/crickets.mp3" fadeout 1.0 fadein 1.0
     show hat
     k "(Today's tournament was a lot of fun.)"
     k "(I can’t believe I actually dealt into a yakuman, though.)"
@@ -293,6 +299,7 @@ label hinata_date3:
     #{BG change, backyard garden.}
     #{play https://www.youtube.com/watch?v=F-SsPbS-oaY&list=PLWLfw4C6KoVE3qWt834nAHBmy5Rwz6QHb&index=91 }
     scene bg backyard with fade
+    play music "audio/hinatadate3.mp3" fadeout 1.0 fadein 1.0
     show hat at left1
     show hinata at righthinata
     k "Wow, this is even more impressive than the school gardens."
@@ -398,6 +405,7 @@ label hinata_date3:
     k "I promise. This will be the best year of our lives."
 
     scene bg black with fade
+    stop music
     show hat
     k "(Since I joined the mahjong club, my life has become a lot brighter.)"
     k "(In just one week, I’ve not only made friends, but also met a lover.)"

diff --git a/game/hinata.rpyc b/game/hinata.rpyc
diff --git a/game/images.rpyc b/game/images.rpyc
diff --git a/game/images/bg hinataart.png b/game/images/bg hinataart.png
diff --git a/game/images/bg nanaart.png b/game/images/bg nanaart.png
diff --git a/game/images/bg tent.jpg b/game/images/bg tent.jpg
diff --git a/game/images/bg xeniaart.png b/game/images/bg xeniaart.png
diff --git a/game/images/bg yuiart.png b/game/images/bg yuiart.png
diff --git a/game/nana.rpy b/game/nana.rpy
@@ -1,6 +1,7 @@
 label nana_date1:
     scene bg schoolfront with fade
     show hat
+    play music "audio/fencingwithnana.mp3" fadeout 1.0 fadein 1.0
 
     k "(Nana seemed like a fun person to be around. I’ll call and ask her if she wants to hang out.)"
     "* abababa* *abababa*"
@@ -68,9 +69,11 @@ label nana_date1:
     k "(I think it’s called a lunge? When she leaps forwards with her arm outstretched, like a scorpion stinging its prey.)"
     k "(Honestly, it’s kind of beautiful in a way. She’s so fast. The form is perfect. You can tell she’s practiced it a lot.)"
     k "(But today that’s going to be her downfall.)"
+    play sound "audio/thud.mp3"
 #    {play thud noise}
 #    {BZZT}
     n "What!"
+    play music "audio/sliceoflife.mp3" fadeout 1.0 fadein 1.0
     n "I don’t believe it. You dived right onto the floor. You went prone just as I lunged, and ducked under the blade."
     n "That’s ridiculous, but it worked."
     k "(I won’t be caught by those lunges anymore. This is it, it’s time for my counter attack!)"
@@ -102,6 +105,7 @@ label nana_date1:
 #    {Play https://www.youtube.com/watch?v=iawEZ2ejWm8&list=PLeKSx7u-0kRiJqH14dswC-lHh8Nuu0APx&index=22}
     hide hatfence
     hide nanafence
+    play music "audio/nanadate1.mp3" fadeout 1.0 fadein 1.0
     show hat at left1
     show nana at right1
     k "(I feel so sweaty. I’m all out of breath. I think I’ve even got a bruise or two.)"
@@ -136,6 +140,7 @@ label nana_date1:
 #    {Background transition to Keikus room at night, with crickets playing.}
 #        {same as above. Never gonna date nana in my life ;_;}
     scene bg keikunight with fade
+    play music "audio/crickets.mp3" fadeout 1.0 fadein 1.0
     show hat
     k "(That was really tiring.)"
     k "(But I guess that’s a good thing.)"
@@ -154,6 +159,7 @@ label nana_date2:
     k "(Time to head off to the library.)"
     k "(It seems weird that she’d want to meet me in the library, but I was planning on asking her to meet me there anyway.)"
     scene bg library with fade
+    play music "audio/nanadate2.mp3" fadeout 1.0 fadein 1.0
     show nana at right1
     show hat at left1
     n "Ah, Keiku!"
@@ -298,16 +304,18 @@ label nana_date2:
     k "Anyway, my stop’s coming up. I’ll see you tomorrow at the tournament."
     n "Yep, see you tomorrow. Good luck!"
     scene bg keikunight with fade
+    play music "audio/crickets.mp3" fadeout 1.0 fadein 1.0
     show hat
     k "(Well, that was a lot of fun.)"
     k "(At the very least, I can definitely say I got back at her for that fencing match.)"
     k "(I really wasn’t expecting her to ask me for advice though. On the surface she seemed like the sort of person who’s super confident in herself and wouldn’t need advice.)"
     k "(Oh well. I better go to sleep soon.)"
     k "(. . .)"
     k "( z z z )"
+    jump post_date2
 
 label nana_date3:
-    scene maccastable
+    scene bg maccastable
     show xenia at left1
     x "Time to leave, I suppose."
     show hinata at righthinata
@@ -341,6 +349,7 @@ label nana_date3:
     n "And if that doesn’t work then there’s always alcohol."
     n "Alright, I’ve picked out my song. ‘Mirai wa bokura no te no naka’."
     #{Play https://www.youtube.com/watch?v=j7myzgxz9nI }
+    play music "audio/futureisinourhands.mp3" fadeout 1.0 fadein 1.0
     n "THE FUTURE IS IN OUR HAAAAAAAAANDS."
     k "(Wow, she’s even bringing out the pretend air guitar on stage.)"
     n "WE DON’T NEED ANYONE’S RULES."
@@ -358,6 +367,7 @@ label nana_date3:
     n "OOOOOO"
     n "AAAAAAAA"
     n "..."
+    stop music
     #{cut music}
     n "Alright, how was that?"
     k "Amazing! You look so cool up there."
@@ -367,6 +377,7 @@ label nana_date3:
     k "This song looks nice. ‘Nantokanare’."
     k "Ahem."
     #{play https://www.youtube.com/watch?v=NvJGKyiGPyQ }
+    play music "audio/nantokanare.mp3" fadeout 1.0 fadein 1.0
     k "Y-yaseeeeeee."
     k "G-gaman bakkari deee."
     k "Mou…"
@@ -381,6 +392,7 @@ label nana_date3:
     k "WOAAAAAAAH"
     n "NANTOKANAREEEEEEEE"
 #    {cut music}
+    stop music
     n "Great stuff, Keiku. See how much fun it is to just belt it out?"
     n "Let’s do a proper duet this time."
     k "Hmmm, hmmm..."
@@ -389,6 +401,7 @@ label nana_date3:
     k "Alright, let’s do it."
     k ". . ."
     #{Play https://www.youtube.com/watch?v=sPPVgHQu09Y }
+    play music "audio/youwashock.mp3" fadeout 1.0 fadein 1.0
     n "YOU ARE SHOCK!"
     k "Because of your love, even the sky collapses..."
     n "YOU ARE SHOCK!"
@@ -403,6 +416,7 @@ label nana_date3:
 #    {fade bg to black, fade to train night time.}
 #    {play https://www.youtube.com/watch?v=sdpmAAuR1N0&list=PL3-XFrU0Gj6lCJmooIqRJX-kYwhP3fOce&index=14 }
     scene bg train with fade
+    play music "audio/keikunanatrain.mp3" fadeout 1.0 fadein 1.0
     show hat at left1
     show nana at right1
     k "Phew, that was a lot of fun, but my voice is all tired out now."
@@ -418,6 +432,7 @@ label nana_date3:
     k "Alright then. I’ll see you tomorrow."
     n "I’m looking forward to it."
     scene bg keikunight with fade
+    stop music
     show hat
     k "(That whole tournament today was a lot of fun.)"
     k "(Especially watching Nana play. The way she plays is so cool!)"
@@ -435,7 +450,7 @@ label nana_date3:
     show hat
     k "*Yawwwwwn*"
     #{play https://www.youtube.com/watch?v=yN77vYbXLB4 }
-
+    play music "audio/keikunanatrain2.mp3" fadeout 1.0 fadein 1.0
     k "(Time to get up and go.)"
     k "(That’s funny. I’m not having any trouble getting out of bed this morning like I normally do on a Sunday.)"
     #{bg fade to black and into train daytime.}
@@ -528,9 +543,11 @@ label nana_date3:
     k "(She has a lot of distance between her and the stairs, though.)"
     k "(She’s building up a lot of speed.)"
     k "(Maybe she’ll actually pull this off…)"
+    stop music
     n "WOOOOO!"
     #{Play noise that sounds like a crash}
     #{cut music}
+    play sound "audio/thud.mp3"
     n "Ah, shit!"
     k "Nana! Are you alright?"
     n "Owwwwwww."
@@ -549,6 +566,7 @@ label nana_date3:
     k "I’m going to carry you back to the trainstation. Come on, hop on my back."
     n ". . ."
     n "Alright, then."
+    play music "audio/keikunanatrain3.mp3" fadeout 1.0 fadein 1.0
     #{play https://www.youtube.com/watch?v=OviLl5o4l64&list=PL3-XFrU0Gj6labD69JOO6I1mjKaun2-Q-&index=6 }
     k "(She’s a lot lighter than I expected.)"
     k "(Ah, I can feel her chest pushing against my back.)"
@@ -607,6 +625,7 @@ label nana_date3:
     k "Of course. There’s no way I’d leave you now."
 
     scene bg black with fade
+    stop music
     show hat
     k "(Since I joined the mahjong club, my life has become a lot brighter.)"
     k "(In just one week, I’ve not only made friends, but also met a lover.)"

diff --git a/game/nana.rpyc b/game/nana.rpyc
diff --git a/game/options.rpyc b/game/options.rpyc
diff --git a/game/saves/1-1-LT1.save b/game/saves/1-1-LT1.save
diff --git a/game/saves/_reload-2-LT1.save b/game/saves/_reload-2-LT1.save
diff --git a/game/saves/auto-1-LT1.save b/game/saves/auto-1-LT1.save
diff --git a/game/saves/auto-10-LT1.save b/game/saves/auto-10-LT1.save
diff --git a/game/saves/auto-2-LT1.save b/game/saves/auto-2-LT1.save
diff --git a/game/saves/auto-3-LT1.save b/game/saves/auto-3-LT1.save
diff --git a/game/saves/auto-4-LT1.save b/game/saves/auto-4-LT1.save
diff --git a/game/saves/auto-5-LT1.save b/game/saves/auto-5-LT1.save
diff --git a/game/saves/auto-6-LT1.save b/game/saves/auto-6-LT1.save
diff --git a/game/saves/auto-7-LT1.save b/game/saves/auto-7-LT1.save
diff --git a/game/saves/auto-8-LT1.save b/game/saves/auto-8-LT1.save
diff --git a/game/saves/auto-9-LT1.save b/game/saves/auto-9-LT1.save