From fd464731d522a4fecf49f172f27d556098d38125 Mon Sep 17 00:00:00 2001
From: Toastie <toastie@toastiet0ast.com>
Date: Tue, 4 Feb 2025 01:35:35 +1300
Subject: [PATCH] Minor cleanup, fish and xp design files The design files are
not in any standard format, just the way I think it is useful to see them
---
src/EllieBot/.editorconfig | 360 ------------------
src/EllieBot/EllieBot.csproj | 34 +-
src/EllieBot/Modules/Games/Fish/DESIGN.md | 41 ++
.../Modules/Games/Fish/{ => Db}/FishCatch.cs | 0
.../Modules/Games/Fish/Db/UserFishStats.cs | 12 +
.../Fish/Db/UserFishStatsConfiguration.cs | 13 +
.../Modules/Games/Fish/FishCommands.cs | 1 +
.../Modules/Games/Fish/FishService.cs | 35 +-
src/EllieBot/Modules/Xp/DESIGN.md | 32 ++
src/EllieBot/_common/Services/IEService.cs | 1 +
10 files changed, 124 insertions(+), 405 deletions(-)
delete mode 100644 src/EllieBot/.editorconfig
create mode 100644 src/EllieBot/Modules/Games/Fish/DESIGN.md
rename src/EllieBot/Modules/Games/Fish/{ => Db}/FishCatch.cs (100%)
create mode 100644 src/EllieBot/Modules/Games/Fish/Db/UserFishStats.cs
create mode 100644 src/EllieBot/Modules/Games/Fish/Db/UserFishStatsConfiguration.cs
create mode 100644 src/EllieBot/Modules/Xp/DESIGN.md
diff --git a/src/EllieBot/.editorconfig b/src/EllieBot/.editorconfig
deleted file mode 100644
index 9814958..0000000
--- a/src/EllieBot/.editorconfig
+++ /dev/null
@@ -1,360 +0,0 @@
-root = true
-# Remove the line below if you want to inherit .editorconfig settings from higher directories
-
-[obj/**]
-generated_code = true
-
-# C# files
-[*.cs]
-
-
-#### Core EditorConfig Options ####
-
-# Indentation and spacing
-indent_size = 4
-indent_style = space
-tab_width = 4
-
-# New line preferences
-end_of_line = crlf
-insert_final_newline = false
-
-#### .NET Coding Conventions ####
-
-# Organize usings
-dotnet_separate_import_directive_groups = false
-dotnet_sort_system_directives_first = false
-
-# this. and Me. preferences
-dotnet_style_qualification_for_event = false
-dotnet_style_qualification_for_field = false
-dotnet_style_qualification_for_method = false
-dotnet_style_qualification_for_property = false
-
-# Language keywords vs BCL types preferences
-dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
-dotnet_style_predefined_type_for_member_access = true:suggestion
-
-# Parentheses preferences
-dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:warning
-dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:warning
-dotnet_style_parentheses_in_other_operators = never_if_unnecessary
-dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:warning
-
-# Modifier preferences
-dotnet_style_require_accessibility_modifiers = always:error
-
-# Expression-level preferences
-dotnet_style_coalesce_expression = true
-dotnet_style_collection_initializer = true
-dotnet_style_explicit_tuple_names = true
-dotnet_style_namespace_match_folder = true
-dotnet_style_null_propagation = true
-dotnet_style_object_initializer = true
-dotnet_style_operator_placement_when_wrapping = beginning_of_line
-dotnet_style_prefer_auto_properties = true:warning
-dotnet_style_prefer_compound_assignment = true
-dotnet_style_prefer_conditional_expression_over_assignment = false:suggestion
-dotnet_style_prefer_conditional_expression_over_return = false:suggestion
-dotnet_style_prefer_inferred_anonymous_type_member_names = true
-dotnet_style_prefer_inferred_tuple_names = true
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true:error
-dotnet_style_prefer_simplified_boolean_expressions = true
-dotnet_style_prefer_simplified_interpolation = true
-
-# Field preferences
-dotnet_style_readonly_field = true:suggestion
-
-# Parameter preferences
-dotnet_code_quality_unused_parameters = all:warning
-
-#### C# Coding Conventions ####
-
-# var preferences
-csharp_style_var_elsewhere = true
-csharp_style_var_for_built_in_types = true:suggestion
-csharp_style_var_when_type_is_apparent = true:suggestion
-
-# Expression-bodied members
-csharp_style_expression_bodied_accessors = true:suggestion
-csharp_style_expression_bodied_indexers = true:suggestion
-csharp_style_expression_bodied_lambdas = true:suggestion
-csharp_style_expression_bodied_local_functions = true:suggestion
-csharp_style_expression_bodied_methods = when_on_single_line:suggestion
-csharp_style_expression_bodied_operators = when_on_single_line:suggestion
-csharp_style_expression_bodied_properties = true:suggestion
-
-# Pattern matching preferences
-csharp_style_pattern_matching_over_as_with_null_check = true:error
-csharp_style_pattern_matching_over_is_with_cast_check = true:error
-csharp_style_prefer_not_pattern = true:error
-csharp_style_prefer_pattern_matching = true:suggestion
-csharp_style_prefer_switch_expression = true
-
-# Null-checking preferences
-csharp_style_conditional_delegate_call = true:error
-
-# Modifier preferences
-csharp_prefer_static_local_function = true
-csharp_preferred_modifier_order = public, private, protected, internal, static, extern, new, virtual, abstract, sealed, override, readonly, unsafe, volatile, async
-
-# Code-block preferences
-csharp_prefer_braces = when_multiline:warning
-csharp_prefer_simple_using_statement = true
-
-# Expression-level preferences
-csharp_prefer_simple_default_expression = true
-csharp_style_deconstructed_variable_declaration = true
-csharp_style_implicit_object_creation_when_type_is_apparent = true:error
-csharp_style_inlined_variable_declaration = true:warning
-csharp_style_pattern_local_over_anonymous_function = true
-csharp_style_prefer_index_operator = true
-csharp_style_prefer_range_operator = true
-csharp_style_throw_expression = true:error
-csharp_style_unused_value_assignment_preference = discard_variable:warning
-csharp_style_unused_value_expression_statement_preference = discard_variable
-
-# 'using' directive preferences
-csharp_using_directive_placement = outside_namespace:error
-
-# Enforce file-scoped namespaces
-csharp_style_namespace_declarations = file_scoped:error
-
-# New line preferences
-csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
-csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false
-csharp_style_allow_embedded_statements_on_same_line_experimental = false
-
-#### C# Formatting Rules ####
-
-# New line preferences
-csharp_new_line_before_catch = true
-csharp_new_line_before_else = true
-csharp_new_line_before_finally = true
-csharp_new_line_before_members_in_anonymous_types = true
-csharp_new_line_before_members_in_object_initializers = true
-csharp_new_line_before_open_brace = all
-csharp_new_line_between_query_expression_clauses = true
-
-# Indentation preferences
-csharp_indent_block_contents = true
-csharp_indent_braces = false
-csharp_indent_case_contents = true
-csharp_indent_case_contents_when_block = true
-csharp_indent_labels = one_less_than_current
-csharp_indent_switch_labels = true
-
-# Space preferences
-csharp_space_after_cast = false
-csharp_space_after_colon_in_inheritance_clause = true
-csharp_space_after_comma = true
-csharp_space_after_dot = false
-csharp_space_after_keywords_in_control_flow_statements = true
-csharp_space_after_semicolon_in_for_statement = true
-csharp_space_around_binary_operators = before_and_after
-csharp_space_around_declaration_statements = false
-csharp_space_before_colon_in_inheritance_clause = true
-csharp_space_before_comma = false
-csharp_space_before_dot = false
-csharp_space_before_open_square_brackets = false
-csharp_space_before_semicolon_in_for_statement = false
-csharp_space_between_empty_square_brackets = false
-csharp_space_between_method_call_empty_parameter_list_parentheses = false
-csharp_space_between_method_call_name_and_opening_parenthesis = false
-csharp_space_between_method_call_parameter_list_parentheses = false
-csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
-csharp_space_between_method_declaration_name_and_open_parenthesis = false
-csharp_space_between_method_declaration_parameter_list_parentheses = false
-csharp_space_between_parentheses = false
-csharp_space_between_square_brackets = false
-
-# Wrapping preferences
-csharp_preserve_single_line_blocks = true
-csharp_preserve_single_line_statements = false
-
-#### Naming styles ####
-
-# Naming rules
-
-dotnet_naming_rule.private_readonly_field.symbols = private_readonly_field
-dotnet_naming_rule.private_readonly_field.style = begins_with_underscore
-dotnet_naming_rule.private_readonly_field.severity = warning
-
-# dotnet_naming_rule.private_field.symbols = private_field
-# dotnet_naming_rule.private_field.style = camel_case
-# dotnet_naming_rule.private_field.severity = warning
-
-dotnet_naming_rule.const_fields.symbols = const_fields
-dotnet_naming_rule.const_fields.style = all_upper
-dotnet_naming_rule.const_fields.severity = warning
-
-# dotnet_naming_rule.class_should_be_pascal_case.severity = error
-# dotnet_naming_rule.class_should_be_pascal_case.symbols = class
-# dotnet_naming_rule.class_should_be_pascal_case.style = pascal_case
-
-dotnet_naming_rule.struct_should_be_pascal_case.severity = error
-dotnet_naming_rule.struct_should_be_pascal_case.symbols = struct
-dotnet_naming_rule.struct_should_be_pascal_case.style = pascal_case
-
-dotnet_naming_rule.interface_should_be_begins_with_i.severity = error
-dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
-dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
-
-# dotnet_naming_rule.types_should_be_pascal_case.severity = error
-# dotnet_naming_rule.types_should_be_pascal_case.symbols = types
-# dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
-
-# dotnet_naming_rule.enum_should_be_pascal_case.severity = error
-# dotnet_naming_rule.enum_should_be_pascal_case.symbols = enum
-# dotnet_naming_rule.enum_should_be_pascal_case.style = pascal_case
-
-# dotnet_naming_rule.property_should_be_pascal_case.severity = error
-# dotnet_naming_rule.property_should_be_pascal_case.symbols = property
-# dotnet_naming_rule.property_should_be_pascal_case.style = pascal_case
-
-dotnet_naming_rule.method_should_be_pascal_case.severity = error
-dotnet_naming_rule.method_should_be_pascal_case.symbols = method
-dotnet_naming_rule.method_should_be_pascal_case.style = pascal_case
-
-dotnet_naming_rule.async_method_should_be_ends_with_async.severity = error
-dotnet_naming_rule.async_method_should_be_ends_with_async.symbols = async_method
-dotnet_naming_rule.async_method_should_be_ends_with_async.style = ends_with_async
-
-# dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = error
-# dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
-# dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
-
-dotnet_naming_rule.local_variable_should_be_camel_case.severity = error
-dotnet_naming_rule.local_variable_should_be_camel_case.symbols = local_variable
-dotnet_naming_rule.local_variable_should_be_camel_case.style = camel_case
-
-# Symbol specifications
-
-dotnet_naming_symbols.const_fields.required_modifiers = const
-dotnet_naming_symbols.const_fields.applicable_kinds = field
-
-dotnet_naming_symbols.class.applicable_kinds = class
-dotnet_naming_symbols.class.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.class.required_modifiers =
-
-dotnet_naming_symbols.interface.applicable_kinds = interface
-dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.interface.required_modifiers =
-
-dotnet_naming_symbols.struct.applicable_kinds = struct
-dotnet_naming_symbols.struct.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.struct.required_modifiers =
-
-dotnet_naming_symbols.enum.applicable_kinds = enum
-dotnet_naming_symbols.enum.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.enum.required_modifiers =
-
-dotnet_naming_symbols.method.applicable_kinds = method
-dotnet_naming_symbols.method.applicable_accessibilities = public
-dotnet_naming_symbols.method.required_modifiers =
-
-dotnet_naming_symbols.property.applicable_kinds = property
-dotnet_naming_symbols.property.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.property.required_modifiers =
-
-dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
-dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.types.required_modifiers =
-
-dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
-dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.non_field_members.required_modifiers =
-
-dotnet_naming_symbols.private_readonly_field.applicable_kinds = field
-dotnet_naming_symbols.private_readonly_field.applicable_accessibilities = private, protected
-dotnet_naming_symbols.private_readonly_field.required_modifiers = readonly
-
-dotnet_naming_symbols.private_field.applicable_kinds = field
-dotnet_naming_symbols.private_field.applicable_accessibilities = private, protected
-dotnet_naming_symbols.private_field.required_modifiers =
-
-dotnet_naming_symbols.async_method.applicable_kinds = method, local_function
-dotnet_naming_symbols.async_method.applicable_accessibilities = *
-dotnet_naming_symbols.async_method.required_modifiers = async
-
-dotnet_naming_symbols.local_variable.applicable_kinds = parameter, local
-dotnet_naming_symbols.local_variable.applicable_accessibilities = local
-dotnet_naming_symbols.local_variable.required_modifiers =
-
-# Naming styles
-
-
-dotnet_naming_style.all_upper.capitalization = all_upper
-
-dotnet_naming_style.pascal_case.required_prefix =
-dotnet_naming_style.pascal_case.required_suffix =
-dotnet_naming_style.pascal_case.word_separator =
-dotnet_naming_style.pascal_case.capitalization = pascal_case
-
-dotnet_naming_style.begins_with_i.required_prefix = I
-dotnet_naming_style.begins_with_i.required_suffix =
-dotnet_naming_style.begins_with_i.word_separator =
-dotnet_naming_style.begins_with_i.capitalization = pascal_case
-
-dotnet_naming_style.begins_with_underscore.required_prefix = _
-dotnet_naming_style.begins_with_underscore.required_suffix =
-dotnet_naming_style.begins_with_underscore.word_separator =
-dotnet_naming_style.begins_with_underscore.capitalization = camel_case
-
-dotnet_naming_style.ends_with_async.required_prefix =
-# dotnet_naming_style.ends_with_async.required_suffix = Async
-dotnet_naming_style.ends_with_async.word_separator =
-dotnet_naming_style.ends_with_async.capitalization = pascal_case
-
-dotnet_naming_style.camel_case.required_prefix =
-dotnet_naming_style.camel_case.required_suffix =
-dotnet_naming_style.camel_case.word_separator =
-dotnet_naming_style.camel_case.capitalization = camel_case
-
-# CA1822: Mark members as static
-dotnet_diagnostic.ca1822.severity = suggestion
-
-# IDE0004: Cast is redundant
-dotnet_diagnostic.ide0004.severity = warning
-
-# IDE0058: Expression value is never used
-dotnet_diagnostic.ide0058.severity = none
-
-# # IDE0011: Add braces to 'if'/'else' statement
-# dotnet_diagnostic.ide0011.severity = none
-
-resharper_wrap_after_invocation_lpar = false
-resharper_wrap_before_invocation_rpar = false
-
-# ReSharper properties
-resharper_align_multiline_calls_chain = true
-resharper_csharp_wrap_after_declaration_lpar = true
-resharper_csharp_wrap_after_invocation_lpar = false
-resharper_csharp_wrap_before_binary_opsign = true
-resharper_csharp_wrap_before_invocation_rpar = false
-resharper_csharp_wrap_parameters_style = chop_if_long
-resharper_force_chop_compound_if_expression = false
-resharper_keep_existing_linebreaks = true
-resharper_keep_user_linebreaks = true
-resharper_max_formal_parameters_on_line = 3
-resharper_place_simple_embedded_statement_on_same_line = false
-resharper_wrap_chained_binary_expressions = chop_if_long
-resharper_wrap_chained_binary_patterns = chop_if_long
-resharper_wrap_chained_method_calls = chop_if_long
-resharper_wrap_object_and_collection_initializer_style = chop_always
-
-resharper_csharp_wrap_before_first_type_parameter_constraint = true
-resharper_csharp_place_type_constraints_on_same_line = false
-resharper_csharp_wrap_before_extends_colon = true
-resharper_csharp_place_constructor_initializer_on_same_line = false
-resharper_force_attribute_style = separate
-resharper_csharp_braces_for_ifelse = required_for_multiline_statement
-resharper_csharp_braces_for_foreach = required_for_multiline
-resharper_csharp_braces_for_while = required_for_multiline
-resharper_csharp_braces_for_for = required_for_multiline
-resharper_arrange_redundant_parentheses_highlighting = hint
-
-# IDE0011: Add braces
-dotnet_diagnostic.IDE0011.severity = warning
-
-resharper_arrange_type_member_modifiers_highlighting = hint
\ No newline at end of file
diff --git a/src/EllieBot/EllieBot.csproj b/src/EllieBot/EllieBot.csproj
index 918638e..72b6799 100644
--- a/src/EllieBot/EllieBot.csproj
+++ b/src/EllieBot/EllieBot.csproj
@@ -27,13 +27,13 @@
<PrivateAssets>all</PrivateAssets>
<Publish>True</Publish>
</PackageReference>
- <PackageReference Include="CodeHollow.FeedReader" Version="1.2.6"/>
- <PackageReference Include="CommandLineParser" Version="2.9.1"/>
+ <PackageReference Include="CodeHollow.FeedReader" Version="1.2.6" />
+ <PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="Discord.Net" Version="3.17.1" />
<PackageReference Include="CoreCLR-NCalc" Version="3.1.253" />
- <PackageReference Include="Google.Apis.Urlshortener.v1" Version="1.41.1.138"/>
+ <PackageReference Include="Google.Apis.Urlshortener.v1" Version="1.41.1.138" />
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.68.0.3653" />
- <PackageReference Include="Google.Apis.Customsearch.v1" Version="1.49.0.2084"/>
+ <PackageReference Include="Google.Apis.Customsearch.v1" Version="1.49.0.2084" />
<PackageReference Include="Google.Protobuf" Version="3.29.3" />
<PackageReference Include="Grpc" Version="2.46.6" />
@@ -46,23 +46,23 @@
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" />
- <PackageReference Include="MorseCode.ITask" Version="2.0.3"/>
- <PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0"/>
+ <PackageReference Include="MorseCode.ITask" Version="2.0.3" />
+ <PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
<!-- DI -->
<!-- <PackageReference Include="Ninject" Version="3.3.6"/>-->
<!-- <PackageReference Include="Ninject.Extensions.Conventions" Version="3.3.0"/>-->
<!-- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />-->
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
- <PackageReference Include="DryIoc.dll" Version="5.4.3"/>
+ <PackageReference Include="DryIoc.dll" Version="5.4.3" />
<!-- <PackageReference Include="Scrutor" Version="4.2.0" />-->
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.1" />
- <PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2"/>
- <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
- <PackageReference Include="NonBlocking" Version="2.1.2"/>
+ <PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2" />
+ <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+ <PackageReference Include="NonBlocking" Version="2.1.2" />
<PackageReference Include="OneOf" Version="3.0.271" />
<PackageReference Include="OneOf.SourceGenerator" Version="3.0.271" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
@@ -71,10 +71,10 @@
<PackageReference Include="SixLabors.Fonts" Version="2.1.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.5" />
- <PackageReference Include="SixLabors.Shapes" Version="1.0.0-beta0009"/>
+ <PackageReference Include="SixLabors.Shapes" Version="1.0.0-beta0009" />
<PackageReference Include="StackExchange.Redis" Version="2.8.24" />
<PackageReference Include="YamlDotNet" Version="15.1.6" />
- <PackageReference Include="SharpToken" Version="2.0.3"/>
+ <PackageReference Include="SharpToken" Version="2.0.3" />
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
@@ -102,14 +102,14 @@
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\EllieBot.GrpcApiBase\EllieBot.GrpcApiBase.csproj"/>
- <ProjectReference Include="..\Ellie.Marmalade\Ellie.Marmalade.csproj"/>
- <ProjectReference Include="..\EllieBot.Voice\EllieBot.Voice.csproj"/>
- <ProjectReference Include="..\EllieBot.Generators\EllieBot.Generators.csproj" OutputItemType="Analyzer"/>
+ <ProjectReference Include="..\EllieBot.GrpcApiBase\EllieBot.GrpcApiBase.csproj" />
+ <ProjectReference Include="..\Ellie.Marmalade\Ellie.Marmalade.csproj" />
+ <ProjectReference Include="..\EllieBot.Voice\EllieBot.Voice.csproj" />
+ <ProjectReference Include="..\EllieBot.Generators\EllieBot.Generators.csproj" OutputItemType="Analyzer" />
</ItemGroup>
<ItemGroup>
- <AdditionalFiles Include="strings\responses\responses.en-US.json"/>
+ <AdditionalFiles Include="strings\responses\responses.en-US.json" />
</ItemGroup>
<ItemGroup>
diff --git a/src/EllieBot/Modules/Games/Fish/DESIGN.md b/src/EllieBot/Modules/Games/Fish/DESIGN.md
new file mode 100644
index 0000000..4beddd4
--- /dev/null
+++ b/src/EllieBot/Modules/Games/Fish/DESIGN.md
@@ -0,0 +1,41 @@
+## Fishing
+
+- Catch different kinds of fish in different locations
+- Fish have
+ - Rarity (how hard is it to catch?)
+ - Quality (1-4 stars, higher stars less likely)
+ - Spot (Where can they be caught)
+ - Weather (Which weather conditions can they be caught in)
+ - Time (What time of day can they be caught)
+
+### Todo
+ - Sets (sub collections)
+ - Profile Badge or achievement?
+ - Buff for each completed set?
+ - Baits
+ - Increase the odds of getting
+ - Any Fish
+ - Any Trash
+ - Fish in weather
+ - Fish in location
+ - Rare Fish/Trash
+ - Quality of the catch
+ - Boost fishing speed?
+ - Or this could be a separate consumable?
+ - Reel in
+ - If the fish is rare, or quality is high, require the user to reel it in
+
+```mermaid
+
+flowchart TD
+ classDef todo fill:#e55
+
+ A[.fish] --> B[Catch Fish]
+ B --> C["Show off with .fili"]
+ B --> D["Complete the set"]:::todo
+ D --> E[Recognition]:::todo & F[Buff?]:::todo
+ F --> B
+ B --> X[Buy bait]:::todo
+ X1[Modify Odds]:::todo --> B
+ X --> X1
+```
diff --git a/src/EllieBot/Modules/Games/Fish/FishCatch.cs b/src/EllieBot/Modules/Games/Fish/Db/FishCatch.cs
similarity index 100%
rename from src/EllieBot/Modules/Games/Fish/FishCatch.cs
rename to src/EllieBot/Modules/Games/Fish/Db/FishCatch.cs
diff --git a/src/EllieBot/Modules/Games/Fish/Db/UserFishStats.cs b/src/EllieBot/Modules/Games/Fish/Db/UserFishStats.cs
new file mode 100644
index 0000000..8462f1f
--- /dev/null
+++ b/src/EllieBot/Modules/Games/Fish/Db/UserFishStats.cs
@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace EllieBot.Modules.Games;
+
+public sealed class UserFishStats
+{
+ [Key]
+ public int Id { get; set; }
+
+ public ulong UserId { get; set; }
+ public int Skill { get; set; }
+}
\ No newline at end of file
diff --git a/src/EllieBot/Modules/Games/Fish/Db/UserFishStatsConfiguration.cs b/src/EllieBot/Modules/Games/Fish/Db/UserFishStatsConfiguration.cs
new file mode 100644
index 0000000..4d65ffd
--- /dev/null
+++ b/src/EllieBot/Modules/Games/Fish/Db/UserFishStatsConfiguration.cs
@@ -0,0 +1,13 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace EllieBot.Modules.Games;
+
+public sealed class UserFishStatsConfiguration : IEntityTypeConfiguration<UserFishStats>
+{
+ public void Configure(EntityTypeBuilder<UserFishStats> builder)
+ {
+ builder.HasIndex(x => x.UserId)
+ .IsUnique();
+ }
+}
\ No newline at end of file
diff --git a/src/EllieBot/Modules/Games/Fish/FishCommands.cs b/src/EllieBot/Modules/Games/Fish/FishCommands.cs
index d89c289..f4bec17 100644
--- a/src/EllieBot/Modules/Games/Fish/FishCommands.cs
+++ b/src/EllieBot/Modules/Games/Fish/FishCommands.cs
@@ -1,5 +1,6 @@
using System.ComponentModel.DataAnnotations;
using System.Text;
+using EllieBot.Modules.Games.Fish;
using Format = Discord.Format;
namespace EllieBot.Modules.Games;
diff --git a/src/EllieBot/Modules/Games/Fish/FishService.cs b/src/EllieBot/Modules/Games/Fish/FishService.cs
index af7f068..43d8868 100644
--- a/src/EllieBot/Modules/Games/Fish/FishService.cs
+++ b/src/EllieBot/Modules/Games/Fish/FishService.cs
@@ -1,17 +1,14 @@
-using LinqToDB;
+using System.Security.Cryptography;
+using LinqToDB;
using LinqToDB.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using System.ComponentModel.DataAnnotations;
-using System.Security.Cryptography;
-namespace EllieBot.Modules.Games;
+namespace EllieBot.Modules.Games.Fish;
public sealed class FishService(FishConfigService fcs, IBotCache cache, DbService db) : IEService
{
- public const double MAX_SKILL = 100;
+ private const double MAX_SKILL = 100;
- private Random _rng = new Random();
+ private readonly Random _rng = new Random();
private static TypedKey<bool> FishingKey(ulong userId)
=> new($"fishing:{userId}");
@@ -198,10 +195,10 @@ public sealed class FishService(FishConfigService fcs, IBotCache cache, DbServic
MaxStars = caught.Stars,
Count = 1
},
- (old) => new()
+ (old) => new FishCatch()
{
Count = old.Count + 1,
- MaxStars = Math.Max((int)old.MaxStars, caught.Stars),
+ MaxStars = Math.Max(old.MaxStars, caught.Stars),
},
() => new()
{
@@ -400,22 +397,4 @@ public sealed class FishService(FishConfigService fcs, IBotCache cache, DbServic
return catches;
}
-}
-
-public sealed class UserFishStats
-{
- [Key]
- public int Id { get; set; }
-
- public ulong UserId { get; set; }
- public int Skill { get; set; }
-}
-
-public sealed class UserFishStatsConfiguration : IEntityTypeConfiguration<UserFishStats>
-{
- public void Configure(EntityTypeBuilder<UserFishStats> builder)
- {
- builder.HasIndex(x => x.UserId)
- .IsUnique();
- }
}
\ No newline at end of file
diff --git a/src/EllieBot/Modules/Xp/DESIGN.md b/src/EllieBot/Modules/Xp/DESIGN.md
new file mode 100644
index 0000000..7881156
--- /dev/null
+++ b/src/EllieBot/Modules/Xp/DESIGN.md
@@ -0,0 +1,32 @@
+## Xp System
+
+- Users in voice and text channels gain xp
+- Users gain levels due to activity and receive rewards/recognition
+- Server admin can
+ - Set Role Rewards
+ - Exclude Users, channels and entire servers
+
+### Todo
+
+- Let users specify server currency rewards
+- Server owner should be able to set xp rate on the server
+- Remove global xp?
+
+```mermaid
+flowchart TD
+ classDef haha fill: #550
+ A1[Text-Chatting] & A2[Voice-Chatting] --> B[Gain Xp]
+ B -.-> Bq{Exclude?}
+ Bq -->|No| C[Level Up]
+ C --> S1
+ C --> S2
+
+ subgraph S1[Recognition]
+ Dx[Level Up Notification] & Dy[Xp Card]
+ end
+
+ subgraph S2[lvl up rewards]
+ Ex[Role] & Ey[Currency]:::haha
+ Ex --> Ex2[Server Benefit]
+ end
+```
\ No newline at end of file
diff --git a/src/EllieBot/_common/Services/IEService.cs b/src/EllieBot/_common/Services/IEService.cs
index 944d8cc..db25ecf 100644
--- a/src/EllieBot/_common/Services/IEService.cs
+++ b/src/EllieBot/_common/Services/IEService.cs
@@ -4,6 +4,7 @@ namespace EllieBot.Services;
/// <summary>
/// All services must implement this interface in order to be auto-discovered by the DI system
/// </summary>
+[UsedImplicitly(ImplicitUseTargetFlags.WithInheritors)]
public interface IEService
{
}
\ No newline at end of file