mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 21:48:39 +01:00
All camelCase (Brute|Burn|Fire|Tox|Oxy|Organ|Stamina)(Loss) procs now use snake_case. UNDERSCORES RULE! (#94111)
## 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! /🆑
This commit is contained in:
@@ -397,7 +397,7 @@
|
||||
.["is_user_irradiated"] = mod.wearer ? HAS_TRAIT(mod.wearer, TRAIT_IRRADIATED) : FALSE
|
||||
.["background_radiation_level"] = perceived_threat_level
|
||||
.["health_max"] = mod.wearer?.getMaxHealth() || 0
|
||||
.["loss_tox"] = mod.wearer?.getToxLoss() || 0
|
||||
.["loss_tox"] = mod.wearer?.get_tox_loss() || 0
|
||||
|
||||
/obj/item/mod/module/rad_protection/proc/on_pre_potential_irradiation(datum/source, datum/radiation_pulse_information/pulse_information, insulation_to_target)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
@@ -264,10 +264,10 @@
|
||||
.["health"] = mod.wearer?.health || 0
|
||||
.["health_max"] = mod.wearer?.getMaxHealth() || 0
|
||||
if(display_detailed_vitals)
|
||||
.["loss_brute"] = mod.wearer?.getBruteLoss() || 0
|
||||
.["loss_fire"] = mod.wearer?.getFireLoss() || 0
|
||||
.["loss_tox"] = mod.wearer?.getToxLoss() || 0
|
||||
.["loss_oxy"] = mod.wearer?.getOxyLoss() || 0
|
||||
.["loss_brute"] = mod.wearer?.get_brute_loss() || 0
|
||||
.["loss_fire"] = mod.wearer?.get_fire_loss() || 0
|
||||
.["loss_tox"] = mod.wearer?.get_tox_loss() || 0
|
||||
.["loss_oxy"] = mod.wearer?.get_oxy_loss() || 0
|
||||
.["body_temperature"] = mod.wearer?.bodytemperature || 0
|
||||
.["nutrition"] = mod.wearer?.nutrition || 0
|
||||
if(display_dna)
|
||||
|
||||
@@ -226,7 +226,7 @@
|
||||
/obj/item/mod/module/balloon/on_use(mob/activator)
|
||||
if(!do_after(mod.wearer, blowing_time, target = mod))
|
||||
return FALSE
|
||||
mod.wearer.adjustOxyLoss(oxygen_damage)
|
||||
mod.wearer.adjust_oxy_loss(oxygen_damage)
|
||||
playsound(src, 'sound/items/modsuit/inflate_bloon.ogg', 50, TRUE)
|
||||
var/obj/item/balloon = new balloon_path(get_turf(src))
|
||||
mod.wearer.put_in_hands(balloon)
|
||||
|
||||
@@ -28,10 +28,10 @@
|
||||
. = ..()
|
||||
.["health"] = mod.wearer?.health || 0
|
||||
.["health_max"] = mod.wearer?.getMaxHealth() || 0
|
||||
.["loss_brute"] = mod.wearer?.getBruteLoss() || 0
|
||||
.["loss_fire"] = mod.wearer?.getFireLoss() || 0
|
||||
.["loss_tox"] = mod.wearer?.getToxLoss() || 0
|
||||
.["loss_oxy"] = mod.wearer?.getOxyLoss() || 0
|
||||
.["loss_brute"] = mod.wearer?.get_brute_loss() || 0
|
||||
.["loss_fire"] = mod.wearer?.get_fire_loss() || 0
|
||||
.["loss_tox"] = mod.wearer?.get_tox_loss() || 0
|
||||
.["loss_oxy"] = mod.wearer?.get_oxy_loss() || 0
|
||||
|
||||
return .
|
||||
|
||||
|
||||
@@ -425,7 +425,7 @@
|
||||
mod.wearer.say(pick_list_replacements(NINJA_FILE, "lines"), forced = type)
|
||||
to_chat(mod.wearer, span_notice("You have used the adrenaline boost."))
|
||||
mod.wearer.SetAllImmobility(0)
|
||||
mod.wearer.adjustStaminaLoss(-200)
|
||||
mod.wearer.adjust_stamina_loss(-200)
|
||||
mod.wearer.remove_status_effect(/datum/status_effect/speech/stutter)
|
||||
mod.wearer.reagents.add_reagent(/datum/reagent/medicine/stimulants, 5)
|
||||
reagents.remove_reagent(reagent_required, reagents.total_volume * 0.75)
|
||||
|
||||
@@ -172,7 +172,7 @@
|
||||
//phasing out
|
||||
mod.visible_message(span_warning("[mod.wearer] leaps out of the timeline!"))
|
||||
mod.wearer.SetAllImmobility(0)
|
||||
mod.wearer.setStaminaLoss(0)
|
||||
mod.wearer.set_stamina_loss(0)
|
||||
phased_mob = new(get_turf(mod.wearer.loc), mod.wearer)
|
||||
RegisterSignal(mod, COMSIG_MOD_ACTIVATE, PROC_REF(on_activate_block))
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user