juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Orthographic and obsolete in Knowledge

Browse Source
This commit is contained in:
Tornado Tech
2025-03-06 18:22:01 +10:00
parent e54e8a95ee
commit 44f4c17266
7 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/_CP14/Knowledge/CP14KnowledgeSystem.cs
View File

@@ -55,7 +55,7 @@ public sealed partial class CP14KnowledgeSystem : SharedCP14KnowledgeSystem
private void AddKnowledgeLearningVerb(Entity<CP14KnowledgeLearningSourceComponent> ent, ref GetVerbsEvent<Verb> args)
{
var user = args.User;
foreach (var knowledge in ent.Comp.Knowledges)
foreach (var knowledge in ent.Comp.Knowledge)
{
if (!_proto.TryIndex(knowledge, out var indexedKnowledge))
continue;
@@ -91,7 +91,7 @@ public sealed partial class CP14KnowledgeSystem : SharedCP14KnowledgeSystem
return;
//Remove knowledge
foreach (var knowledge in ent.Comp.Knowledges)
foreach (var knowledge in ent.Comp.Knowledge)
{
if (!_proto.TryIndex(knowledge, out var indexedKnowledge))
continue;
@@ -112,7 +112,7 @@ public sealed partial class CP14KnowledgeSystem : SharedCP14KnowledgeSystem
//Add knowledge
foreach (var knowledge in _proto.EnumeratePrototypes<CP14KnowledgePrototype>())
{
if (ent.Comp.Knowledges.Contains(knowledge))
if (ent.Comp.Knowledge.Contains(knowledge))
continue;
args.Verbs.Add(new Verb()
@@ -147,7 +147,7 @@ public sealed partial class CP14KnowledgeSystem : SharedCP14KnowledgeSystem
if (!_proto.TryIndex(proto, out var indexedKnowledge))
return false;
if (knowledgeStorage.Knowledges.Contains(proto))
if (knowledgeStorage.Knowledge.Contains(proto))
return false;
foreach (var dependency in indexedKnowledge.Dependencies)
@@ -214,7 +214,7 @@ public sealed partial class CP14KnowledgeSystem : SharedCP14KnowledgeSystem
LogType.Mind,
LogImpact.Medium,
$"{EntityManager.ToPrettyString(uid):player} learned new knowledge: {Loc.GetString(indexedKnowledge.Name)}");
return knowledgeStorage.Knowledges.Add(proto);
return knowledgeStorage.Knowledge.Add(proto);
}
public bool TryForgotKnowledge(EntityUid uid, ProtoId<CP14KnowledgePrototype> proto, bool silent = false)
@@ -222,13 +222,13 @@ public sealed partial class CP14KnowledgeSystem : SharedCP14KnowledgeSystem
if (!TryComp<CP14KnowledgeStorageComponent>(uid, out var knowledgeStorage))
return false;
if (!knowledgeStorage.Knowledges.Contains(proto))
if (!knowledgeStorage.Knowledge.Contains(proto))
return false;
if (!_proto.TryIndex(proto, out var indexedKnowledge))
return false;
knowledgeStorage.Knowledges.Remove(proto);
knowledgeStorage.Knowledge.Remove(proto);
if (_mind.TryGetMind(uid, out var mind, out var mindComp) && mindComp.Session is not null)
{
@@ -264,6 +264,6 @@ public sealed partial class CP14KnowledgeSystem : SharedCP14KnowledgeSystem
if (!TryComp<CP14KnowledgeStorageComponent>(entity, out var knowledgeComp))
return;
RaiseNetworkEvent(new CP14KnowledgeInfoEvent(GetNetEntity(entity),knowledgeComp.Knowledges), args.SenderSession);
RaiseNetworkEvent(new CP14KnowledgeInfoEvent(GetNetEntity(entity),knowledgeComp.Knowledge), args.SenderSession);
}
}

5
Content.Shared/_CP14/Knowledge/Components/CP14AutoAddKnowledgeComponent.cs
View File

@@ -4,11 +4,12 @@ using Robust.Shared.Prototypes;
namespace Content.Shared._CP14.Knowledge.Components;
/// <summary>
/// The ability to add a skill to an entity and quickly teach it some skills
/// The ability to add a <see cref="CP14KnowledgePrototype"/> to an entity
/// and quickly teach it some skills.
/// </summary>
[RegisterComponent, Access(typeof(SharedCP14KnowledgeSystem))]
public sealed partial class CP14AutoAddKnowledgeComponent : Component
{
[DataField]
public List<ProtoId<CP14KnowledgePrototype>> Knowledge = new();
public List<ProtoId<CP14KnowledgePrototype>> Knowledge = [];
}

2
Content.Shared/_CP14/Knowledge/Components/CP14KnowledgeLearningSourceComponent.cs
View File

@@ -10,7 +10,7 @@ namespace Content.Shared._CP14.Knowledge.Components;
public sealed partial class CP14KnowledgeLearningSourceComponent : Component
{
[DataField, ViewVariables(VVAccess.ReadOnly)]
public HashSet<ProtoId<CP14KnowledgePrototype>> Knowledges { get; private set; } = new();
public HashSet<ProtoId<CP14KnowledgePrototype>> Knowledge { get; private set; } = [];
[DataField]
public TimeSpan DoAfter = TimeSpan.FromSeconds(5f);

8
Content.Shared/_CP14/Knowledge/Components/CP14KnowledgePaperTextComponent.cs
View File

@@ -1,10 +1,8 @@
namespace Content.Shared._CP14.Knowledge.Components;
/// <summary>
/// automatically generates content for PaperComponent, based on the knowledge that can be learnt from this object
/// Automatically generates content for PaperComponent,
/// based on the knowledge that can be learnt from this object.
/// </summary>
[RegisterComponent, Access(typeof(SharedCP14KnowledgeSystem))]
public sealed partial class CP14KnowledgePaperTextComponent : Component
{
}
public sealed partial class CP14KnowledgePaperTextComponent : Component;

4
Content.Shared/_CP14/Knowledge/Components/CP14KnowledgeStorageComponent.cs
View File

@@ -4,11 +4,11 @@ using Robust.Shared.Prototypes;
namespace Content.Shared._CP14.Knowledge.Components;
/// <summary>
/// a list of skills learned by this entity
/// A list of <see cref="CP14KnowledgePrototype"/> learned by this entity.
/// </summary>
[RegisterComponent, Access(typeof(SharedCP14KnowledgeSystem))]
public sealed partial class CP14KnowledgeStorageComponent : Component
{
[DataField, ViewVariables(VVAccess.ReadOnly)]
public HashSet<ProtoId<CP14KnowledgePrototype>> Knowledges { get; private set; } = new();
public HashSet<ProtoId<CP14KnowledgePrototype>> Knowledge { get; private set; } = [];
}

9
Content.Shared/_CP14/Knowledge/Prototypes/CP14KnowledgePrototype.cs
View File

@@ -8,19 +8,18 @@ namespace Content.Shared._CP14.Knowledge.Prototypes;
[Prototype("CP14Knowledge")]
public sealed partial class CP14KnowledgePrototype : IPrototype
{
[ViewVariables]
[IdDataField]
public string ID { get; private set; } = default!;
[DataField(required: true)]
public LocId Name { get; private set; } = default!;
public LocId Name { get; private set; }
[DataField]
public LocId Desc{ get; private set; } = default!;
public LocId Desc { get; private set; }
/// <summary>
/// to study this knowledge, other knowledge on which it is based may be necessary.
/// To study this knowledge, other knowledge on which it is based may be necessary.
/// </summary>
[DataField]
public HashSet<ProtoId<CP14KnowledgePrototype>> Dependencies = new();
public HashSet<ProtoId<CP14KnowledgePrototype>> Dependencies = [];
}

8
Content.Shared/_CP14/Knowledge/SharedCP14KnowledgeSystem.cs
View File

@@ -26,13 +26,13 @@ public abstract partial class SharedCP14KnowledgeSystem : EntitySystem
return;
if (!TryComp<CP14KnowledgeLearningSourceComponent>(ent, out var knowledge))
return;
if (knowledge.Knowledges.Count <= 0)
if (knowledge.Knowledge.Count <= 0)
return;
var sb = new StringBuilder();
sb.Append(Loc.GetString("cp14-knowledge-book-pre-text"));
foreach (var k in knowledge.Knowledges)
foreach (var k in knowledge.Knowledge)
{
if (!_proto.TryIndex(k, out var indexedKnowledge))
continue;
@@ -54,7 +54,7 @@ public abstract partial class SharedCP14KnowledgeSystem : EntitySystem
if (!Resolve(uid, ref knowledgeStorage, false))
return false;
if (!knowledgeStorage.Knowledges.Contains(knowledge))
if (!knowledgeStorage.Knowledge.Contains(knowledge))
return false;
var ev = new CP14KnowledgeUsedEvent(uid, knowledge, factor);
@@ -72,7 +72,7 @@ public abstract partial class SharedCP14KnowledgeSystem : EntitySystem
if (!Resolve(uid, ref knowledgeStorage, false))
return false;
return knowledgeStorage.Knowledges.Contains(knowledge);
return knowledgeStorage.Knowledge.Contains(knowledge);
}
}