Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dynamic Affection change #171 #179

Merged
merged 3 commits into from
Feb 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions BytesOfLove/game/script.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ define dc = Character("Director of Computing College", color="#10436b")
define pe = Character("Perl", color="5c5f5d")
define bsl = Character("Breakout Session Leader", color="5c5f5d")

#Affection change
define affection_change = 2

#Rust
image rust_normal = "Rust/Rust_Base_1.png"
image rust_talk = "Rust/Rust_Base_2.png"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ label w0_d1_DoorDash:
mc "\"Whatever, at least you finally got here.\""

"Tip the driver":
$ pe_rep = reputation(pe_rep, 2)
$ pe_rep = reputation(pe_rep, affection_change)
$ byte = bytecoin(byte, -35)
u "\"Your total is 30 Bytecoin.\""
mc "{i}*Hands over 35 Bytecoin*{/i}"
Expand All @@ -28,7 +28,7 @@ label w0_d1_DoorDash:
mc "{i}*Closes the door*{/i}"

"Don't tip the driver":
$ pe_rep = reputation(pe_rep, -2)
$ pe_rep = reputation(pe_rep, -affection_change)
$ byte = bytecoin(byte, -30)
u "\"Your total is 30 Bytecoin.\""
mc "{i}*Hands over 30 Bytecoin with no tip*{/i}"
Expand Down
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you missed a reputation changed in the "Be nice" branch of this, add it and the pr is lgtm.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made the change

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ label w0_d1_VendingMachine:
menu w0_d1_Rust:
"Be mean":

$ r_rep = reputation(r_rep, -2)
$ r_rep = reputation(r_rep, -affection_change)
mc "\"Yeah, I do, my name is [mc].\""
hide rust_normal
show rust_talk at right
Expand All @@ -38,7 +38,7 @@ label w0_d1_VendingMachine:
"{i}*Rust leaves*{/i}"

"Be nice":
$ r_rep = reputation(r_rep, 2)
$ r_rep = reputation(r_rep, affection_change)

hide rust_talk
show rust_normal at right
Expand Down
12 changes: 6 additions & 6 deletions BytesOfLove/game/scripts/orientation/w0_d2.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ label w0_d2:
"Make up excuse(s)":
hide cpp_talk
show cpp_normal
$ p_rep = reputation(r_rep, -1)
$ js_rep = reputation(r_rep, -1)
$ c_rep = reputation(r_rep, -1)
$ p_rep = reputation(r_rep, int(-affection_change * 0.5))
$ js_rep = reputation(r_rep, int(-affection_change * 0.5))
$ c_rep = reputation(r_rep, int(-affection_change * 0.5))
mc "\"So, I was about to get in my car this morning, when suddenly I heard a faint meow.\""
mc "\"Looking up, I was able to see a cat 20 feet up the tree.\""
mc "\"I had to help this cat get down, so I climbed the tree.\""
Expand Down Expand Up @@ -206,7 +206,7 @@ label w0_d2:
# Another short interaction not worth seperating files. Temporarily named everything "Respond to X" since I didnt know what to put - Lazzy
menu w0_d2_BreakoutResponse1:
"Respond to Javascript":
$ js_rep = reputation(js_rep, 2)
$ js_rep = reputation(js_rep, affection_change)
mc "\"Yeah, it is pretty annoying that your mom won’t leave you alone.\""
mc "\"Parents can be so annoying.\""
mc "\"I wish my mom had cared enough to come with me to orientation though.\""
Expand All @@ -217,7 +217,7 @@ label w0_d2:
show js_normal at left

"Respond to Python":
$ p_rep = reputation(p_rep, 2)
$ p_rep = reputation(p_rep, affection_change)
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.\""
Expand All @@ -228,7 +228,7 @@ label w0_d2:
show python_pocket at right

"Respond to C++":
$ c_rep = reputation(c_rep, 3)
$ c_rep = reputation(c_rep, int(affection_change * 1.5))
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.\""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ label w0_d2_LunchApology:
mc "\"Hey guys, about what happened on the campus tour...\""

"Apologize and smooth things over":
$ c_rep = reputation(c_rep, 2)
$ p_rep = reputation(p_rep, 2)
$ js_rep = reputation(js_rep, 2)
$ c_rep = reputation(c_rep, affection_change)
$ p_rep = reputation(p_rep, affection_change)
$ js_rep = reputation(js_rep, affection_change)
mc "\"I just want to apologize one more time for what happened.\""
mc "\"I think that we could all be good friends.\""
mc "\"And I am excited to get to know you guys better in the future.\""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
label w0_d2_LunchFlirt:
menu w0_d2_LunchFlirtC:
"Flirt with Python":
$ p_rep = reputation(p_rep, -2)
$ p_rep = reputation(p_rep, -affection_change)
mc "\"Especially you Python.\""
mc "{i}Winks{/i}"
hide python_pocket
Expand All @@ -16,7 +16,7 @@ label w0_d2_LunchFlirt:
hide cpp_talk
show cpp_normal at right
"Flirt with C++":
$ c_rep = reputation(c_rep, -2)
$ c_rep = reputation(c_rep, -affection_change)
mc "\"Especially you C++.\""
mc "{i}Winks{/i}"
hide cpp_normal
Expand All @@ -32,7 +32,7 @@ label w0_d2_LunchFlirt:
show js_normal

"Flirt with JavaScript":
$ js_rep = reputation(js_rep, -2)
$ js_rep = reputation(js_rep, -affection_change)
mc "\"Especially you JavaScript.\""
mc "{i}Winks{/i}"
hide js_normal
Expand All @@ -48,9 +48,9 @@ label w0_d2_LunchFlirt:
show cpp_normal at right

"Everyone":
$ p_rep = reputation(p_rep, -6)
$ js_rep = reputation(js_rep, -6)
$ c_rep = reputation(c_rep, -6)
$ p_rep = reputation(p_rep, -affection_change *3)
$ js_rep = reputation(js_rep, -affection_change * 3)
$ c_rep = reputation(c_rep, -affection_change * 3)
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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
label w0_d2_StatueC:
$ c_rep = reputation(c_rep, 2)
$ p_rep = reputation(p_rep, -2)
$ js_rep = reputation(js_rep, -2)
$ c_rep = reputation(c_rep, affection_change)
$ p_rep = reputation(p_rep, -affection_change)
$ js_rep = reputation(js_rep, -affection_change)
hide python_pocket_happy
show python_angry at left
hide cpp_talk
Expand Down Expand Up @@ -36,7 +36,7 @@ label w0_d2_StatueC:
c "\"Hm, so you don’t think I’m cute?\""

"Admit C++ is cute":
$ c_rep = reputation(c_rep, 2)
$ c_rep = reputation(c_rep, affection_change)
hide cpp_talk
show cpp_normal
mc "{i}Flustered{/i}"
Expand Down Expand Up @@ -73,7 +73,7 @@ label w0_d2_StatueC:
show cpp_angry

"Call out C++":
$ c_rep = reputation(c_rep, -2)
$ c_rep = reputation(c_rep, -affection_change)
hide cpp_talk
show cpp_normal
mc "\"Don’t go fishing for a compliment just because I agreed with you...\""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
label w0_d2_StatueDB:
$ c_rep = reputation(c_rep, -2)
$ p_rep = reputation(p_rep, -2)
$ js_rep = reputation(js_rep, -2)
$ c_rep = reputation(c_rep, -affection_change)
$ p_rep = reputation(p_rep, -affection_change)
$ js_rep = reputation(js_rep, -affection_change)
hide python_pocket_happy
show python_pocket at left
hide cpp_talk
Expand Down Expand Up @@ -62,9 +62,9 @@ label w0_d2_StatueDBContinue:
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)
$ c_rep = reputation(c_rep, -affection_change)
$ p_rep = reputation(p_rep, -affection_change)
$ js_rep = reputation(js_rep, -affection_change)
hide python_angry_talk
show python_angry at left
mc "\"No way! I don’t think that! That’s crazy! I mean-\""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
label w0_d2_StatueJS:
$ p_rep = reputation(p_rep, 2)
$ js_rep = reputation(js_rep, 2)
$ c_rep = reputation(c_rep, -2)
$ p_rep = reputation(p_rep, affection_change)
$ js_rep = reputation(js_rep, affection_change)
$ c_rep = reputation(c_rep, -affection_change)
hide js_talk
show js_normal at right
hide python_pocket_happy
Expand Down Expand Up @@ -47,7 +47,7 @@ label w0_d2_StatueJS:
js "\"Hm, so do you think I’m cute?\""

"Admit JavaScript is cute":
$ js_rep = reputation(js_rep, 2)
$ js_rep = reputation(js_rep, affection_change)
mc "{i}Flustered{/i}"
mc "\"Well... that’s not exactly what I was saying...\""
mc "\"But, I do think you’re kind of cute.\""
Expand Down Expand Up @@ -75,7 +75,7 @@ label w0_d2_StatueJS:
mc "\"Woah, I’m not superficial, I just think--\""

"Call out JavaScript":
$ js_rep = reputation(js_rep, -2)
$ js_rep = reputation(js_rep, -affection_change)
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.\""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ label w0_d2_StatueSexist:
"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)
$ p_rep = reputation(p_rep, -affection_change * 2)
$ js_rep = reputation(js_rep, -affection_change * 2)
$ c_rep = reputation(c_rep, -affection_change * 2)
mc "\"Look sweetheart, I don’t need your help here.\""
hide python_angry
show python_angry_talk at left
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ label w0_d3_JSGeology:
js "\"He {i}rocks{i}?\""

"Laugh at the joke":
$ js_rep = reputation(js_rep,2)
$ js_rep = reputation(js_rep,affection_change)

mc "{i}*Laughs*{/i} \"Why have I never thought of that?\""
mc "\"You’re really funny, you know that?\""
Expand All @@ -73,7 +73,7 @@ label w0_d3_JSGeology:
show js_normal

"Don't laugh at the joke":
$ js_rep = reputation(js_rep,-2)
$ js_rep = reputation(js_rep,-affection_change)

hide js_smirk
show js_angry
Expand Down Expand Up @@ -124,7 +124,7 @@ label w0_d3_JSGeology:
js "\"Ah, I would but I am pretty committed to watching One Piece right now.\""

"One Piece? I prefer two piece swimsuits":
$ js_rep = reputation(js_rep,-2)
$ js_rep = reputation(js_rep,-affection_change)

hide js_talk
show js_angry
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
label w0_d3_JSWomenSuffrage:
$ js_rep = reputation(js_rep,-2)
$ js_rep = reputation(js_rep,-affection_change)

hide js_talk
show js_normal
Expand Down Expand Up @@ -36,8 +36,8 @@ label w0_d3_JSWomenSuffrage:
c "\"You are really saying that you don’t want women to vote.\""

"Double Down":
$ js_rep = reputation(js_rep,-2)
$ c_rep = reputation(c_rep,-2)
$ js_rep = reputation(js_rep,-affection_change)
$ c_rep = reputation(c_rep,-affection_change)

hide cpp_angry_talk
show cpp_angry at right
Expand All @@ -48,7 +48,7 @@ label w0_d3_JSWomenSuffrage:
mc "\"And you know what else? I think that-\""

"Admit your mistake":
$ js_rep = reputation(js_rep,2)
$ js_rep = reputation(js_rep,affection_change)

hide cpp_angry_talk
show cpp_angry at right
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ label w0_d3_JSWomenTennis:
js "\"Who's your favorite player??\""

"Steffi Graf":
$ js_rep = reputation(js_rep,2)
$ js_rep = reputation(js_rep,affection_change)

hide js_talk
show js_smirk
Expand Down Expand Up @@ -48,7 +48,7 @@ label w0_d3_JSWomenTennis:
mc "\"Sorry!\""

"Billie Jean King":
$ js_rep = reputation(js_rep,2)
$ js_rep = reputation(js_rep,affection_change)

hide js_talk
show js_smirk
Expand Down Expand Up @@ -83,7 +83,7 @@ label w0_d3_JSWomenTennis:
mc "\"Sorry!\""

"Ada Lovelace":
$ js_rep = reputation(js_rep,-2)
$ js_rep = reputation(js_rep,-affection_change)

hide js_talk
show js_normal
Expand Down Expand Up @@ -140,7 +140,7 @@ label w0_d3_JSWomenTennis:
mc "\"Hm, I definitely can see why you would think that...\""

"Allow me to explain what actually happened":
$ js_rep = reputation(js_rep,-2)
$ js_rep = reputation(js_rep,-affection_change)

mc "\"But, allow me to explain what actually happened...\""
mc "\"...\""
Expand All @@ -160,7 +160,7 @@ label w0_d3_JSWomenTennis:
show cpp_angry at right

"I'm sorry for lying":
$ js_rep = reputation(js_rep,2)
$ js_rep = reputation(js_rep,affection_change)
mc "\"I’m sorry for lying about liking tennis and knowing Ada Lovelace.\""
mc "\"That wasn’t cool of me.\""
mc "\"I just wanted to be able to relate to you since I remembered you liked tennis.\""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ label w0_d3_CppCopy:
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)
$ r_rep = reputation(r_rep, int(affection_change * 0.5))
hide python_pocket_happy
show python_pocket
mc "\"Also, I really like your hair today, it looks good.\""
Expand All @@ -88,7 +88,7 @@ label w0_d3_CppCopy:
hide python_pocket_happy with dissolve

"Give an offensive compliment":
$ r_rep = reputation(r_rep, -1)
$ r_rep = reputation(r_rep, int(-affection_change * 0.5))
hide python_pocket_happy
show python_pocket
mc "\"Anywho…\""
Expand Down
Loading