From e38808306586f70558c0d670dc871d1c47f61038 Mon Sep 17 00:00:00 2001 From: Nicola Date: Tue, 19 May 2026 19:21:11 +0200 Subject: [PATCH] Removed Memory Display. --- RuinAdventurer.csproj.lscache | 458 ++++++++++++++++++++++++++ Scenes/Game.tscn | 1 - Scripts/UI/Common/UIHandler.cs | 1 - Scripts/UI/Common/UIHandlerDisplay.cs | 12 - 4 files changed, 458 insertions(+), 14 deletions(-) create mode 100644 RuinAdventurer.csproj.lscache diff --git a/RuinAdventurer.csproj.lscache b/RuinAdventurer.csproj.lscache new file mode 100644 index 0000000..90fe2a3 --- /dev/null +++ b/RuinAdventurer.csproj.lscache @@ -0,0 +1,458 @@ +version=1 + +# This file caches language service data to improve the performance of C# Dev Kit. +# It is not intended for manual editing. It can safely be deleted and will be +# regenerated automatically. For more information, see https://aka.ms/lscache +# +# To control where cache files are stored, use the following VS Code setting: +# "dotnet.projectsystem.cacheInProjectFolder": true + +[project] +language=C# +primary +lastDtbSucceeded + +[properties] +AssemblyName=RuinAdventurer +CommandLineArgsForDesignTimeEvaluation=-langversion:12.0 -define:TRACE +CompilerGeneratedFilesOutputPath= +MaxSupportedLangVersion=12.0 +ProjectAssetsFile=.godot/mono/temp/obj/project.assets.json +RootNamespace=RuinAdventurer +RunAnalyzers= +RunAnalyzersDuringLiveAnalysis= +SolutionPath=RuinAdventurer.sln +TargetFrameworkIdentifier=.NETCoreApp +TargetPath=.godot/mono/temp/bin/Debug/RuinAdventurer.dll +TargetRefPath=.godot/mono/temp/obj/Debug/ref/RuinAdventurer.dll +TemporaryDependencyNodeTargetIdentifier=net8.0 + +[commandLineArguments] +/noconfig +/unsafe- +/checked- +/nowarn:1701,1702,1701,1702 +/fullpaths +/nostdlib+ +/errorreport:prompt +/warn:8 +/define:GODOT;GODOT_LINUXBSD;GODOT_PC;GODOT4;GODOT4_6;GODOT4_6_1;GODOT4_OR_GREATER;GODOT4_0_OR_GREATER;GODOT4_1_OR_GREATER;GODOT4_2_OR_GREATER;GODOT4_3_OR_GREATER;GODOT4_4_OR_GREATER;GODOT4_5_OR_GREATER;GODOT4_6_OR_GREATER;GODOT4_6_0_OR_GREATER;GODOT4_6_1_OR_GREATER;TRACE;DEBUG;NET;NET8_0;NETCOREAPP;TOOLS;NET5_0_OR_GREATER;NET6_0_OR_GREATER;NET7_0_OR_GREATER;NET8_0_OR_GREATER;NETCOREAPP1_0_OR_GREATER;NETCOREAPP1_1_OR_GREATER;NETCOREAPP2_0_OR_GREATER;NETCOREAPP2_1_OR_GREATER;NETCOREAPP2_2_OR_GREATER;NETCOREAPP3_0_OR_GREATER;NETCOREAPP3_1_OR_GREATER +/highentropyva+ +/debug+ +/debug:portable +/filealign:512 +/optimize- +/out:.godot/mono/temp/obj/Debug/RuinAdventurer.dll +/refout:.godot/mono/temp/obj/Debug/refint/RuinAdventurer.dll +/target:library +/warnaserror- +/utf8output +/deterministic+ +/langversion:12.0 +/warnaserror+:NU1605,SYSLIB0011 + +[sourceFiles] +.godot/mono/temp/obj/Debug/ + .NETCoreApp,Version=v8.0.AssemblyAttributes.cs + RuinAdventurer.AssemblyInfo.cs +addons/godotsteam_csharpbindings/Apps/ + Dlc.cs + DlcDownloadProgress.cs + InstalledApps.cs + TimedTrial.cs +addons/godotsteam_csharpbindings/Friends/ + AvatarSize.cs + ChatRoomEnterResponse.cs + ClanActivityCounts.cs + ClanChatMessage.cs + ClanChatMessageType.cs + ClanOfficer.cs + CommunityProfileItemProperty.cs + CommunityProfileItemType.cs + Follow.cs + Friend.cs + FriendFlag.cs + FriendGroup.cs + FriendRelationship.cs + GameOverlayType.cs + GameOverlayUserType.cs + PersonaChange.cs + PersonaState.cs + ProfileData.cs + RecentPlayer.cs + RichPresenceKeys.cs + SteamGroup.cs + UserRestriction.cs +addons/godotsteam_csharpbindings/GameSearch/ + PlayerData.cs + PlayerResult.cs + SearchProgress.cs + SearchResult.cs +addons/godotsteam_csharpbindings/HTMLSurface/ + HtmlKeyModifiers.cs + HtmlLinkData.cs + HtmlMouseButton.cs + HtmlMouseCursor.cs + HtmlPageData.cs + HtmlScrollData.cs + HtmlUrlData.cs + HtmlWindowData.cs +addons/godotsteam_csharpbindings/ + Methods.cs + Screenshots/VRScreenshotType.cs + Signals.cs + Steam.AppLists.cs + Steam.AppLists.Signals.cs + Steam.Apps.cs + Steam.Apps.Signals.cs + Steam.cs + Steam.Friends.cs + Steam.Friends.Signals.cs + Steam.GameSearch.cs + Steam.GameSearch.Signals.cs + Steam.Generated.Data.cs + Steam.HTMLSurface.cs + Steam.HTMLSurface.Signals.cs + Steam.HTTP.cs + Steam.HTTP.Signals.cs + Steam.Input.cs + Steam.Input.Signals.cs + Steam.Inventory.cs + Steam.Inventory.Signals.cs + Steam.Matchmaking.cs + Steam.Matchmaking.Signals.cs + Steam.MatchmakingServers.cs + Steam.MatchmakingServers.Signals.cs + Steam.Music.cs + Steam.MusicRemote.cs + Steam.MusicRemote.Signals.cs + Steam.Networking.cs + Steam.Networking.Signals.cs + Steam.NetworkingMessages.cs + Steam.NetworkingMessages.Signals.cs + Steam.NetworkingSockets.cs + Steam.NetworkingSockets.Signals.cs + Steam.NetworkingTypes.cs + Steam.NetworkingUtils.cs + Steam.NetworkingUtils.Signals.cs + Steam.ParentalSettings.cs + Steam.ParentalSettings.Signals.cs + Steam.Parties.cs + Steam.Parties.Signals.cs + Steam.RemotePlay.cs + Steam.RemotePlay.Signals.cs + Steam.RemoteStorage.cs + Steam.RemoteStorage.Signals.cs + Steam.Screenshots.cs + Steam.Screenshots.Signals.cs + Steam.Signals.cs + Steam.UGC.cs + Steam.UGC.Signals.cs + Steam.User.cs + Steam.User.Signals.cs + Steam.UserStats.cs + Steam.UserStats.Signals.cs + Steam.Utils.cs + Steam.Utils.Signals.cs + Steam.Video.cs + Steam.Video.Signals.cs + Steam/ + ErrorResult.cs + SteamInitExResult.cs + SteamInitExStatus.cs + SteamInitResult.cs + SteamInitStatus.cs + Utils/ + ApiCallResult.cs + FloatingGamepadTextInputMode.cs + GamepadTextInputLineMode.cs + GamepadTextInputMode.cs + ImageRGBA.cs + ImageSize.cs + OverlayNotificationPosition.cs + TextFilteringContext.cs + Video/BroadcastStatus.cs +Scripts/Core/ + FileHandler.cs + GameData.cs + ResourceLoader.cs + SaveGameData.cs + SaveGameDataApplier.cs + SaveGameDataFactory.cs + SaveGameManager.cs + SoundManager.cs + SteamworksHandler.cs +Scripts/DSL/ + NodeResult.cs + Nodes/ + CraftNode.cs + ExploreNode.cs + ForNode.cs + HarvestNode.cs + IfNode.cs + MaintainNode.cs + MoveNode.cs + ProgramNode.cs + SacrificeNode.cs + StartNode.cs + WhileNode.cs +Scripts/Gameplay/Crafting/ + CraftingResult.cs + GameResource.cs + Ingredient.cs + Inventory.cs + Item.cs + ItemData.cs +Scripts/Gameplay/Research/ + Research.cs + ResearchData.cs + ResearchEffect.cs + ResearchResult.cs + ResearchState.cs +Scripts/Gameplay/Robots/ + Robot.cs + RobotStats.cs + RobotTypeStats.cs +Scripts/ + Gameplay/Survival/SurvivalState.cs + Tests/ + TestRunner.cs + TestRunnerHelpers.cs + UI/Common/ + Camera3d.cs + UIHandler.cs + UIHandlerDisplay.cs + UIStyle.cs + UI/DSL/ + CodingWindow.cs + NodeDisplay.cs + NodeDisplays/ + CraftNodeDisplay.cs + ExploreNodeDisplay.cs + ForNodeDisplay.cs + HarvestNodeDisplay.cs + IfNodeDisplay.cs + MaintainNodeDisplay.cs + MoveNodeDisplay.cs + SacrificeNodeDisplay.cs + StartNodeDisplay.cs + WhileNodeDisplay.cs + NodeTooltip.cs + RunningProgramGraphBuilder.cs + ScriptConnection.cs + ScriptGraphCompiler.cs + ScriptGraphSerializer.cs + UI/Inventory/ + InventoryDisplay.cs + ItemDisplay.cs + UI/Menus/ + MainMenu.cs + OptionsMenu.cs + WorldSetup.cs + UI/ + Research/ResearchList.cs + Robots/ + RobotDisplay.cs + RobotList.cs + Tutorial/TutorialBubble.cs + World/ + GateRequirementGenerator.cs + Layer.cs + LightHandler.cs + Map.cs + MultimeshHandler.cs + Pathfinding.cs + Placeholder.cs + ResourceDistributor.cs + Tile.cs + TileRenderData.cs + WFC.cs + World.cs + +[metadataReferences] +/ + godotsharp/4.6.1/lib/net8.0/GodotSharp.dll + godotsharpeditor/4.6.1/lib/net8.0/GodotSharpEditor.dll + microsoft.netcore.app.ref/8.0.21/ref/net8.0/ + Microsoft.CSharp.dll + Microsoft.VisualBasic.Core.dll + Microsoft.VisualBasic.dll + Microsoft.Win32.Primitives.dll + Microsoft.Win32.Registry.dll + mscorlib.dll + netstandard.dll + System.AppContext.dll + System.Buffers.dll + System.Collections.Concurrent.dll + System.Collections.dll + System.Collections.Immutable.dll + System.Collections.NonGeneric.dll + System.Collections.Specialized.dll + System.ComponentModel.Annotations.dll + System.ComponentModel.DataAnnotations.dll + System.ComponentModel.dll + System.ComponentModel.EventBasedAsync.dll + System.ComponentModel.Primitives.dll + System.ComponentModel.TypeConverter.dll + System.Configuration.dll + System.Console.dll + System.Core.dll + System.Data.Common.dll + System.Data.DataSetExtensions.dll + System.Data.dll + System.Diagnostics.Contracts.dll + System.Diagnostics.Debug.dll + System.Diagnostics.DiagnosticSource.dll + System.Diagnostics.FileVersionInfo.dll + System.Diagnostics.Process.dll + System.Diagnostics.StackTrace.dll + System.Diagnostics.TextWriterTraceListener.dll + System.Diagnostics.Tools.dll + System.Diagnostics.TraceSource.dll + System.Diagnostics.Tracing.dll + System.dll + System.Drawing.dll + System.Drawing.Primitives.dll + System.Dynamic.Runtime.dll + System.Formats.Asn1.dll + System.Formats.Tar.dll + System.Globalization.Calendars.dll + System.Globalization.dll + System.Globalization.Extensions.dll + System.IO.Compression.Brotli.dll + System.IO.Compression.dll + System.IO.Compression.FileSystem.dll + System.IO.Compression.ZipFile.dll + System.IO.dll + System.IO.FileSystem.AccessControl.dll + System.IO.FileSystem.dll + System.IO.FileSystem.DriveInfo.dll + System.IO.FileSystem.Primitives.dll + System.IO.FileSystem.Watcher.dll + System.IO.IsolatedStorage.dll + System.IO.MemoryMappedFiles.dll + System.IO.Pipes.AccessControl.dll + System.IO.Pipes.dll + System.IO.UnmanagedMemoryStream.dll + System.Linq.dll + System.Linq.Expressions.dll + System.Linq.Parallel.dll + System.Linq.Queryable.dll + System.Memory.dll + System.Net.dll + System.Net.Http.dll + System.Net.Http.Json.dll + System.Net.HttpListener.dll + System.Net.Mail.dll + System.Net.NameResolution.dll + System.Net.NetworkInformation.dll + System.Net.Ping.dll + System.Net.Primitives.dll + System.Net.Quic.dll + System.Net.Requests.dll + System.Net.Security.dll + System.Net.ServicePoint.dll + System.Net.Sockets.dll + System.Net.WebClient.dll + System.Net.WebHeaderCollection.dll + System.Net.WebProxy.dll + System.Net.WebSockets.Client.dll + System.Net.WebSockets.dll + System.Numerics.dll + System.Numerics.Vectors.dll + System.ObjectModel.dll + System.Reflection.DispatchProxy.dll + System.Reflection.dll + System.Reflection.Emit.dll + System.Reflection.Emit.ILGeneration.dll + System.Reflection.Emit.Lightweight.dll + System.Reflection.Extensions.dll + System.Reflection.Metadata.dll + System.Reflection.Primitives.dll + System.Reflection.TypeExtensions.dll + System.Resources.Reader.dll + System.Resources.ResourceManager.dll + System.Resources.Writer.dll + System.Runtime.CompilerServices.Unsafe.dll + System.Runtime.CompilerServices.VisualC.dll + System.Runtime.dll + System.Runtime.Extensions.dll + System.Runtime.Handles.dll + System.Runtime.InteropServices.dll + System.Runtime.InteropServices.JavaScript.dll + System.Runtime.InteropServices.RuntimeInformation.dll + System.Runtime.Intrinsics.dll + System.Runtime.Loader.dll + System.Runtime.Numerics.dll + System.Runtime.Serialization.dll + System.Runtime.Serialization.Formatters.dll + System.Runtime.Serialization.Json.dll + System.Runtime.Serialization.Primitives.dll + System.Runtime.Serialization.Xml.dll + System.Security.AccessControl.dll + System.Security.Claims.dll + System.Security.Cryptography.Algorithms.dll + System.Security.Cryptography.Cng.dll + System.Security.Cryptography.Csp.dll + System.Security.Cryptography.dll + System.Security.Cryptography.Encoding.dll + System.Security.Cryptography.OpenSsl.dll + System.Security.Cryptography.Primitives.dll + System.Security.Cryptography.X509Certificates.dll + System.Security.dll + System.Security.Principal.dll + System.Security.Principal.Windows.dll + System.Security.SecureString.dll + System.ServiceModel.Web.dll + System.ServiceProcess.dll + System.Text.Encoding.CodePages.dll + System.Text.Encoding.dll + System.Text.Encoding.Extensions.dll + System.Text.Encodings.Web.dll + System.Text.Json.dll + System.Text.RegularExpressions.dll + System.Threading.Channels.dll + System.Threading.dll + System.Threading.Overlapped.dll + System.Threading.Tasks.Dataflow.dll + System.Threading.Tasks.dll + System.Threading.Tasks.Extensions.dll + System.Threading.Tasks.Parallel.dll + System.Threading.Thread.dll + System.Threading.ThreadPool.dll + System.Threading.Timer.dll + System.Transactions.dll + System.Transactions.Local.dll + System.ValueTuple.dll + System.Web.dll + System.Web.HttpUtility.dll + System.Windows.dll + System.Xml.dll + System.Xml.Linq.dll + System.Xml.ReaderWriter.dll + System.Xml.Serialization.dll + System.Xml.XDocument.dll + System.Xml.XmlDocument.dll + System.Xml.XmlSerializer.dll + System.Xml.XPath.dll + System.Xml.XPath.XDocument.dll + WindowsBase.dll + +[analyzerReferences] +/sdk/9.0.306/Sdks/Microsoft.NET.Sdk/analyzers/ + Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll + Microsoft.CodeAnalysis.NetAnalyzers.dll +/ + godot.sourcegenerators/4.6.1/analyzers/dotnet/cs/Godot.SourceGenerators.dll + microsoft.netcore.app.ref/8.0.21/analyzers/dotnet/cs/ + Microsoft.Interop.ComInterfaceGenerator.dll + Microsoft.Interop.JavaScript.JSImportGenerator.dll + Microsoft.Interop.LibraryImportGenerator.dll + Microsoft.Interop.SourceGeneration.dll + System.Text.Json.SourceGeneration.dll + System.Text.RegularExpressions.Generator.dll + +[analyzerConfigFiles] +.editorconfig +.godot/mono/temp/obj/Debug/RuinAdventurer.GeneratedMSBuildEditorConfig.editorconfig +/sdk/9.0.306/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_8_default.globalconfig diff --git a/Scenes/Game.tscn b/Scenes/Game.tscn index 4934413..f8d6d6a 100644 --- a/Scenes/Game.tscn +++ b/Scenes/Game.tscn @@ -319,7 +319,6 @@ size_flags_stretch_ratio = 2.0 [node name="CodeContainer" type="GraphEdit" parent="CanvasLayer/UIHandler/MainUI/Content/CodingWindow/VBoxContainer/Scripting/EditorWindow" unique_id=1600198848] layout_mode = 2 size_flags_vertical = 3 -scroll_offset = Vector2(-4, 0) right_disconnects = true [node name="Buttons" type="HBoxContainer" parent="CanvasLayer/UIHandler/MainUI/Content/CodingWindow/VBoxContainer/Scripting/EditorWindow" unique_id=265797151] diff --git a/Scripts/UI/Common/UIHandler.cs b/Scripts/UI/Common/UIHandler.cs index 5a4ab11..84da30a 100644 --- a/Scripts/UI/Common/UIHandler.cs +++ b/Scripts/UI/Common/UIHandler.cs @@ -7,7 +7,6 @@ public partial class UIHandler : Control [Export] Camera3d mainCam; [Export] Map map; [Export] RichTextLabel FPS; - [Export] RichTextLabel RAM; [Export] PanelContainer options; [Export] Control uiContent; [Export] PanelContainer menu; diff --git a/Scripts/UI/Common/UIHandlerDisplay.cs b/Scripts/UI/Common/UIHandlerDisplay.cs index 20ed874..9d6278e 100644 --- a/Scripts/UI/Common/UIHandlerDisplay.cs +++ b/Scripts/UI/Common/UIHandlerDisplay.cs @@ -7,23 +7,11 @@ public partial class UIHandler public void DisplayStats() { FPS.Text = Engine.GetFramesPerSecond().ToString() + " FPS"; - RAM.Text = GetMemoryDisplay(); DisplaySurvivalStats(); DisplayWorldStats(); DisplayLoseCondition(); } - private string GetMemoryDisplay() - { - double memory = Process.GetCurrentProcess().WorkingSet64 / (1024 * 1024); - if (memory > 1024) - { - return Math.Round(memory / 1024, 2).ToString() + " GB"; - } - - return memory.ToString() + " MB"; - } - private void DisplayRobotAlarm() { string messages = "";