diff --git a/BytesOfLove/.gitignore b/BytesOfLove/.gitignore index b3ae648..df3f801 100644 --- a/BytesOfLove/.gitignore +++ b/BytesOfLove/.gitignore @@ -227,3 +227,7 @@ UFOSC/log.txt UFOSC/traceback.txt UFOSC/game/cache + +# intellij ignore +*.iml +.idea \ No newline at end of file diff --git a/BytesOfLove/game/script.rpy b/BytesOfLove/game/script.rpy index b7af973..85e84e0 100644 --- a/BytesOfLove/game/script.rpy +++ b/BytesOfLove/game/script.rpy @@ -254,7 +254,4 @@ label start: "Your name is [mc]." - #jump w0_d3 - - jump w0_d1 - + jump w0_d1 \ No newline at end of file diff --git a/BytesOfLove/game/scripts/before_orientation/before_orientation_choices/w0_d1_VendingMachine.rpy b/BytesOfLove/game/scripts/before_orientation/before_orientation_choices/w0_d1_VendingMachine.rpy index e3f8234..9263c1d 100644 --- a/BytesOfLove/game/scripts/before_orientation/before_orientation_choices/w0_d1_VendingMachine.rpy +++ b/BytesOfLove/game/scripts/before_orientation/before_orientation_choices/w0_d1_VendingMachine.rpy @@ -16,42 +16,62 @@ 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}" @@ -59,4 +79,4 @@ label w0_d1_VendingMachine: 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 \ No newline at end of file diff --git a/BytesOfLove/game/scripts/orientation/w0_d3.rpy b/BytesOfLove/game/scripts/orientation/w0_d3.rpy index 016116e..55eb510 100644 --- a/BytesOfLove/game/scripts/orientation/w0_d3.rpy +++ b/BytesOfLove/game/scripts/orientation/w0_d3.rpy @@ -27,7 +27,7 @@ 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.\"" @@ -44,23 +44,40 @@ 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 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 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 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: @@ -167,14 +184,15 @@ 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 - + show python_pocket p"\"Oh, hey [mc]!\"" p"\"How are you doing, did you get the classes you wanted?\"" @@ -199,12 +217,11 @@ label w0_d3_Registration: p"\"Anyway I gotta run, I’ll see you in Fall!\"" mc"\"Sure thing, bye!\"" - hide python_pocket_happy with fade + hide python_pocket_happy with dissolve "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 \ No newline at end of file diff --git a/BytesOfLove/game/scripts/orientation/w0_d3_choices/w0_d3_CppCopy.rpy b/BytesOfLove/game/scripts/orientation/w0_d3_choices/w0_d3_CppCopy.rpy index 40f7640..88f9c6f 100644 --- a/BytesOfLove/game/scripts/orientation/w0_d3_choices/w0_d3_CppCopy.rpy +++ b/BytesOfLove/game/scripts/orientation/w0_d3_choices/w0_d3_CppCopy.rpy @@ -1,61 +1,134 @@ label w0_d3_CppCopy: + show cpp_normal at left + show python_pocket at right mc "\"Definitely no reason to stress myself out, C++ will have me covered.\"" mc "\"You know, I’m actually getting kind of sleepy…\"" - scene empty_lecture_hall with longer_fade + + scene breakout_room with longer_fade + + hide cpp_normal + hide python_pocket + show python_pocket_happy p "\"HEY, [mc]!\"" with hpunch p "\"Are you coming? Everyone is going to the administrative building to pick their classes.\"" + + hide python_pocket_happy + show python_pocket mc "{i}Sleepy and confused.{/i} \"Woah, what happened?\"" mc "\"I swear I was listening to the breakout leader talk about Calc 1, and that’s the last thing I remember…\"" + + hide python_pocket + show python_pocket_happy p "\"Yeah, you fell asleep like 20 minutes ago, LOL.\"" p "\"JavaScript was going to wake you up, but we figured you needed the sleep.\"" p "\"We thought you might’ve had a late night again…\"" + + hide python_pocket_happy + show python_pocket mc "\"Haha, no. I fell asleep as soon as I got home last night.\"" mc "\"I’m not sure why I’m so tired.\"" + + hide python_pocket + show python_pocket_happy p "\"Well, you said you wanted the college experience.\"" p "\"Falling asleep in class definitely puts you on the right track.\"" + + hide python_pocket_happy + show python_pocket mc "\"Haha, you’re right, my dreams are coming true already!\"" mc "\"Wait, where is everyone else?\"" + + hide python_pocket + show python_pocket_happy p "\"They left already, C++ insisted on being first in line to get her classes.\"" p "\"And C++’s panicking made JavaScript scared, so she left too.\"" + + hide python_pocket_happy + show python_pocket mc "\"Well thanks for staying behind to wake me up.\"" mc "\"Aren’t you worried about missing registration too?\"" + + hide python_pocket + show python_pocket_happy p "\"No, not really.\"" p "\"I figure it will all work out, so I’m not stressing about it.\"" p "\"With all these freshmen, there will definitely be space for everyone in Programming 1…\"" + + hide python_pocket_happy + show python_pocket mc "\"Wow, that is pretty chill of you, Python.\"" mc "\"That’s a good outlook, you’re probably right.\"" + hide python_pocket + show python_pocket_happy menu w0_d3_PreparingToPickClasses: p "\"Also, I can catch you up on what you missed while you were asleep.\"" "Give a friendly compliment": $ r_rep = reputation(r_rep, 1) + hide python_pocket_happy + show python_pocket mc "\"Also, I really like your hair today, it looks good.\"" + + hide python_pocket + show python_pocket_happy p "\"Thank you!\"" p "\"I like your outfit today, you have good style.\"" + + hide python_pocket_happy + show python_pocket mc "{i}Blushing{/i} \"Thanks!\"" mc "\"Anywho…\'" mc "\"We should probably get going now, so that we don’t completely miss registration.\"" + + hide python_pocket + show python_pocket_happy p "\"Okay, good idea.\"" - "Give a rude compliment": + hide python_pocket_happy with dissolve + + "Give an offensive compliment": $ r_rep = reputation(r_rep, -1) + hide python_pocket_happy + show python_pocket mc "\"Anywho…\"" + + hide python_pocket + show python_angry mc "\"I bet you get a lot of guys looking at you dressed like that.\"" mc "\"I doubt there are many women on campus hotter than you.\"" + + hide python_angry + show python_angry_talk p "\"Uhm… thanks?\"" p "\"We should get going.\"" + + hide python_angry_talk + show python_angry mc "\"Wait, did you hear what I said?\"" + + hide python_angry + show python_angry_talk p "\"Uh, yeah I did…\"" + + hide python_angry_talk + show python_angry mc "\"You’re right, we should get going.\"" mc "\"Sorry…\"" + hide python_angry with dissolve + "Head to registration": + hide python_pocket_happy + show python_pocket + mc "\"Anywho…\"" mc "\"We should probably get going now, so that we don’t completely miss registration.\"" - p "\"Okay, good idea.\"" - - # jump to next scene + hide python_pocket + show python_pocket_happy + p "\"Okay, good idea.\"" + hide python_pocket_happy with dissolve + jump w0_d3_Registration \ No newline at end of file diff --git a/BytesOfLove/game/scripts/orientation/w0_d3_choices/w0_d3_MeetingRust.rpy b/BytesOfLove/game/scripts/orientation/w0_d3_choices/w0_d3_MeetingRust.rpy index 48283cd..d87ecbe 100644 --- a/BytesOfLove/game/scripts/orientation/w0_d3_choices/w0_d3_MeetingRust.rpy +++ b/BytesOfLove/game/scripts/orientation/w0_d3_choices/w0_d3_MeetingRust.rpy @@ -1,25 +1,28 @@ label w0_d3_MeetingRust: if r_rep == 50: + show rust_normal at right with dissolve r "\"Hey there! My name is Rust.\"" - show rust_normal at right with dissolve menu w0_d3_FirstTimeRust: r "\"You look about my age, do you go to UB?\"" - + "Be mean": $ r_rep = reputation(r_rep, -2) mc "\"Yeah, I do, my name is [mc].\"" r "\"Cool, you seem chill. What’s your major?\"" + hide rust_normal + show rust_confused at right mc "\"Wouldn’t you like to know...\"" - - hide rust_normal - - show rust_angry at right - r "\"Damn, I was just wondering.\"" + + hide rust_confused + show rust_talk at right r "\"I’m in Computer Engineering, in case you wanted to know mine.\"" + + hide rust_talk + show rust_angry at right mc "\"Oh thanks, I didn’t want to know.\"" r "\"Jeez, you don’t have to be mean about it, man.\"" mc "\"Whatever.\"" @@ -30,54 +33,70 @@ label w0_d3_MeetingRust: $ r_rep = reputation(r_rep, 2) mc "\"Yeah I do! My name is [mc], nice to meet you!\"" mc "\"What major are you?\"" + + hide rust_normal + show rust_talk at right r "{i}*Smiles*{/i} \"I’m in computer engineering, what about you?\"" + + hide rust_talk + show rust_normal at right mc "\"Oh cool, I’m in computer science!\"" mc "\"We both need to take Programming 1 as freshmen, right?\"" mc "\"Are you going to be doing it this semester?\"" + + hide rust_normal + show rust_talk at right r "\"Yeah, that’s what I am planning on doing.\"" r "\"I have some programming experience from highschool, but I’m excited to start learning more here.\"" r "\"We could totally work on projects and study together!\"" + + hide rust_talk + show rust_normal at right mc "\"Absolutely! That would be really cool!\"" mc "\"We’ll probably be spending a lot of time together then.\"" + + hide rust_normal + show rust_talk at right r "\"For sure, I’m excited to become better friends with you.\"" r "\"Well anyway, I have to get going.\"" r "\"Gotta do a few more things before I leave for orientation.\"" r "\"It was nice seeing you again, hope to see you around soon!\"" - hide rust_normal with dissolve + hide rust_talk with dissolve "{i}Rust leaves{/i}" + elif r_rep < 50: + show rust_normal at right with dissolve mc "Hey there, your name is..." window hide - show rust_normal at right with dissolve - + menu w0_d3_RustName: "Robust": window show $ r_rep = reputation(r_rep, -2) - mc "Your name is Robust, right?" hide rust_normal show rust_angry at right + mc "Your name is Robust, right?" r "Oh, it’s you." r "Of course you don’t remember." r "My name is Rust." r "Now what do you want?" - + "Robin": window show $ r_rep = reputation(r_rep, -2) - mc "Your name is Robin, right?" hide rust_normal show rust_angry at right + mc "Your name is Robin, right?" r "Oh, it’s you." r "Of course you don’t remember." r "My name is Rust." r "Now what do you want?" - + "Rust": window show - mc "Your name is Rust, right?" hide rust_normal - show rust_angry at right + show rust_confused at right + mc "Your name is Rust, right?" r "Oh, it’s you." r "Yeah, that's my name." r "What do you want?" @@ -85,9 +104,9 @@ label w0_d3_MeetingRust: "Resch": window show $ r_rep = reputation(r_rep, -2) - mc "Your name is Resch, right?" hide rust_normal show rust_angry at right + mc "Your name is Resch, right?" r "Oh, it’s you." r "Of course you don’t remember." r "My name is Rust." @@ -98,10 +117,19 @@ label w0_d3_MeetingRust: "Be mean": $ r_rep = reputation(r_rep, -2) + hide rust_confused + show rust_angry at right + mc "\"Don’t act like you have something I want, this is the only seat left.\"" mc "\"If I had it my way, you wouldn’t be here.\"" + + hide rust_angry + show rust_confused at right r "\"Dude, what is your problem?\"" r "\"I don’t even know you and you’ve been nothing but mean to me.\"" + + hide rust_confused + show rust_angry at right mc "\"I told you my problem, the only chair open was the one next to you.\"" r "{i}Stands up{i} \"Let me solve that for you, then!\"" r "\"I was just leaving anyway!\"" @@ -112,42 +140,96 @@ label w0_d3_MeetingRust: $ r_rep = reputation(r_rep, 1) mc "\"Listen, Rust...\"" mc "\"I’m sorry about our encounter the other day.\"" + + hide rust_angry + show rust_confused at right mc "\"I was fresh off the drive here and was way too mean to you for no reason.\"" mc "\"It was wrong of me and I’m sorry.\"" + + hide rust_confused + show rust_talk at right r "{i}Sighs{/i} \"That makes sense, I get it.\"" r "\"No hard feelings.\"" r "\"[mc], right? So what is your major?\"" + + hide rust_talk + show rust_normal at right mc "\"Yes, and I’m in computer science.\"" mc "\"You're in computer engineering, right?\"" + + hide rust_normal + show rust_talk at right r "\"Yes I am!\"" r "\"So we’re supposed to be signing up for classes today, what are you trying to get into?\"" + + hide rust_talk + show rust_normal at right mc "\"I’m hoping to take Programming 1 this semester, are you doing the same?\"" + + hide rust_normal + show rust_talk at right r "\"Yes, I have some programming experience from highschool, but I am excited to start learning more here.\"" r "\"We could totally work on projects and study together!\"" + + hide rust_talk + show rust_normal at right mc "\"Absolutely! That would be really cool!\"" mc "\"We’ll probably be spending a lot of time together then.\"" + + hide rust_normal + show rust_talk at right r "\"Yes, I’m excited to become better friends with you.\"" r "\"Well anyway, I have to get going.\"" r "\"Gotta do a few more things before I leave for orientation.\"" r "\"It was nice seeing you again, hope to see you around soon!\"" + "{i}Rust leaves.{/i}" else: + show rust_normal at right mc "\"Hey, Rust!\"" + + hide rust_normal + show rust_talk at right r "\"Oh hey! What’s up [mc]?\"" + + hide rust_talk + show rust_normal at right mc "\"Same as you, I guess. Eating breakfast before I go to orientation and select my schedule for the semester!\"" + + hide rust_normal + show rust_talk at right r "\"I’m a little nervous. I really hope I get in Programming 1 before they run out of spots.\"" + + hide rust_talk + show rust_normal at right mc "\"I’m sure we’ll both get it just fine.\"" + + hide rust_normal + show rust_talk at right r "\"That’s reassuring to hear.\"" r "\"Hey, listen. Not to run out on you or anything, but I have to get going.\"" r "\"I still have a few more things to do back in my room before orientation.\"" + + hide rust_talk + show rust_normal at right mc "\"No worries! You don’t wanna be late like I was yesterday!\"" + + hide rust_normal + show rust_talk at right r "\"You were late to day one?!\"" + + hide rust_talk + show rust_normal at right mc "\"Yeah, it all worked out though.\"" + menu w0_d3_RustBaddiesOrFriends: mc "\"In fact-\"" - "\"I met some baddies.\"": + "\"I met some baddies!\"": $ r_rep = reputation(r_rep, -1) + + hide rust_normal + show rust_confused at right mc "\"When I eventually made it to my breakout room, there was only one place to sit.\"" mc "\"Luckily, the open table had 3 girls at it\"" mc "\"And they were BADDDD!\"" @@ -163,25 +245,53 @@ label w0_d3_MeetingRust: r "\"Uh, yeah, I bet...\"" r "\"Anyway I have to run, I'll see you later.\"" mc "\"Bye!\"" + + hide rust_talk with dissolve "{i}Rust leaves.{/i}" - + "\"I made three friends.\"": $ r_rep = reputation(r_rep, 1) mc "\"When I eventually made it to my breakout room, there was only one place to sit.\"" mc "\"Luckily, that table had 3 girls at it who were really nice.\"" + + hide rust_normal + show rust_talk at right r "\"Oh, cool!\"" r "\"What were they like?\"" + + hide rust_talk + show rust_normal at right mc "\"Their names are Python, JavaScript, and C++.\"" mc "\"They are all computer science majors, so we should have Programming 1 with them this semester.\"" + + hide rust_normal + show rust_talk at right r "\"Nice, we’ll need all the help we can get!\"" + + hide rust_talk + show rust_normal at right mc "\"Haha, definitely.\"" mc "\"And they all had interesting reasons for being in computer science.\"" + + hide rust_normal + show rust_talk at right r "\"Cool, they sound pretty interesting.\"" + + hide rust_talk + show rust_normal at right mc "\"Totally, we should definitely hang out with them some time.\"" + + hide rust_normal + show rust_talk at right r "\"Absolutely!\"" r "\"Anyway, I have to run…\"" r "\"I’ll see you later!\"" + + hide rust_talk + show rust_normal at right mc "\"Bye!\"" + + hide rust_normal with dissolve "{i}Rust leaves.{/i}" - jump w0_d3_AfterMeetingRust + jump w0_d3_AfterMeetingRust \ No newline at end of file