Merge branch 'main' of https://github.com/TYPSwift/VisualNovel

Author: TYPSwift

BytesOfLove/game/script.rpy

@@ -240,11 +240,15 @@ label start:
     default check = True
     while check:
         $ mc = renpy.input("Your name: ", length=12).strip()
-        if mc.isalpha() and " " not in mc:
+        $ characterList = ["Python", "C++", "Java", "JavaScript", "HTML", "CSS", "Rust", "Perl", "Fish", "Ruby", "Matlab"]
+
+        if mc.isalpha() and " " not in mc and mc not in characterList:
             $ mc = mc.capitalize()
             $ check = False
         elif not mc:
             "Please enter a name"
+        elif mc in characterList:
+            "Please enter a different name."
         else:
             "Please enter a single word name using only alphabetic characters."
 

BytesOfLove/game/scripts/orientation/w0_d2.rpy

@@ -246,10 +246,12 @@ label w0_d2:
 
     "{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
+    show cpp_talk 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?\""
+    hide cpp_talk
+    show cpp_normal
     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.\""
@@ -269,6 +271,8 @@ label w0_d2:
     show python_pocket_happy at left
     p "\"Oh, well I didn’t realize that...\""
     hide cpp_normal
+    hide python_pocket_happy
+    show python_pocket at left
     show cpp_talk
     c "\"Yeah, I wouldn’t expect someone like you to know basic history...\""
     hide cpp_talk

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

@@ -6,6 +6,8 @@ label w0_d2_StatueDB:
     show python_pocket at left
     hide cpp_talk
     show cpp_normal
+    hide js_talk
+    show js_normal at right
     mc "{i}Distracted{/i} \"Wait, guys. Look at that girl over there.\""
     mc "\"She is actually so hot, should I go talk to her?\""
     hide python_pocket_happy

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

@@ -2,6 +2,8 @@ label w0_d2_StatueJS:
     $ p_rep = reputation(p_rep, 2)
     $ js_rep = reputation(js_rep, 2)
     $ c_rep = reputation(c_rep, -2)
+    hide js_talk
+    show js_normal at right
     hide python_pocket_happy
     show python_pocket at left
     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

@@ -4,13 +4,14 @@ label w0_d2_StatueSexist:
     p "\"Everyone just shut up!\""
     p "\"It’s not that important and you’re talking over the tour guide!\""
     p "\"[mc] was just having an opinion about the statue.\""
-    hide python_angry_talk
-    show python_angry at left
+    
 
     menu w0_d2_StatueSexistC:
         p "\"He didn’t say that anybody was hot or ugly, so let’s all just relax.\""
-
+        
         "Say something sexist":
+            hide python_angry_talk
+            show python_angry at left
             $ p_rep = reputation(p_rep, -4)
             $ js_rep = reputation(js_rep, -4)
             $ c_rep = reputation(c_rep, -4)
@@ -25,13 +26,15 @@ label w0_d2_StatueSexist:
             js "\"There is no way you just said that.\""
             hide js_talk
             show js_angry at right
-            hide cpp angry
+            hide cpp_handhip_normal
             show cpp_angry_talk
             c "\"Please shut up.\""
             hide cpp_angry_talk
             show cpp_angry
 
         "Say something normal":
+            hide python_angry_talk
+            show python_angry at left
             mc "\"Thank you, Python.\""
             mc "\"I wasn’t trying to step on any toes.\""