mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-13 09:05:11 +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! /🆑
68 lines
2.5 KiB
Plaintext
68 lines
2.5 KiB
Plaintext
/// Causes a fake "zap" to the hallucinator.
|
|
/datum/hallucination/shock
|
|
random_hallucination_weight = 1 // really low weight, as it also has a snowflake check to trigger when bumping airlocks
|
|
hallucination_tier = HALLUCINATION_TIER_COMMON
|
|
|
|
var/electrocution_icon = 'icons/mob/human/human.dmi'
|
|
var/electrocution_icon_state = "electrocuted_base"
|
|
var/image/shock_image
|
|
var/image/electrocution_skeleton_anim
|
|
|
|
/datum/hallucination/shock/New(mob/living/hallucinator)
|
|
electrocution_icon_state = ishuman(hallucinator) ? "electrocuted_base" : "electrocuted_generic"
|
|
return ..()
|
|
|
|
/datum/hallucination/shock/Destroy()
|
|
if(shock_image)
|
|
hallucinator.client?.images -= shock_image
|
|
shock_image = null
|
|
if(electrocution_skeleton_anim)
|
|
hallucinator.client?.images -= electrocution_skeleton_anim
|
|
electrocution_skeleton_anim = null
|
|
|
|
return ..()
|
|
|
|
/datum/hallucination/shock/start()
|
|
shock_image = image(hallucinator, hallucinator, dir = hallucinator.dir)
|
|
shock_image.appearance_flags |= KEEP_APART
|
|
shock_image.color = rgb(0, 0, 0)
|
|
shock_image.override = TRUE
|
|
|
|
electrocution_skeleton_anim = image(electrocution_icon, hallucinator, icon_state = electrocution_icon_state, layer = ABOVE_MOB_LAYER)
|
|
electrocution_skeleton_anim.appearance_flags |= RESET_COLOR|KEEP_APART
|
|
|
|
SET_PLANE_EXPLICIT(shock_image, ABOVE_GAME_PLANE, hallucinator)
|
|
SET_PLANE_EXPLICIT(electrocution_skeleton_anim, ABOVE_GAME_PLANE, hallucinator)
|
|
|
|
to_chat(hallucinator, span_userdanger("You feel a powerful shock course through your body!"))
|
|
hallucinator.visible_message(span_warning("[hallucinator] falls to the ground, shaking!"), ignored_mobs = hallucinator)
|
|
hallucinator.client?.images |= shock_image
|
|
hallucinator.client?.images |= electrocution_skeleton_anim
|
|
|
|
hallucinator.playsound_local(get_turf(src), SFX_SPARKS, 100, TRUE)
|
|
hallucinator.adjust_stamina_loss(50)
|
|
hallucinator.Stun(4 SECONDS)
|
|
hallucinator.do_jitter_animation(300) // Maximum jitter
|
|
hallucinator.adjust_jitter(20 SECONDS)
|
|
|
|
addtimer(CALLBACK(src, PROC_REF(reset_shock_animation)), 4 SECONDS)
|
|
addtimer(CALLBACK(src, PROC_REF(shock_drop)), 2 SECONDS)
|
|
QDEL_IN(src, 4 SECONDS)
|
|
return TRUE
|
|
|
|
/datum/hallucination/shock/proc/reset_shock_animation()
|
|
if(QDELETED(hallucinator))
|
|
return
|
|
|
|
hallucinator.client?.images -= shock_image
|
|
shock_image = null
|
|
|
|
hallucinator.client?.images -= electrocution_skeleton_anim
|
|
electrocution_skeleton_anim = null
|
|
|
|
/datum/hallucination/shock/proc/shock_drop()
|
|
if(QDELETED(hallucinator))
|
|
return
|
|
|
|
hallucinator.Paralyze(6 SECONDS)
|