mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-12 00:27:31 +01:00
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! /🆑
109 lines
4.2 KiB
Plaintext
109 lines
4.2 KiB
Plaintext
/// Hallucinations that create a hazard somewhere nearby that actually has a danger associated.
|
|
/datum/hallucination/hazard
|
|
abstract_hallucination_parent = /datum/hallucination/hazard
|
|
random_hallucination_weight = 5
|
|
hallucination_tier = HALLUCINATION_TIER_UNCOMMON
|
|
|
|
/// The type of effect we create
|
|
var/hazard_type = /obj/effect/client_image_holder/hallucination/danger
|
|
|
|
/datum/hallucination/hazard/start()
|
|
var/list/possible_points = list()
|
|
for(var/turf/open/floor/floor_in_view in view(hallucinator))
|
|
possible_points += floor_in_view
|
|
|
|
if(!length(possible_points))
|
|
return FALSE
|
|
|
|
new hazard_type(pick(possible_points), hallucinator, src)
|
|
QDEL_IN(src, rand(20 SECONDS, 45 SECONDS))
|
|
return TRUE
|
|
|
|
/datum/hallucination/hazard/lava
|
|
hazard_type = /obj/effect/client_image_holder/hallucination/danger/lava
|
|
|
|
/datum/hallucination/hazard/chasm
|
|
hazard_type = /obj/effect/client_image_holder/hallucination/danger/chasm
|
|
|
|
/datum/hallucination/hazard/anomaly
|
|
hazard_type = /obj/effect/client_image_holder/hallucination/danger/anomaly
|
|
|
|
/// These hallucination effects cause side effects when the hallucinator walks into them.
|
|
/obj/effect/client_image_holder/hallucination/danger
|
|
image_layer = LOW_FLOOR_LAYER
|
|
image_plane = FLOOR_PLANE
|
|
|
|
/obj/effect/client_image_holder/hallucination/danger/Initialize(mapload, list/mobs_which_see_us, datum/hallucination/parent)
|
|
. = ..()
|
|
var/static/list/loc_connections = list(
|
|
COMSIG_ATOM_ENTERED = PROC_REF(atom_touched_holder),
|
|
COMSIG_ATOM_EXITED = PROC_REF(atom_touched_holder),
|
|
)
|
|
AddElement(/datum/element/connect_loc, loc_connections)
|
|
|
|
/obj/effect/client_image_holder/hallucination/danger/proc/atom_touched_holder(datum/source, atom/movable/entered)
|
|
SIGNAL_HANDLER
|
|
|
|
if(!(entered in who_sees_us))
|
|
return
|
|
|
|
on_hallucinator_entered(entered)
|
|
|
|
/// Applies effects whenever the hallucinator enters the turf with our hallucination present.
|
|
/obj/effect/client_image_holder/hallucination/danger/proc/on_hallucinator_entered(mob/living/afflicted)
|
|
return
|
|
|
|
/obj/effect/client_image_holder/hallucination/danger/lava
|
|
name = "lava"
|
|
image_icon = 'icons/turf/floors/lava.dmi'
|
|
|
|
/obj/effect/client_image_holder/hallucination/danger/lava/generate_image()
|
|
var/turf/danger_turf = get_turf(src)
|
|
image_state = "lava-[danger_turf.smoothing_junction || 0]"
|
|
return ..()
|
|
|
|
/obj/effect/client_image_holder/hallucination/danger/lava/on_hallucinator_entered(mob/living/afflicted)
|
|
afflicted.adjust_stamina_loss(20)
|
|
afflicted.cause_hallucination(/datum/hallucination/fire, "fake lava hallucination")
|
|
|
|
/obj/effect/client_image_holder/hallucination/danger/chasm
|
|
name = "chasm"
|
|
image_icon = 'icons/turf/floors/chasms.dmi'
|
|
|
|
/obj/effect/client_image_holder/hallucination/danger/chasm/generate_image()
|
|
var/turf/danger_turf = get_turf(src)
|
|
image_state = "chasms-[danger_turf.smoothing_junction || 0]"
|
|
return ..()
|
|
|
|
/obj/effect/client_image_holder/hallucination/danger/chasm/on_hallucinator_entered(mob/living/afflicted)
|
|
to_chat(afflicted, span_userdanger("You fall into the chasm!"))
|
|
afflicted.visible_message(span_warning("[afflicted] falls to the ground suddenly!"), ignored_mobs = afflicted)
|
|
afflicted.Paralyze(4 SECONDS)
|
|
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), afflicted, span_notice("...It's surprisingly shallow.")), 1.5 SECONDS)
|
|
QDEL_IN(src, 3 SECONDS)
|
|
|
|
/obj/effect/client_image_holder/hallucination/danger/anomaly
|
|
name = "flux wave anomaly"
|
|
image_icon = 'icons/effects/anomalies.dmi'
|
|
image_state = "flux"
|
|
image_layer = OBJ_LAYER + 0.01
|
|
|
|
/obj/effect/client_image_holder/hallucination/danger/anomaly/generate_image()
|
|
. = ..()
|
|
apply_wibbly_filters(.)
|
|
|
|
/obj/effect/client_image_holder/hallucination/danger/anomaly/Initialize(mapload, list/mobs_which_see_us, datum/hallucination/parent)
|
|
. = ..()
|
|
START_PROCESSING(SSobj, src)
|
|
|
|
/obj/effect/client_image_holder/hallucination/danger/anomaly/Destroy()
|
|
STOP_PROCESSING(SSobj, src)
|
|
return ..()
|
|
|
|
/obj/effect/client_image_holder/hallucination/danger/anomaly/process(seconds_per_tick)
|
|
if(SPT_PROB(ANOMALY_MOVECHANCE, seconds_per_tick))
|
|
step(src, pick(GLOB.alldirs))
|
|
|
|
/obj/effect/client_image_holder/hallucination/danger/anomaly/on_hallucinator_entered(mob/living/afflicted)
|
|
afflicted.cause_hallucination(/datum/hallucination/shock, "fake anomaly hallucination")
|