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.

Sign up for GitHub

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

Jump to bottom

Adding species-level flavours and refactoring how reagent flavour is handled. #9107

Merged
merged 4 commits into from
Aug 30, 2023
Merged

Adding species-level flavours and refactoring how reagent flavour is handled. #9107

merged 4 commits into from
Aug 30, 2023

Conversation

MistakeNot4892
Copy link
Contributor

@MistakeNot4892 MistakeNot4892 commented May 27, 2023 •
edited
Loading

  • Makes nutriment_desc and taste_description both write to a field of reagent data, and then clear themselves.
  • Encodes mixed taste data to JSON and only decodes when necessary for mixing or displaying taste information to a user.
  • Allows taste strings to be set up as associative lists with species names for per-species taste information.
  • Updates many strings to have Teshari-specific lines, as the original goal of this monstrosity was just letting Tesh not taste sweet things.

@Atermonera Atermonera closed this May 28, 2023
@Atermonera
Copy link
Contributor

Wait that's the wrong button

@Atermonera Atermonera reopened this May 28, 2023
@MistakeNot4892 MistakeNot4892 force-pushed the birdflavours branch 5 times, most recently from 4bed0e8 to 76195fd Compare July 19, 2023 11:44
@MistakeNot4892 MistakeNot4892 marked this pull request as ready for review July 19, 2023 12:04
@MistakeNot4892
Copy link
Contributor Author

MistakeNot4892 commented Jul 19, 2023 •
edited
Loading

Alright so I'm honestly a bit uncertain about this one.

  • This effectively guarantees that all /datum/reagent instances have a list for data. Previously it was lazylisted. Conversely it also strips the lists out of taste strings so it might come out the same roughly?
  • It involves a LOT of JSON encoding and decoding when reagents with taste are moving around or being processed. I think it should be profiled on live to check how it actually pans out before considering a final merge.
  • It might be slightly over-engineered for a system intended to just let you make something taste different for birds.
  • It also seems like the reagent grinder does not properly mix data when you grind multiple reagents - I don't think this is a bug I introduced. Data mixes properly if you grind them separately and pour them into the same beaker.

This is ready for review otherwise.

@Cerebulon
Copy link
Contributor

The taste strings you have changed seem fine, but it seems like for Drinks you made "spicy" things taste different while for Food you only changed sweet things and left spicy things spicy. I don't mind either way, but it should probably be consistent tasting/not tasting Spice unless it was meant to just be differing interpretations of "strong alcohol" in which case hot noodles (drink) is an outlier.

@MistakeNot4892
Copy link
Contributor Author

Per Discord, could you confirm you would like the spicy stuff rolled back or expanded? I'm not sure where it ended up sitting.

@Atermonera Atermonera added Lore This change affects the server's lore and setting. Quality of Life [PR] This improves user experience somehow. labels Jul 23, 2023
@Cerebulon
Copy link
Contributor

Proceed With The Spicelessness

Atermonera
Atermonera previously approved these changes Jul 23, 2023
View reviewed changes
Spookerton
Spookerton requested changes Aug 30, 2023
View reviewed changes
code/modules/projectiles/projectile/arc.dm Outdated
@@ -191,7 +191,7 @@
var/obj/effect/vfx/water/splash = new(T)
splash.create_reagents(15)
splash.reagents.add_reagent("stomacid", 5)
splash.reagents.add_reagent("blood", 10,list("blood_colour" = "#ec4940"))
splash.reagents.add_reagent("blood", 10,TASTE_DATA(list("blood_colour" = "#ec4940")))
Copy link
Member

Choose a reason for hiding this comment

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

taste data?

code/modules/reagents/reagent_containers/blood_pack.dm Outdated
@@ -36,7 +36,7 @@
if(blood_type != null)
label_text = "[blood_type]"
update_iv_label()
reagents.add_reagent(reag_id, 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
reagents.add_reagent(reag_id, 200, TASTE_DATA(list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null)))
Copy link
Member

Choose a reason for hiding this comment

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

taste data?

code/modules/xenoarcheaology/effects/sweating_reagents.dm Outdated
@@ -29,7 +29,7 @@
spawn()
var/obj/effect/vfx/water/splash = new(T)
splash.create_reagents(15)
splash.reagents.add_reagent("blood", 10, list("blood_colour" = effect_color))
splash.reagents.add_reagent("blood", 10, TASTE_DATA(list("blood_colour" = effect_color)))
Copy link
Member

Choose a reason for hiding this comment

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

taste data?

@MistakeNot4892
Reworking the taste system to allow for species-level taste definitions.
f01fbaa 
Reworking how data is initialized and handled by reagents.

Post-rebase update for taste PR.

Further work on the taste system.

Updating taste strings. God help me.
@MistakeNot4892
Changing some spiciness descriptions for Tesh.
55fca55
@MistakeNot4892
Converting some direct reagent data stuff to work with the new taste …
c29c31f 
…system.
@MistakeNot4892
Fixing erroneous find and replace TASTE_DATA.
faad7bb
@Spookerton Spookerton merged commit 138e7cd into PolarisSS13:master Aug 30, 2023
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Cerebulon Cerebulon Cerebulon left review comments

@Spookerton Spookerton Spookerton approved these changes

@Atermonera Atermonera Atermonera left review comments

Assignees
No one assigned
Labels
Lore This change affects the server's lore and setting. Quality of Life [PR] This improves user experience somehow.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@MistakeNot4892 @Atermonera @Cerebulon @Spookerton