cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 03:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

move the from belly (#17386)

Browse Source 
* move the from belly

* reactions

* attempt two

* this really needs testing

* .

* clean that up

* also fix that

* make it clear

* .

* .
This commit is contained in:
Kashargul
2025-03-20 15:24:03 +01:00
committed by GitHub
parent ef8454a395
commit 77ac89b2e6
9 changed files with 55 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/eating/belly_obj_liquids.dm
+33 -33
View File
@@ -1,7 +1,7 @@
///////////////////// NUTRITION REAGENT PRODUCTION /////////////////
/obj/belly/proc/HandleBellyReagents()
if(show_liquids && reagentbellymode && reagent_mode_flags & DM_FLAG_REAGENTSNUTRI && reagents.total_volume < custom_max_volume && !isnewplayer(owner)) //Removed if(reagentbellymode == TRUE) since that's less optimized
if(show_liquids && reagentbellymode && reagent_mode_flags & DM_FLAG_REAGENTSNUTRI && reagents.total_volume < custom_max_volume && !isnewplayer(owner))
if(isrobot(owner))
var/mob/living/silicon/robot/R = owner
if(R.cell && R.cell.charge >= gen_cost*10 && gen_interval >= gen_time)
@@ -53,7 +53,7 @@
else
owner.nutrition -= gen_cost
for(var/reagent in generated_reagents)
reagents.add_reagent(reagent, generated_reagents[reagent])
reagents.add_reagent(reagent, generated_reagents[reagent], was_from_belly = TRUE)
if(count_liquid_for_sprite)
owner.handle_belly_update() //This is run whenever a belly's contents are changed.
if(LAZYLEN(belly_surrounding))
@@ -64,7 +64,7 @@
/obj/belly/proc/GenerateBellyReagents_digesting() //The rate isnt based on selected reagent, due to the fact that the price of the reagent is already paid by nutrient not gained.
if(reagents.total_volume + (digest_nutri_gain * gen_amount) <= custom_max_volume) //By default a reagent with an amount of 1 should result in pred getting 100 units from a full health prey
for(var/reagent in generated_reagents)
reagents.add_reagent(reagent, generated_reagents[reagent] * digest_nutri_gain / gen_cost)
reagents.add_reagent(reagent, generated_reagents[reagent] * digest_nutri_gain / gen_cost, was_from_belly = TRUE)
else
owner_adjust_nutrition(digest_nutri_gain * owner.get_digestion_efficiency_modifier())
digest_nutri_gain = 0
@@ -72,10 +72,10 @@
/obj/belly/proc/GenerateBellyReagents_digested()
if(reagents.total_volume <= custom_max_volume - 25 * gen_amount)
for(var/reagent in generated_reagents)
reagents.add_reagent(reagent, generated_reagents[reagent] * 25)
reagents.add_reagent(reagent, generated_reagents[reagent] * 25, was_from_belly = TRUE)
else
for(var/reagent in generated_reagents)
reagents.add_reagent(reagent, generated_reagents[reagent] / gen_amount * (custom_max_volume - reagents.total_volume))
reagents.add_reagent(reagent, generated_reagents[reagent] / gen_amount * (custom_max_volume - reagents.total_volume), was_from_belly = TRUE)
digest_nutri_gain = 0
//////////////////////////// REAGENT_ABSORB ////////////////////////
@@ -83,18 +83,18 @@
/obj/belly/proc/GenerateBellyReagents_absorbing()
if(reagents.total_volume <= custom_max_volume - 1.5 * gen_amount) //Going for 1.5 amount of reagent per cycle, can be adjusted in future if need adjustments
for(var/reagent in generated_reagents)
reagents.add_reagent(reagent, generated_reagents[reagent] * 1.5)
reagents.add_reagent(reagent, generated_reagents[reagent] * 1.5, was_from_belly = TRUE)
else
for(var/reagent in generated_reagents)
reagents.add_reagent(reagent, generated_reagents[reagent] / gen_amount * (custom_max_volume - reagents.total_volume))
reagents.add_reagent(reagent, generated_reagents[reagent] / gen_amount * (custom_max_volume - reagents.total_volume), was_from_belly = TRUE)
/obj/belly/proc/GenerateBellyReagents_absorbed()
if(reagents.total_volume <= custom_max_volume - 25 * gen_amount) //Going for 25 amount of reagent for absorbing the prey, can be adjusted in future if need adjustments
for(var/reagent in generated_reagents)
reagents.add_reagent(reagent, generated_reagents[reagent] * 10)
reagents.add_reagent(reagent, generated_reagents[reagent] * 10, was_from_belly = TRUE)
else
for(var/reagent in generated_reagents)
reagents.add_reagent(reagent, generated_reagents[reagent] / gen_amount * (custom_max_volume - reagents.total_volume))
reagents.add_reagent(reagent, generated_reagents[reagent] / gen_amount * (custom_max_volume - reagents.total_volume), was_from_belly = TRUE)
//////////////////////////// REAGENT_DRAIN ///////////////////////// //Currently not needed, maybe later a specific proc for drain needs to be made - Jack
@@ -110,100 +110,100 @@
our_reagents.Add(lowertext(entry))
switch(reagent_chosen)
if(REAGENT_WATER)
generated_reagents = list(REAGENT_ID_WATER_BELLY = 1)
generated_reagents = list(REAGENT_ID_WATER = 1)
if(reagent_name in our_reagents)
reagent_name = lowertext(REAGENT_WATER)
gen_amount = 1
gen_cost = 1
reagentid = REAGENT_ID_WATER_BELLY
reagentid = REAGENT_ID_WATER
reagentcolor = "#0064C877"
if(REAGENT_MILK)
generated_reagents = list(REAGENT_ID_MILK_BELLY = 1)
generated_reagents = list(REAGENT_ID_MILK = 1)
if(reagent_name in our_reagents)
reagent_name = lowertext(REAGENT_MILK)
gen_amount = 1
gen_cost = 5
reagentid = REAGENT_ID_MILK_BELLY
reagentid = REAGENT_ID_MILK
reagentcolor = "#DFDFDF"
if(REAGENT_CREAM)
generated_reagents = list(REAGENT_ID_CREAM_BELLY = 1)
generated_reagents = list(REAGENT_ID_CREAM = 1)
if(reagent_name in our_reagents)
reagent_name = lowertext(REAGENT_CREAM)
gen_amount = 1
gen_cost = 5
reagentid = REAGENT_ID_CREAM_BELLY
reagentid = REAGENT_ID_CREAM
reagentcolor = "#DFD7AF"
if(REAGENT_HONEY)
generated_reagents = list(REAGENT_ID_HONEY_BELLY = 1)
generated_reagents = list(REAGENT_ID_HONEY = 1)
if(reagent_name in our_reagents)
reagent_name = lowertext(REAGENT_HONEY)
gen_amount = 1
gen_cost = 10
reagentid = REAGENT_ID_HONEY_BELLY
reagentid = REAGENT_ID_HONEY
reagentcolor = "#FFFF00"
if(REAGENT_CHERRYJELLY) //Kinda WIP, allows slime like folks something to stuff others with, should make a generic jelly in future
generated_reagents = list(REAGENT_ID_CHERRYJELLY_BELLY = 1)
generated_reagents = list(REAGENT_ID_CHERRYJELLY = 1)
if(reagent_name in our_reagents)
reagent_name = lowertext(REAGENT_CHERRYJELLY)
gen_amount = 1
gen_cost = 10
reagentid = REAGENT_ID_CHERRYJELLY_BELLY
reagentid = REAGENT_ID_CHERRYJELLY
reagentcolor = "#801E28"
if(REAGENT_STOMACID)
generated_reagents = list(REAGENT_ID_STOMACID_BELLY = 1)
generated_reagents = list(REAGENT_ID_STOMACID = 1)
if(reagent_name in our_reagents)
reagent_name = lowertext(REAGENT_STOMACID)
gen_amount = 1
gen_cost = 1
reagentid = REAGENT_ID_STOMACID_BELLY
reagentid = REAGENT_ID_STOMACID
reagentcolor = "#664330"
if(REAGENT_DIETSTOMACID)
generated_reagents = list(REAGENT_ID_DIETSTOMACID_BELLY = 1)
generated_reagents = list(REAGENT_ID_DIETSTOMACID = 1)
if(reagent_name in our_reagents)
reagent_name = lowertext(REAGENT_DIETSTOMACID)
gen_amount = 1
gen_cost = 1
reagentid = REAGENT_ID_DIETSTOMACID_BELLY
reagentid = REAGENT_ID_DIETSTOMACID
reagentcolor = "#664330"
if(REAGENT_CLEANER)
generated_reagents = list(REAGENT_ID_CLEANER_BELLY = 1)
generated_reagents = list(REAGENT_ID_CLEANER = 1)
if(reagent_name in our_reagents)
reagent_name = lowertext(REAGENT_CLEANER)
gen_amount = 1
gen_cost = 10
reagentid = REAGENT_ID_CLEANER_BELLY
reagentid = REAGENT_ID_CLEANER
reagentcolor = "#A5F0EE"
if(REAGENT_LUBE)
generated_reagents = list(REAGENT_ID_LUBE_BELLY = 1)
generated_reagents = list(REAGENT_ID_LUBE = 1)
if(reagent_name in our_reagents)
reagent_name = lowertext(REAGENT_LUBE)
gen_amount = 1
gen_cost = 10
reagentid = REAGENT_ID_LUBE_BELLY
reagentid = REAGENT_ID_LUBE
reagentcolor = "#009CA8"
if(REAGENT_BIOMASS)
generated_reagents = list(REAGENT_ID_BIOMASS_BELLY = 1)
generated_reagents = list(REAGENT_ID_BIOMASS = 1)
if(reagent_name in our_reagents)
reagent_name = lowertext(REAGENT_BIOMASS)
gen_amount = 1
gen_cost = 10
reagentid = REAGENT_ID_BIOMASS_BELLY
reagentid = REAGENT_ID_BIOMASS
reagentcolor = "#DF9FBF"
if(REAGENT_CONCENTRATEDRADIUM)
generated_reagents = list(REAGENT_ID_CONCENTRATEDRADIUM_BELLY = 1)
generated_reagents = list(REAGENT_ID_CONCENTRATEDRADIUM = 1)
if(reagent_name in our_reagents)
reagent_name = lowertext(REAGENT_CONCENTRATEDRADIUM)
gen_amount = 1
gen_cost = 1
reagentid = REAGENT_ID_CONCENTRATEDRADIUM_BELLY
reagentid = REAGENT_ID_CONCENTRATEDRADIUM
reagentcolor = "#C7C7C7"
if(REAGENT_TRICORDRAZINE)
generated_reagents = list(REAGENT_ID_TRICORDRAZINE_BELLY = 1)
generated_reagents = list(REAGENT_ID_TRICORDRAZINE = 1)
if(reagent_name in our_reagents)
reagent_name = lowertext(REAGENT_TRICORDRAZINE)
gen_amount = 1
gen_cost = 10
reagentid = REAGENT_ID_TRICORDRAZINE_BELLY
reagentid = REAGENT_ID_TRICORDRAZINE
reagentcolor = "#8040FF"
is_beneficial = TRUE