Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Adds Research, unlockable technologies, Protolathes... (#264)

Browse Source 
* Work on Research so far
More work on UI...
Fix ResearchClient and Protolathe UI stuff.
Fix infinite select -> request state -> select -> ... loop
Add UI to ResearchClient, etc.
Technology Database states, and a bit of work on the research console ui
A bit of work on Research Console UI
Protolathe sync
Stuff that actually does things
Protolathe databases yay
Alright got my motivation back
Yeah, no. It's almost 3 AM already
Fix serialization bug again
More work on stuff
Stuff
Adds files for most new components/systems.

* Protolathes actually work now

* Research. Just Research.

* Adds icons from Eris.

* Address reviews

* Change LatheMenu resize behaviour

* Update Content.Client/GameObjects/Components/Research/ResearchConsoleBoundUserInterface.cs

Co-Authored-By: Pieter-Jan Briers <pieterjan.briers@gmail.com>

* Update Content.Client/Research/ResearchConsoleMenu.cs

Co-Authored-By: Pieter-Jan Briers <pieterjan.briers@gmail.com>

* Move IoC Resolve out of for loop

* Address review

* Localize stuff
This commit is contained in:
Víctor Aguilera Puerto
2019-09-03 22:51:19 +02:00
committed by Pieter-Jan Briers
parent b62fb4a318
commit ba8b495ec0
61 changed files with 1884 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Content.Shared/GameObjects/Components/Research/SharedLatheComponent.cs
View File

@@ -54,6 +54,30 @@ namespace Content.Shared.GameObjects.Components.Research
}
}
/// <summary>
/// Sent to the server to sync the lathe's technology database with the research server.
/// </summary>
[Serializable, NetSerializable]
public class LatheServerSyncMessage : BoundUserInterfaceMessage
{
public LatheServerSyncMessage()
{
}
}
/// <summary>
/// Sent to the server to open the ResearchClient UI.
/// </summary>
[Serializable, NetSerializable]
public class LatheServerSelectionMessage : BoundUserInterfaceMessage
{
public LatheServerSelectionMessage()
{
}
}
/// <summary>
/// Sent to the client when the lathe is producing a recipe.
/// </summary>

7
Content.Shared/GameObjects/Components/Research/SharedLatheDatabaseComponent.cs
View File

@@ -13,8 +13,8 @@ namespace Content.Shared.GameObjects.Components.Research
public class SharedLatheDatabaseComponent : Component, IEnumerable<LatheRecipePrototype>
{
public override string Name => "LatheDatabase";
public sealed override uint? NetID => ContentNetIDs.LATHE_DATABASE;
public sealed override Type StateType => typeof(LatheDatabaseState);
public override uint? NetID => ContentNetIDs.LATHE_DATABASE;
public override Type StateType => typeof(LatheDatabaseState);
private List<LatheRecipePrototype> _recipes = new List<LatheRecipePrototype>();
@@ -34,7 +34,8 @@ namespace Content.Shared.GameObjects.Components.Research
/// <returns>Whether it could be added or not</returns>
public virtual void AddRecipe(LatheRecipePrototype recipe)
{
_recipes.Add(recipe);
if(!Contains(recipe))
_recipes.Add(recipe);
}
/// <summary>

72
Content.Shared/GameObjects/Components/Research/SharedProtolatheDatabaseComponent.cs Normal file
View File

@@ -0,0 +1,72 @@
using System;
using System.Collections.Generic;
using Content.Shared.Research;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects.Components.Research
{
[ComponentReference(typeof(SharedLatheDatabaseComponent))]
public class SharedProtolatheDatabaseComponent : SharedLatheDatabaseComponent
{
public override string Name => "ProtolatheDatabase";
public sealed override uint? NetID => ContentNetIDs.PROTOLATHE_DATABASE;
public sealed override Type StateType => typeof(ProtolatheDatabaseState);
private List<LatheRecipePrototype> _protolatheRecipes = new List<LatheRecipePrototype>();
/// <summary>
/// A full list of recipes this protolathe can print.
/// </summary>
public List<LatheRecipePrototype> ProtolatheRecipes => _protolatheRecipes;
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
if (serializer.Reading)
{
var recipes = serializer.ReadDataField("protolatherecipes", new List<string>());
var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
foreach (var id in recipes)
{
if (!prototypeManager.TryIndex(id, out LatheRecipePrototype recipe)) continue;
_protolatheRecipes.Add(recipe);
}
} else if (serializer.Writing)
{
var recipes = GetProtolatheRecipeIdList();
serializer.DataField(ref recipes, "protolatherecipes", new List<string>());
}
}
/// <summary>
/// Returns a list of the allowed protolathe recipe IDs.
/// </summary>
/// <returns>A list of recipe IDs allowed</returns>
public List<string> GetProtolatheRecipeIdList()
{
var list = new List<string>();
foreach (var recipe in ProtolatheRecipes)
{
list.Add(recipe.ID);
}
return list;
}
}
[NetSerializable, Serializable]
public class ProtolatheDatabaseState : ComponentState
{
public readonly List<string> Recipes;
public ProtolatheDatabaseState(List<string> recipes) : base(ContentNetIDs.PROTOLATHE_DATABASE)
{
Recipes = recipes;
}
}
}

73
Content.Shared/GameObjects/Components/Research/SharedResearchClientComponent.cs Normal file
View File

@@ -0,0 +1,73 @@
using System;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects.Components.Research
{
public class SharedResearchClientComponent : Component
{
public override string Name => "ResearchClient";
/// <summary>
/// Request that the server updates the client.
/// </summary>
[Serializable, NetSerializable]
public class ResearchClientSyncMessage : BoundUserInterfaceMessage
{
public ResearchClientSyncMessage()
{
}
}
/// <summary>
/// Sent to the server when the client chooses a research server.
/// </summary>
[Serializable, NetSerializable]
public class ResearchClientServerSelectedMessage : BoundUserInterfaceMessage
{
public int ServerId;
public ResearchClientServerSelectedMessage(int serverId)
{
ServerId = serverId;
}
}
/// <summary>
/// Sent to the server when the client deselects a research server.
/// </summary>
[Serializable, NetSerializable]
public class ResearchClientServerDeselectedMessage : BoundUserInterfaceMessage
{
public ResearchClientServerDeselectedMessage()
{
}
}
[NetSerializable, Serializable]
public enum ResearchClientUiKey
{
Key,
}
[Serializable, NetSerializable]
public sealed class ResearchClientBoundInterfaceState : BoundUserInterfaceState
{
public int ServerCount;
public string[] ServerNames;
public int[] ServerIds;
public int SelectedServerId;
public ResearchClientBoundInterfaceState(int serverCount, string[] serverNames, int[] serverIds, int selectedServerId = -1)
{
ServerCount = serverCount;
ServerNames = serverNames;
ServerIds = serverIds;
SelectedServerId = selectedServerId;
}
}
}
}

55
Content.Shared/GameObjects/Components/Research/SharedResearchConsoleComponent.cs Normal file
View File

@@ -0,0 +1,55 @@
using System;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects.Components.Research
{
public class SharedResearchConsoleComponent : Component
{
public override string Name => "ResearchConsole";
public override uint? NetID => ContentNetIDs.RESEARCH_CONSOLE;
[NetSerializable, Serializable]
public enum ResearchConsoleUiKey
{
Key,
}
[Serializable, NetSerializable]
public class ConsoleUnlockTechnologyMessage : BoundUserInterfaceMessage
{
public string Id;
public ConsoleUnlockTechnologyMessage(string id)
{
Id = id;
}
}
[Serializable, NetSerializable]
public class ConsoleServerSyncMessage : BoundUserInterfaceMessage
{
public ConsoleServerSyncMessage()
{}
}
[Serializable, NetSerializable]
public class ConsoleServerSelectionMessage : BoundUserInterfaceMessage
{
public ConsoleServerSelectionMessage()
{}
}
[Serializable, NetSerializable]
public sealed class ResearchConsoleBoundInterfaceState : BoundUserInterfaceState
{
public int Points;
public int PointsPerSecond;
public ResearchConsoleBoundInterfaceState(int points, int pointsPerSecond)
{
Points = points;
PointsPerSecond = pointsPerSecond;
}
}
}
}

124
Content.Shared/GameObjects/Components/Research/SharedTechnologyDatabaseComponent.cs Normal file
View File

@@ -0,0 +1,124 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Content.Shared.Research;
using Robust.Shared.GameObjects;
using Robust.Shared.GameStates;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects.Components.Research
{
public class SharedTechnologyDatabaseComponent : Component, IEnumerable<TechnologyPrototype>
{
public override string Name => "TechnologyDatabase";
public override uint? NetID => ContentNetIDs.TECHNOLOGY_DATABASE;
public override Type StateType => typeof(TechnologyDatabaseState);
protected List<TechnologyPrototype> _technologies = new List<TechnologyPrototype>();
/// <summary>
/// A read-only list of unlocked technologies.
/// </summary>
public IReadOnlyList<TechnologyPrototype> Technologies => _technologies;
public IEnumerator<TechnologyPrototype> GetEnumerator()
{
return Technologies.GetEnumerator();
}
IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
/// <summary>
/// Returns a list with the IDs of all unlocked technologies.
/// </summary>
/// <returns>A list of technology IDs</returns>
public List<string> GetTechnologyIdList()
{
List<string> techIds = new List<string>();
foreach (var tech in _technologies)
{
techIds.Add(tech.ID);
}
return techIds;
}
/// <summary>
/// Returns whether a technology is unlocked on this database or not.
/// </summary>
/// <param name="technology">The technology to be checked</param>
/// <returns>Whether it is unlocked or not</returns>
public bool IsTechnologyUnlocked(TechnologyPrototype technology)
{
return _technologies.Contains(technology);
}
/// <summary>
/// Returns whether a technology can be unlocked on this database,
/// taking parent technologies into account.
/// </summary>
/// <param name="technology">The technology to be checked</param>
/// <returns>Whether it could be unlocked or not</returns>
public bool CanUnlockTechnology(TechnologyPrototype technology)
{
if (technology == null || IsTechnologyUnlocked(technology)) return false;
var protoMan = IoCManager.Resolve<IPrototypeManager>();
foreach (var technologyId in technology.RequiredTechnologies)
{
protoMan.TryIndex(technologyId, out TechnologyPrototype requiredTechnology);
if (requiredTechnology == null)
return false;
if (!IsTechnologyUnlocked(requiredTechnology))
return false;
}
return true;
}
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
if (serializer.Reading)
{
var techs = serializer.ReadDataField("technologies", new List<string>());
var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
foreach (var id in techs)
{
if (!prototypeManager.TryIndex(id, out TechnologyPrototype tech)) continue;
_technologies.Add(tech);
}
} else if (serializer.Writing)
{
var techs = GetTechnologyIdList();
serializer.DataField(ref techs, "technologies", new List<string>());
}
}
}
[Serializable, NetSerializable]
public class TechnologyDatabaseState : ComponentState
{
public List<string> Technologies;
public TechnologyDatabaseState(List<string> technologies) : base(ContentNetIDs.TECHNOLOGY_DATABASE)
{
technologies = technologies;
}
public TechnologyDatabaseState(List<TechnologyPrototype> technologies) : base(ContentNetIDs.TECHNOLOGY_DATABASE)
{
Technologies = new List<string>();
foreach (var technology in technologies)
{
Technologies.Add(technology.ID);
}
}
}
}

5
Content.Shared/GameObjects/ContentNetIDs.cs
View File

@@ -24,6 +24,9 @@
public const uint MATERIAL_STORAGE = 1018;
public const uint HAND_TELEPORTER = 1019;
public const uint VENDING_MACHINE = 1020;
public const uint WIRES = 1021;
public const uint PROTOLATHE_DATABASE = 1021;
public const uint TECHNOLOGY_DATABASE = 1022;
public const uint RESEARCH_CONSOLE = 1023;
public const uint WIRES = 1024;
}
}

10
Content.Shared/Research/LatheRecipePrototype.cs
View File

@@ -6,6 +6,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
using YamlDotNet.RepresentationModel;
namespace Content.Shared.Research
@@ -21,11 +22,13 @@ namespace Content.Shared.Research
private int _completeTime;
private Dictionary<string, int> _requiredMaterials;
[ViewVariables]
public string ID => _id;
/// <summary>
/// Name displayed in the lathe GUI.
/// </summary>
[ViewVariables]
public string Name
{
get
@@ -43,6 +46,7 @@ namespace Content.Shared.Research
/// <summary>
/// Short description displayed in the lathe GUI.
/// </summary>
[ViewVariables]
public string Description
{
get
@@ -60,17 +64,20 @@ namespace Content.Shared.Research
/// <summary>
/// Texture path used in the lathe GUI.
/// </summary>
[ViewVariables]
public SpriteSpecifier Icon => _icon;
/// <summary>
/// The prototype name of the resulting entity when the recipe is printed.
/// </summary>
[ViewVariables]
public string Result => _result;
/// <summary>
/// The materials required to produce this recipe.
/// Takes a material ID as string.
/// </summary>
[ViewVariables]
public Dictionary<string, int> RequiredMaterials
{
get => _requiredMaterials;
@@ -78,10 +85,11 @@ namespace Content.Shared.Research
}
/// <summary>
/// <summary>
/// How many milliseconds it'll take for the lathe to finish this recipe.
/// Might lower depending on the lathe's upgrade level.
/// </summary>
[ViewVariables]
public int CompleteTime => _completeTime;
public void LoadFrom(YamlMappingNode mapping)

76
Content.Shared/Research/TechnologyPrototype.cs Normal file
View File

@@ -0,0 +1,76 @@
using System;
using System.Collections.Generic;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
using YamlDotNet.RepresentationModel;
namespace Content.Shared.Research
{
[NetSerializable, Serializable, Prototype("technology")]
public class TechnologyPrototype : IPrototype, IIndexedPrototype
{
private string _name;
private string _id;
private SpriteSpecifier _icon;
private string _description;
private int _requiredPoints;
private List<string> _requiredTechnologies;
private List<string> _unlockedRecipes;
/// <summary>
/// The ID of this technology prototype.
/// </summary>
[ViewVariables]
public string ID => _id;
/// <summary>
/// The name this technology will have on user interfaces.
/// </summary>
[ViewVariables]
public string Name => _name;
/// <summary>
/// An icon that represent this technology.
/// </summary>
public SpriteSpecifier Icon => _icon;
/// <summary>
/// A short description of the technology.
/// </summary>
[ViewVariables]
public string Description => _description;
/// <summary>
/// The required research points to unlock this technology.
/// </summary>
[ViewVariables]
public int RequiredPoints => _requiredPoints;
/// <summary>
/// A list of technology IDs required to unlock this technology.
/// </summary>
[ViewVariables]
public List<string> RequiredTechnologies => _requiredTechnologies;
/// <summary>
/// A list of recipe IDs this technology unlocks.
/// </summary>
[ViewVariables]
public List<string> UnlockedRecipes => _unlockedRecipes;
public void LoadFrom(YamlMappingNode mapping)
{
var serializer = YamlObjectSerializer.NewReader(mapping);
serializer.DataField(ref _name, "name", string.Empty);
serializer.DataField(ref _id, "id", string.Empty);
serializer.DataField(ref _description, "description", string.Empty);
serializer.DataField(ref _icon, "icon", SpriteSpecifier.Invalid);
serializer.DataField(ref _requiredPoints, "requiredpoints", 0);
serializer.DataField(ref _requiredTechnologies, "requiredtechnologies", new List<string>());
serializer.DataField(ref _unlockedRecipes, "unlockedrecipes", new List<string>());
}
}
}