From 907089abe14bdab14e9b608065ae43e6656ef757 Mon Sep 17 00:00:00 2001 From: glax Date: Wed, 17 Jan 2024 23:12:51 +0100 Subject: [PATCH] ToString overrides --- CShocker/Ranges/RandomIntegerRange.cs | 5 +++++ CShocker/Ranges/Range.cs | 12 ------------ CShocker/Shockers/Abstract/HttpShocker.cs | 7 +++++++ CShocker/Shockers/Abstract/Shocker.cs | 8 ++++++++ 4 files changed, 20 insertions(+), 12 deletions(-) delete mode 100644 CShocker/Ranges/Range.cs diff --git a/CShocker/Ranges/RandomIntegerRange.cs b/CShocker/Ranges/RandomIntegerRange.cs index 26897f2..38b723d 100644 --- a/CShocker/Ranges/RandomIntegerRange.cs +++ b/CShocker/Ranges/RandomIntegerRange.cs @@ -19,4 +19,9 @@ public abstract class RandomIntegerRange { return Random.Shared.Next(this.Min, this.Max); } + + public override string ToString() + { + return $"Min: {Min} Max: {Max}"; + } } \ No newline at end of file diff --git a/CShocker/Ranges/Range.cs b/CShocker/Ranges/Range.cs deleted file mode 100644 index 3688947..0000000 --- a/CShocker/Ranges/Range.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace CShocker.Ranges; - -public struct Range -{ - public short Min, Max; - - public Range(short min, short max) - { - Min = min; - Max = max; - } -} \ No newline at end of file diff --git a/CShocker/Shockers/Abstract/HttpShocker.cs b/CShocker/Shockers/Abstract/HttpShocker.cs index 6675178..f9ba63d 100644 --- a/CShocker/Shockers/Abstract/HttpShocker.cs +++ b/CShocker/Shockers/Abstract/HttpShocker.cs @@ -14,4 +14,11 @@ public abstract class HttpShocker : Shocker Endpoint = endpoint; ApiKey = apiKey; } + + public override string ToString() + { + return $"{base.ToString()}\n" + + $"Endpoint: {Endpoint}\n" + + $"ApiKey: {ApiKey}"; + } } \ No newline at end of file diff --git a/CShocker/Shockers/Abstract/Shocker.cs b/CShocker/Shockers/Abstract/Shocker.cs index 2973499..7dad3bb 100644 --- a/CShocker/Shockers/Abstract/Shocker.cs +++ b/CShocker/Shockers/Abstract/Shocker.cs @@ -41,4 +41,12 @@ public abstract class Shocker { this.Logger = logger; } + + public override string ToString() + { + return $"ShockerType: {Enum.GetName(typeof(ShockerApi), this.ApiType)}\n" + + $"Shocker-IDs: {string.Join(", ", this.ShockerIds)}\n" + + $"IntensityRange: {IntensityRange}\n" + + $"DurationRange: {DurationRange}"; + } } \ No newline at end of file