Skip to content

Commit 40daa20

Browse files
nickv779nickv779
authored
Merge pull request #176 from WilsonGoins/issue_113
Issue 113 + Other Small Fixes
2 parents 6b70906 + 290ac52 commit 40daa20

File tree

8 files changed

+294
-40
lines changed

8 files changed

+294
-40
lines changed

‎BytesOfLove/game/scripts/before_orientation/before_orientation_choices/w0_d1_DoorDash.rpy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ label w0_d1_DoorDash:
22
mc "I passed like 15 Chipotles on the way here, I bet I can order a burrito for dinner..."
33
# Edit transitions below when we have clock - Lazzy
44
scene hotel_room_night with shorter_fade
5-
"{i}*15 minutes later*{/i}"
5+
"{i}*30 minutes later*{/i}"
66
mc "This driver sucks! I ordered this 30 minutes ago, and he still hasn’t picked it up!!!"
77
scene hotel_room_night with shorter_fade
88
"{i}*20 minutes later*{/i}"

‎BytesOfLove/game/scripts/orientation/w0_d3.rpy‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ label w0_d3:
99
mc"All set! And I actually have enough time to eat breakfast this time!"
1010
scene hotel_buffet with shorter_fade
1111
mc"Oh wow! Everything looks so good!"
12+
13+
show rust_normal at right with dissolve
1214
"{i}While holding your food you notice that there is only one seat available, and it’s next to a boy who looks about your age.{/i}"
1315
mc"Well, I guess I’m eating with him."
1416
jump w0_d3_MeetingRust
@@ -30,7 +32,7 @@ label w0_d3_AfterMeetingRust:
3032
dc"\"Also-\""
3133
dc"\"If you are NOT in the College of Computing,\""
3234
dc"\"You are in the WRONG room!\""
33-
dc"\"From here, you will all go to your break out rooms from yesterday.\""
35+
dc"\"From here, you will all go to your breakout rooms from yesterday.\""
3436
dc"\"Then, your breakout room leaders will give you further instructions.\""
3537

3638
scene empty_lecture_hall with shorter_fade
@@ -44,7 +46,7 @@ label w0_d3_AfterMeetingRust:
4446
bsl"\"Okay, as we found out yesterday, most of us here are computer science majors.\""
4547
bsl"\"So, before we go to the administration building, I will give you some tips on picking classes.\""
4648

47-
show cpp_talk
49+
show cpp_talk with dissolve
4850
c"\"Ugh, I wish we could just pick classes already.\""
4951
c"\"I don’t want to sit through this lady talking about stuff I already know.\""
5052

@@ -55,7 +57,7 @@ label w0_d3_AfterMeetingRust:
5557

5658
hide cpp_normal
5759
show cpp_normal at left
58-
show python_pocket_happy at right
60+
show python_pocket_happy at right with dissolve
5961
p"\"I didn’t do any research either…\""
6062
p"\"I kinda figured they would just tell us what to pick.\""
6163

@@ -65,7 +67,7 @@ label w0_d3_AfterMeetingRust:
6567
c"\"Jeez, you guys are hopeless.\""
6668

6769
hide cpp_talk
68-
show cpp_normal
70+
show cpp_normal at left
6971
bsl"\"Okay, since most of you are freshmen in computer science, here are the classes you want to take.\""
7072

7173
mc"I wonder if I really need to pay attention…"
@@ -82,7 +84,7 @@ label w0_d3_AfterMeetingRust:
8284

8385
label w0_d3_Registration:
8486
scene office with longer_fade
85-
show advisor at right with dissolve
87+
show advisor with dissolve
8688
a"\"Hey there, sugar!\""
8789
a"\"Hmmm...\""
8890
a"\"Says 'ere your [mc]\""
@@ -192,32 +194,32 @@ label w0_d3_Registration:
192194
"Talk to Python":
193195
mc"\"Hey, Python!\""
194196

195-
show python_pocket
196-
197197
p"\"Oh, hey [mc]!\""
198198
p"\"How are you doing, did you get the classes you wanted?\""
199+
199200
mc"\"Yeah, I did!\""
200201
mc"\"I obviously am taking Introduction to Programming 1,\""
201202
mc"\"And then I’m also taking Calculus 1.\""
202203

203-
hide python_pocket
204-
show python_pocket_happy at center
205-
206204
p"\"Oh, cool.\""
207205
p"\"I am taking those too.\""
206+
208207
mc"\"What time is your Calculus 1 class?\""
209208
mc"\"Maybe we’ll have it together...\""
209+
210210
p"\"Hmm, let me check...\""
211211
p"\"Okay, it looks like mine is at 10:40 in Carlington Amphitheater.\""
212212
p"\"What about you?\""
213+
213214
mc"\"No way, mine is too!\""
214215
mc"\"That’s good, at least I’ll know somebody.\""
216+
215217
p "{i}Smiles warmly{i}"
216218
p"\"Yeah I’m excited.\""
217219
p"\"Anyway I gotta run, I’ll see you in Fall!\""
218-
mc"\"Sure thing, bye!\""
219220

220-
hide python_pocket_happy with dissolve
221+
hide python_normal with dissolve
222+
mc"\"Sure thing, bye!\""
221223

222224
"Go Home":
223225
mc"\"I can always see her another time, I don’t need to talk to her today.\""

‎BytesOfLove/game/scripts/orientation/w0_d3_choices/C++_Choices/w0_d3_CPPPayAttention.rpy‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
label w0_d3_CPPPayAttention:
2-
scene
32
mc "But on the other hand, I should take classes I’m interested in, not what she’s interested in."
43
mc "I guess I’ll pay attention to the recommendations."
54
bsl "\"So, since it will be all of your first semester, the classes you take are very important.\""
@@ -14,19 +13,46 @@ label w0_d3_CPPPayAttention:
1413
bsl "\"There aren’t any classes that computer science students NEED to take.\""
1514
mc "Nice, so I basically don’t have to pay attention anymore..."
1615
mc "I mean maybe I should, but-"
16+
17+
hide cpp_normal
18+
hide python_pocket
19+
show js_talk
1720
js "{i}*Whispers*{/i} \"Hey, [mc]!\""
21+
22+
hide js_talk
23+
show js_normal
1824
mc "{i}*Whispers*{/i} \"Hey, JavaScript.\""
1925
mc "\"What’s up?\""
26+
27+
hide js_normal
28+
show js_talk
2029
js "\"This is, like, SO boring.\""
30+
31+
hide js_talk
32+
show js_smirk
2133
mc "\"Yeah, I get what you mean.\""
2234
mc "\"But I’m also sort of stressed about getting the right classes, ya know?\""
35+
36+
hide js_smirk
37+
show js_talk
2338
js "\"OMG, totally.\""
2439
js "\"It’s like, SO stressful!\""
2540
js "\"This is our future, it’s kinda scary...\""
41+
42+
hide js_talk
43+
show js_smirk
2644
mc "\"Yeah, but it sounds like we just need to take Introduction to Programming 1 and Calc 1.\""
2745
mc "\"And other than that, we can pick whatever.\""
46+
47+
hide js_smirk
48+
show js_talk
2849
js "\"I wonder what other classes they will have to offer.\""
50+
51+
hide js_talk
52+
show js_smirk
2953
mc "\"I hope I can take a super niche-interesting class.\""
54+
hide js_smirk
55+
show js_talk
3056

3157
menu w0_d3_JSClasses:
3258
js "\"Oh yeah? Like what?\""
@@ -38,5 +64,4 @@ label w0_d3_CPPPayAttention:
3864
jump w0_d3_JSWomenSuffrage
3965

4066
"Maybe a class on geology":
41-
jump w0_d3_JSGeology
42-
67+
jump w0_d3_JSGeology

‎BytesOfLove/game/scripts/orientation/w0_d3_choices/C++_Choices/w0_d3_JSGeology.rpy‎

Lines changed: 79 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,152 @@
11
label w0_d3_JSGeology:
2+
hide js_talk
3+
show js_smirk
24
mc "\"Maybe a class on geology.\""
35
mc "\"Rocks fascinated me as a kid,\""
46
mc "\"Not enough to major in it, but I would love to learn more.\""
7+
hide js_smirk
8+
show js_talk
59

610
menu w0_d3_GeologyChoice:
711
js "\"Really what got you interested in them?\""
812

913
"I got a really close look at one when I was a kid":
14+
hide js_talk
15+
show js_smirk
1016
mc "\"When I was a little kid I was playing soccer with my friend one day.\""
1117
mc "\"We didn’t have a ball so we were playing with a rock,\""
1218
mc "\"And one thing led to another and the next thing I knew the rock was flying at my face.\""
19+
20+
hide js_smirk
21+
show js_talk
1322
js "\"Oh my god!\""
1423
js "\"Are you okay? What happened?\""
24+
25+
hide js_talk
26+
show js_smirk
1527
mc "\"I woke up in the hospital holding the rock.\""
16-
mc "\"So, I had a lot of time to stare at it.\""
28+
mc "\"So, I had a lot of time to look at it.\""
1729
mc "\"And ever since then, I’ve been fascinated by them.\""
30+
31+
hide js_smirk
32+
show js_talk
1833
js "\"Wow! That is such a crazy story!\""
34+
35+
hide js_talk
36+
show js_smirk
1937
mc "\"Some of my friends say that I was never the same after the accident,\""
2038
mc "\"But personally, I think I’ve always been this dumb.\""
39+
40+
hide js_smirk
41+
show js_blush
2142
js "\"Hahahaha!\""
22-
js "\"[mc] you’re so funny!\""
43+
js "\"[mc], you’re so funny!\""
44+
hide js_blush
45+
show js_normal
2346

2447
"My dad is a geologist":
48+
hide js_talk
49+
show js_smirk
2550
mc "\"My dad is a geologist, so I guess his passion kinda rubbed off on me.\""
2651
mc "\"He was always talking about his work and telling me all kinds of facts.\""
2752
mc "\"He’s the best.\""
53+
54+
hide js_smirk
55+
show js_talk
2856
js "\"So you could say...\""
57+
hide js_talk
58+
show js_smirk
2959

3060
menu w0_d3_JavaScriptJoke:
31-
js "\"He rocks?\""
61+
js "\"He {i}rocks{i}?\""
3262

3363
"Laugh at the joke":
3464
$ js_rep = reputation(js_rep,2)
65+
3566
mc "{i}*Laughs*{/i} \"Why have I never thought of that?\""
3667
mc "\"You’re really funny, you know that?\""
68+
69+
hide js_smirk
70+
show js_blush
3771
js "{i}*Smiles*{/i} \"Thank you, [mc], you’re a good guy.\""
72+
hide js_blush
73+
show js_normal
3874

3975
"Don't laugh at the joke":
4076
$ js_rep = reputation(js_rep,-2)
77+
78+
hide js_smirk
79+
show js_angry
4180
mc "\"That was horrible.\""
4281
mc "\"You’re trying too hard to be funny, JavaScript.\""
82+
83+
hide js_angry
84+
show js_talk
4385
js "\"You just don’t know how to be nice, do you?\""
86+
87+
hide js_talk
88+
show js_angry
4489
mc "\"I’m just being honest.\""
4590
mc "\"Would you rather me just pretend you’re funny?\""
91+
92+
hide js_angry
93+
show js_talk
4694
js "\"Are you just intentionally trying to piss me off?\""
4795
js "\"You could just be nice for a change.\""
4896
js "\"I hope all your stupid rock classes are full.\""
97+
hide js_talk
98+
show js_angry
4999

50100
"I really like Hank from Breaking Bad":
101+
102+
hide js_talk
103+
show js_smirk
51104
mc "\"So I watched Breaking Bad back in high school.\""
52105
mc "\"And there is this character named Hank, who really likes rocks.\""
106+
mc "\"Or, minerals, I should say...\""
53107
mc "\"He collects them, and I thought that was really interesting,\""
54108
mc "\"So now it’s a passion of mine too.\""
109+
110+
hide js_smirk
111+
show js_talk
55112
js "\"Wow, that is so cool!\""
56113
js "\"I didn’t know that was a part of Breaking Bad...\""
57114
js "\"I thought it was just about making meth and stuff.\""
115+
116+
hide js_talk
117+
show js_smirk
58118
mc "\"That technically is the plot, but the story encapsulates so much more than that.\""
59119
mc "\"I would highly recommend you watch it.\""
120+
hide js_smirk
121+
show js_talk
60122

61123
menu w0_d3_JSOnePiece:
62124
js "\"Ah, I would but I am pretty committed to watching One Piece right now.\""
63125

64126
"One Piece? I prefer two piece swimsuits":
65127
$ js_rep = reputation(js_rep,-2)
128+
129+
hide js_talk
130+
show js_angry
66131
mc "\"One piece? I prefer watching girls in two piece swimsuits...\""
132+
133+
hide js_angry
134+
show js_talk
67135
js "\"One Piece is an anime, idiot!\""
68136
js "\"All you think about is girls!\""
137+
hide js_talk
138+
show js_angry
69139

70140
"I've never heard of One Piece":
141+
hide js_talk
142+
show js_smirk
71143
mc "\"Huh, I’ve never heard of One Piece, what is it-\""
144+
hide js_smirk
145+
show js_normal
72146

73147
bsl "\"Hey, can you guys be quiet back there?\""
74148
bsl "\"You have been talking the whole time.\""
75149
bsl "\"We will be going to the advising building to pick classes soon,\""
76150
bsl "\"So wait to talk until we leave the classroom please.\""
77-
mc "\"Sure, sorry.\""
151+
mc "\"Sure, sorry.\""
152+
jump w0_d3_Registration

0 commit comments

Comments
 (0)