From aa6f2507f1bf95b56545fcce611dfc1b1dbdc2a1 Mon Sep 17 00:00:00 2001 From: Lance Tan Date: Tue, 29 Oct 2024 18:32:20 -0400 Subject: [PATCH 1/5] changed 3 files, waiting to merge 4th file --- .vscode/settings.json | 8 +++ BytesOfLove/game/script.rpy | 2 +- .../game/scripts/.vscode/settings.json | 8 +++ .../w0_d2_choices/w0_d2_StatueC.rpy | 61 +++++++++++++++++++ .../w0_d2_choices/w0_d2_StatueDB.rpy | 38 ++++++++++++ .../w0_d2_choices/w0_d2_StatueSexist.rpy | 18 +++++- 6 files changed, 133 insertions(+), 2 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 BytesOfLove/game/scripts/.vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..46ebd25 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + "files.exclude": { + "**/*.rpyc": true, + "**/*.rpa": true, + "**/*.rpymc": true, + "**/cache/": true + } +} \ No newline at end of file diff --git a/BytesOfLove/game/script.rpy b/BytesOfLove/game/script.rpy index 4e7b55e..49a9d5c 100644 --- a/BytesOfLove/game/script.rpy +++ b/BytesOfLove/game/script.rpy @@ -248,6 +248,6 @@ label start: "Your name is [mc]." #jump w1_d1_LunchApology - + jump w0_d2 jump w0_d1 diff --git a/BytesOfLove/game/scripts/.vscode/settings.json b/BytesOfLove/game/scripts/.vscode/settings.json new file mode 100644 index 0000000..46ebd25 --- /dev/null +++ b/BytesOfLove/game/scripts/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + "files.exclude": { + "**/*.rpyc": true, + "**/*.rpa": true, + "**/*.rpymc": true, + "**/cache/": true + } +} \ No newline at end of file diff --git a/BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueC.rpy b/BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueC.rpy index 834cc9a..847e699 100644 --- a/BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueC.rpy +++ b/BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueC.rpy @@ -2,15 +2,34 @@ label w0_d2_StatueC: $ c_rep = reputation(c_rep, 2) $ p_rep = reputation(p_rep, -2) $ js_rep = reputation(js_rep, -2) + hide python_pocket_happy + show python_angry at left + hide cpp_talk + show cpp_normal + show js_normal at right mc "\"Yep, I totally knew that. It’s pretty insensitive of Python to support someone like that.\"" + hide python_angry + show python_angry_talk at left p "\"I seriously didn’t know, jeez...\"" p "\"You guys don’t need to be mean about it.\"" + hide python_angry_talk + show python_angry at left + hide cpp_normal + show cpp_handhip_talk c "\"At least someone knows what they’re talking about, thanks, [mc].\"" + hide cpp_handhip_talk + show cpp_normal + hide js_normal + show js_talk at right js "\"There is no way you knew that!\"" js "\"And even if you did, C++ is being so mean, there’s no need to be nasty!\"" js "\"I bet you’re just agreeing with her because you think she’s cute!\"" js "\"God, men are so shallow!\"" + hide js_talk + show js_normal at right mc "{i}Flustered{/i} \"No, not at all! I seriously mean what I said.\"" + hide cpp_normal + show cpp_talk # Short choice decided other file was not neccessary - Lazzy menu w0_d2_CuteC: @@ -18,35 +37,77 @@ label w0_d2_StatueC: "Admit C++ is cute": $ c_rep = reputation(c_rep, 2) + hide cpp_talk + show cpp_normal mc "{i}Flustered{/i}" mc "\"Well... that’s not what I was saying.\"" mc "\"I do think you’re kinda cute...\"" + hide cpp_normal + show cpp_happy c "{i}Blushes{/i}" + hide js_normal + show js_talk at right js "\"Ugh I knew it!\"" #this \/ line is good but awarge js "\"Stop being such a simp!\"" js "\"So typical of boys to only care about looks.\"" js "\"C++, don’t think you’re right just because this guy agrees with you!\"" + hide js_talk + show js_angry at right + hide cpp_happy + show cpp_angry_talk c "\"And what would you know about being right?\"" c "\"You’re just jealous he didn’t take your side!\"" + hide cpp_angry_talk + show cpp_angry + hide js_angry + show js_talk at right js "\"I wouldn’t want someone so superficial to agree with me anyway!\"" + hide js_talk + show js_angry at right mc "\"Woah, I’m not superficial, I just think-\"" + hide cpp_angry + show cpp_angry_talk c "\"[mc], be quiet. This isn’t even about you!\"" + hide cpp_angry_talk + show cpp_angry "Call out C++": $ c_rep = reputation(c_rep, -2) + hide cpp_talk + show cpp_normal mc "\"Don’t go fishing for a compliment just because I agreed with you...\"" mc "\"I agree that Python shouldn’t go around calling statues cool without knowing what they represent.\"" mc "\"That's it.\"" + hide cpp_talk + show cpp_angry_talk c "\"So you think I’m ugly!?\"" + hide cpp_angry_talk + show cpp_angry mc "\"I-\"" + hide js_angry + show js_talk at right js "\"Why are you begging for his attention C++?\"" js "\"This isn’t about you, it’s about the statue.\"" js "\"Or did you forget what you were mad about already?\"" + hide js_talk + show js_normal + hide cpp_angry + show cpp_angry_talk c "\"Okay sugar queen, no one asked you for your input.\"" c "\"You’re just mad because he didn’t take your side.\"" + hide cpp_angry_talk + show cpp_angry + hide js_normal + show js_talk at right js "\"At least he doesn’t think I’m ugly...\"" + hide js_talk + show js_normal at right + hide cpp_angry + show cpp_angry_talk c "\"Excuse me!?\"" + hide cpp_angry_talk + show cpp_angry mc "\"I never said-\"" jump w0_d2_StatueSexist \ No newline at end of file diff --git a/BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueDB.rpy b/BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueDB.rpy index 5a3606d..6e41538 100644 --- a/BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueDB.rpy +++ b/BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueDB.rpy @@ -2,12 +2,26 @@ label w0_d2_StatueDB: $ c_rep = reputation(c_rep, -2) $ p_rep = reputation(p_rep, -2) $ js_rep = reputation(js_rep, -2) + hide python_pocket_happy + show python_pocket at left + hide cpp_talk + show cpp_normal 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 + show python_angry_talk at left p "\"What are you even talking about, [mc]?\"" + hide python_angry_talk + show python_angry at left + hide js_normal + show js_talk at right js "\"Yeah, what is wrong with you?\"" js "\"Were you even listening to the conversation we were having?\"" + hide js_talk + show js_normal at right mc "\"What? Of course I was!\"" + hide cpp_normal + show cpp_talk menu w0_d2_GuessingConvo: c "\"Okay, then what were we talking about?\"" @@ -23,31 +37,55 @@ label w0_d2_StatueDB: label w0_d2_StatueDBContinue: c "\"See? That wasn’t even close to what we were talking about.\"" + hide cpp_talk + show cpp_normal + hide js_normal + show js_talk at right js "\"I bet you didn’t know what we were talking about because you were too busy staring at that girl!\"" js "\"You are sooo into her!\"" + hide js_talk + show js_normal at right mc "\"Woah, woah, woah. You’re getting mad at me?\"" mc "\"Look at her, she’s a 10!\"" mc "\"When do you get to see girls THAT cute?\"" + hide python_angry + show python_angry_talk at left menu w0_d2_CuteGroup: p "\"What? Aren’t we cute enough?\"" "Admit the girls are cute": + hide python_angry_talk + show python_angry at left mc "\"Well I am not going to sit here and say that you guys aren’t cute...\"" "Deny that they're cute": $ c_rep = reputation(c_rep, -2) $ p_rep = reputation(p_rep, -2) $ js_rep = reputation(js_rep, -2) + hide python_angry_talk + show python_angry at left mc "\"No way! I don’t think that! That’s crazy! I mean-\"" mc "\"This feels like a trap!\"" mc "\"I was just looking at that girl, it wasn’t related to you three.\"" + hide python_angry + show python_angry_talk at left p "\"Okay, I see how it is...\"" + hide python_angry_talk + show python_angry at left mc "\"No, I meant-\"" + hide cpp_normal + show cpp_angry_talk c "\"Well I don’t care who you think is or isn’t cute!\"" c "\"That’s no reason to be ignoring us.\"" + hide cpp_angry_talk + show cpp_normal + hide js_normal + show js_talk at right js "\"Yeah, sorry our conversation isn’t interesting enough for you.\"" + hide js_talk + show js_normal at right mc "\"No, that’s not what I was saying-\"" bsl "\"Hey you guys are being really loud.\"" bsl "\"Could you try to keep it down?\"" diff --git a/BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueSexist.rpy b/BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueSexist.rpy index a33cdff..e0116f3 100644 --- a/BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueSexist.rpy +++ b/BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueSexist.rpy @@ -1,8 +1,10 @@ label w0_d2_StatueSexist: + hide python_angry + show python_angry_talk at left 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.\"" - + menu w0_d2_StatueSexistC: p "\"He didn’t say that anybody was hot or ugly, so let’s all just relax.\"" @@ -10,15 +12,29 @@ label w0_d2_StatueSexist: $ p_rep = reputation(p_rep, -4) $ js_rep = reputation(js_rep, -4) $ c_rep = reputation(c_rep, -4) + hide python_angry_talk + show python_angry at left mc "\"Look sweetheart, I don’t need your help here.\"" + hide python_angry + show python_angry_talk at left p "\"I'M SORRY WHAT!?\"" + hide python_angry_talk + show python_angry at left + hide js_angry + show js_talk at right js "\"There is no way you just said that.\"" + hide js_talk + show js_angry at right + hide cpp angry + show cpp_angry_talk c "\"Please shut up.\"" "Say something normal": mc "\"Thank you, Python.\"" mc "\"I wasn’t trying to step on any toes.\"" + hide cpp_angry_talk + show cpp_angry bsl "\"Uh... I am not a tour guide, I am just the leader of our breakout session.\"" bsl "\"Which you guys have really been interrupting.\"" bsl "\"Could you try to keep it down?\"" From 30a9ecff40fac8136c692cb60ee79cffb1c1694a Mon Sep 17 00:00:00 2001 From: Lance-Tan Date: Tue, 29 Oct 2024 18:47:13 -0400 Subject: [PATCH 2/5] vs settings removed, added merge file delete vs code settings, added merge file --- .../game/scripts/.vscode/settings.json | 8 --- .../w0_d2_choices/w0_d2_StatueJS.rpy | 60 +++++++++++++++++++ 2 files changed, 60 insertions(+), 8 deletions(-) diff --git a/BytesOfLove/game/scripts/.vscode/settings.json b/BytesOfLove/game/scripts/.vscode/settings.json index 46ebd25..e69de29 100644 --- a/BytesOfLove/game/scripts/.vscode/settings.json +++ b/BytesOfLove/game/scripts/.vscode/settings.json @@ -1,8 +0,0 @@ -{ - "files.exclude": { - "**/*.rpyc": true, - "**/*.rpa": true, - "**/*.rpymc": true, - "**/cache/": true - } -} \ No newline at end of file diff --git a/BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueJS.rpy b/BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueJS.rpy index 3e5ac99..874eeee 100644 --- a/BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueJS.rpy +++ b/BytesOfLove/game/scripts/orientation/w0_d2_choices/w0_d2_StatueJS.rpy @@ -2,18 +2,44 @@ label w0_d2_StatueJS: $ p_rep = reputation(p_rep, 2) $ js_rep = reputation(js_rep, 2) $ c_rep = reputation(c_rep, -2) + hide python_pocket_happy + show python_pocket at left mc "\"I agree with JavaScript and Python, you need to take a chill pill C++.\"" mc "\"He does look cool, I didn’t realize that was ‘Firewall’ Jackson either.\"" + hide js_normal + show js_normal at right + hide cpp_talk + show cpp_angry_talk c "\"Ugh whatever.\"" c "\"You guys need to be more knowledgeable, though, it’s embarrassing.\"" + hide cpp_angry_talk + show cpp_angry + hide js_normal + show js_talk at right js "\"That is ridiculous, why do you even know that?\"" + hide js_talk + show js_normal at right + hide cpp_angry + show cpp_angry_talk c "\"Who doesn’t know that?\"" c "\"Have you ever taken a history class?\"" + hide cpp_angry_talk + show cpp_angry + hide js_normal + show js_talk at right js "\"Yes I have!\"" js "\"You are being so mean right now, C++, there’s no need to be nasty!\"" js "\"I bet you’re just mad because [mc] doesn’t agree with you.\"" + hide js_talk + show js_normal at right + hide cpp_angry + show cpp_handhip_talk c "\"Well [mc] is only agreeing with you because he thinks you’re cute.\"" + hide cpp_handhip_talk + show cpp_handhip_normal mc "{i}Flustered{/i} \"Whoa whoa whoa, I never said that.\"" + hide js_normal + show js_smirk at right menu w0_d2_CuteJS: js "\"Hm, so do you think I’m cute?\"" @@ -23,13 +49,27 @@ label w0_d2_StatueJS: mc "{i}Flustered{/i}" mc "\"Well... that’s not exactly what I was saying...\"" mc "\"But, I do think you’re kind of cute.\"" + hide js_smirk + show js_blush at right js "{i}Blushes{/i} \"Well that makes sense…\"" + hide cpp_handhip_normal + show cpp_handhip_talk c "\"Ugh I knew it!\"" c "\"So typical of boys to only care about looks.\"" c "\"JavaScript, don’t think you’re right just because this guy agrees with you!\"" + hide cpp_handhip_talk + show cpp_handhip_normal + hide js_blush + show js_talk at right js "\"And what would you know about being right?\"" js "\"You’re just mad because he didn’t take your side!\"" + hide js_talk + show js_smirk at right + hide cpp_handhip_normal + show cpp_handhip_talk c "\"I wouldn’t want someone so superficial to agree with me anyway!\"" + hide cpp_handhip_talk + show cpp_handhip_normal mc "\"Woah, I’m not superficial, I just think--\"" "Call out JavaScript": @@ -37,15 +77,35 @@ label w0_d2_StatueJS: mc "\"Alright, don’t go fishing for a compliment just because I agreed with you...\"" mc "\"I agree that Python shouldn’t go around calling statues cool without knowing what they represent.\"" mc "\"That's it.\"" + hide js_smirk + show js_talk at right js "\"So you think I'm ugly!?\"" + hide js_talk + show js_angry at right mc "\"I-\"" + hide cpp_handhip_normal + show cpp_talk c "\"Why are you begging for his attention, JavaScript?\"" c "\"This isn’t about you, it’s about the statue.\"" c "\"Or did you forget what you were so mad about already?\"" + hide cpp_talk + show cpp_handhip_normal + hide js_angry + show js_talk at right js "\"Listen, know it all, no one asked you for your input in the first place.\"" js "\"You’re just mad because he didn’t take your side.\"" + hide js_talk + show js_angry at right + hide cpp_handhip_normal + show cpp_handhip_talk c "\"At least he doesn’t think I’m ugly...\"" + hide cpp_handhip_talk + show cpp_handhip_normal + hide js_angry + show js_talk at right js "\"Excuse me!?\"" + hide js_talk + show js_normal at right mc "\"I never said-\"" jump w0_d2_StatueSexist \ No newline at end of file From 6179008d173a8118e13bb5b92ede82e83934b985 Mon Sep 17 00:00:00 2001 From: Lance-Tan Date: Tue, 29 Oct 2024 18:49:01 -0400 Subject: [PATCH 3/5] Update script.rpy removed jump --- BytesOfLove/game/script.rpy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BytesOfLove/game/script.rpy b/BytesOfLove/game/script.rpy index 49a9d5c..abf2b27 100644 --- a/BytesOfLove/game/script.rpy +++ b/BytesOfLove/game/script.rpy @@ -248,6 +248,6 @@ label start: "Your name is [mc]." #jump w1_d1_LunchApology - jump w0_d2 + jump w0_d1 From 30ea2cc460d876bce44dbf2dd55d5b29bcbf90b7 Mon Sep 17 00:00:00 2001 From: nickv779 <99559784+nickv779@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:56:47 -0500 Subject: [PATCH 4/5] Delete BytesOfLove/game/scripts/.vscode/settings.json removing the vs code file --- BytesOfLove/game/scripts/.vscode/settings.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 BytesOfLove/game/scripts/.vscode/settings.json diff --git a/BytesOfLove/game/scripts/.vscode/settings.json b/BytesOfLove/game/scripts/.vscode/settings.json deleted file mode 100644 index e69de29..0000000 From e2e90f075209e9de184b3b9ebb4188f0f0718251 Mon Sep 17 00:00:00 2001 From: nickv779 <99559784+nickv779@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:57:16 -0500 Subject: [PATCH 5/5] Delete .vscode/settings.json --- .vscode/settings.json | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 46ebd25..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "files.exclude": { - "**/*.rpyc": true, - "**/*.rpa": true, - "**/*.rpymc": true, - "**/cache/": true - } -} \ No newline at end of file