Big project cleanup with overhaul of file responsibilities (KISS) and code (DRY, YAGNI)
This commit is contained in:
+71
-67
@@ -1,88 +1,92 @@
|
||||
using System.Collections.Generic;
|
||||
using Godot;
|
||||
|
||||
public class FileHandler
|
||||
public static class FileHandler
|
||||
{
|
||||
private const string ScriptDirectory = "user://scripts";
|
||||
private const string ScriptExtension = ".json";
|
||||
private const string ScriptDirectory = "user://scripts";
|
||||
private const string ScriptExtension = ".json";
|
||||
|
||||
public static void CreateScriptDirectory()
|
||||
{
|
||||
DirAccess.MakeDirRecursiveAbsolute(ScriptDirectory);
|
||||
}
|
||||
public static void CreateScriptDirectory()
|
||||
{
|
||||
DirAccess.MakeDirRecursiveAbsolute(ScriptDirectory);
|
||||
}
|
||||
|
||||
public static void SaveProgram(string filename, string content)
|
||||
{
|
||||
CreateScriptDirectory();
|
||||
string path = GetProgramPath(filename);
|
||||
public static void SaveProgram(string filename, string content)
|
||||
{
|
||||
CreateScriptDirectory();
|
||||
string path = GetProgramPath(filename);
|
||||
|
||||
FileAccess file = FileAccess.Open(path, FileAccess.ModeFlags.Write);
|
||||
file.StoreString(content);
|
||||
}
|
||||
FileAccess file = FileAccess.Open(path, FileAccess.ModeFlags.Write);
|
||||
if (file == null) return;
|
||||
|
||||
public static List<string> LoadProgramNames()
|
||||
{
|
||||
CreateScriptDirectory();
|
||||
List<string> programs = new List<string>();
|
||||
file.StoreString(content);
|
||||
file.Flush();
|
||||
}
|
||||
|
||||
DirAccess dir = DirAccess.Open(ScriptDirectory);
|
||||
if (dir == null)
|
||||
{
|
||||
return programs;
|
||||
}
|
||||
public static List<string> LoadProgramNames()
|
||||
{
|
||||
CreateScriptDirectory();
|
||||
List<string> programs = new List<string>();
|
||||
|
||||
dir.ListDirBegin();
|
||||
while (true)
|
||||
{
|
||||
string fileName = dir.GetNext();
|
||||
if (fileName == "")
|
||||
break;
|
||||
DirAccess dir = DirAccess.Open(ScriptDirectory);
|
||||
if (dir == null)
|
||||
{
|
||||
return programs;
|
||||
}
|
||||
|
||||
if (!dir.CurrentIsDir() && fileName.EndsWith(ScriptExtension))
|
||||
{
|
||||
programs.Add(fileName.Replace(ScriptExtension, ""));
|
||||
}
|
||||
}
|
||||
dir.ListDirEnd();
|
||||
dir.ListDirBegin();
|
||||
while (true)
|
||||
{
|
||||
string fileName = dir.GetNext();
|
||||
if (fileName == "") break;
|
||||
|
||||
return programs;
|
||||
}
|
||||
if (dir.CurrentIsDir()) continue;
|
||||
if (!fileName.EndsWith(ScriptExtension)) continue;
|
||||
|
||||
public static string LoadProgram(string name)
|
||||
{
|
||||
CreateScriptDirectory();
|
||||
string path = GetProgramPath(name);
|
||||
programs.Add(fileName.Replace(ScriptExtension, ""));
|
||||
}
|
||||
dir.ListDirEnd();
|
||||
|
||||
if (!FileAccess.FileExists(path))
|
||||
{
|
||||
return "";
|
||||
}
|
||||
return programs;
|
||||
}
|
||||
|
||||
FileAccess file = FileAccess.Open(path, FileAccess.ModeFlags.Read);
|
||||
return file.GetAsText();
|
||||
}
|
||||
public static string LoadProgram(string name)
|
||||
{
|
||||
CreateScriptDirectory();
|
||||
string path = GetProgramPath(name);
|
||||
|
||||
public static bool DeleteProgram(string name)
|
||||
{
|
||||
CreateScriptDirectory();
|
||||
string path = GetProgramPath(name);
|
||||
if (!FileAccess.FileExists(path))
|
||||
{
|
||||
return "";
|
||||
}
|
||||
|
||||
if (!FileAccess.FileExists(path))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
FileAccess file = FileAccess.Open(path, FileAccess.ModeFlags.Read);
|
||||
if (file == null) return "";
|
||||
|
||||
DirAccess dir = DirAccess.Open(ScriptDirectory);
|
||||
if (dir == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return file.GetAsText();
|
||||
}
|
||||
|
||||
return dir.Remove($"{name}{ScriptExtension}") == Error.Ok;
|
||||
}
|
||||
public static bool DeleteProgram(string name)
|
||||
{
|
||||
CreateScriptDirectory();
|
||||
string path = GetProgramPath(name);
|
||||
|
||||
private static string GetProgramPath(string filename)
|
||||
{
|
||||
return $"{ScriptDirectory}/{filename}{ScriptExtension}";
|
||||
}
|
||||
if (!FileAccess.FileExists(path))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
DirAccess dir = DirAccess.Open(ScriptDirectory);
|
||||
if (dir == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return dir.Remove($"{name}{ScriptExtension}") == Error.Ok;
|
||||
}
|
||||
|
||||
private static string GetProgramPath(string filename)
|
||||
{
|
||||
return $"{ScriptDirectory}/{filename}{ScriptExtension}";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ using Godot;
|
||||
using System.Collections.Generic;
|
||||
using System.Text.Json;
|
||||
|
||||
public partial class ResourceLoader
|
||||
public static class ResourceLoader
|
||||
{
|
||||
private const string LayerPrefabPath = "res://Prefabs/Layer.tscn";
|
||||
private const string RobotPrefabPath = "res://Prefabs/Robot/Robot.tscn";
|
||||
@@ -39,7 +39,7 @@ public partial class ResourceLoader
|
||||
public static Dictionary<string, MeshInstance3D> LoadTiles()
|
||||
{
|
||||
Dictionary<string, MeshInstance3D> tileMeshes = new Dictionary<string, MeshInstance3D>();
|
||||
PackedScene tileCollection = GD.Load<PackedScene>($"res://Assets/Objects/Tiles.glb");
|
||||
PackedScene tileCollection = GD.Load<PackedScene>("res://Assets/Objects/Tiles.glb");
|
||||
Node root = tileCollection.Instantiate();
|
||||
foreach (MeshInstance3D child in root.GetChildren())
|
||||
{
|
||||
@@ -52,7 +52,7 @@ public partial class ResourceLoader
|
||||
public static Dictionary<string, MeshInstance3D> LoadDecorations()
|
||||
{
|
||||
Dictionary<string, MeshInstance3D> decorationMeshes = new Dictionary<string, MeshInstance3D>();
|
||||
PackedScene decorationCollection = GD.Load<PackedScene>($"res://Assets/Objects/Decorations.glb");
|
||||
PackedScene decorationCollection = GD.Load<PackedScene>("res://Assets/Objects/Decorations.glb");
|
||||
Node root = decorationCollection.Instantiate();
|
||||
foreach (MeshInstance3D child in root.GetChildren())
|
||||
{
|
||||
@@ -114,8 +114,9 @@ public partial class ResourceLoader
|
||||
|
||||
public static SortedDictionary<string, ItemData> LoadItems()
|
||||
{
|
||||
|
||||
FileAccess file = FileAccess.Open(RecipesPath, FileAccess.ModeFlags.Read);
|
||||
if (file == null) return new SortedDictionary<string, ItemData>();
|
||||
|
||||
string json = file.GetAsText();
|
||||
|
||||
SortedDictionary<string, ItemData> result = new SortedDictionary<string, ItemData>();
|
||||
@@ -133,8 +134,9 @@ public partial class ResourceLoader
|
||||
|
||||
public static Dictionary<string, Research> LoadResearch()
|
||||
{
|
||||
|
||||
FileAccess file = FileAccess.Open(ResearchPath, FileAccess.ModeFlags.Read);
|
||||
if (file == null) return new Dictionary<string, Research>();
|
||||
|
||||
string json = file.GetAsText();
|
||||
|
||||
Dictionary<string, Research> result = new Dictionary<string, Research>();
|
||||
|
||||
@@ -0,0 +1,148 @@
|
||||
using Godot;
|
||||
using System.Collections.Generic;
|
||||
|
||||
public static class SaveGameDataApplier
|
||||
{
|
||||
public static void ApplyWorldData(SaveGameData saveGame)
|
||||
{
|
||||
if (saveGame == null) return;
|
||||
|
||||
GameData.seed = saveGame.Seed;
|
||||
GameData.currentLayer = saveGame.CurrentLayer;
|
||||
GameData.visibleLayer = saveGame.VisibleLayer;
|
||||
GameData.lowestLayer = saveGame.LowestLayer;
|
||||
GameData.maxRobotCount = saveGame.MaxRobotCount;
|
||||
GameData.canMove = saveGame.CanMove;
|
||||
|
||||
ApplySettingsData(saveGame.Settings);
|
||||
ApplySurvivalData(saveGame.Survival);
|
||||
ApplyInventoryData(saveGame.Inventory);
|
||||
ApplyResearchData(saveGame.Research);
|
||||
ApplyLayerData(saveGame.Layers);
|
||||
}
|
||||
|
||||
private static void ApplySurvivalData(SurvivalSaveData survival)
|
||||
{
|
||||
if (survival == null) return;
|
||||
|
||||
GameData.survival.hunger = survival.Hunger;
|
||||
GameData.survival.thirst = survival.Thirst;
|
||||
GameData.survival.energy = survival.Energy;
|
||||
GameData.survival.isDead = survival.IsDead;
|
||||
GameData.survival.deathReason = survival.DeathReason ?? "";
|
||||
GameData.survival.currentStatus = survival.CurrentStatus ?? "";
|
||||
GameData.survival.elapsedSeconds = survival.ElapsedSeconds;
|
||||
}
|
||||
|
||||
private static void ApplySettingsData(SettingsSaveData settings)
|
||||
{
|
||||
if (settings == null) return;
|
||||
|
||||
GameData.screenMode = settings.ScreenMode;
|
||||
GameData.soundVolume = settings.SoundVolume;
|
||||
GameData.lightColor = new Color(
|
||||
settings.LightColorR,
|
||||
settings.LightColorG,
|
||||
settings.LightColorB,
|
||||
settings.LightColorA
|
||||
);
|
||||
|
||||
ApplyScreenMode(settings.ScreenMode);
|
||||
SoundManager.SetMasterVolume(settings.SoundVolume);
|
||||
LightHandler.RedrawLights(GameData.lightColor);
|
||||
}
|
||||
|
||||
private static void ApplyScreenMode(int screenMode)
|
||||
{
|
||||
switch (screenMode)
|
||||
{
|
||||
case 0:
|
||||
DisplayServer.WindowSetMode(DisplayServer.WindowMode.Fullscreen);
|
||||
DisplayServer.WindowSetFlag(DisplayServer.WindowFlags.Borderless, false);
|
||||
break;
|
||||
case 1:
|
||||
DisplayServer.WindowSetMode(DisplayServer.WindowMode.Windowed);
|
||||
DisplayServer.WindowSetFlag(DisplayServer.WindowFlags.Borderless, false);
|
||||
break;
|
||||
case 2:
|
||||
DisplayServer.WindowSetMode(DisplayServer.WindowMode.Fullscreen);
|
||||
DisplayServer.WindowSetFlag(DisplayServer.WindowFlags.Borderless, true);
|
||||
break;
|
||||
default:
|
||||
DisplayServer.WindowSetMode(DisplayServer.WindowMode.Windowed);
|
||||
DisplayServer.WindowSetFlag(DisplayServer.WindowFlags.Borderless, false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private static void ApplyInventoryData(List<ItemSaveData> savedItems)
|
||||
{
|
||||
GameData.inventory = new Inventory();
|
||||
if (savedItems == null) return;
|
||||
|
||||
foreach (ItemSaveData savedItem in savedItems)
|
||||
{
|
||||
if (!GameData.availableItems.ContainsKey(savedItem.Id)) continue;
|
||||
|
||||
GameData.inventory.AddItem(
|
||||
new Item { data = GameData.availableItems[savedItem.Id] },
|
||||
savedItem.Amount
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private static void ApplyResearchData(List<ResearchSaveData> savedResearch)
|
||||
{
|
||||
if (savedResearch == null) return;
|
||||
|
||||
foreach (ResearchSaveData savedState in savedResearch)
|
||||
{
|
||||
if (!GameData.availableResearch.ContainsKey(savedState.Id)) continue;
|
||||
|
||||
Research research = GameData.availableResearch[savedState.Id];
|
||||
research.state = savedState.State;
|
||||
research.elapsedResearchTime = savedState.ElapsedResearchTime;
|
||||
research.paidResources = savedState.PaidResources;
|
||||
}
|
||||
|
||||
GameData.RebuildRobotStatsFromResearch();
|
||||
}
|
||||
|
||||
private static void ApplyLayerData(List<LayerSaveData> savedLayers)
|
||||
{
|
||||
if (savedLayers == null || GameData.map == null) return;
|
||||
|
||||
foreach (LayerSaveData savedLayer in savedLayers)
|
||||
{
|
||||
if (savedLayer.Level < 0 || savedLayer.Level >= GameData.map.Length) continue;
|
||||
|
||||
Layer layer = GameData.map[savedLayer.Level];
|
||||
layer.isGateOpen = savedLayer.IsGateOpen;
|
||||
layer.hasContentGenerated = savedLayer.HasContentGenerated;
|
||||
layer.gateIngredients = savedLayer.GateIngredients ?? new List<Ingredient>();
|
||||
layer.currentResources = savedLayer.CurrentResources ?? new List<string>();
|
||||
|
||||
ApplyTileData(layer, savedLayer.Tiles);
|
||||
}
|
||||
}
|
||||
|
||||
private static void ApplyTileData(Layer layer, List<TileSaveData> savedTiles)
|
||||
{
|
||||
if (savedTiles == null) return;
|
||||
|
||||
foreach (TileSaveData savedTile in savedTiles)
|
||||
{
|
||||
if (savedTile.X < 0 || savedTile.X >= GameData.layerSize) continue;
|
||||
if (savedTile.Y < 0 || savedTile.Y >= GameData.layerSize) continue;
|
||||
|
||||
Tile tile = layer.tiles[savedTile.X, savedTile.Y];
|
||||
tile.collapsedMesh = savedTile.CollapsedMesh;
|
||||
tile.containsLight = savedTile.ContainsLight;
|
||||
tile.containsDecoration = savedTile.ContainsDecoration;
|
||||
tile.containsResource = savedTile.ContainsResource;
|
||||
tile.wasVisited = savedTile.WasVisited;
|
||||
tile.resource = savedTile.Resource == null ? null : GameResource.FromSaveData(savedTile.Resource);
|
||||
tile.ContentNode.Visible = savedTile.WasVisited || (tile.collapsedMesh == "gate" && !layer.isGateOpen);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
uid://jv7k2npga7u0
|
||||
@@ -0,0 +1,160 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
public static class SaveGameDataFactory
|
||||
{
|
||||
public static SaveGameData CreateSaveData()
|
||||
{
|
||||
return new SaveGameData
|
||||
{
|
||||
Seed = GameData.seed,
|
||||
CurrentLayer = GameData.currentLayer,
|
||||
VisibleLayer = GameData.visibleLayer,
|
||||
LowestLayer = GameData.lowestLayer,
|
||||
MaxRobotCount = GameData.maxRobotCount,
|
||||
CanMove = GameData.canMove,
|
||||
Settings = CreateSettingsSaveData(),
|
||||
Survival = CreateSurvivalSaveData(),
|
||||
Inventory = CreateInventorySaveData(),
|
||||
Research = CreateResearchSaveData(),
|
||||
Layers = CreateLayerSaveData(),
|
||||
Robots = CreateRobotSaveData()
|
||||
};
|
||||
}
|
||||
|
||||
public static SaveGameData CreateCoreSaveData(SaveGameData saveGame)
|
||||
{
|
||||
return new SaveGameData
|
||||
{
|
||||
Seed = saveGame.Seed,
|
||||
CurrentLayer = saveGame.CurrentLayer,
|
||||
VisibleLayer = saveGame.VisibleLayer,
|
||||
LowestLayer = saveGame.LowestLayer,
|
||||
MaxRobotCount = saveGame.MaxRobotCount,
|
||||
CanMove = saveGame.CanMove,
|
||||
Settings = saveGame.Settings,
|
||||
Survival = saveGame.Survival,
|
||||
Inventory = saveGame.Inventory,
|
||||
Research = new List<ResearchSaveData>(),
|
||||
Layers = new List<LayerSaveData>(),
|
||||
Robots = new List<RobotSaveData>()
|
||||
};
|
||||
}
|
||||
|
||||
private static SurvivalSaveData CreateSurvivalSaveData()
|
||||
{
|
||||
return new SurvivalSaveData
|
||||
{
|
||||
Hunger = GameData.survival.hunger,
|
||||
Thirst = GameData.survival.thirst,
|
||||
Energy = GameData.survival.energy,
|
||||
IsDead = GameData.survival.isDead,
|
||||
DeathReason = GameData.survival.deathReason,
|
||||
CurrentStatus = GameData.survival.currentStatus,
|
||||
ElapsedSeconds = GameData.survival.elapsedSeconds
|
||||
};
|
||||
}
|
||||
|
||||
private static SettingsSaveData CreateSettingsSaveData()
|
||||
{
|
||||
return new SettingsSaveData
|
||||
{
|
||||
ScreenMode = GameData.screenMode,
|
||||
SoundVolume = GameData.soundVolume,
|
||||
LightColorR = GameData.lightColor.R,
|
||||
LightColorG = GameData.lightColor.G,
|
||||
LightColorB = GameData.lightColor.B,
|
||||
LightColorA = GameData.lightColor.A
|
||||
};
|
||||
}
|
||||
|
||||
private static List<ItemSaveData> CreateInventorySaveData()
|
||||
{
|
||||
List<ItemSaveData> result = new List<ItemSaveData>();
|
||||
|
||||
foreach (Item item in GameData.inventory.items)
|
||||
{
|
||||
result.Add(new ItemSaveData
|
||||
{
|
||||
Id = item.data.Id,
|
||||
Amount = item.currentAmount
|
||||
});
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static List<ResearchSaveData> CreateResearchSaveData()
|
||||
{
|
||||
List<ResearchSaveData> result = new List<ResearchSaveData>();
|
||||
|
||||
foreach (Research research in GameData.availableResearch.Values)
|
||||
{
|
||||
result.Add(new ResearchSaveData
|
||||
{
|
||||
Id = research.data.Id,
|
||||
State = research.state,
|
||||
ElapsedResearchTime = research.elapsedResearchTime,
|
||||
PaidResources = research.paidResources
|
||||
});
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static List<LayerSaveData> CreateLayerSaveData()
|
||||
{
|
||||
List<LayerSaveData> result = new List<LayerSaveData>();
|
||||
if (GameData.map == null) return result;
|
||||
|
||||
foreach (Layer layer in GameData.map)
|
||||
{
|
||||
if (layer == null) continue;
|
||||
|
||||
result.Add(new LayerSaveData
|
||||
{
|
||||
Level = layer.level,
|
||||
IsGateOpen = layer.isGateOpen,
|
||||
HasContentGenerated = layer.hasContentGenerated,
|
||||
GateIngredients = new List<Ingredient>(layer.gateIngredients),
|
||||
CurrentResources = new List<string>(layer.currentResources),
|
||||
Tiles = CreateTileSaveData(layer)
|
||||
});
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static List<TileSaveData> CreateTileSaveData(Layer layer)
|
||||
{
|
||||
List<TileSaveData> result = new List<TileSaveData>();
|
||||
|
||||
foreach (Tile tile in layer.tiles)
|
||||
{
|
||||
result.Add(new TileSaveData
|
||||
{
|
||||
X = tile.GridPosition.X,
|
||||
Y = tile.GridPosition.Y,
|
||||
CollapsedMesh = tile.collapsedMesh,
|
||||
ContainsLight = tile.containsLight,
|
||||
ContainsDecoration = tile.containsDecoration,
|
||||
ContainsResource = tile.containsResource,
|
||||
WasVisited = tile.wasVisited,
|
||||
Resource = tile.resource == null ? null : tile.resource.CreateSaveData()
|
||||
});
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static List<RobotSaveData> CreateRobotSaveData()
|
||||
{
|
||||
List<RobotSaveData> result = new List<RobotSaveData>();
|
||||
|
||||
foreach (Robot robot in GameData.robots)
|
||||
{
|
||||
result.Add(robot.CreateSaveData());
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
uid://b87q17gdv4pfh
|
||||
@@ -27,7 +27,7 @@ public static class SaveGameManager
|
||||
CreateSaveDirectory();
|
||||
ClearOldLayerFiles();
|
||||
|
||||
SaveJson(GameDataPath, CreateCoreSaveData(saveGame));
|
||||
SaveJson(GameDataPath, SaveGameDataFactory.CreateCoreSaveData(saveGame));
|
||||
SaveJson(RobotsPath, saveGame.Robots);
|
||||
SaveJson(ResearchPath, saveGame.Research);
|
||||
|
||||
@@ -53,176 +53,12 @@ public static class SaveGameManager
|
||||
|
||||
public static SaveGameData CreateSaveData()
|
||||
{
|
||||
return new SaveGameData
|
||||
{
|
||||
Seed = GameData.seed,
|
||||
CurrentLayer = GameData.currentLayer,
|
||||
VisibleLayer = GameData.visibleLayer,
|
||||
LowestLayer = GameData.lowestLayer,
|
||||
MaxRobotCount = GameData.maxRobotCount,
|
||||
CanMove = GameData.canMove,
|
||||
Settings = CreateSettingsSaveData(),
|
||||
Survival = CreateSurvivalSaveData(),
|
||||
Inventory = CreateInventorySaveData(),
|
||||
Research = CreateResearchSaveData(),
|
||||
Layers = CreateLayerSaveData(),
|
||||
Robots = CreateRobotSaveData()
|
||||
};
|
||||
return SaveGameDataFactory.CreateSaveData();
|
||||
}
|
||||
|
||||
public static void ApplyWorldData(SaveGameData saveGame)
|
||||
{
|
||||
if (saveGame == null) return;
|
||||
|
||||
GameData.seed = saveGame.Seed;
|
||||
GameData.currentLayer = saveGame.CurrentLayer;
|
||||
GameData.visibleLayer = saveGame.VisibleLayer;
|
||||
GameData.lowestLayer = saveGame.LowestLayer;
|
||||
GameData.maxRobotCount = saveGame.MaxRobotCount;
|
||||
GameData.canMove = saveGame.CanMove;
|
||||
|
||||
ApplySettingsData(saveGame.Settings);
|
||||
ApplySurvivalData(saveGame.Survival);
|
||||
ApplyInventoryData(saveGame.Inventory);
|
||||
ApplyResearchData(saveGame.Research);
|
||||
ApplyLayerData(saveGame.Layers);
|
||||
}
|
||||
|
||||
private static SurvivalSaveData CreateSurvivalSaveData()
|
||||
{
|
||||
return new SurvivalSaveData
|
||||
{
|
||||
Hunger = GameData.survival.hunger,
|
||||
Thirst = GameData.survival.thirst,
|
||||
Energy = GameData.survival.energy,
|
||||
IsDead = GameData.survival.isDead,
|
||||
DeathReason = GameData.survival.deathReason,
|
||||
CurrentStatus = GameData.survival.currentStatus,
|
||||
ElapsedSeconds = GameData.survival.elapsedSeconds
|
||||
};
|
||||
}
|
||||
|
||||
private static SettingsSaveData CreateSettingsSaveData()
|
||||
{
|
||||
return new SettingsSaveData
|
||||
{
|
||||
ScreenMode = GameData.screenMode,
|
||||
SoundVolume = GameData.soundVolume,
|
||||
LightColorR = GameData.lightColor.R,
|
||||
LightColorG = GameData.lightColor.G,
|
||||
LightColorB = GameData.lightColor.B,
|
||||
LightColorA = GameData.lightColor.A
|
||||
};
|
||||
}
|
||||
|
||||
private static List<ItemSaveData> CreateInventorySaveData()
|
||||
{
|
||||
List<ItemSaveData> result = new List<ItemSaveData>();
|
||||
|
||||
foreach (Item item in GameData.inventory.items)
|
||||
{
|
||||
result.Add(new ItemSaveData
|
||||
{
|
||||
Id = item.data.Id,
|
||||
Amount = item.currentAmount
|
||||
});
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static List<ResearchSaveData> CreateResearchSaveData()
|
||||
{
|
||||
List<ResearchSaveData> result = new List<ResearchSaveData>();
|
||||
|
||||
foreach (Research research in GameData.availableResearch.Values)
|
||||
{
|
||||
result.Add(new ResearchSaveData
|
||||
{
|
||||
Id = research.data.Id,
|
||||
State = research.state,
|
||||
ElapsedResearchTime = research.elapsedResearchTime,
|
||||
PaidResources = research.paidResources
|
||||
});
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static List<LayerSaveData> CreateLayerSaveData()
|
||||
{
|
||||
List<LayerSaveData> result = new List<LayerSaveData>();
|
||||
if (GameData.map == null) return result;
|
||||
|
||||
foreach (Layer layer in GameData.map)
|
||||
{
|
||||
if (layer == null) continue;
|
||||
|
||||
result.Add(new LayerSaveData
|
||||
{
|
||||
Level = layer.level,
|
||||
IsGateOpen = layer.isGateOpen,
|
||||
HasContentGenerated = layer.hasContentGenerated,
|
||||
GateIngredients = new List<Ingredient>(layer.gateIngredients),
|
||||
CurrentResources = new List<string>(layer.currentResources),
|
||||
Tiles = CreateTileSaveData(layer)
|
||||
});
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static List<TileSaveData> CreateTileSaveData(Layer layer)
|
||||
{
|
||||
List<TileSaveData> result = new List<TileSaveData>();
|
||||
|
||||
foreach (Tile tile in layer.tiles)
|
||||
{
|
||||
result.Add(new TileSaveData
|
||||
{
|
||||
X = tile.GridPosition.X,
|
||||
Y = tile.GridPosition.Y,
|
||||
CollapsedMesh = tile.collapsedMesh,
|
||||
ContainsLight = tile.containsLight,
|
||||
ContainsDecoration = tile.containsDecoration,
|
||||
ContainsResource = tile.containsResource,
|
||||
WasVisited = tile.wasVisited,
|
||||
Resource = tile.resource == null ? null : tile.resource.CreateSaveData()
|
||||
});
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static List<RobotSaveData> CreateRobotSaveData()
|
||||
{
|
||||
List<RobotSaveData> result = new List<RobotSaveData>();
|
||||
|
||||
foreach (Robot robot in GameData.robots)
|
||||
{
|
||||
result.Add(robot.CreateSaveData());
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static SaveGameData CreateCoreSaveData(SaveGameData saveGame)
|
||||
{
|
||||
return new SaveGameData
|
||||
{
|
||||
Seed = saveGame.Seed,
|
||||
CurrentLayer = saveGame.CurrentLayer,
|
||||
VisibleLayer = saveGame.VisibleLayer,
|
||||
LowestLayer = saveGame.LowestLayer,
|
||||
MaxRobotCount = saveGame.MaxRobotCount,
|
||||
CanMove = saveGame.CanMove,
|
||||
Settings = saveGame.Settings,
|
||||
Survival = saveGame.Survival,
|
||||
Inventory = saveGame.Inventory,
|
||||
Research = new List<ResearchSaveData>(),
|
||||
Layers = new List<LayerSaveData>(),
|
||||
Robots = new List<RobotSaveData>()
|
||||
};
|
||||
SaveGameDataApplier.ApplyWorldData(saveGame);
|
||||
}
|
||||
|
||||
private static List<LayerSaveData> LoadLayerSaveData()
|
||||
@@ -276,6 +112,8 @@ public static class SaveGameManager
|
||||
{
|
||||
string json = JsonSerializer.Serialize(data, JsonOptions);
|
||||
FileAccess file = FileAccess.Open(path, FileAccess.ModeFlags.Write);
|
||||
if (file == null) return;
|
||||
|
||||
file.StoreString(json);
|
||||
file.Flush();
|
||||
}
|
||||
@@ -285,128 +123,9 @@ public static class SaveGameManager
|
||||
if (!FileAccess.FileExists(path)) return default;
|
||||
|
||||
FileAccess file = FileAccess.Open(path, FileAccess.ModeFlags.Read);
|
||||
if (file == null) return default;
|
||||
|
||||
string json = file.GetAsText();
|
||||
return JsonSerializer.Deserialize<T>(json);
|
||||
}
|
||||
|
||||
private static void ApplySurvivalData(SurvivalSaveData survival)
|
||||
{
|
||||
if (survival == null) return;
|
||||
|
||||
GameData.survival.hunger = survival.Hunger;
|
||||
GameData.survival.thirst = survival.Thirst;
|
||||
GameData.survival.energy = survival.Energy;
|
||||
GameData.survival.isDead = survival.IsDead;
|
||||
GameData.survival.deathReason = survival.DeathReason ?? "";
|
||||
GameData.survival.currentStatus = survival.CurrentStatus ?? "";
|
||||
GameData.survival.elapsedSeconds = survival.ElapsedSeconds;
|
||||
}
|
||||
|
||||
private static void ApplySettingsData(SettingsSaveData settings)
|
||||
{
|
||||
if (settings == null) return;
|
||||
|
||||
GameData.screenMode = settings.ScreenMode;
|
||||
GameData.soundVolume = settings.SoundVolume;
|
||||
GameData.lightColor = new Color(
|
||||
settings.LightColorR,
|
||||
settings.LightColorG,
|
||||
settings.LightColorB,
|
||||
settings.LightColorA
|
||||
);
|
||||
|
||||
ApplyScreenMode(settings.ScreenMode);
|
||||
SoundManager.SetMasterVolume(settings.SoundVolume);
|
||||
LightHandler.RedrawLights(GameData.lightColor);
|
||||
}
|
||||
|
||||
private static void ApplyScreenMode(int screenMode)
|
||||
{
|
||||
switch (screenMode)
|
||||
{
|
||||
case 0:
|
||||
DisplayServer.WindowSetMode(DisplayServer.WindowMode.Fullscreen);
|
||||
DisplayServer.WindowSetFlag(DisplayServer.WindowFlags.Borderless, false);
|
||||
break;
|
||||
case 1:
|
||||
DisplayServer.WindowSetMode(DisplayServer.WindowMode.Windowed);
|
||||
DisplayServer.WindowSetFlag(DisplayServer.WindowFlags.Borderless, false);
|
||||
break;
|
||||
case 2:
|
||||
DisplayServer.WindowSetMode(DisplayServer.WindowMode.Fullscreen);
|
||||
DisplayServer.WindowSetFlag(DisplayServer.WindowFlags.Borderless, true);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private static void ApplyInventoryData(List<ItemSaveData> savedItems)
|
||||
{
|
||||
GameData.inventory = new Inventory();
|
||||
if (savedItems == null) return;
|
||||
|
||||
foreach (ItemSaveData savedItem in savedItems)
|
||||
{
|
||||
if (!GameData.availableItems.ContainsKey(savedItem.Id)) continue;
|
||||
|
||||
GameData.inventory.AddItem(
|
||||
new Item { data = GameData.availableItems[savedItem.Id] },
|
||||
savedItem.Amount
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private static void ApplyResearchData(List<ResearchSaveData> savedResearch)
|
||||
{
|
||||
if (savedResearch == null) return;
|
||||
|
||||
foreach (ResearchSaveData savedState in savedResearch)
|
||||
{
|
||||
if (!GameData.availableResearch.ContainsKey(savedState.Id)) continue;
|
||||
|
||||
Research research = GameData.availableResearch[savedState.Id];
|
||||
research.state = savedState.State;
|
||||
research.elapsedResearchTime = savedState.ElapsedResearchTime;
|
||||
research.paidResources = savedState.PaidResources;
|
||||
}
|
||||
|
||||
GameData.RebuildRobotStatsFromResearch();
|
||||
}
|
||||
|
||||
private static void ApplyLayerData(List<LayerSaveData> savedLayers)
|
||||
{
|
||||
if (savedLayers == null || GameData.map == null) return;
|
||||
|
||||
foreach (LayerSaveData savedLayer in savedLayers)
|
||||
{
|
||||
if (savedLayer.Level < 0 || savedLayer.Level >= GameData.map.Length) continue;
|
||||
|
||||
Layer layer = GameData.map[savedLayer.Level];
|
||||
layer.isGateOpen = savedLayer.IsGateOpen;
|
||||
layer.hasContentGenerated = savedLayer.HasContentGenerated;
|
||||
layer.gateIngredients = savedLayer.GateIngredients ?? new List<Ingredient>();
|
||||
layer.currentResources = savedLayer.CurrentResources ?? new List<string>();
|
||||
|
||||
ApplyTileData(layer, savedLayer.Tiles);
|
||||
}
|
||||
}
|
||||
|
||||
private static void ApplyTileData(Layer layer, List<TileSaveData> savedTiles)
|
||||
{
|
||||
if (savedTiles == null) return;
|
||||
|
||||
foreach (TileSaveData savedTile in savedTiles)
|
||||
{
|
||||
if (savedTile.X < 0 || savedTile.X >= GameData.layerSize) continue;
|
||||
if (savedTile.Y < 0 || savedTile.Y >= GameData.layerSize) continue;
|
||||
|
||||
Tile tile = layer.tiles[savedTile.X, savedTile.Y];
|
||||
tile.collapsedMesh = savedTile.CollapsedMesh;
|
||||
tile.containsLight = savedTile.ContainsLight;
|
||||
tile.containsDecoration = savedTile.ContainsDecoration;
|
||||
tile.containsResource = savedTile.ContainsResource;
|
||||
tile.wasVisited = savedTile.WasVisited;
|
||||
tile.resource = savedTile.Resource == null ? null : GameResource.FromSaveData(savedTile.Resource);
|
||||
tile.ContentNode.Visible = savedTile.WasVisited || (tile.collapsedMesh == "gate" && !layer.isGateOpen);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,12 +13,9 @@ public partial class SteamworksHandler : Node
|
||||
SteamInitExStatus status = Steam.SteamInitEx(false).Status;
|
||||
if (status != 0)
|
||||
{
|
||||
GD.Print("Steam not initialized!");
|
||||
return;
|
||||
}
|
||||
|
||||
GD.Print("Steam initialized!");
|
||||
GD.Print("User: " + Steam.GetPersonaName());
|
||||
isSteamInitialized = true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user