Merge pull request 'issue34-init' (#6) from issue34-init into master

Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/6

game/script.rpy

@@ -348,10 +348,4 @@ transform rleft:
 transform rright:
    xalign 1.7 yalign 0.1
 
-label start:
+call start
-$ fangscore = 0
-$ anonscore = 0
-$ tradwife = False
-pause 1.0
-
-jump chapter_1

game/script/1.first-two-days-anon-meets-fang.rpy

@@ -1,5 +1,4 @@
 label chapter_1:
-
     #First Day of School
     "January sixth."
 
@@ -1947,4 +1946,4 @@ Nas "I know babe. I just wish I could help them more."
 
     A "Yeah. If you need any help Naser, I owe ya for the pizza."
 
-jump chapter_2
+    return

game/script/10.an-excellent-reason-to-start-abusing-mod-powers.rpy

@@ -1,7 +1,7 @@
 label chapter_10:
-
-scene black with fade
     #Confession
+    scene black with fade
+
     play music 'audio/OST/appreciating_the_scenery.ogg' fadein 1.0
     A "Hang on, lemme get my key…"
 
@@ -350,4 +350,4 @@ scene black with fade
     stop music fadeout 1.0
     "..."
 
-jump chapter_11
+    return

game/script/11.school-assignment-and-route-lock.rpy

@@ -1,5 +1,4 @@
 label chapter_11:
-
     scene room anon day
     show fang neutral at sleft
     show anon neutral flip at acenter
@@ -3208,45 +3207,4 @@ F "Anon, remind me, what’s a quark again?"
 
     "..."
 
-#Ending Deciding
-#11 to ending is all a big if statement, just smooth sailing and Copy/Paste from here.
-
-if anonscore >= 4 and fangscore >= 4:
-    jump chapter_11D
-
-elif anonscore >= 3 and fangscore <=4:
-    jump chapter_11C
-
-elif anonscore <= 3 and fangscore >=3:
-    jump chapter_11B
-
-elif anonscore <= 2 and fangscore <= 2:
-    jump chapter_11A
-
-else:
-#>>ERROR HANDLING OH SWEET BABY JESUS SHIT HIT THE FAN
-   St "FUCK FUCK FUCK FUCK"
-   A "What?"
-   St "Some dipshit developer made broken code and this is the error handling message..."
-   A "What?"
-   St "Basically the if/else statement that handles this shit has failed at catching the score, and someone fucked up."
-   A "Shit... what does that mean?"
-   St "Well... the games broken and will end soon"
-   A "Does this mean that the 3 fucks speedrunning have an easy way to beat the game?"
-   St "Yes, but you have to have something wrong with you to speedrun a visual novel beta"
-   "/dev/non" "well shit. Please do report this bug and all the choices you made that lead to this point. Something fucked up real bad"
-   jump ending
-#just liek maek gaem
-
-label ending:
-play music "audio/OST/Dino Destiny Reader.ogg"
-scene credits at Pan((0, 0),(0, 7400), 61) with fade
-pause 1200
-scene black with fade
-stop music fadeout 3.0
-pause 5
-if tradwife:
-   scene c10 with fade
-   pause 20
     return
-

game/script/11A.fang-desperately-wants-to-win-prom-night.rpy

@@ -1,6 +1,4 @@
-#label shooter: - commented out 6/12/21 - new format
 label chapter_11A:
-
     #Announcing a Plan | shooter
     show anon neutral at aleft
     show fang neutral at scenter
@@ -110,4 +108,4 @@ F "I’ll start looking for a good suit to wear!"
     "Highlight of our time here at Volcano High indeed."
     stop music fadeout 1.0
 
-jump chapter_12A
+    return

game/script/11B.anon-gets-fangs'-pronouns-right,-and-she's-smug-about-it.rpy

@@ -1,5 +1,4 @@
 label chapter_11B:
-
     #>>doomer | Announcing Nothing Important
     play music "audio/OST/Appreciating her Company.ogg" fadein 1.0
     "About fifteen minutes into the assignment, the two of us are just about done."
@@ -170,4 +169,5 @@ stop music fadeout 1.0
     "The two of us continue making plans up to the bell, and I toss the paper out when I leave."
 
     "..."
-jump chapter_12B
+
+    return

game/script/11C.anon-gets-fangs'-pronouns-right,-but-she-tells-him-she's-okay-with-being-called-a-girl.rpy

@@ -1,5 +1,4 @@
 label chapter_11C:
-
     #Announcing a Date | Tradwife
     show anon neutral at aleft
     show fang neutral at scenter
@@ -266,4 +265,4 @@ scene black with fade
     stop music fadeout 1.0
     "..."
 
-jump chapter_12C
+    return

game/script/11D.anon-gets-fangs'-pronouns-right-and-she-teases-him-while-carrying-herself-with-more-confidence.rpy

@@ -1,8 +1,5 @@
 label chapter_11D:
-
-#label golden: - commented out 6/12/21 - redundant with new chapter labels
     #Announcing a Show | Golden
-
     #le inconsistant indention has arrived
     #le wrong move indent slut
 
@@ -297,4 +294,5 @@ stop music fadeout 1.0
     "Man, I hope dad’s suit has actually been to the cleaner, I don’t wanna disappoint."
 
     "..."
-jump chapter_12D
+
+    return

game/script/12A.music-museum-date.rpy

@@ -1,5 +1,4 @@
 label chapter_12A:
-
     #Lets all go to the Museum
     scene black with fade
     scene room anon dark with fade
@@ -550,4 +549,4 @@ stop music fadeout 1.0
 
     "..."
 
-jump chapter_13A
+    return

game/script/12B.band-fang-likes-concert.rpy

@@ -1,5 +1,4 @@
 label chapter_12B:
-
     #Let's all go to a Concert
     scene room anon day
     play music 'audio/OST/intercept.ogg' fadein 1.0
@@ -366,6 +365,6 @@ A "That’s the plan!"
     F "Dweeb."
     scene black with fade
     stop music fadeout 1.0
-#Prom is For Suckers
     "..."
-jump chapter_13B
+
+    return

game/script/12C.anon-fang-lovey-dovey.rpy

@@ -1,5 +1,4 @@
 label chapter_12C:
-
     scene room anon night with fade
     stop music fadeout 1.0
     play music "audio/OST/its_footloose_now.ogg" fadein 1.0
@@ -575,4 +574,5 @@ F "I love you."
     scene black with fade
     stop music fadeout 1.0
     "..."
-jump chapter_13C
+
+    return

game/script/12D.aquarium.rpy

@@ -1,9 +1,8 @@
 label chapter_12D:
-
+    #Let's all go to the Aquarium
     scene black with fade
     pause 3
-#Let's all go to the Aquarium
+
-#label LetsAllGoToTheAquarium: - commented out on 6/12/21 - redundo with new systeo
     play music "audio/OST/west_coast_kicking.ogg" fadein 1.0
     "Every day after school for the next few weeks I would join Fang to help her practice."
 
@@ -425,4 +424,4 @@ scene aquariumoutside with dissolve
     stop music fadeout 1.0
     "..."
 
-jump chapter_13D
+    return

game/script/13A.fang-loses-it-after-losing-prom-queen.rpy

@@ -1,5 +1,4 @@
 label chapter_13A:
-
     scene home fang day
     show fang a prom happy flip at sright
     show fangmom neutral at fmleft
@@ -1383,4 +1382,4 @@ scene black with fade
 
     "..."
 
-jump chapter_14A
+    return

game/script/13B.fang-breaks-up-with-anon.rpy

@@ -1,5 +1,5 @@
 label chapter_13B:
-
+    #Prom is For Suckers
     "-One Month Later-"
 
     play music 'audio/OST/west_coast_kicking.ogg' fadein 1.0
@@ -630,4 +630,4 @@ stop music fadeout 1.0
     scene black with fade
     "..."
 
-jump chapter_14B
+    return

game/script/13C.fang-and-anon-go-to-beach-and-prom.rpy

@@ -1,8 +1,6 @@
 label chapter_13C:
-
-pause 3
-
     #Prom is Suprising
+    pause 3
     scene black with fade
     stop music fadeout 1.0
     play music "audio/OST/Appreciating the Moment.ogg" fadein 1.0
@@ -1378,4 +1376,5 @@ with move
     scene black with fade
     stop music fadeout 1.0
     "..."
-jump chapter_14C
+
+    return

game/script/14A.KO_OP-ending.rpy

@@ -1,9 +1,6 @@
-#label BowlingForVolcanoHigh: - commented out 6/12/21 - redundant with new label/jump per chapter
 label chapter_14A:
-
-scene room anon day
-
     #Bowling for Volcano High
+    scene room anon day
 
     "I wake up the next morning with my head cradled in my arms."
     play music "audio/OST/Appreciating the Moment.ogg" fadein 1.0
@@ -771,7 +768,6 @@ play sound "audio/effects/wind.wav" loop volume 0.3
     "..."
 
     "It’s better this way."
-
     $ quick_menu = False
     window hide
     play sound "audio/effects/wind.wav" loop volume 0.2
@@ -782,4 +778,4 @@ scene black with fade
     pause 30
     scene 1of4 with fade
     pause 15
-$ renpy.quit()
+    return

game/script/14B.bad-ending.rpy

@@ -1,6 +1,5 @@
-#Anon and the Infinite Sadness
-#label clusterfuck - commented out 6/12/21 - you know the drill, redundant, etc.
 label chapter_14B:
+    #Anon and the Infinite Sadness
     "After Fang broke up with me everything just fell apart."
 
     "I couldn’t be bothered with school anymore, instead shutting myself in my room and replaying old games."
@@ -238,4 +237,4 @@ scene 2of4 with fade
     pause 5
     scene black with fade
     pause 5
-jump ending
+    return

game/script/14C.good-ending.rpy

@@ -1,5 +1,4 @@
 label chapter_14C:
-
     #Volcano Highschool Musical
     "-Three years later-"
 
@@ -713,4 +712,4 @@ stop music fadeout 15.0
     pause 16
     scene black with fade
     pause 1
-jump ending
+    return

game/script/14D.gold-ending.rpy

@@ -1,5 +1,5 @@
 label chapter_14D:
-
+    #Fast Times at Volcano High
     "-Five Years Later-"
 
     "July seventeenth."
@@ -609,4 +609,4 @@ stop music fadeout 15.0
     pause 16
     scene black with fade
     pause 1
-jump ending
+    return

game/script/2.fourth-day-of-school.rpy

@@ -1,5 +1,4 @@
 label chapter_2:
-
     scene black with fade
 
     "We finish eating and make small talk until the bell signals us to go to our sixth period."
@@ -1514,5 +1513,4 @@ A "See ya."
 
     scene black with fade
 
-#jump StartOfChap3 - commented out 6/12/21 - confuses with new file consistency + in line with og script
+    return
-jump chapter_3

game/script/3.showing-up-at-band-practice-and-giving-feedback.rpy

@@ -1,11 +1,8 @@
 label chapter_3:
-
     #Band Practice
-#label StartOfChap3: commented out 6/12/21 - confuses with new file consistency + in line with og script
 
     scene black
 
-
     play music 'audio/OST/Appreciating the Atmosphere.ogg'
 
     "-One Week Later-"
@@ -762,4 +759,4 @@ if persistent.lewd == True:
     "Fuck."
     "..."
 
-jump chapter_4
+    return

game/script/4.anon-needs-help-during-music-period.rpy

@@ -1,9 +1,7 @@
 label chapter_4:
-
     #Music class
     scene black with fade
 
-
     play music 'audio/OST/Skinrow Soul.ogg'
     show outside school fog
 
@@ -596,4 +594,4 @@ scene black with fade
     "God, I feel like a jerk now."
     "..."
 
-jump chapter_5
+    return

game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy

@@ -1,5 +1,4 @@
 label chapter_5:
-
     #Gardening Club
     scene skinrow
     show anon neutral at aleft
@@ -2544,4 +2543,4 @@ scene black with fade
 
     "..."
 
-jump chapter_6
+    return

game/script/6.anon-helps-fang-find-a-venue-for-band.rpy

@@ -1,5 +1,4 @@
 label chapter_6:
-
     #Not A Date
     scene room anon dark with fade
     "-One Month Later-"
@@ -2687,4 +2686,4 @@ scene black with fade
 
     "..."
 
-jump chapter_7
+    return

game/script/7.concert-day.rpy

@@ -1,5 +1,4 @@
 label chapter_7:
-
     #Concert Day
     "-One Week Later-"
 
@@ -1068,4 +1067,4 @@ scene black with fade
 
     "..."
 
-jump chapter_8
+    return

game/script/8.anon-and-fang-study-together.rpy

@@ -1,5 +1,4 @@
 label chapter_8:
-
     scene black with fade
     #Study Session
 
@@ -1299,4 +1298,4 @@ stop music fadeout 1.0
 
     "..."
 
-jump chapter_9
+    return

game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy

@@ -1,8 +1,4 @@
 label chapter_9:
-
-#jump ChVVURMDRAMA - commented out 6/12/21 - probably redundant with new "system"
-#label ChVVURMDRAMA:- commented out 6/12/21 - probably redundant with new "system"
-
     #VVURM DRAMA
     scene hallway with fade
     play music 'audio/OST/Fuck You I Like This Chick.ogg' fadein 1.0
@@ -1305,4 +1301,4 @@ stop music fadeout 1.0
 
     "..."
 
-jump chapter_10
+    return

game/storyline.rpy

@@ -0,0 +1,64 @@
+label start:
+    $ fangscore = 0
+    $ anonscore = 0
+    $ tradwife = False
+    pause 1.0
+    call chapter_1
+    call chapter_2
+    call chapter_3
+    call chapter_4
+    call chapter_5
+    call chapter_6
+    call chapter_7
+    call chapter_8
+    call chapter_9
+    call chapter_10
+    call chapter_11
+    #Ending Deciding
+    if anonscore >= 4 and fangscore >= 4:
+        call chapter_11D
+        call chapter_12D
+        call chapter_13D
+        call chapter_14D
+    elif anonscore >= 3 and fangscore <=4:
+        call chapter_11C
+        call chapter_12C
+        call chapter_13C
+        call chapter_14C
+    elif anonscore <= 3 and fangscore >=3:
+        call chapter_11B
+        call chapter_12B
+        call chapter_13B
+        call chapter_14B
+    elif anonscore <= 2 and fangscore <= 2:
+        call chapter_11A
+        call chapter_12A
+        call chapter_13A
+        call chapter_14A
+        $ renpy.quit()
+    else:
+        #>>ERROR HANDLING OH SWEET BABY JESUS SHIT HIT THE FAN
+       St "FUCK FUCK FUCK FUCK"
+       A "What?"
+       St "Some dipshit developer made broken code and this is the error handling message..."
+       A "What?"
+       St "Basically the if/else statement that handles this shit has failed at catching the score, and someone fucked up."
+       A "Shit... what does that mean?"
+       St "Well... the games broken and will end soon"
+       A "Does this mean that the 3 fucks speedrunning have an easy way to beat the game?"
+       St "Yes, but you have to have something wrong with you to speedrun a visual novel beta"
+       "/dev/non" "well shit. Please do report this bug and all the choices you made that lead to this point. Something fucked up real bad"
+       #just liek maek gaem
+    call ending
+
+label ending:
+    play music "audio/OST/Dino Destiny Reader.ogg"
+    scene credits at Pan((0, 0),(0, 7400), 61) with fade
+    pause 1200
+    scene black with fade
+    stop music fadeout 3.0
+    pause 5
+    if tradwife:
+       scene c10 with fade
+       pause 20
+    return