diff --git a/.editorconfig b/.editorconfig index 581bf02..8c5f444 100644 --- a/.editorconfig +++ b/.editorconfig @@ -77,7 +77,6 @@ csharp_style_expression_bodied_local_functions = when_on_single_line csharp_style_expression_bodied_methods = false # Analyzers -dotnet_analyzer_diagnostic.severity = suggestion dotnet_diagnostic.IDE0001.severity = suggestion # Name can be simplified. dotnet_diagnostic.IDE0005.severity = warning # Unused using directives. @@ -86,7 +85,6 @@ dotnet_diagnostic.IDE0010.severity = silent # Incomplete switch statements. dotnet_diagnostic.IDE0072.severity = silent # ^ Ditto. dotnet_diagnostic.IDE0022.severity = warning # Use of expression body for methods. dotnet_diagnostic.IDE0046.severity = silent # Use conditional expression for return. -dotnet_diagnostic.IDE0055.severity = silent # Formatting rule. dotnet_diagnostic.IDE0059.severity = warning # Useless assignation. dotnet_diagnostic.IDE1006.severity = default # Naming rule. dotnet_diagnostic.CA1710.severity = silent # Meaningful names. diff --git a/addons/GodotInk/Src/InkChoice.cs b/addons/GodotInk/Src/InkChoice.cs index ec31b59..857cb2d 100644 --- a/addons/GodotInk/Src/InkChoice.cs +++ b/addons/GodotInk/Src/InkChoice.cs @@ -1,7 +1,6 @@ #nullable enable using Godot; -using Ink.Runtime; using System.Collections.Generic; namespace GodotInk; @@ -17,14 +16,14 @@ public partial class InkChoice : GodotObject public int Index => inner.index; public List Tags => inner.tags; - private readonly Choice inner; + private readonly Ink.Runtime.Choice inner; private InkChoice() { - inner = new Choice(); + inner = new Ink.Runtime.Choice(); } - public InkChoice(Choice inner) + public InkChoice(Ink.Runtime.Choice inner) { this.inner = inner; } diff --git a/addons/GodotInk/Src/InkStory.cs b/addons/GodotInk/Src/InkStory.cs index c7bf4cb..75d0bf8 100644 --- a/addons/GodotInk/Src/InkStory.cs +++ b/addons/GodotInk/Src/InkStory.cs @@ -1,7 +1,6 @@ #nullable enable using Godot; -using Ink.Runtime; using System; using System.Collections.Generic; @@ -38,10 +37,10 @@ protected virtual string RawStory } private string rawStory = string.Empty; - private Story runtimeStory = null!; + private Ink.Runtime.Story runtimeStory = null!; private readonly Dictionary> observers = new(); - private readonly Dictionary internalObservers = new(); + private readonly Dictionary internalObservers = new(); public static InkStory Create(string rawStory) { @@ -59,7 +58,7 @@ private void InitializeRuntimeStory() runtimeStory.onMakeChoice -= OnMadeChoice; } - runtimeStory = new Story(rawStory); + runtimeStory = new Ink.Runtime.Story(rawStory); runtimeStory.onDidContinue += OnContinued; runtimeStory.onMakeChoice += OnMadeChoice; @@ -229,7 +228,7 @@ public void ObserveVariable(string variableName, Callable observer) { if (!internalObservers.ContainsKey(variableName)) { - Story.VariableObserver internalObserver = BuildObserver(); + Ink.Runtime.Story.VariableObserver internalObserver = BuildObserver(); runtimeStory.ObserveVariable(variableName, internalObserver); internalObservers[variableName] = internalObserver; } @@ -251,7 +250,7 @@ public void ObserveVariable(string[] variableNames, Callable observer) ObserveVariable(variableName, observer); } - private Story.VariableObserver BuildObserver() + private Ink.Runtime.Story.VariableObserver BuildObserver() { return delegate (string name, object? value) { @@ -677,7 +676,7 @@ private void OnContinued() _ = EmitSignal(SignalName.Continued); } - private void OnMadeChoice(Choice choice) + private void OnMadeChoice(Ink.Runtime.Choice choice) { _ = EmitSignal(SignalName.MadeChoice, new InkChoice(choice)); }