From 522c4f3290d99748482fa1839ee3e63b01a97090 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Sun, 5 Apr 2026 22:19:09 +0200 Subject: [PATCH] splits up the biogen (#19356) * splits up the biogen * ugh --------- Co-authored-by: Cameron Lennox --- code/game/machinery/biogenerator.dm | 112 ++++---- .../packages/tgui/interfaces/Biogenerator.tsx | 246 ------------------ .../Biogenerator/BiogeneratorItems.tsx | 49 ++++ .../BiogeneratorItemsCategory.tsx | 98 +++++++ .../Biogenerator/BiogeneratorSearch.tsx | 46 ++++ .../tgui/interfaces/Biogenerator/constants.ts | 10 + .../tgui/interfaces/Biogenerator/functions.ts | 12 + .../tgui/interfaces/Biogenerator/index.tsx | 65 +++++ .../tgui/interfaces/Biogenerator/types.ts | 17 ++ .../interfaces/SpawnPanel/CreateObject.tsx | 3 + 10 files changed, 357 insertions(+), 301 deletions(-) delete mode 100644 tgui/packages/tgui/interfaces/Biogenerator.tsx create mode 100644 tgui/packages/tgui/interfaces/Biogenerator/BiogeneratorItems.tsx create mode 100644 tgui/packages/tgui/interfaces/Biogenerator/BiogeneratorItemsCategory.tsx create mode 100644 tgui/packages/tgui/interfaces/Biogenerator/BiogeneratorSearch.tsx create mode 100644 tgui/packages/tgui/interfaces/Biogenerator/constants.ts create mode 100644 tgui/packages/tgui/interfaces/Biogenerator/functions.ts create mode 100644 tgui/packages/tgui/interfaces/Biogenerator/index.tsx create mode 100644 tgui/packages/tgui/interfaces/Biogenerator/types.ts diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index fe7eb1f5a90..ff3dac7d684 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -1,14 +1,14 @@ // Use this define to register something as a creatable! // * n - The proper name of the purchasable // * o - The object type path of the purchasable to spawn -// * r - The amount to dispense +// * r - The maximum amount to dispense // * p - The price of the purchasable in biomass #define BIOGEN_ITEM(n, o, r, p) n = new /datum/data/biogenerator_item(n, o, r, p) // Use this define to register something as dispensable // * n - The proper name of the purchasable // * o - The reagent ID -// * r - The amount of reagent to dispense +// * r - The maximum amount to dispense // * p - The price of the purchasable in biomass #define BIOGEN_REAGENT(n, o, r, p) n = new /datum/data/biogenerator_reagent(n, o, r, p) @@ -64,26 +64,19 @@ item_list = list() item_list["Food Items"] = list( - BIOGEN_REAGENT("Milk x10", REAGENT_ID_MILK, 10, 20), - BIOGEN_REAGENT("Milk x50", REAGENT_ID_MILK, 50, 95), - BIOGEN_REAGENT("Cream x10", REAGENT_ID_CREAM, 10, 30), - BIOGEN_REAGENT("Cream x50", REAGENT_ID_CREAM, 50, 120), - BIOGEN_ITEM("Slab of meat", /obj/item/reagent_containers/food/snacks/meat, 1, 50), - BIOGEN_ITEM("Slabs of meat x5", /obj/item/reagent_containers/food/snacks/meat, 5, 250), + BIOGEN_REAGENT("Milk", REAGENT_ID_MILK, 50, 20), + BIOGEN_REAGENT("Cream", REAGENT_ID_CREAM, 50, 30), + BIOGEN_ITEM("Slab of meat", /obj/item/reagent_containers/food/snacks/meat, 5, 50), + BIOGEN_ITEM("Algae Sheets", /obj/item/stack/material/algae, 50, 100), ) item_list["Cooking Ingredients"] = list( - BIOGEN_REAGENT("Universal Enzyme x10", REAGENT_ID_ENZYME, 10, 30), - BIOGEN_REAGENT("Universal Enzyme x50", REAGENT_ID_ENZYME, 50, 120), - BIOGEN_ITEM("Nutri-spread", /obj/item/reagent_containers/food/snacks/spreads, 1, 30), - BIOGEN_ITEM("Nutri-spread x5", /obj/item/reagent_containers/food/snacks/spreads, 5, 120), + BIOGEN_REAGENT("Universal Enzyme", REAGENT_ID_ENZYME, 50, 30), + BIOGEN_ITEM("Nutri-spread", /obj/item/reagent_containers/food/snacks/spreads, 5, 30), ) item_list["Gardening Nutrients"] = list( - BIOGEN_ITEM("E-Z-Nutrient", /obj/item/reagent_containers/glass/bottle/eznutrient, 1, 60), - BIOGEN_ITEM("E-Z-Nutrient x5", /obj/item/reagent_containers/glass/bottle/eznutrient, 5, 300), - BIOGEN_ITEM("Left 4 Zed", /obj/item/reagent_containers/glass/bottle/left4zed, 1, 120), - BIOGEN_ITEM("Left 4 Zed x5", /obj/item/reagent_containers/glass/bottle/left4zed, 5, 600), - BIOGEN_ITEM("Robust Harvest", /obj/item/reagent_containers/glass/bottle/robustharvest, 1, 150), - BIOGEN_ITEM("Robust Harvest x5", /obj/item/reagent_containers/glass/bottle/robustharvest, 5, 750), + BIOGEN_ITEM("E-Z-Nutrient", /obj/item/reagent_containers/glass/bottle/eznutrient, 5, 60), + BIOGEN_ITEM("Left 4 Zed", /obj/item/reagent_containers/glass/bottle/left4zed, 5, 120), + BIOGEN_ITEM("Robust Harvest", /obj/item/reagent_containers/glass/bottle/robustharvest, 5, 150), ) item_list["Leather Products"] = list( BIOGEN_ITEM("Wallet", /obj/item/storage/wallet, 1, 100), @@ -99,21 +92,23 @@ BIOGEN_ITEM("Leather Coat", /obj/item/clothing/suit/leathercoat, 1, 500), BIOGEN_ITEM("Leather Jacket", /obj/item/clothing/suit/storage/toggle/brown_jacket, 1, 500), BIOGEN_ITEM("Winter Coat", /obj/item/clothing/suit/storage/hooded/wintercoat, 1, 500), - //VOREStation Edit - Algae for oxygen generator - BIOGEN_ITEM("Algae Sheets x4", /obj/item/stack/material/algae, 4, 400), - BIOGEN_ITEM("Algae Sheets x50", /obj/item/stack/material/algae, 50, 5000), ) /obj/machinery/biogenerator/tgui_static_data(mob/user) - var/list/static_data[0] + var/list/static_data = list() // Available items - in static data because we don't wanna compute this list every time! It hardly changes. static_data["items"] = list() for(var/cat in item_list) var/list/cat_items = list() - for(var/prize_name in item_list[cat]) - var/datum/data/biogenerator_reagent/prize = item_list[cat][prize_name] - cat_items[prize_name] = list("name" = prize_name, "price" = prize.cost, "reagent" = istype(prize)) + for(var/prize_name, value in item_list[cat]) + if(istype(value, /datum/data/biogenerator_item)) + var/datum/data/biogenerator_item/cat_item = value + cat_items[prize_name] = list("name" = prize_name, "price" = cat_item.cost, "max_amount" = cat_item.equipment_amt) + continue + var/datum/data/biogenerator_reagent/cat_reag = value + cat_items[prize_name] = list("name" = prize_name, "price" = cat_reag.cost, "max_amount" = cat_reag.reagent_amt, "reagent" = TRUE) + static_data["items"][cat] = cat_items return static_data @@ -136,13 +131,13 @@ ui.open() /obj/machinery/biogenerator/tgui_act(action, params, datum/tgui/ui) - if(..()) + . = ..() + if(.) return - . = TRUE switch(action) if("activate") - INVOKE_ASYNC(src, PROC_REF(activate), ui.user) + activate(ui.user) return TRUE if("detach") if(beaker) @@ -153,47 +148,52 @@ if("purchase") var/category = params["cat"] // meow var/name = params["name"] + var/amount = params["amount"] - if(!(category in item_list) || !(name in item_list[category])) // Not trying something that's not in the list, are you? - return + if(!(category in item_list) || !(name in item_list[category]) || !isnum(amount)) // Not trying something that's not in the list, are you? + return FALSE var/datum/data/biogenerator_item/bi = item_list[category][name] + if(!istype(bi)) var/datum/data/biogenerator_reagent/br = item_list[category][name] if(!istype(br)) - return + return FALSE if(!beaker) - return - var/cost = round(br.cost / build_eff) + return FALSE + if(amount <= 0 || amount > br.reagent_amt) + return FALSE + var/cost = round(br.cost / build_eff) * amount if(cost > points) to_chat(ui.user, span_danger("Insufficient biomass.")) - return - var/amt_to_actually_dispense = round(min(beaker.reagents.get_free_space(), br.reagent_amt)) + return FALSE + var/amt_to_actually_dispense = round(min(beaker.reagents.get_free_space(), br.reagent_amt)) * amount if(amt_to_actually_dispense <= 0) to_chat(ui.user, span_danger("The loaded beaker is full!")) - return + return FALSE points -= (cost * (amt_to_actually_dispense / br.reagent_amt)) beaker.reagents.add_reagent(br.reagent_id, amt_to_actually_dispense) playsound(src, 'sound/machines/reagent_dispense.ogg', 25, 1) - return + return FALSE + + if(amount <= 0 || amount > bi.equipment_amt) + return FALSE var/cost = round(bi.cost / build_eff) if(cost > points) to_chat(ui.user, span_danger("Insufficient biomass.")) - return + return FALSE - points -= cost + points -= cost * amount if(ispath(bi.equipment_path, /obj/item/stack)) - new bi.equipment_path(loc, bi.equipment_amt) + new bi.equipment_path(loc, amount) playsound(src, 'sound/machines/vending/vending_drop.ogg', 100, 1) return TRUE - for(var/i in 1 to bi.equipment_amt) + for(var/i in 1 to amount) new bi.equipment_path(loc) playsound(src, 'sound/machines/vending/vending_drop.ogg', 100, 1) return TRUE - else - return FALSE /obj/machinery/biogenerator/on_reagent_change() //When the reagents change, change the icon as well. update_icon() @@ -277,19 +277,21 @@ points += 1 else points += I.reagents.get_reagent_amount(REAGENT_ID_NUTRIMENT) * 10 * eat_eff qdel(I) - if(S) - processing = 1 - update_icon() - playsound(src, 'sound/machines/blender.ogg', 40, 1) - use_power(S * 30) - sleep((S + 15) / eat_eff) - processing = 0 - SStgui.update_uis(src) - playsound(src, 'sound/machines/biogenerator_end.ogg', 40, 1) - update_icon() - else + if(!S) to_chat(user, span_warning("Error: No growns inside. Please insert growns.")) - return + return + + processing = 1 + update_icon() + playsound(src, 'sound/machines/blender.ogg', 40, 1) + use_power(S * 30) + addtimer(CALLBACK(src, PROC_REF(finish_processing)), (S + 15) / eat_eff, TIMER_DELETE_ME) + +/obj/machinery/biogenerator/proc/finish_processing() + processing = 0 + SStgui.update_uis(src) + playsound(src, 'sound/machines/biogenerator_end.ogg', 40, 1) + update_icon() /obj/machinery/biogenerator/RefreshParts() ..() diff --git a/tgui/packages/tgui/interfaces/Biogenerator.tsx b/tgui/packages/tgui/interfaces/Biogenerator.tsx deleted file mode 100644 index 91187182bf2..00000000000 --- a/tgui/packages/tgui/interfaces/Biogenerator.tsx +++ /dev/null @@ -1,246 +0,0 @@ -import { useState } from 'react'; -import { useBackend } from 'tgui/backend'; -import { Window } from 'tgui/layouts'; -import { - Box, - Button, - Collapsible, - Dropdown, - Input, - Section, - Stack, -} from 'tgui-core/components'; -import type { BooleanLike } from 'tgui-core/react'; -import { createSearch } from 'tgui-core/string'; - -type Sortable = { - name: string; - affordable: number; - price: number; - reagent: BooleanLike; -}; -type Data = { - items: Record; - build_eff: number; - points: number; - processing: BooleanLike; - beaker: boolean; -}; - -const sortTypes = { - Alphabetical: (a: Sortable, b: Sortable) => a.name.localeCompare(b.name), - 'By availability': (a: Sortable, b: Sortable) => - -(a.affordable - b.affordable), - 'By price': (a: Sortable, b: Sortable) => a.price - b.price, -}; - -export const Biogenerator = (props) => { - const { act, data } = useBackend(); - - const { processing, points, beaker } = data; - - const [searchText, setSearchText] = useState(''); - const [sortOrder, setSortOrder] = useState('Alphabetical'); - const [descending, setDescending] = useState(false); - - return ( - - - {(processing && ( -
- The biogenerator is processing reagents! -
- )) || ( - <> -
- {points} points available. - - -
- - - - )} - - - ); -}; - -const BiogeneratorItems = (props: { - searchText: string; - sortOrder: string; - descending: boolean; -}) => { - const { act, data } = useBackend(); - const { points, items = [], build_eff, beaker } = data; - // Search thingies - const searcher = createSearch<[string, Sortable]>( - props.searchText, - (item) => { - return item[0]; - }, - ); - - let has_contents = false; - const contents = Object.entries(items).map((kv) => { - let items_in_cat = Object.entries(kv[1]) - .filter(searcher) - .map((kv2) => { - kv2[1].affordable = +(points >= kv2[1].price / build_eff); - return kv2[1]; - }) - .sort(sortTypes[props.sortOrder]); - if (items_in_cat.length === 0) { - return undefined; - } - if (props.descending) { - items_in_cat = items_in_cat.reverse(); - } - - has_contents = true; - return ( - - ); - }); - return ( - -
- {has_contents ? ( - contents - ) : ( - No items matching your criteria was found! - )} -
- - ); -}; - -const BiogeneratorSearch = (props: { - searchText: string; - sortOrder: string; - descending: boolean; - onSearchText: React.Dispatch>; - onSortOrder: React.Dispatch>; - onDescending: React.Dispatch>; -}) => { - return ( - - - - props.onSearchText(value)} - /> - - - props.onSortOrder(v)} - /> - - - - - - ))} - - ); -}; diff --git a/tgui/packages/tgui/interfaces/Biogenerator/BiogeneratorItems.tsx b/tgui/packages/tgui/interfaces/Biogenerator/BiogeneratorItems.tsx new file mode 100644 index 00000000000..3a97f14d94f --- /dev/null +++ b/tgui/packages/tgui/interfaces/Biogenerator/BiogeneratorItems.tsx @@ -0,0 +1,49 @@ +import { useBackend } from 'tgui/backend'; +import { Section } from 'tgui-core/components'; +import { createSearch } from 'tgui-core/string'; +import { BiogeneratorItemsCategory } from './BiogeneratorItemsCategory'; +import { sortTypes } from './constants'; +import type { Data, Sortable } from './types'; + +export const BiogeneratorItems = (props: { + searchText: string; + sortOrder: string; + descending: boolean; +}) => { + const { act, data } = useBackend(); + const { points, items = [], build_eff, beaker } = data; + // Search thingies + const searcher = createSearch<[string, Sortable]>( + props.searchText, + (item) => { + return item[0]; + }, + ); + + const contents = Object.entries(items).map((kv) => { + let items_in_cat = Object.entries(kv[1]) + .filter(searcher) + .map((kv2) => { + kv2[1].affordable = +(points >= kv2[1].price / build_eff); + return kv2[1]; + }) + .sort(sortTypes[props.sortOrder]); + if (items_in_cat.length === 0) { + return undefined; + } + if (props.descending) { + items_in_cat = items_in_cat.reverse(); + } + + return ( + + ); + }); + return
{contents}
; +}; diff --git a/tgui/packages/tgui/interfaces/Biogenerator/BiogeneratorItemsCategory.tsx b/tgui/packages/tgui/interfaces/Biogenerator/BiogeneratorItemsCategory.tsx new file mode 100644 index 00000000000..734fcec6e60 --- /dev/null +++ b/tgui/packages/tgui/interfaces/Biogenerator/BiogeneratorItemsCategory.tsx @@ -0,0 +1,98 @@ +import { useState } from 'react'; +import { useBackend } from 'tgui/backend'; +import { + Button, + Collapsible, + Slider, + Stack, + Table, +} from 'tgui-core/components'; +import type { BooleanLike } from 'tgui-core/react'; +import { canBuyItem } from './functions'; +import type { Data, Sortable } from './types'; + +export const BiogeneratorItemsCategory = (props: { + title: string; + items: Sortable[]; + build_eff: number; + beaker: BooleanLike; +}) => { + const { title, items, build_eff, beaker } = props; + return ( + + + {items.map((item) => ( + + ))} +
+ + ); +}; + +const BiogeneratorItemsEntry = (props: { + title: string; + item: Sortable; + build_eff: number; + beaker: BooleanLike; +}) => { + const { act, data } = useBackend(); + const [amount, setAmount] = useState(1); + const { title, item, build_eff, beaker } = props; + const { points } = data; + + return ( + + {item.name} + + + {item.max_amount > 1 && ( + + `${val}x`} + onChange={(_, val) => setAmount(val)} + /> + + )} + + + + + + + Price: + + + {`${(item.price / build_eff).toFixed()}`} + + + ); +}; diff --git a/tgui/packages/tgui/interfaces/Biogenerator/BiogeneratorSearch.tsx b/tgui/packages/tgui/interfaces/Biogenerator/BiogeneratorSearch.tsx new file mode 100644 index 00000000000..9e65c54e74e --- /dev/null +++ b/tgui/packages/tgui/interfaces/Biogenerator/BiogeneratorSearch.tsx @@ -0,0 +1,46 @@ +import { Box, Button, Dropdown, Input, Stack } from 'tgui-core/components'; +import { sortTypes } from './constants'; + +export const BiogeneratorSearch = (props: { + searchText: string; + sortOrder: string; + descending: boolean; + onSearchText: React.Dispatch>; + onSortOrder: React.Dispatch>; + onDescending: React.Dispatch>; +}) => { + return ( + + + + props.onSearchText(value)} + /> + + + props.onSortOrder(v)} + /> + + + + + + + + + + + + + + )} + + + ); +}; diff --git a/tgui/packages/tgui/interfaces/Biogenerator/types.ts b/tgui/packages/tgui/interfaces/Biogenerator/types.ts new file mode 100644 index 00000000000..2c1f02fab22 --- /dev/null +++ b/tgui/packages/tgui/interfaces/Biogenerator/types.ts @@ -0,0 +1,17 @@ +import type { BooleanLike } from 'tgui-core/react'; + +export type Sortable = { + name: string; + affordable: number; + price: number; + max_amount: number; + reagent?: BooleanLike; +}; + +export type Data = { + items: Record; + build_eff: number; + points: number; + processing: BooleanLike; + beaker: boolean; +}; diff --git a/tgui/packages/tgui/interfaces/SpawnPanel/CreateObject.tsx b/tgui/packages/tgui/interfaces/SpawnPanel/CreateObject.tsx index ef932408503..3123ef023af 100644 --- a/tgui/packages/tgui/interfaces/SpawnPanel/CreateObject.tsx +++ b/tgui/packages/tgui/interfaces/SpawnPanel/CreateObject.tsx @@ -126,6 +126,9 @@ export function CreateObject(props: CreateObjectProps) { if (storedShowIcons !== undefined) setshowIcons(storedShowIcons); if (storedShowPreview !== undefined) setshowPreview(storedShowPreview); if (storedSelectedObj && allObjects[storedSelectedObj]) { + act('selected-atom-changed', { + newObj: storedSelectedObj, + }); setSelectedObj(storedSelectedObj); props.onIconSettingsChange?.({ icon: allObjects[storedSelectedObj].icon,