-
Notifications
You must be signed in to change notification settings - Fork 64
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #101 from sarahtran1/main
Fixed issue #99 and some other script features
- Loading branch information
Showing
10 changed files
with
645 additions
and
642 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 14 additions & 14 deletions
28
BytesOfLove/game/scripts/orientation/w0_d2 choices/w0_d2_LunchApology.rpy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,37 @@ | ||
| label w0_d2_LunchApology: | ||
| p "Hey JavaScript!" | ||
| p "Is it okay if we join you?" | ||
| js "Yeah, sure!" | ||
| p "\"Hey JavaScript!\"" | ||
| p "\"Is it okay if we join you?\"" | ||
| js "\"Yeah, sure!\"" | ||
| #hide python_happy | ||
| #show python_pocket | ||
| #show cpp_normal at right with dissolve | ||
| mc "Lunch was good, I am glad that we got to eat some good food." | ||
| mc "\"Lunch was good, I am glad that we got to eat some good food.\"" | ||
|
|
||
| menu w0_d2_LunchApologyC: | ||
| mc "Hey guys, about what happened on the campus tour..." | ||
| mc "\"Hey guys, about what happened on the campus tour...\"" | ||
|
|
||
| "Apologize and smooth things over": | ||
| $ c_rep = reputation(c_rep, 2) | ||
| $ p_rep = reputation(p_rep, 2) | ||
| $ js_rep = reputation(js_rep, 2) | ||
| mc "I just want to apologize one more time for what happened." | ||
| mc "I think that we could all be good friends." | ||
| mc "And I am excited to get to know you guys better in the future." | ||
| mc "\"I just want to apologize one more time for what happened.\"" | ||
| mc "\"I think that we could all be good friends.\"" | ||
| mc "\"And I am excited to get to know you guys better in the future.\"" | ||
|
|
||
| jump w0_d2_LunchFlirtDecision | ||
|
|
||
| "Don't apologize": | ||
| mc "..." | ||
| mc "Huh, I totally forgot what I was about to say." | ||
| mc "\"...\"" | ||
| mc "\"Huh, I totally forgot what I was about to say.\"" | ||
| jump w0_d2_AfterLunch | ||
|
|
||
| menu w0_d2_LunchFlirtDecision: | ||
| "Flirt": | ||
| jump w0_d2_LunchFlirt | ||
|
|
||
| "Don't Flirt": | ||
| js "I totally agree, [mc]!" | ||
| js "I think we can be good friends as well." | ||
| p "Yeah, and it’s so good that we are all computer science majors." | ||
| p "Hopefully we will have a lot of classes together." | ||
| js "\"I totally agree, [mc]!\"" | ||
| js "\"I think we can be good friends as well.\"" | ||
| p "\"Yeah, and it’s so good that we are all computer science majors.\"" | ||
| p "\"Hopefully we will have a lot of classes together.\"" | ||
| jump w0_d2_AfterLunch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 34 additions & 34 deletions
68
BytesOfLove/game/scripts/orientation/w0_d2 choices/w0_d2_LunchJava.rpy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
104 changes: 52 additions & 52 deletions
104
BytesOfLove/game/scripts/orientation/w0_d2 choices/w0_d2_LunchPythonC.rpy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,67 +1,67 @@ | ||
| label w0_d2_LunchPythonC: | ||
| mc "Hey Python and C++, what did you guys get for lunch?" | ||
| mc "\"Hey Python and C++, what did you guys get for lunch?\"" | ||
| show python_normal at left with easeinleft | ||
| p "{i}*Says nothing*{/i}" | ||
| mc "Look, I’m sorry about what happened earlier." | ||
| mc "Do you think we can move past this and start over?" | ||
| p "I guess it would be nice if we all got along." | ||
| p "What do you think, C++?" | ||
| p "\"...\"" | ||
| mc "\"Look, I’m sorry about what happened earlier.\"" | ||
| mc "\"Do you think we can move past this and start over?\"" | ||
| p "\"I guess it would be nice if we all got along.\"" | ||
| p "\"What do you think, C++?\"" | ||
| show cpp_talk at right with easeinright | ||
| c "I don’t care, do whatever you want." | ||
| p "It’s settled then." | ||
| p "No hard feelings, we’re all friends here." | ||
| mc "Great. What did you get for lunch?" | ||
| p "I got a beef burrito and some plantains for lunch." | ||
| p "It looks really good, and I am starving!" | ||
| mc "Yeah me too, I didn’t even get to eat breakfast." | ||
| c "Why not? You’re so stupid you don’t know how to cook?" | ||
| c "*Sighs* Sorry that was mean, why didn’t you get breakfast??" | ||
| mc "My morning was a mess." | ||
| mc "I am from an area about 4 hours away from here and so I had to stay in a hotel." | ||
| mc "And last night I was up way too late." | ||
| mc "And as you can guess I didn’t wake up on time." | ||
| c "And that was why you barely made it to the room on time?" | ||
| mc "Yeah, and that wasn’t even the worst part." | ||
| mc "I rushed out the door and got to my car in like 3 minutes." | ||
| mc "But when I started driving, I realized I didn’t even know where the school was." | ||
| p "Yeah, I ran into the same problem." | ||
| p "I have never been to Bytesborough before today." | ||
| mc "Then I eventually got here and I realized I missed the start of orientation." | ||
| mc "Luckily there was a professor there who told me where I was supposed to go." | ||
| mc "And that’s how I ended up in the breakout room." | ||
| c "You met a professor?" | ||
| c "I don’t think there are any professors on campus right now." | ||
| c "Since classes haven’t started, they have no reason to be here." | ||
| p "You’re right. Come to think of it, I haven't seen any professors either." | ||
| mc "Huh, I didn’t think of that." | ||
| mc "She was definitely older than us and seemed really knowledgeable." | ||
| c "You better not be trying to get ahead of me before the semester even starts." | ||
| mc "Don’t worry, I don’t have to try, I’m probably ahead of you already." | ||
| mc "Anyway, what did you guys think about JavaScript?" | ||
| p "She seemed really nice." | ||
| c "She just does too much." | ||
| c "She was always saying ‘slay’, or ‘queen’." | ||
| c "\"I don’t care, do whatever you want.\"" | ||
| p "\"It’s settled then.\"" | ||
| p "\"No hard feelings, we’re all friends here.\"" | ||
| mc "\"Great. What did you get for lunch?\"" | ||
| p "\"I got a beef burrito and some plantains for lunch.\"" | ||
| p "\"It looks really good, and I am starving!\"" | ||
| mc "\"Yeah me too, I didn’t even get to eat breakfast.\"" | ||
| c "\"Why not? You’re so stupid you don’t know how to cook?\"" | ||
| c "{i}Sighs{/i} \"Sorry that was mean, why didn’t you get breakfast??\"" | ||
| mc "\"My morning was a mess.\"" | ||
| mc "\"I am from an area about 4 hours away from here and so I had to stay in a hotel.\"" | ||
| mc "\"And last night I was up way too late.\"" | ||
| mc "\"And as you can guess I didn’t wake up on time.\"" | ||
| c "\"And that was why you barely made it to the room on time?\"" | ||
| mc "\"Yeah, and that wasn’t even the worst part.\"" | ||
| mc "\"I rushed out the door and got to my car in like 3 minutes.\"" | ||
| mc "\"But when I started driving, I realized I didn’t even know where the school was.\"" | ||
| p "\"Yeah, I ran into the same problem.\"" | ||
| p "\"I have never been to Bytesborough before today.\"" | ||
| mc "\"Then I eventually got here and I realized I missed the start of orientation.\"" | ||
| mc "\"Luckily there was a professor there who told me where I was supposed to go.\"" | ||
| mc "\"And that’s how I ended up in the breakout room.\"" | ||
| c "\"You met a professor?\"" | ||
| c "\"I don’t think there are any professors on campus right now.\"" | ||
| c "\"Since classes haven’t started, they have no reason to be here.\"" | ||
| p "\"You’re right. Come to think of it, I haven't seen any professors either.\"" | ||
| mc "\"Huh, I didn’t think of that.\"" | ||
| mc "\"She was definitely older than us and seemed really knowledgeable.\"" | ||
| c "\"You better not be trying to get ahead of me before the semester even starts.\"" | ||
| mc "\"Don’t worry, I don’t have to try, I’m probably ahead of you already.\"" | ||
| mc "\"Anyway, what did you guys think about JavaScript?\"" | ||
| p "\"She seemed really nice.\"" | ||
| c "\"She just does too much.\"" | ||
| c "\"She was always saying ‘slay’, or ‘queen’.\"" | ||
|
|
||
| menu w0_d2_JSAnnoying: | ||
| c "Talk about being chronically online..." | ||
| c "\"Talk about being chronically online...\"" | ||
|
|
||
| "Make fun of JavaScript": | ||
| mc "Yeah, she is pretty annoying." | ||
| mc "\"Yeah, she is pretty annoying.\"" | ||
| # Add camera pan | ||
| mc "Look over there, she’s sitting alone." | ||
| mc "It makes sense when you think about it." | ||
| mc "I wouldn’t want to sit with her either." | ||
| mc "\"Look over there, she’s sitting alone.\"" | ||
| mc "\"It makes sense when you think about it.\"" | ||
| mc "\"I wouldn’t want to sit with her either.\"" | ||
|
|
||
| "Defend JavaScript": | ||
| mc "I mean she can be a little much." | ||
| mc "But I wouldn’t go as far as to say she is annoying." | ||
| mc "\"I mean she can be a little much.\"" | ||
| mc "\"But I wouldn’t go as far as to say she is annoying.\"" | ||
| # Add camera pan | ||
| mc "Look, she is sitting alone over there." | ||
| mc "Do you guys want to go sit with her?" | ||
| mc "\"Look, she is sitting alone over there.\"" | ||
| mc "\"Do you guys want to go sit with her?\"" | ||
|
|
||
| p "I think we should go sit with her." | ||
| p "She is probably feeling lonely." | ||
| p "And we shouldn’t be mean to someone who could be our new friend." | ||
| p "\"I think we should go sit with her.\"" | ||
| p "\"She is probably feeling lonely.\"" | ||
| p "\"And we shouldn’t be mean to someone who could be our new friend.\"" | ||
|
|
||
| show js_normal with dissolve | ||
| jump w0_d2_LunchApology |
Oops, something went wrong.