From e3accaea35858a6441f835cf2dac5e466549377c Mon Sep 17 00:00:00 2001 From: datlo Date: Tue, 15 Apr 2025 17:00:35 +0200 Subject: [PATCH] Fix smith machine sheet values (#28915) --- code/__DEFINES/machines.dm | 10 +++++----- code/__DEFINES/smith_defines.dm | 6 ++++++ code/modules/mining/machine_redemption.dm | 8 ++++---- code/modules/smithing/machinery/magma_crucible.dm | 4 ++-- code/modules/smithing/machinery/smart_hopper.dm | 4 ++-- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index 5f8fc1b3422..55f3b9884dd 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -110,8 +110,8 @@ /// [/obj/machinery/requests_console] can relay anonymous information. #define RC_INFO (1<<2) -/// ORM / Smart hopper point defines -#define BASE_POINT_MULT 0.90 -#define BASE_SHEET_MULT 0.90 -#define POINT_MULT_ADD_PER_RATING 0.10 -#define SHEET_MULT_ADD_PER_RATING 0.10 +/// ORM point defines +#define ORM_BASE_POINT_MULT 0.90 +#define ORM_BASE_SHEET_MULT 0.90 +#define ORM_POINT_MULT_ADD_PER_RATING 0.10 +#define ORM_SHEET_MULT_ADD_PER_RATING 0.10 diff --git a/code/__DEFINES/smith_defines.dm b/code/__DEFINES/smith_defines.dm index 056004bbe94..55de237b662 100644 --- a/code/__DEFINES/smith_defines.dm +++ b/code/__DEFINES/smith_defines.dm @@ -12,3 +12,9 @@ #define OPERATION_SPEED_MULT_PER_RATING 0.075 #define EFFICIENCY_MULT_ADD_PER_RATING 0.05 + +//Smithing machines points defines +#define SMITHING_BASE_POINT_MULT 0.60 +#define SMITHING_BASE_SHEET_MULT 0.60 +#define SMITHING_POINT_MULT_ADD_PER_RATING 0.10 +#define SMITHING_SHEET_MULT_ADD_PER_RATING 0.25 diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index fda2e7768ae..1d201c89fa9 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -127,12 +127,12 @@ return ..() /obj/machinery/mineral/ore_redemption/RefreshParts() - var/P = BASE_POINT_MULT - var/S = BASE_SHEET_MULT + var/P = ORM_BASE_POINT_MULT + var/S = ORM_BASE_SHEET_MULT for(var/obj/item/stock_parts/micro_laser/M in component_parts) - P += POINT_MULT_ADD_PER_RATING * M.rating + P += ORM_POINT_MULT_ADD_PER_RATING * M.rating for(var/obj/item/stock_parts/matter_bin/M in component_parts) - S += SHEET_MULT_ADD_PER_RATING * M.rating + S += ORM_SHEET_MULT_ADD_PER_RATING * M.rating // Manipulators do nothing // Update our values point_upgrade = P diff --git a/code/modules/smithing/machinery/magma_crucible.dm b/code/modules/smithing/machinery/magma_crucible.dm index aad2d3c5a5f..0c03380c035 100644 --- a/code/modules/smithing/machinery/magma_crucible.dm +++ b/code/modules/smithing/machinery/magma_crucible.dm @@ -51,9 +51,9 @@ return TRUE /obj/machinery/magma_crucible/RefreshParts() - var/sheet_mult = BASE_SHEET_MULT + var/sheet_mult = SMITHING_BASE_SHEET_MULT for(var/obj/item/stock_parts/micro_laser/component in component_parts) - sheet_mult += SHEET_MULT_ADD_PER_RATING * component.rating + sheet_mult += SMITHING_SHEET_MULT_ADD_PER_RATING * component.rating // Update our values sheet_per_ore = sheet_mult diff --git a/code/modules/smithing/machinery/smart_hopper.dm b/code/modules/smithing/machinery/smart_hopper.dm index cbec036b7c0..b52b16b5e1c 100644 --- a/code/modules/smithing/machinery/smart_hopper.dm +++ b/code/modules/smithing/machinery/smart_hopper.dm @@ -58,9 +58,9 @@ update_icon(UPDATE_OVERLAYS) /obj/machinery/mineral/smart_hopper/RefreshParts() - var/point_mult = BASE_POINT_MULT + var/point_mult = SMITHING_BASE_POINT_MULT for(var/obj/item/stock_parts/component in component_parts) - point_mult += POINT_MULT_ADD_PER_RATING * component.rating + point_mult += SMITHING_POINT_MULT_ADD_PER_RATING * component.rating // Update our values point_upgrade = point_mult SStgui.update_uis(src)