mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-18 19:44:58 +01:00
Joshua Kidder
7a3ad79506
## About The Pull Request It's just a partial cleanup of anti-[STYLE](https://github.com/tgstation/tgstation/blob/master/.github/guides/STYLE.md) code from /tg/'s ancient history. I compiled & tested with my helpful assistant and damage is still working. <img width="1920" height="1040" alt="image" src="https://github.com/user-attachments/assets/26dabc17-088f-4008-b299-3ff4c27142c3" /> I'll upload the .cs script I used to do it shortly. ## Why It's Good For The Game Just minor code cleanup. Script used is located at https://metek.tech/camelTo-Snake.7z EDIT 11/23/25: Updated the script to use multithreading and sequential scan so it works a hell of a lot faster ``` /* // Copyright 2025 Joshua 'Joan Metekillot' Kidder This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. // */ using System.Text.RegularExpressions; class Program { static async Task Main(string[] args) { var readFile = new FileStreamOptions { Access = FileAccess.Read, Share = FileShare.ReadWrite, Options = FileOptions.Asynchronous | FileOptions.SequentialScan }; FileStreamOptions writeFile = new FileStreamOptions { Share = FileShare.ReadWrite, Access = FileAccess.ReadWrite, Mode = FileMode.Truncate, Options = FileOptions.Asynchronous }; RegexOptions regexOptions = RegexOptions.Multiline | RegexOptions.Compiled; Dictionary<string, int> changedProcs = new(); string regexPattern = @"(?<=\P{L})([a-z]+)([A-Z]{1,2}[a-z]+)*(Brute|Burn|Fire|Tox|Oxy|Organ|Stamina)(Loss)([A-Z]{1,2}[a-z]+)*"; Regex camelCaseProcRegex = new(regexPattern, regexOptions); string snakeify(Match matchingRegex) { var vals = matchingRegex.Groups.Cast<Group>().SelectMany(_ => _.Captures).Select(_ => _.Value).ToArray(); var newVal = string.Join("_", vals.Skip(1).ToArray()).ToLower(); string logString = $"{vals[0]} => {newVal}"; if (changedProcs.TryGetValue(logString, out int value)) { changedProcs[logString] = value + 1; } else { changedProcs.Add(logString, 1); } return newVal; } var dmFiles = Directory.EnumerateFiles(".", "*.dm", SearchOption.AllDirectories).ToAsyncEnumerable<string>(); // uses default ParallelOptions // https://learn.microsoft.com/en-us/dotnet/api/system.threading.tasks.paralleloptions?view=net-10.0#main await Parallel.ForEachAsync(dmFiles, async (filePath, UnusedCancellationToken) => { var reader = new StreamReader(filePath, readFile); string oldContent = await reader.ReadToEndAsync(); string newContent = camelCaseProcRegex.Replace(oldContent, new MatchEvaluator((Func<Match, string>)snakeify)); if (oldContent != newContent) { var writer = new StreamWriter(filePath, writeFile); await writer.WriteAsync(newContent); await writer.DisposeAsync(); } reader.Dispose(); }); var logToList = changedProcs.Cast<KeyValuePair<string, int>>().ToList(); foreach (var pair in logToList) { Console.WriteLine($"{pair.Key}: {pair.Value} locations"); } } } ``` ## Changelog 🆑 Bisar code: All (Brute|Burn|Fire|Tox|Oxy|Organ|Stamina)(Loss) procs now use snake_case, in-line with the STYLE guide. Underscores rule! /🆑
83 lines
3.5 KiB
Plaintext
83 lines
3.5 KiB
Plaintext
/**
|
|
* Adjusts the health of a simple mob by a set amount
|
|
*
|
|
* Arguments:
|
|
* * amount The amount that will be used to adjust the mob's health
|
|
* * updating_health If the mob's health should be immediately updated to the new value
|
|
* * forced If we should force update the adjustment of the mob's health no matter the restrictions, like TRAIT_GODMODE
|
|
* returns the net change in bruteloss after applying the damage amount
|
|
*/
|
|
/mob/living/basic/proc/adjust_health(amount, updating_health = TRUE, forced = FALSE)
|
|
. = FALSE
|
|
if(!forced && HAS_TRAIT(src, TRAIT_GODMODE))
|
|
return 0
|
|
. = bruteloss // bruteloss value before applying damage
|
|
bruteloss = round(clamp(bruteloss + amount, 0, maxHealth * 2), DAMAGE_PRECISION)
|
|
if(updating_health)
|
|
updatehealth()
|
|
return . - bruteloss
|
|
|
|
/mob/living/basic/get_damage_mod(damage_type)
|
|
var/modifier = ..()
|
|
if (damage_type in damage_coeff)
|
|
return modifier * damage_coeff[damage_type]
|
|
return modifier
|
|
|
|
/mob/living/basic/adjust_brute_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
|
|
if(!can_adjust_brute_loss(amount, forced, required_bodytype))
|
|
return 0
|
|
if(forced)
|
|
. = adjust_health(amount * CONFIG_GET(number/damage_multiplier), updating_health, forced)
|
|
else if(damage_coeff[BRUTE])
|
|
. = adjust_health(amount * damage_coeff[BRUTE] * CONFIG_GET(number/damage_multiplier), updating_health, forced)
|
|
|
|
/mob/living/basic/adjust_fire_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype)
|
|
if(!can_adjust_fire_loss(amount, forced, required_bodytype))
|
|
return 0
|
|
if(forced)
|
|
. = adjust_health(amount * CONFIG_GET(number/damage_multiplier), updating_health, forced)
|
|
else if(damage_coeff[BURN])
|
|
. = adjust_health(amount * damage_coeff[BURN] * CONFIG_GET(number/damage_multiplier), updating_health, forced)
|
|
|
|
/mob/living/basic/adjust_oxy_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype, required_respiration_type)
|
|
if(!can_adjust_oxy_loss(amount, forced, required_biotype, required_respiration_type))
|
|
return 0
|
|
if(forced)
|
|
. = adjust_health(amount * CONFIG_GET(number/damage_multiplier), updating_health, forced)
|
|
else if(damage_coeff[OXY])
|
|
. = adjust_health(amount * damage_coeff[OXY] * CONFIG_GET(number/damage_multiplier), updating_health, forced)
|
|
|
|
/mob/living/basic/adjust_tox_loss(amount, updating_health = TRUE, forced = FALSE, required_biotype)
|
|
if(!can_adjust_tox_loss(amount, forced, required_biotype))
|
|
return 0
|
|
if(forced)
|
|
. = adjust_health(amount * CONFIG_GET(number/damage_multiplier), updating_health, forced)
|
|
else if(damage_coeff[TOX])
|
|
. = adjust_health(amount * damage_coeff[TOX] * CONFIG_GET(number/damage_multiplier), updating_health, forced)
|
|
|
|
/mob/living/basic/adjust_stamina_loss(amount, updating_stamina = TRUE, forced = FALSE, required_biotype)
|
|
if(!can_adjust_stamina_loss(amount, forced, required_biotype))
|
|
return 0
|
|
. = staminaloss
|
|
|
|
var/stamina_delta = forced ? amount : amount * damage_coeff[STAMINA]
|
|
staminaloss = max(0, min(max_stamina, staminaloss + stamina_delta))
|
|
|
|
if(stamina_delta > 0)
|
|
received_stamina_damage(staminaloss, -1 * stamina_delta, amount)
|
|
if(updating_stamina && stamina_delta)
|
|
update_stamina()
|
|
. -= staminaloss
|
|
|
|
/mob/living/basic/received_stamina_damage(current_level, amount_actual, amount)
|
|
if (stamina_recovery == 0)
|
|
return ..()
|
|
|
|
/mob/living/basic/received_stamina_damage(current_level, amount_actual, amount)
|
|
. = ..()
|
|
if (stat == DEAD || stamina_crit_threshold == BASIC_MOB_NO_STAMCRIT)
|
|
return
|
|
|
|
if (100 / (max_stamina / current_level) >= stamina_crit_threshold)
|
|
apply_status_effect(/datum/status_effect/incapacitating/stamcrit)
|