mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-13 09:05:11 +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! /🆑
118 lines
4.5 KiB
Plaintext
118 lines
4.5 KiB
Plaintext
|
|
/mob/living/basic/slime/emp_act(severity)
|
|
. = ..()
|
|
if(. & EMP_PROTECT_SELF)
|
|
return
|
|
powerlevel = 0 // oh no, the power!
|
|
|
|
///If a slime is attack with an empty hand, shoves included, try to wrestle them off the mob they are on
|
|
/mob/living/basic/slime/proc/on_attack_hand(mob/living/basic/slime/defender_slime, mob/living/attacker)
|
|
SIGNAL_HANDLER
|
|
|
|
if(isnull(buckled))
|
|
return
|
|
|
|
if(buckled == attacker ? prob(60) : prob(30)) //its easier to remove the slime from yourself
|
|
attacker.visible_message(span_warning("[attacker] attempts to wrestle \the [defender_slime.name] off [buckled == attacker ? "" : buckled] !"), \
|
|
span_danger("[buckled == attacker ? "You attempt" : "[attacker] attempts" ] to wrestle \the [defender_slime.name] off [buckled == attacker ? "" : buckled]!"))
|
|
playsound(loc, 'sound/items/weapons/punchmiss.ogg', 25, TRUE, -1)
|
|
return
|
|
|
|
attacker.visible_message(span_warning("[attacker] manages to wrestle \the [defender_slime.name] off!"), span_notice("You manage to wrestle \the [defender_slime.name] off!"))
|
|
playsound(loc, 'sound/items/weapons/shove.ogg', 50, TRUE, -1)
|
|
|
|
defender_slime.discipline_slime()
|
|
|
|
/mob/living/basic/slime/attackby(obj/item/attacking_item, mob/living/user, list/modifiers, list/attack_modifiers)
|
|
|
|
//Lets you feed slimes plasma. Checks before the passthrough force check
|
|
if(istype(attacking_item, /obj/item/stack/sheet/mineral/plasma) && stat == CONSCIOUS)
|
|
use_sheet(attacking_item, user)
|
|
return
|
|
|
|
//Checks if the item passes through the slime first. Safe items can be used simply
|
|
if(check_item_passthrough(attacking_item, user))
|
|
return
|
|
|
|
try_discipline_slime(attacking_item)
|
|
|
|
if(!istype(attacking_item, /obj/item/storage/bag/xeno))
|
|
return ..()
|
|
|
|
use_xeno_bag(attacking_item, user)
|
|
|
|
|
|
///Checks if an item harmlessly passes through the slime
|
|
/mob/living/basic/slime/proc/check_item_passthrough(obj/item/attacking_item, mob/living/user)
|
|
if(attacking_item.force <= 0)
|
|
return FALSE
|
|
|
|
if(!prob(25))
|
|
return FALSE
|
|
|
|
user.do_attack_animation(src)
|
|
user.changeNext_move(CLICK_CD_MELEE)
|
|
to_chat(user, span_danger("[attacking_item] passes right through [src]!"))
|
|
return TRUE
|
|
|
|
///Attempts to use the item to discipline the unruly slime
|
|
/mob/living/basic/slime/proc/try_discipline_slime(obj/item/attacking_item)
|
|
if(attacking_item.force < 3)
|
|
return
|
|
|
|
var/force_effect = attacking_item.force * (life_stage == SLIME_LIFE_STAGE_BABY ? 2 : 1)
|
|
if(prob(10 + force_effect))
|
|
discipline_slime()
|
|
|
|
///Handles feeding a sheet of plasma to a slime
|
|
/mob/living/basic/slime/proc/use_sheet(obj/item/stack/sheet/mineral/plasma/delicious_sheet, mob/living/user)
|
|
befriend(user)
|
|
to_chat(user, span_notice("You feed the slime the plasma. It chirps happily."))
|
|
delicious_sheet.use(1)
|
|
new /obj/effect/temp_visual/heart(loc)
|
|
return
|
|
|
|
///Handles feeding a slim with a bag full of extracts
|
|
/mob/living/basic/slime/proc/use_xeno_bag(obj/item/storage/bag/xeno/xeno_bag, mob/living/user)
|
|
if(!crossbreed_modification)
|
|
to_chat(user, span_warning("The slime is not currently being mutated."))
|
|
return
|
|
var/has_output = FALSE //Have we outputted text?
|
|
var/has_found = FALSE //Have we found an extract to be added?
|
|
for(var/obj/item/slime_extract/extract in xeno_bag.contents)
|
|
if(extract.crossbreed_modification == crossbreed_modification)
|
|
xeno_bag.atom_storage.attempt_remove(extract, get_turf(src), silent = TRUE)
|
|
qdel(extract)
|
|
applied_crossbreed_amount++
|
|
has_found = TRUE
|
|
if(applied_crossbreed_amount >= SLIME_EXTRACT_CROSSING_REQUIRED)
|
|
to_chat(user, span_notice("You feed the slime as many of the extracts from the bag as you can, and it mutates!"))
|
|
playsound(src, 'sound/effects/blob/attackblob.ogg', 50, TRUE)
|
|
spawn_corecross()
|
|
has_output = TRUE
|
|
break
|
|
|
|
if(has_output)
|
|
return
|
|
|
|
if(!has_found)
|
|
to_chat(user, span_warning("There are no extracts in the bag that this slime will accept!"))
|
|
else
|
|
to_chat(user, span_notice("You feed the slime some extracts from the bag."))
|
|
playsound(src, 'sound/effects/blob/attackblob.ogg', 50, TRUE)
|
|
|
|
///Handles the adverse effects of water on slimes
|
|
/mob/living/basic/slime/proc/apply_water()
|
|
adjust_brute_loss(rand(15,20))
|
|
discipline_slime()
|
|
|
|
///Stops the slime from feeding, and might remove rabidity and targets
|
|
/mob/living/basic/slime/proc/discipline_slime()
|
|
stop_feeding(silent = TRUE)
|
|
if(life_stage == SLIME_LIFE_STAGE_BABY && prob(80))
|
|
ai_controller?.clear_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET)
|
|
ai_controller?.clear_blackboard_key(BB_CURRENT_HUNTING_TARGET)
|
|
|
|
if(prob(10))
|
|
ai_controller?.set_blackboard_key(BB_SLIME_RABID, FALSE)
|