cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-07-20 04:32:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reworking the taste system to allow for species-level taste definitions.

Browse Source 
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.
This commit is contained in:
MistakeNot4892
2023-05-27 23:36:50 +10:00
parent c8d8d55c29
commit f01fbaa902
15 changed files with 697 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/taste.dm
+15 -13
View File
@@ -23,6 +23,7 @@ calculate text size per text.
*/
/datum/reagents/proc/generate_taste_message(mob/living/carbon/taster = null)
var/minimum_percent = 10
var/taster_species = taster?.get_species_name()
if(ishuman(taster))
var/mob/living/carbon/human/H = taster
minimum_percent = round(10/ (H.isSynthetic() ? TASTE_DULL : H.species.taste_sensitivity))
@@ -33,20 +34,21 @@ calculate text size per text.
for(var/datum/reagent/R in reagent_list)
if(!R.taste_mult)
continue
if(R.type == /datum/reagent/nutriment)
var/list/taste_data = R.get_data()
for(var/taste in taste_data)
if(taste in tastes)
tastes[taste] += taste_data[taste]
else
tastes[taste] = taste_data[taste]
var/list/reagent_data = R.get_taste_data()
if(!reagent_data)
continue
reagent_data = cached_json_decode(reagent_data)
if(!islist(reagent_data) || !length(reagent_data))
continue
var/list/taste_data
if(taster_species in reagent_data)
taste_data = reagent_data[taster_species]
else if(TASTE_STRING_DEFAULT in reagent_data)
taste_data = reagent_data[TASTE_STRING_DEFAULT]
else
var/taste_desc = R.taste_description
var/taste_amount = get_reagent_amount(R.id) * R.taste_mult
if(R.taste_description in tastes)
tastes[taste_desc] += taste_amount
else
tastes[taste_desc] = taste_amount
continue
for(var/taste in taste_data)
tastes[taste] += taste_data[taste]
//deal with percentages
var/total_taste = 0