Merge pull request ufosc#137 from Lance-Tan/main

Updated Backgrounds (issue ufosc#97)

Author: nickv779

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+    "files.exclude": {
+        "**/*.rpyc": true,
+        "**/*.rpa": true,
+        "**/*.rpymc": true,
+        "**/cache/": true
+    }
+}

BytesOfLove/game/backgrounds/breakout-room.PNG

@@ -143,14 +143,15 @@ image w0_d3_buffet = "backgrounds/hotelBuffet.jpg"
 
 
 #new backgrounds 
+image breakout_room = "backgrounds/breakout-room.PNG"
 image campus_pathway = "backgrounds/campus_pathway.PNG"
 image dining_hall = "backgrounds/dining-hall.PNG"
 image driving_car = "backgrounds/driving-car.png"
 image empty_lecture_hall = "backgrounds/empty-lecture-hall.png"
 image full_lecture_hall = "backgrounds/full-lecture-hall.png"
 image hotel_buffet = "backgrounds/hotel-buffet.png"
 image hotel_room_day = "backgrounds/hotel-room-day.png"
-image hotel-room-night = "backgrounds/hotel-room-night.png"
+image hotel_room_night = "backgrounds/hotel-room-night.png"
 image office = "backgrounds/office.PNG"
 image parking_lot = "backgrounds/parking-lot.png"
 image starting_car = "backgrounds/starting-car.png"
@@ -163,6 +164,7 @@ image vending_machine = "backgrounds/vending-machine.PNG"
 
 
 
+
 image w0_d3_Advisor = "backgrounds/ciseDungeon.png"
 
 image w0_d3_parkingLot = "backgrounds/IMG_3556.jpg"
@@ -229,7 +231,7 @@ init python:
 label start:
     stop music fadeout 4
     # PROLOUGUE
-    scene instruction_screen with shorter_fade
+    scene campus_pathway with shorter_fade
     "Welcome to Bytes of Love! A visual novel currently being developed by the University of Florida's Open Source Club!"
     "This is an educational dating simulator where you build relationships with other programming languages that are represented as anime-style characters."
     "Throughout the game, these characters will immerse you into computer science and the college experience."

BytesOfLove/game/script.rpy

@@ -1,5 +1,5 @@
 label w0_d1:
-    scene w0_d1_hotel
+    scene hotel_room_night
 
     mc "Man, I can't believe it, tomorrow is the first day of orientation at the University of Byteborough."
     mc "I can't wait for everything I'm going to experience, all the parties, friends, clubs, and ladies!"
@@ -25,12 +25,12 @@ label w0_d1:
             jump w0_d1_DoorDash
 
     label w0_d1_End:
-        scene w0_d1_hotel with longer_fade
+        scene hotel_room_night with longer_fade
         mc "Man that hit the spot."
         mc "Now what should I do with the rest of my night?"
         mc "I know I’ll play some Valorant. I’ve been grinding so I can go from silver to gold."
         #Add clock below when it is made - Lazzy
-        scene w0_d1_hotel with shorter_fade
+        scene hotel_room_night with shorter_fade
         "{i}Time passes it's now 11:30PM{/i}"
         mc "Now I’m Silver 3! I just have to win a few more games to push to gold!"
         mc "Do I play one more ranked game so I can get gold, or do I head to bed early so I'm not late in the morning?"
@@ -39,7 +39,7 @@ label w0_d1:
             mc "I have a big day tomorrow."
 
             "Grind Valorant": 
-                scene w0_d1_hotel with shorter_fade
+                scene hotel_room_night with shorter_fade
                 mc "{i}*4 hours later*{/i}"
                 mc "Wow, that was miserable. I went back and forth for 4 hours, and sacrificed my pride and rank."
                 mc "Now it’s 3:30 AM, I deranked to Silver I, and I am so tired."                

BytesOfLove/game/scripts/before_orientation/before_orientation.rpy

@@ -1,13 +1,13 @@
 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 w0_d1_hotel with shorter_fade
+    scene hotel_room_night with shorter_fade
     "{i}*15 minutes later*{/i}"
     mc "This driver sucks! I ordered this 30 minutes ago, and he still hasn’t picked it up!!!"
-    scene w0_d1_hotel with shorter_fade
+    scene hotel_room_night with shorter_fade
     "{i}*20 minutes later*{/i}"
     mc "Uuuugggghhhhh. I’m so hungry. Can this loser hurry up? It isn’t that hard to deliver food."
-    scene w0_d1_hotel with shorter_fade
+    scene hotel_room_night with shorter_fade
     "{i}*20 more minutes later, there is a knock at the door*{/i}"
     u "\"Are you [mc]? I’ve got your food.\""
     mc "{i}*Annoyed*{/i} \"What took you so long?\""

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

@@ -20,7 +20,7 @@ label w0_d1_RoomService:
 
     mc "Yeah, I HAVE to get [food_item]. You can’t go wrong with that."
     $ byte = bytecoin(byte, -15)
-    scene w0_d1_hotel with shorter_fade
+    scene hotel_room_night with shorter_fade
     "{i}*5 minutes pass*{/i}"
     mc "I hope this doesn’t take too long, I’m getting pretty hungry here."
     "{i}*You hear a knock on the door*{/i}"

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

@@ -3,7 +3,7 @@ label w0_d1_VendingMachine:
     mc "And, I will save some money. You never know when you’ll need it."
     mc "I am pretty hungry though, maybe I should eat something more to fuel my body and mind."
 
-    scene w0_d1_vending
+    scene vending_machine
     #scene test
     "{i}*You walk downstairs to find a vending machine*{/i}"
     "{i}*On your way to the vending machines you see someone*{/i}"

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

@@ -1,5 +1,5 @@
 label w0_d2:
-    scene w0_d2_sunnyhotel with longer_fade
+    scene hotel_room_day with longer_fade
     "{i}You wake up in your room and look at the clock.{/i}"
     "{i}It's 9:30AM, orientation started 15 minutes ago.{/i}"
     mc "WHAT THE HELL?!?!?"
@@ -17,15 +17,15 @@ label w0_d2:
     mc "What kind of excuse can I come up with..."
     mc "I was sick? Family emergency? My car wouldn’t start?"
     "{i}You turn the key and the car struggles to start{/i}"
-    scene w0_d2_urgentcar with shorter_fade
+    scene starting_car with shorter_fade
     mc "WAIT NOT ACTUALLY! PLEASE START!!!"
-    scene w0_d2_insidecar with shorter_fade
+    scene driving_car with shorter_fade
     "{i}As the car starts, you sign in relief and speed off.{/i}"
     mc "I don’t even know where I’m going. This city is all new to me!"
     mc "I’m going to be so late..."
 
     #"*Scene fades to the lecture hall.*" Current one is temporary
-    scene w0_d2_lecturehall with longer_fade
+    scene full_lecture_hall with longer_fade
     "{i}You burst through the doors into an nearly empty auditorium, looking around frantically in search of someone.{/i}" 
     mc "Oh look there’s somebody."
     mc "She looks old, I wonder if she is a professor..."
@@ -81,7 +81,7 @@ label w0_d2:
 
     # Insert transition to breakout room - Lazzy
     # currently put a temp one in - Anton
-    scene w0_d2_breakout with fade 
+    scene breakout_room with fade 
 
     mc "Jeez, everyone’s here already, where am I going to sit?"
     mc "Oh! There’s a seat! And the company isn’t that bad either..."
@@ -221,52 +221,59 @@ label w0_d2:
             mc "\"Yeah I agree with Python, computer science definitely seems cool.\""
             mc "\"I’m just like you, I don’t have much experience, but I’m excited to learn.\""
             mc "\"And A.I. is a great field to make money in.\""
+            hide python_pocket
+            show python_pocket_happy at right
             p "\"I don’t care too much about the money, but it definitely won’t hurt!\""
+            hide python_pocket_happy
+            show python_pocket at right
 
         "Respond to C++":
             $ c_rep = reputation(c_rep, 3)
             mc "\"I think it’s really cool that your parents work for those companies, C++.\""
             mc "\"I’ve never heard of iClicker or Mentimeter.\""
             mc "\"I don’t know much when it comes to coding, but you sound really experienced.\""
             mc "\"Maybe you could show me the ropes sometime...?\""
+            hide cpp_normal
+            show cpp_talk
             c "\"Sure, if you can keep up...\""
+            hide cpp_talk
+            show cpp_normal
 
     bsl "\"Alright now, we’re gonna start our guided tour of campus!\""
 
     #tour just started put scene change
-    scene w0_d2_statue with fade
+    scene statue_garden with fade
 
     "{i}The group tours campus as the breakout session leader talks about random trivia{/i}"
     bsl "\"And if you look to your left you will see Half-A-Century Tower...\""
+    show cpp_normal with dissolve
     c "\"Gosh, this is so boring.\""
     c "\"Who doesn’t know all of this stuff already?\""
     c "\"I mean did anybody really come to this school without already taking a tour?\""
-    p "\"I didn’t... so this is interesting! I’m really enjoying this tour.\""
-
-
     show python_pocket_happy at left with dissolve
+    p "\"I didn’t... so this is interesting! I’m really enjoying this tour.\""    
     p "\"Like look at that cool statue over there.\""
     p "\"Don’t you guys think he looks cool?\""
     hide python_pocket_happy
     show python_pocket at left
-    show cpp_talk with dissolve
+    hide cpp_normal
+    show cpp_talk
     c "\"Oh? You think that’s cool?\""
     c "\"That statue is actually Thomas ‘Firewall’ Jackson.\""
     c "\"He was a general in a huge war a while ago and the armies he commanded were basically impenetrable.\""
     c "\"But, he killed a lot of people...\""
     c "\"You really think someone like that is cool??\""
-    
     hide cpp_talk
     show cpp_normal
-
     hide python_pocket
     show python_pocket_happy at left
     p "\"Oh, well I didn’t realize that...\""
-
     hide cpp_normal
     show cpp_talk
     c "\"Yeah, I wouldn’t expect someone like you to know basic history...\""
-    show js_normal at right with dissolve
+    hide cpp_talk
+    show cpp_normal
+    show js_talk at right with dissolve
     js "\"Well I thought he was cool looking too, it was just an honest mistake.\""
     js "\"There’s no need to be so aggressive, C++...\""
 
@@ -286,7 +293,7 @@ label w0_d2_AfterStatue:
     bsl "\"Now we will be taking a break for lunch.\""
 
     #change scene to cafeteria
-    scene w0_d2_cafeteria with longer_fade 
+    scene dining_hall with longer_fade 
 
 
     bsl "\"The different food stations are located around the room.\""
@@ -312,7 +319,7 @@ label w0_d2_AfterLunch:
     bsl "\"Everyone, make sure you get back to Room 283 in 10 minutes.\""
 
 
-    scene w0_d2_breakout with fade 
+    scene breakout_room with fade 
 
     bsl "\"Okay guys, we are now going to be playing a fun game to test your knowledge.\""
     bsl "\"Since The University of ByteBorough is renowned for the College of Computing...\""
@@ -648,7 +655,7 @@ label w0_d2_AfterLunch:
     c "\"I guess it wasn’t boring...\""
     "{i}Everyone laughs.{/i}"
 
-    scene w0_d1_hotel with longer_fade  
+    scene hotel_room_night with longer_fade  
     mc "\"Well, that was a fun day.\""
     mc "\"Those girls were so nice, I hope I can run into them again tomorrow.\""
     mc "\"One thing is for sure, I can’t stay up late again.\""

BytesOfLove/game/scripts/orientation/w0_d2.rpy

@@ -1,10 +1,15 @@
 label w0_d2_LunchApology:
+    hide python_pocket
+    show python_pocket_happy at left
     p "\"Hey JavaScript!\""
     p "\"Is it okay if we join you?\""
+    hide python_pocket_happy
+    show python_pocket at left
+    hide js_normal
+    show js_talk
     js "\"Yeah, sure!\""
-    #hide python_happy
-    #show python_pocket
-    #show cpp_normal at right with dissolve
+    hide js_talk
+    show js_normal
     mc "\"Lunch was good, I am glad that we got to eat some good food.\""
 
     menu w0_d2_LunchApologyC:
@@ -30,8 +35,16 @@ menu w0_d2_LunchFlirtDecision:
         jump w0_d2_LunchFlirt
 
     "Don't Flirt":
+        hide js_normal
+        show js_talk
         js "\"I totally agree, [mc]!\""
         js "\"I think we can be good friends as well.\""
+        hide js_talk
+        show js_normal
+        hide python_pocket
+        show python_pocket_happy at left
         p "\"Yeah, and it’s so good that we are all computer science majors.\""
         p "\"Hopefully we will have a lot of classes together.\""
+        hide python_pocket_happy
+        show python_pocket at left
         jump w0_d2_AfterLunch

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

@@ -4,34 +4,70 @@ label w0_d2_LunchFlirt:
             $ p_rep = reputation(p_rep, -2)
             mc "\"Especially you Python.\""
             mc "{i}Winks{/i}"
+            hide python_pocket
+            show python_pocket_happy at left
             p "\"Wow, way to ruin an apology.\""
             p "\"I expected nothing less.\""
+            hide python_pocket_happy
+            show python_pocket at left
+            hide cpp_normal
+            show cpp_talk at right
             c "\"Typical man...\""
+            hide cpp_talk
+            show cpp_normal at right
         "Flirt with C++":
             $ c_rep = reputation(c_rep, -2)
             mc "\"Especially you C++.\""
             mc "{i}Winks{/i}"
+            hide cpp_normal
+            show cpp_talk at right
             c "\"Wow, way to ruin an apology.\""
             c "\"I expected nothing less.\""
+            hide cpp_talk
+            show cpp_normal at right
+            hide js_normal
+            show js_talk
             js "\"What a simp...\""
+            hide js_talk
+            show js_normal
 
         "Flirt with JavaScript":
             $ js_rep = reputation(js_rep, -2)
             mc "\"Especially you JavaScript.\""
             mc "{i}Winks{/i}"
+            hide js_normal
+            show js_talk
             js "\"Wow, way to ruin an apology.\""
             js "\"I expected nothing less.\""
+            hide js_talk
+            show js_normal
+            hide cpp_normal
+            show cpp_talk at right
             c "\"Men...\""
+            hide cpp_talk
+            show cpp_normal at right
 
         "Everyone":
             $ p_rep = reputation(p_rep, -6)
             $ js_rep = reputation(js_rep, -6)
             $ c_rep = reputation(c_rep, -6)
             mc "\"Maybe I could get to know all of you really well back at my hotel tonight...\""
+            hide cpp_normal
+            show cpp_talk at right
             c "\"What the actual fuck is wrong with you.\""
             c "\"That is so disgusting.\""
+            hide cpp_talk
+            show cpp_normal at right
+            hide python_pocket
+            show python_angry_talk at left
             p "\"I can’t believe you, you are despicable.\""
+            hide python_angry_talk
+            show python_angry at left
+            hide js_normal
+            show js_talk
             js "\"I think I might actually throw up...\""
+            hide js_talk
+            show js_normal
 
     mc "\"Hmm, I thought that would go differently.\""
     mc "\"Can’t blame me, shooters gotta shoot...\""