Issue 113 + Other Small Fixes

BytesOfLove/.gitignore

@@ -227,3 +227,7 @@ UFOSC/log.txt
 UFOSC/traceback.txt
 
 UFOSC/game/cache
+
+# intellij ignore
+*.iml
+.idea

BytesOfLove/game/script.rpy

@@ -254,7 +254,4 @@ label start:
 
     "Your name is [mc]."
 
-    #jump w0_d3
-
-    jump w0_d1
-
+    jump w0_d1

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

@@ -2,7 +2,7 @@ label w0_d1_DoorDash:
     mc "I passed like 15 Chipotles on the way here, I bet I can order a burrito for dinner..."
     # Edit transitions below when we have clock - Lazzy
     scene hotel_room_night with shorter_fade
-    "{i}*15 minutes later*{/i}"
+    "{i}*30 minutes later*{/i}"
     mc "This driver sucks! I ordered this 30 minutes ago, and he still hasn’t picked it up!!!"
     scene hotel_room_night with shorter_fade
     "{i}*20 minutes later*{/i}"

BytesOfLove/game/scripts/before_orientation/before_orientation_choices/w0_d1_VendingMachine.rpy

@@ -16,47 +16,67 @@ label w0_d1_VendingMachine:
 
             $ r_rep = reputation(r_rep, -2)
             mc "\"Yeah, I do, my name is [mc].\""
+            hide rust_normal
+            show rust_talk at right
             r "\"Cool cool. What’s your major?\""
+            hide rust_talk
+            show rust_confused at right
             mc "\"Wouldn’t you like to know...\""
-
-            hide rust_normal 
-            # hide test
-            #scene test2
-
-            show rust_angry at right
 
             r "{i}*hushed*{/i} \"Damn, I was just wondering.\""
 
-            # scene test3
-            show rust_angry at right
-
+            hide rust_confused
+            show rust_talk at right
             r "\"I’m computer engineering, in case you wanted to know my major.\""
+
+            hide rust_talk
+            show rust_angry at right
             mc "\"Oh thanks, I didn't.\""
             r "\"Jeez... you don’t have to be mean about it, man.\""
             mc "\"Whatever.\""
             hide rust_angry with dissolve
             "{i}*Rust leaves*{/i}"
+
         "Be nice":
             $ r_rep = reputation(r_rep, 2)
+
+            hide rust_talk
+            show rust_normal at right
             mc "\"Yeah I do, my name is [mc]. What’s your major?\""
+
+            hide rust_normal
+            show rust_talk at right
             r "{i}*Smiles*{/i} \"I’m computer engineering. What about you?\""
+
+            hide rust_talk
+            show rust_normal at right
             mc "\"Oh, I’m in computer science!\""
             mc "\"We both need to take Programming 1, right?\""
             mc "\"Are you going to be doing it this semester?\""
+
+            hide rust_normal
+            show rust_talk at right
             r "\"Yes, that's what I am planning on doing.\""
             r "\"I have some programming experience from highschool, but I’m excited to learn more.\""
             r "\"We can definitely work on projects and study together! It’ll be pretty cool.\""
+
+            hide rust_talk
+            show rust_normal at right
             mc "\"Absolutely! We’ll probably be spending a lot of time together.\""
+
+            hide rust_normal
+            show rust_talk at right
             r "\"Yeah, I’m excited to get to know you better.\""
             r "\"Well anyway, I have to get back to my room so I can get a good night's sleep.\""
             r "\"You should probably do the same.\""
             r "\"It was nice to meet you, see you in class!\""
-            hide rust_normal with dissolve
+
+            hide rust_talk with dissolve
             "{i}*Rust leaves*{/i}"
 
     "{i}*You stand at the vending machine, thinking about what you want*{/i}"
     $ byte = bytecoin(byte, -5)
     mc "Hmm, they don’t have Doritos, I guess I’m only getting a Snickers tonight."
     "{i}*You get a snickers bar and heads back up to your room*{/i}"
 
-jump w0_d1_End
+jump w0_d1_End

BytesOfLove/game/scripts/orientation/w0_d3.rpy

@@ -9,6 +9,8 @@ label w0_d3:
     mc"All set! And I actually have enough time to eat breakfast this time!"
     scene hotel_buffet with shorter_fade
     mc"Oh wow! Everything looks so good!"
+
+    show rust_normal at right with dissolve
     "{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}"
     mc"Well, I guess I’m eating with him."
     jump w0_d3_MeetingRust
@@ -27,10 +29,10 @@ label w0_d3_AfterMeetingRust:
     mc"I really hope I don’t mess anything up."
     mc"And I hope I’m able to get classes with all of the people I just met!"
 
-    dc"\"Hello again, students!\""
+    dc"\"Also-\""
     dc"\"If you are NOT in the College of Computing,\""
     dc"\"You are in the WRONG room!\""
-    dc"\"From here, you will all go to your break out rooms from yesterday.\""
+    dc"\"From here, you will all go to your breakout rooms from yesterday.\""
     dc"\"Then, your breakout room leaders will give you further instructions.\""
 
     scene empty_lecture_hall with shorter_fade
@@ -44,28 +46,45 @@ label w0_d3_AfterMeetingRust:
     bsl"\"Okay, as we found out yesterday, most of us here are computer science majors.\""
     bsl"\"So, before we go to the administration building, I will give you some tips on picking classes.\""
 
+    show cpp_talk with dissolve
     c"\"Ugh, I wish we could just pick classes already.\""
     c"\"I don’t want to sit through this lady talking about stuff I already know.\""
 
+    hide cpp_talk
+    show cpp_normal
     mc"\"You already know what classes you want to take?\""
     mc"\"I didn’t realize we were supposed to do research and stuff…\""
 
+    hide cpp_normal
+    show cpp_normal at left
+    show python_pocket_happy at right with dissolve
     p"\"I didn’t do any research either…\""
     p"\"I kinda figured they would just tell us what to pick.\""
 
+    hide python_pocket_happy
+    show python_pocket at right
+    show cpp_talk at left
     c"\"Jeez, you guys are hopeless.\""
 
+    hide cpp_talk
+    show cpp_normal at left
     bsl"\"Okay, since most of you are freshmen in computer science, here are the classes you want to take.\""
 
     mc"I wonder if I really need to pay attention…"
     mc"Surely, I can just copy whatever C++ does?"
     mc"It seems like she always has it figured out…"
-    jump w0_d3_CppCopy
+
+    menu chooseAction:
+        "Copy C++ and Don't Pay Attention":
+            jump w0_d3_CppCopy
+
+        "Be Better Than C++ and Pay Attention":
+            jump w0_d3_CPPPayAttention
 
 
 label w0_d3_Registration:
     scene office with longer_fade
-    show advisor at right with dissolve
+    show advisor with dissolve
     a"\"Hey there, sugar!\""
     a"\"Hmmm...\""
     a"\"Says 'ere your [mc]\""
@@ -167,44 +186,44 @@ label w0_d3_Registration:
     mc"\"Wow, what a good day!\""
     mc"\"I made it to orientation on time and picked some good classes.\""
     mc"\"I am so excited to start college!\""
+
+    show python_normal
     mc"\"Oh, look. There’s Python\""
 
     menu w0d3_talktopython:
         "Talk to Python":
             mc"\"Hey, Python!\""
 
-            show python_pocket at center with dissolve
-
-
             p"\"Oh, hey [mc]!\""
             p"\"How are you doing, did you get the classes you wanted?\""
+
             mc"\"Yeah, I did!\""
             mc"\"I obviously am taking Introduction to Programming 1,\""
             mc"\"And then I’m also taking Calculus 1.\""
 
-            hide python_pocket
-            show python_pocket_happy at center
-
             p"\"Oh, cool.\""
             p"\"I am taking those too.\""
+
             mc"\"What time is your Calculus 1 class?\""
             mc"\"Maybe we’ll have it together...\""
+
             p"\"Hmm, let me check...\""
             p"\"Okay, it looks like mine is at 10:40 in Carlington Amphitheater.\""
             p"\"What about you?\""
+
             mc"\"No way, mine is too!\""
             mc"\"That’s good, at least I’ll know somebody.\""
+
             p "{i}Smiles warmly{i}"
             p"\"Yeah I’m excited.\""
             p"\"Anyway I gotta run, I’ll see you in Fall!\""
-            mc"\"Sure thing, bye!\""
 
-            hide python_pocket_happy with fade
+            hide python_normal with dissolve
+            mc"\"Sure thing, bye!\""
 
         "Go Home":
             mc"\"I can always see her another time, I don’t need to talk to her today.\""
             mc"\"Plus, I’m pretty tired, I just want to go back to the hotel.\""
 
 
-    scene black with longer_fade
-
+    scene black with longer_fade

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

@@ -1,5 +1,4 @@
 label w0_d3_CPPPayAttention:
-    scene
     mc "But on the other hand, I should take classes I’m interested in, not what she’s interested in."
     mc "I guess I’ll pay attention to the recommendations."
     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:
     bsl "\"There aren’t any classes that computer science students NEED to take.\""
     mc "Nice, so I basically don’t have to pay attention anymore..."
     mc "I mean maybe I should, but-"
+
+    hide cpp_normal
+    hide python_pocket
+    show js_talk
     js "{i}*Whispers*{/i} \"Hey, [mc]!\""
+
+    hide js_talk
+    show js_normal
     mc "{i}*Whispers*{/i} \"Hey, JavaScript.\""
     mc "\"What’s up?\""
+
+    hide js_normal
+    show js_talk
     js "\"This is, like, SO boring.\""
+
+    hide js_talk
+    show js_smirk
     mc "\"Yeah, I get what you mean.\""
     mc "\"But I’m also sort of stressed about getting the right classes, ya know?\""
+
+    hide js_smirk
+    show js_talk
     js "\"OMG, totally.\""
     js "\"It’s like, SO stressful!\""
     js "\"This is our future, it’s kinda scary...\""
+
+    hide js_talk
+    show js_smirk
     mc "\"Yeah, but it sounds like we just need to take Introduction to Programming 1 and Calc 1.\""
     mc "\"And other than that, we can pick whatever.\""
+
+    hide js_smirk
+    show js_talk
     js "\"I wonder what other classes they will have to offer.\""
+
+    hide js_talk
+    show js_smirk
     mc "\"I hope I can take a super niche-interesting class.\""
+    hide js_smirk
+    show js_talk
 
     menu w0_d3_JSClasses:
         js "\"Oh yeah? Like what?\""
@@ -38,5 +64,4 @@ label w0_d3_CPPPayAttention:
             jump w0_d3_JSWomenSuffrage
 
         "Maybe a class on geology":
-            jump w0_d3_JSGeology
-
+            jump w0_d3_JSGeology