Skip to content

Commit ea3f285

Browse files
authored
Merge pull request ufosc#153 from William-Dunlap/main
Fixed Issue ufosc#141
2 parents 37efa53 + 3a9d315 commit ea3f285

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

BytesOfLove/game/scripts/orientation/w0_d2.rpy

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,12 @@ label w0_d2:
246246

247247
"{i}The group tours campus as the breakout session leader talks about random trivia{/i}"
248248
bsl "\"And if you look to your left you will see Half-A-Century Tower...\""
249-
show cpp_normal with dissolve
249+
show cpp_talk with dissolve
250250
c "\"Gosh, this is so boring.\""
251251
c "\"Who doesn’t know all of this stuff already?\""
252252
c "\"I mean did anybody really come to this school without already taking a tour?\""
253+
hide cpp_talk
254+
show cpp_normal
253255
show python_pocket_happy at left with dissolve
254256
p "\"I didn’t... so this is interesting! I’m really enjoying this tour.\""
255257
p "\"Like look at that cool statue over there.\""
@@ -269,6 +271,8 @@ label w0_d2:
269271
show python_pocket_happy at left
270272
p "\"Oh, well I didn’t realize that...\""
271273
hide cpp_normal
274+
hide python_pocket_happy
275+
show python_pocket at left
272276
show cpp_talk
273277
c "\"Yeah, I wouldn’t expect someone like you to know basic history...\""
274278
hide cpp_talk

BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueDB.rpy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ label w0_d2_StatueDB:
66
show python_pocket at left
77
hide cpp_talk
88
show cpp_normal
9+
hide js_talk
10+
show js_normal at right
911
mc "{i}Distracted{/i} \"Wait, guys. Look at that girl over there.\""
1012
mc "\"She is actually so hot, should I go talk to her?\""
1113
hide python_pocket_happy

BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueJS.rpy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ label w0_d2_StatueJS:
22
$ p_rep = reputation(p_rep, 2)
33
$ js_rep = reputation(js_rep, 2)
44
$ c_rep = reputation(c_rep, -2)
5+
hide js_talk
6+
show js_normal at right
57
hide python_pocket_happy
68
show python_pocket at left
79
mc "\"I agree with JavaScript and Python, you need to take a chill pill C++.\""

BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueSexist.rpy

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ label w0_d2_StatueSexist:
44
p "\"Everyone just shut up!\""
55
p "\"It’s not that important and you’re talking over the tour guide!\""
66
p "\"[mc] was just having an opinion about the statue.\""
7-
hide python_angry_talk
8-
show python_angry at left
7+
98

109
menu w0_d2_StatueSexistC:
1110
p "\"He didn’t say that anybody was hot or ugly, so let’s all just relax.\""
12-
11+
1312
"Say something sexist":
13+
hide python_angry_talk
14+
show python_angry at left
1415
$ p_rep = reputation(p_rep, -4)
1516
$ js_rep = reputation(js_rep, -4)
1617
$ c_rep = reputation(c_rep, -4)
@@ -25,13 +26,15 @@ label w0_d2_StatueSexist:
2526
js "\"There is no way you just said that.\""
2627
hide js_talk
2728
show js_angry at right
28-
hide cpp angry
29+
hide cpp_handhip_normal
2930
show cpp_angry_talk
3031
c "\"Please shut up.\""
3132
hide cpp_angry_talk
3233
show cpp_angry
3334

3435
"Say something normal":
36+
hide python_angry_talk
37+
show python_angry at left
3538
mc "\"Thank you, Python.\""
3639
mc "\"I wasn’t trying to step on any toes.\""
3740

0 commit comments

Comments
 (0)