adding fixes to merge

This commit is contained in:
stillzero 2021-06-18 21:36:38 -05:00
parent 614c29eec1
commit 09ec83d90c
5 changed files with 13 additions and 28246 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1252,6 +1252,13 @@ label chapter_11:
Nas "What did I ever do to her…?" Nas "What did I ever do to her…?"
if wingStory:
jump wingA
else:
jump wingB
label wingA:
A "I-er…" A "I-er…"
Nas "What, do you know?" Nas "What, do you know?"

View File

@ -67,7 +67,7 @@ label chapter_4:
hide naser with moveoutleft hide naser with moveoutleft
hide naomi with moveoutleft hide naomi with moveoutleft
"I turn away from the two and leave them behind in the cafeteria." "I turn away from the two and leave them behind in the cafeteria."
scene bandroom scene auditorium
"Now that im in front of the auditorium when it isnt crowded for once, I can get a decent look around the foyer." "Now that im in front of the auditorium when it isnt crowded for once, I can get a decent look around the foyer."
"The walls are as vine-covered as anywhere else in the building, but the ones here have small magenta flowers blooming on them here and there." "The walls are as vine-covered as anywhere else in the building, but the ones here have small magenta flowers blooming on them here and there."
"I suppose theres different kinds of vines, wouldnt make much sense otherwise. Never really thought about it until now." "I suppose theres different kinds of vines, wouldnt make much sense otherwise. Never really thought about it until now."

View File

@ -1465,7 +1465,7 @@ label chapter_5:
"Even if hes constantly checked out." "Even if hes constantly checked out."
"And smells of burnt skunk." "And smells of burnt skunk."
"The fuck is he on, anyway?!" "The fuck is he on, anyway?!"
scene bandroom scene auditorium
show anon neutral at acenter show anon neutral at acenter
show reed neutral at sright show reed neutral at sright
Re "Its carfe, bro…" Re "Its carfe, bro…"
@ -1755,6 +1755,9 @@ label chapter_5:
jump interrupt4c jump interrupt4c
label quiet4c: label quiet4c:
$ wingStory = True
F "And the worst part is he cant even hate me." F "And the worst part is he cant even hate me."
show fang sad show fang sad

View File

@ -52,7 +52,6 @@ label chapter_6:
"Still feeling refreshed, I grab my jacket and start making my way across town to Fangs house." "Still feeling refreshed, I grab my jacket and start making my way across town to Fangs house."
scene black with fade scene black with fade
"..." "..."
scene home fang day with fade
play music "audio/OST/Skinrow Soul.ogg" fadein 1.0 play music "audio/OST/Skinrow Soul.ogg" fadein 1.0
show anon neutral at aleft show anon neutral at aleft
"Passing through the snobby part of town to catch a bus, my thoughts begin intruding on me." "Passing through the snobby part of town to catch a bus, my thoughts begin intruding on me."