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

Actual randomized humanoids (#11574)

Browse Source
This commit is contained in:
Flipp Syder
2022-10-20 06:46:05 -07:00
committed by GitHub
parent e4c67e998f
commit 0fe9f38968
8 changed files with 418 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/GameTicking/Rules/Configurations/NukeopsRuleConfiguration.cs
View File

@@ -1,5 +1,6 @@
using Content.Server.GameTicking.Rules.Configurations;
using Content.Shared.Dataset;
using Content.Shared.Humanoid.Prototypes;
using Content.Shared.Roles;
using Robust.Shared.Audio;
using Robust.Shared.Prototypes;
@@ -25,8 +26,8 @@ public sealed class NukeopsRuleConfiguration : GameRuleConfiguration
[DataField("maxOps")]
public int MaxOperatives = 5;
[DataField("spawnEntityProto", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
public string SpawnEntityPrototype = "MobHumanNukeOp";
[DataField("randomHumanoidSettings", customTypeSerializer: typeof(PrototypeIdSerializer<RandomHumanoidSettingsPrototype>))]
public string RandomHumanoidSettingsPrototype = "NukeOp";
[DataField("spawnPointProto", customTypeSerializer: typeof(PrototypeIdSerializer<StartingGearPrototype>))]
public string SpawnPointPrototype = "SpawnPointNukies";

4
Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
View File

@@ -35,6 +35,7 @@ using Robust.Shared.Audio;
using Robust.Shared.Configuration;
using Robust.Shared.Player;
using Content.Server.Administration.Commands;
using Content.Server.Humanoid.Systems;
using Content.Shared.Preferences;
using Content.Server.Preferences.Managers;
@@ -57,6 +58,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem
[Dependency] private readonly RoundEndSystem _roundEndSystem = default!;
[Dependency] private readonly SharedAudioSystem _audioSystem = default!;
[Dependency] private readonly GameTicker _ticker = default!;
[Dependency] private readonly RandomHumanoidSystem _randomHumanoid = default!;
private enum WinType
@@ -732,7 +734,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem
if (sessions.TryGetValue(i, out var session))
{
var mob = EntityManager.SpawnEntity(_nukeopsRuleConfig.SpawnEntityPrototype, _random.Pick(spawns));
var mob = _randomHumanoid.SpawnRandomHumanoid(_nukeopsRuleConfig.RandomHumanoidSettingsPrototype, _random.Pick(spawns), string.Empty);
var profile = _prefs.GetPreferences(session.UserId).SelectedCharacter as HumanoidCharacterProfile;
SetupOperativeEntity(mob, spawnDetails.Name, spawnDetails.Gear, profile);