mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-12 08:36:00 +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! /🆑
61 lines
3.1 KiB
Plaintext
61 lines
3.1 KiB
Plaintext
/// Tests that guns (bayonetted or otherwise) are able to be used as melee weapons in close range
|
|
/datum/unit_test/pistol_whip
|
|
|
|
/datum/unit_test/pistol_whip/Run()
|
|
var/mob/living/carbon/human/consistent/attacker = EASY_ALLOCATE()
|
|
var/mob/living/carbon/human/consistent/victim = EASY_ALLOCATE()
|
|
var/obj/item/gun/ballistic/automatic/pistol/gun = EASY_ALLOCATE()
|
|
|
|
attacker.put_in_active_hand(gun, forced = TRUE)
|
|
victim.forceMove(locate(attacker.x + 1, attacker.y, attacker.z))
|
|
|
|
var/expected_ammo = gun.magazine.max_ammo + 1
|
|
// These assertions are just here because I don't understand gun code
|
|
TEST_ASSERT(gun.chambered, "Gun spawned without a chambered round.")
|
|
TEST_ASSERT_EQUAL(gun.get_ammo(countchambered = TRUE), expected_ammo, "Gun spawned without a full magazine, \
|
|
when it should spawn with mag size + 1 (chambered) rounds.")
|
|
|
|
// Combat mode in melee range with RMB -> pistol whip
|
|
attacker.set_combat_mode(TRUE)
|
|
click_wrapper(attacker, victim, list(RIGHT_CLICK = TRUE, BUTTON = RIGHT_CLICK))
|
|
TEST_ASSERT_NOTEQUAL(victim.get_brute_loss(), 0, "Victim did not take brute damage from being pistol-whipped.")
|
|
TEST_ASSERT_EQUAL(gun.get_ammo(countchambered = TRUE), expected_ammo, "The gun fired a shot when it was used for a pistol whip.")
|
|
victim.fully_heal()
|
|
|
|
// Combat mode LMB -> point blank shot
|
|
attacker.set_combat_mode(TRUE)
|
|
click_wrapper(attacker, victim)
|
|
TEST_ASSERT_NOTEQUAL(victim.get_brute_loss(), 0, "Victim did not take brute damage from being fired upon point-blank.")
|
|
TEST_ASSERT(locate(/obj/item/ammo_casing/c9mm) in attacker.loc, "The gun did not eject a casing when it was used for a point-blank shot.")
|
|
TEST_ASSERT_EQUAL(gun.get_ammo(countchambered = TRUE), expected_ammo - 1, "The gun did not fire a shot when it was used for a point-blank shot.")
|
|
victim.fully_heal()
|
|
|
|
// Combat mode RMB click in melee range with bayonet -> bayonet stab
|
|
var/obj/item/knife/combat/knife = EASY_ALLOCATE()
|
|
gun.AddComponent(/datum/component/bayonet_attachable, starting_bayonet = knife)
|
|
|
|
attacker.set_combat_mode(TRUE)
|
|
click_wrapper(attacker, victim, list(RIGHT_CLICK = TRUE, BUTTON = RIGHT_CLICK))
|
|
TEST_ASSERT_NOTEQUAL(victim.get_brute_loss(), 0, "Victim did not take brute damage from being bayonet stabbed.")
|
|
victim.fully_heal()
|
|
|
|
/// Test that bayonetted weapons can be used to butcher
|
|
/datum/unit_test/bayonet_butchering
|
|
|
|
/datum/unit_test/bayonet_butchering/Run()
|
|
var/mob/living/carbon/human/species/monkey/meat = EASY_ALLOCATE()
|
|
meat.death()
|
|
|
|
var/mob/living/carbon/human/consistent/butcher = EASY_ALLOCATE()
|
|
butcher.set_combat_mode(TRUE)
|
|
var/obj/item/gun/energy/recharge/kinetic_accelerator/gun = EASY_ALLOCATE()
|
|
var/obj/item/knife/combat/knife = EASY_ALLOCATE()
|
|
var/datum/component/bayonet_attachable/bayonet = gun.GetComponent(/datum/component/bayonet_attachable)
|
|
bayonet.add_bayonet(knife)
|
|
var/datum/component/butchering/butcher_comp = knife.GetComponent(/datum/component/butchering)
|
|
butcher_comp.speed = 1 SECONDS
|
|
|
|
butcher.put_in_active_hand(gun, forced = TRUE)
|
|
click_wrapper(butcher, meat, list(RIGHT_CLICK = TRUE, BUTTON = RIGHT_CLICK))
|
|
TEST_ASSERT(QDELETED(meat), "The butcher did not butchering the monkey when using a bayonetted weapon.")
|