From ff9d6ee893db4d1d085a6593f42fd96e24e09df6 Mon Sep 17 00:00:00 2001 From: larentoun <31931237+larentoun@users.noreply.github.com> Date: Mon, 15 Jul 2024 14:05:30 +0300 Subject: [PATCH 1/4] vehicles use run_delay config --- modular_bandastation/balance/_balance.dm | 4 ++++ modular_bandastation/balance/_balance.dme | 3 +++ modular_bandastation/balance/code/balance_riding.dm | 12 ++++++++++++ modular_bandastation/modular_bandastation.dme | 1 + 4 files changed, 20 insertions(+) create mode 100644 modular_bandastation/balance/_balance.dm create mode 100644 modular_bandastation/balance/_balance.dme create mode 100644 modular_bandastation/balance/code/balance_riding.dm diff --git a/modular_bandastation/balance/_balance.dm b/modular_bandastation/balance/_balance.dm new file mode 100644 index 0000000000000..c246560c2bf2b --- /dev/null +++ b/modular_bandastation/balance/_balance.dm @@ -0,0 +1,4 @@ +/datum/modpack/balance + name = "Изменение баланса" + desc = "Любые изменения баланса идут сюда" + author = "larentoun" diff --git a/modular_bandastation/balance/_balance.dme b/modular_bandastation/balance/_balance.dme new file mode 100644 index 0000000000000..2f3cc14531f35 --- /dev/null +++ b/modular_bandastation/balance/_balance.dme @@ -0,0 +1,3 @@ +#include "_balance.dm" + +#include "code/balance_riding.dm" diff --git a/modular_bandastation/balance/code/balance_riding.dm b/modular_bandastation/balance/code/balance_riding.dm new file mode 100644 index 0000000000000..8d3c107de7d20 --- /dev/null +++ b/modular_bandastation/balance/code/balance_riding.dm @@ -0,0 +1,12 @@ +#define TG_SPEED 1.5 + +/datum/component/riding/Initialize(mob/living/riding_mob, force, buckle_mob_flags, potion_boost) + . = ..() + if(. == COMPONENT_INCOMPATIBLE) + return + if(vehicle_move_delay == 0) + vehicle_move_delay = max(CONFIG_GET(number/movedelay/run_delay) - TG_SPEED, 0) + return + vehicle_move_delay = round(CONFIG_GET(number/movedelay/run_delay) / TG_SPEED * vehicle_move_delay, 0.01) + +#undef TG_SPEED diff --git a/modular_bandastation/modular_bandastation.dme b/modular_bandastation/modular_bandastation.dme index 15cbaef82a810..f805bb52659d5 100644 --- a/modular_bandastation/modular_bandastation.dme +++ b/modular_bandastation/modular_bandastation.dme @@ -8,6 +8,7 @@ #include "aesthetics/_aesthetics.dme" #include "ai_laws/_ai_laws.dme" #include "autohiss/_autohiss.dme" +#include "balance/_balance.dme" #include "barsigns/_barsigns.dme" #include "communication/_communication.dme" //#include "crawl_speed/_crawl_speed.dme" // Fixing floored melee brawl, or first steps to remove RP speed From 9d676914c8c9de4784d95e14cf3d39455c41b288 Mon Sep 17 00:00:00 2001 From: larentoun <31931237+larentoun@users.noreply.github.com> Date: Mon, 15 Jul 2024 14:10:29 +0300 Subject: [PATCH 2/4] slowdown 0 movedelay more --- modular_bandastation/balance/code/balance_riding.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_bandastation/balance/code/balance_riding.dm b/modular_bandastation/balance/code/balance_riding.dm index 8d3c107de7d20..d1843f5650a61 100644 --- a/modular_bandastation/balance/code/balance_riding.dm +++ b/modular_bandastation/balance/code/balance_riding.dm @@ -5,7 +5,7 @@ if(. == COMPONENT_INCOMPATIBLE) return if(vehicle_move_delay == 0) - vehicle_move_delay = max(CONFIG_GET(number/movedelay/run_delay) - TG_SPEED, 0) + vehicle_move_delay = max(CONFIG_GET(number/movedelay/run_delay) - TG_SPEED, 0) * TG_SPEED return vehicle_move_delay = round(CONFIG_GET(number/movedelay/run_delay) / TG_SPEED * vehicle_move_delay, 0.01) From 9efee4637d7a34eca1d0af312259c886b199d9fd Mon Sep 17 00:00:00 2001 From: larentoun <31931237+larentoun@users.noreply.github.com> Date: Mon, 15 Jul 2024 14:12:04 +0300 Subject: [PATCH 3/4] round it to be safe --- modular_bandastation/balance/code/balance_riding.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_bandastation/balance/code/balance_riding.dm b/modular_bandastation/balance/code/balance_riding.dm index d1843f5650a61..cc3839b54f198 100644 --- a/modular_bandastation/balance/code/balance_riding.dm +++ b/modular_bandastation/balance/code/balance_riding.dm @@ -5,7 +5,7 @@ if(. == COMPONENT_INCOMPATIBLE) return if(vehicle_move_delay == 0) - vehicle_move_delay = max(CONFIG_GET(number/movedelay/run_delay) - TG_SPEED, 0) * TG_SPEED + vehicle_move_delay = round(max(CONFIG_GET(number/movedelay/run_delay) - TG_SPEED, 0) * TG_SPEED, 0.01) return vehicle_move_delay = round(CONFIG_GET(number/movedelay/run_delay) / TG_SPEED * vehicle_move_delay, 0.01) From ac1a6eb30e52f92dc1f8e23510e93c9b1d247fc1 Mon Sep 17 00:00:00 2001 From: larentoun <31931237+larentoun@users.noreply.github.com> Date: Mon, 15 Jul 2024 14:14:13 +0300 Subject: [PATCH 4/4] review --- modular_bandastation/balance/code/balance_riding.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modular_bandastation/balance/code/balance_riding.dm b/modular_bandastation/balance/code/balance_riding.dm index cc3839b54f198..c63f14c45cb73 100644 --- a/modular_bandastation/balance/code/balance_riding.dm +++ b/modular_bandastation/balance/code/balance_riding.dm @@ -1,12 +1,14 @@ #define TG_SPEED 1.5 +#define RP_SPEED CONFIG_GET(number/movedelay/run_delay) /datum/component/riding/Initialize(mob/living/riding_mob, force, buckle_mob_flags, potion_boost) . = ..() if(. == COMPONENT_INCOMPATIBLE) return if(vehicle_move_delay == 0) - vehicle_move_delay = round(max(CONFIG_GET(number/movedelay/run_delay) - TG_SPEED, 0) * TG_SPEED, 0.01) + vehicle_move_delay = round(max(RP_SPEED - TG_SPEED, 0) * TG_SPEED, 0.01) return - vehicle_move_delay = round(CONFIG_GET(number/movedelay/run_delay) / TG_SPEED * vehicle_move_delay, 0.01) + vehicle_move_delay = round(RP_SPEED / TG_SPEED * vehicle_move_delay, 0.01) #undef TG_SPEED +#undef RP_SPEED