Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

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>());
}
}
}