2022-05-14 08:58:45 +10:00
|
|
|
|
using Content.Server.Access.Systems;
|
|
|
|
|
|
using Content.Server.DetailExaminable;
|
2022-05-10 13:43:30 -05:00
|
|
|
|
using Content.Server.Hands.Components;
|
|
|
|
|
|
using Content.Server.Hands.Systems;
|
Humanoid appearance refactor (#10882)
* initial commit
- species prototype modifications
- markings points as its own file
- shared humanoid component
* adds a tool to convert sprite accessories to markings (in go)
* removes a fmt call
* converts sprite accessory to markings
* adds hair and facial hair to marking categories
* multiple changes
- humanoid visualizer system
- markings modifications for visualizer
- modifications to shared humanoid component
- lays out a base for humanoid system
* hidden layers, ports some properties from appearance component, shrinks DefaultMarkings a little
* squishes the initialize event calls into one function
adds stuff to set species/skin color externally from a server message - currently laid out as if it a dirty call to a networked component, may be subject to change (server-side has not been implemented yet)
* makes the sprite pipeline more obvious
* apply all markings, hidden layer set replacement
* ensures that markings are cleared when the new set is applied
* starts refactoring markingsset (unfinished)
* more additions to the markingset api
* adds constructor logic to markingset
* adds a method to filter out markings in a set based on a given species
* fixes enumerators in markingset
* adds validator into MarkingSet, fixes ForwardMarkingEnumerator
* modifications to the humanoid visual system
* ensuredefault in markingset
* oop
* fixes up data keys, populates OnAppearanceChange in visualizer
* changes to humanoid component, markings
marking equality is now more strict, humanoidcomponent is now implemented for client as a child of sharedhumanoidcomponent
* markings are now applied the visualizer by diffing them
* base sprites are now applied to humanoids from humanoidvisualizer
* passes along base sprite settings to the marking application so that markings know to follow skin color/alpha or not (see: slimes)
* custom base layers on humanoids
* merges all data keys into one data class for humanoid visualizers
* setappearance in sharedhumanoidsystem, removes custombaselayercolors
* humanoidcomponent, system (empty) in server
* adds some basic public API functions to HumanoidSystem
* add marking, remove marking
* changes appearance MarkingsSet to a List<Marking>, adds listener for PlayerSpawnCompleteEvent in HumanoidSystem
* ensuredefaultmarkings, oninit for humanoids
* markingmanager API changes
* removes MarkingsSet
* LoadProfile, adjusts randomization in humanoid appearance to account for species
* base layer settings in humanoidsystem, eye color from profile
* rearranges files to centralize under Humanoid namespace
* more reorganization, deletes some stuff
gotta break stuff to make other things work, right?
goodbye SpriteAccessory...
* fixes a good chunk of server-side issues
still does not compile, yet
* singlemarkingpicker xaml layout
* singlemarkingpicker logic
* magic mirror window (varying pieces of it, mostly client-oriented)
* removes some imports, gives MagicMirror a BUI class (not filled in yet)
* populates magic mirror BUI functionality / window callbacks
* fixes up some errors in humanoidprofileeditor
* changes to SingleMarkingPicker
SingleMarkingPicker now accepts a List<Marking>, species, and total possible markings available in that marking category
* fixes up hair pickers on humanoid profile editor
* fixes the errors in markingpicker
* markingsystem is now gone
* fixes a bunch of build errors
* so that's why i did it like that
* namespace issues, adds robustxamlloader to singlemarkingpicker
* another robustxamlloader
* human, lizard sprites/points
* prototype fixes, deletion of old spriteaccessory
* component registration, fixes dwarf skin toning
no, 'ReptilianToned' does not exist
* removes component registration from abstract humanoid component
* visualizer data now cloneable
* serialize for visualizer key
* zero-count edge case
* missing semi-colon moment
* setspecies in humanoidsystem
* ensures that default markings, if empty, will cause ensuredefault to skip over that given category
* tryadd instead of add
* whoops
* diff and apply should properly apply markings now
* always ensure default, fixes double load for player spawning
* apply skin color now sets the skin color property in humanoidcomponent
* removes sprite from a few species prototypes
* sprite changes for specific base layers based on humanoid sex
* layer ordering fix, and a missing base layer should now disallow markings on that layer
* anymarking base layer, adds the right leg/foot for humans
* loading a profile will now clear all markings on that humanoid
* adds missing layers for humans
* separates species.yml into respective species prototype files
* ensures that if layer visibility was changed, all markings have to be reapplied
* server-side enforcement of hiding hair (and other head-related markings) when equipping things that hide hair
* slime fix, clothingsystem now dictates layer visibility server side
* sussy
* layer settings should now ensure a marking should match the skin tone
* whoops
* skincolor static class and functions in UI
* skin color validation in humanoidcharacterappearance
* markingpicker now shows only the markings for the selected category in used
* getter for slot in singlemarkingpicker now ensures slot is 0 if markings exists
* FilterSpecies no longer attempts to do removal while iterating
* expands for SingleMarkingPicker
* humanoid base dummy has blank layers now (and snout/tail/headside/headtop)
* fixes an issue with visualizer system if the marking count was different but the markings themselves were (somewhat) the same
* whoops
* adds edge case handlers for count differences in humanoid markings
* preview now loads profile instead of directly setting appearance
* moves marking set loading to update controls
* clones a marking set in markingpicker by using the deep clone constructor
* whoops (deep cloning a marking now copies the marking id)
* adds replace function for markingset
* points should now update after the markings are remove/added
* merging base layer sprites into a humanoid should now clear them before merging
* sets dirty range start to count only if the dirty range start was never set above 0
* fixes up some issues with singlemarkingpicker
* color selector sliders in single marking picker should now expand
* hair from hair pickers should now apply in profile loading (client-side)
* category in singlemarkingpicker now sets the private category variable
* slot selector should now populate
* single marking picker buttons now have text, also shows the category name over all user-clickable elements
* removes a comment
* removing hair slots now sets it to bald, defaults to zero used slots if current hair is bald on hair/facial hair
* random skin color, eye color
* populate colors now checks if the marking count is greater than zero in singlemarkingpicker
* hair/facial hair pickers now just get the first possible hair from the respective species list
* different approach to random skin color
* oh, that's why it wasn't working
* randomize everything now just updates every single control
* selecting a new marking in SingleMarkingPicker should attempt to copy over old colors, populate list now uses cache,
* markingmanager now uses OnlyWhitelisted to populate by category and species
* filterspecies now uses onlyWhitelist to filter markings based on whitelist or not
* oops
* ui fix for singlemarkingpicker, ensures that cache is not null if it is null when populatelist is called
* order of operations for the horizontal expand for add/remove
* hair pickers should now update when you add/remove the hair slot
* fixes variable naming error in character appearance
* loc string fix in singlemarkingpicker
* lizards, vox now have onlyWhitelist, vox restriction for hair/facialhairs
* having zero possible hairs should no longer cause an exception in randomization
* setting species should now update hair pickers
* ignore categories for marking picker
* and a clear as well for the category button
* places that functionality in its own function instead
* adds eye base sprite, vox now also have their own custom eye sprites
* loading a profile client-side should do FilterSpecies for markings now
* client-side load profile does filter species after adding in the hairs now
* magic mirror
* callbacks now call the callback instead of adding it on construct
* whoops
* in removemarking too
* adds missing synchronize calls
* comments out an updateinterface call in magic mirror
* magic mirror window title, minimum sizing
* fixes minsize, adds warning for players who try to set their hair for species that have no hair
* removes spaces in xaml
* namespace changes/organization
* whoopsie (merge conflicts)
* re-enables identity from humanoid component
* damagevisuals now uses the enum given to it instead of the layerstate given on that layer tied to the enum
* removes commas from json
* changes to visuals system so the change is consistent
* chest
* reptilian
* visualizer system now handles body sprite setting/coloration, similar to how characterappearance did it
not a big fan of this
* adds a check in applybasesprites
* adding/removing parts should now make them invisible on a humanoid
* body part removal/adding now enumerates over sublayers instead
* synchro now runs in bodycomponent startup
* parts instead of slots
* humanoidcompnent check
* switches from rsi to actualrsi
* removes all the body stuff (too slow)
* cleans up resolves from humanoid visualizer system
* merging sprites now checks if the base sprites have been modified or not (through things like species changes, or custom base sprite changes)
* not forgetting that one again
* merging now returns an actual dirty value
* replaces the sequenceequal with a more accurate solution
* permanent layers, layer visibility on add/remove part in body
* should send all hidden layers over now
* isdirty in visualizer system for base layers
* isdirty checks count as well
* ok, IsDirty should now set the base layers if the merged sprites are different
* equals override in HumanoidSpritePrototypes.cs
temporary until record prototypes :heck:
* makes fields readonly, equates IDs instead
* adds forced markings through marking picker
* forced in humanoidsystem api, ignorespecies in markingpicker
* marking bui
* makes that serializable as well
* ignore species/forced toggles now work
* adds icon to modifier verb, interface and keys to humanoid bases
* needs the actual enum value to open, no?
* makes the key the actual key
* actions now propagate upwards
* ignore species when set now repopulates markingpicker
* modifiable base layers in the markings window
* oops!
* layout changes
* info box should now appear
* adds ignorespecies for marking picker, collapsible for base layer section of appearance modification window
* collapsible layout moment
* if base layers have changed, all markings are now dirty (and if a base layer is missing, the marking is still 'applied' but it's now just invisible
* small change to marking visibility
* small changes to modifier UI
* markings now match skin on zombification
* zombie stuff
* makes the line edit in marking modifier window more obvious
* disables vox on round start
* horizontal expand on the single label in base layer modifiers
* humanoid profiles in prototypes
* randomhumanoidappearance won't work if the humanoid has a profile already stored
* removes unused code
* documentation in humanoidsystem server-side
* documentation in shared/client
* whoops
* converts accessory into marking in locale files (also adds marking loc string into single marking picker)
* be gone, shared humanoid appearance system from the last upstream merge
* species ignore on randomization (defaults to no ignored species)
* more upstream merge parts that bypassed any errors before merge
* addresses review (also just adds typeserializers in some places)
* submodule moment
* upstream merge issues
2022-09-22 15:19:00 -07:00
|
|
|
|
using Content.Server.Humanoid;
|
2022-07-10 18:36:53 -07:00
|
|
|
|
using Content.Server.IdentityManagement;
|
2022-05-10 13:43:30 -05:00
|
|
|
|
using Content.Server.PDA;
|
|
|
|
|
|
using Content.Server.Roles;
|
|
|
|
|
|
using Content.Server.Station.Components;
|
2022-07-10 21:10:03 -04:00
|
|
|
|
using Content.Server.Mind.Commands;
|
2022-05-27 06:01:07 +02:00
|
|
|
|
using Content.Shared.Access.Systems;
|
2022-05-14 08:58:45 +10:00
|
|
|
|
using Content.Shared.CCVar;
|
Humanoid appearance refactor (#10882)
* initial commit
- species prototype modifications
- markings points as its own file
- shared humanoid component
* adds a tool to convert sprite accessories to markings (in go)
* removes a fmt call
* converts sprite accessory to markings
* adds hair and facial hair to marking categories
* multiple changes
- humanoid visualizer system
- markings modifications for visualizer
- modifications to shared humanoid component
- lays out a base for humanoid system
* hidden layers, ports some properties from appearance component, shrinks DefaultMarkings a little
* squishes the initialize event calls into one function
adds stuff to set species/skin color externally from a server message - currently laid out as if it a dirty call to a networked component, may be subject to change (server-side has not been implemented yet)
* makes the sprite pipeline more obvious
* apply all markings, hidden layer set replacement
* ensures that markings are cleared when the new set is applied
* starts refactoring markingsset (unfinished)
* more additions to the markingset api
* adds constructor logic to markingset
* adds a method to filter out markings in a set based on a given species
* fixes enumerators in markingset
* adds validator into MarkingSet, fixes ForwardMarkingEnumerator
* modifications to the humanoid visual system
* ensuredefault in markingset
* oop
* fixes up data keys, populates OnAppearanceChange in visualizer
* changes to humanoid component, markings
marking equality is now more strict, humanoidcomponent is now implemented for client as a child of sharedhumanoidcomponent
* markings are now applied the visualizer by diffing them
* base sprites are now applied to humanoids from humanoidvisualizer
* passes along base sprite settings to the marking application so that markings know to follow skin color/alpha or not (see: slimes)
* custom base layers on humanoids
* merges all data keys into one data class for humanoid visualizers
* setappearance in sharedhumanoidsystem, removes custombaselayercolors
* humanoidcomponent, system (empty) in server
* adds some basic public API functions to HumanoidSystem
* add marking, remove marking
* changes appearance MarkingsSet to a List<Marking>, adds listener for PlayerSpawnCompleteEvent in HumanoidSystem
* ensuredefaultmarkings, oninit for humanoids
* markingmanager API changes
* removes MarkingsSet
* LoadProfile, adjusts randomization in humanoid appearance to account for species
* base layer settings in humanoidsystem, eye color from profile
* rearranges files to centralize under Humanoid namespace
* more reorganization, deletes some stuff
gotta break stuff to make other things work, right?
goodbye SpriteAccessory...
* fixes a good chunk of server-side issues
still does not compile, yet
* singlemarkingpicker xaml layout
* singlemarkingpicker logic
* magic mirror window (varying pieces of it, mostly client-oriented)
* removes some imports, gives MagicMirror a BUI class (not filled in yet)
* populates magic mirror BUI functionality / window callbacks
* fixes up some errors in humanoidprofileeditor
* changes to SingleMarkingPicker
SingleMarkingPicker now accepts a List<Marking>, species, and total possible markings available in that marking category
* fixes up hair pickers on humanoid profile editor
* fixes the errors in markingpicker
* markingsystem is now gone
* fixes a bunch of build errors
* so that's why i did it like that
* namespace issues, adds robustxamlloader to singlemarkingpicker
* another robustxamlloader
* human, lizard sprites/points
* prototype fixes, deletion of old spriteaccessory
* component registration, fixes dwarf skin toning
no, 'ReptilianToned' does not exist
* removes component registration from abstract humanoid component
* visualizer data now cloneable
* serialize for visualizer key
* zero-count edge case
* missing semi-colon moment
* setspecies in humanoidsystem
* ensures that default markings, if empty, will cause ensuredefault to skip over that given category
* tryadd instead of add
* whoops
* diff and apply should properly apply markings now
* always ensure default, fixes double load for player spawning
* apply skin color now sets the skin color property in humanoidcomponent
* removes sprite from a few species prototypes
* sprite changes for specific base layers based on humanoid sex
* layer ordering fix, and a missing base layer should now disallow markings on that layer
* anymarking base layer, adds the right leg/foot for humans
* loading a profile will now clear all markings on that humanoid
* adds missing layers for humans
* separates species.yml into respective species prototype files
* ensures that if layer visibility was changed, all markings have to be reapplied
* server-side enforcement of hiding hair (and other head-related markings) when equipping things that hide hair
* slime fix, clothingsystem now dictates layer visibility server side
* sussy
* layer settings should now ensure a marking should match the skin tone
* whoops
* skincolor static class and functions in UI
* skin color validation in humanoidcharacterappearance
* markingpicker now shows only the markings for the selected category in used
* getter for slot in singlemarkingpicker now ensures slot is 0 if markings exists
* FilterSpecies no longer attempts to do removal while iterating
* expands for SingleMarkingPicker
* humanoid base dummy has blank layers now (and snout/tail/headside/headtop)
* fixes an issue with visualizer system if the marking count was different but the markings themselves were (somewhat) the same
* whoops
* adds edge case handlers for count differences in humanoid markings
* preview now loads profile instead of directly setting appearance
* moves marking set loading to update controls
* clones a marking set in markingpicker by using the deep clone constructor
* whoops (deep cloning a marking now copies the marking id)
* adds replace function for markingset
* points should now update after the markings are remove/added
* merging base layer sprites into a humanoid should now clear them before merging
* sets dirty range start to count only if the dirty range start was never set above 0
* fixes up some issues with singlemarkingpicker
* color selector sliders in single marking picker should now expand
* hair from hair pickers should now apply in profile loading (client-side)
* category in singlemarkingpicker now sets the private category variable
* slot selector should now populate
* single marking picker buttons now have text, also shows the category name over all user-clickable elements
* removes a comment
* removing hair slots now sets it to bald, defaults to zero used slots if current hair is bald on hair/facial hair
* random skin color, eye color
* populate colors now checks if the marking count is greater than zero in singlemarkingpicker
* hair/facial hair pickers now just get the first possible hair from the respective species list
* different approach to random skin color
* oh, that's why it wasn't working
* randomize everything now just updates every single control
* selecting a new marking in SingleMarkingPicker should attempt to copy over old colors, populate list now uses cache,
* markingmanager now uses OnlyWhitelisted to populate by category and species
* filterspecies now uses onlyWhitelist to filter markings based on whitelist or not
* oops
* ui fix for singlemarkingpicker, ensures that cache is not null if it is null when populatelist is called
* order of operations for the horizontal expand for add/remove
* hair pickers should now update when you add/remove the hair slot
* fixes variable naming error in character appearance
* loc string fix in singlemarkingpicker
* lizards, vox now have onlyWhitelist, vox restriction for hair/facialhairs
* having zero possible hairs should no longer cause an exception in randomization
* setting species should now update hair pickers
* ignore categories for marking picker
* and a clear as well for the category button
* places that functionality in its own function instead
* adds eye base sprite, vox now also have their own custom eye sprites
* loading a profile client-side should do FilterSpecies for markings now
* client-side load profile does filter species after adding in the hairs now
* magic mirror
* callbacks now call the callback instead of adding it on construct
* whoops
* in removemarking too
* adds missing synchronize calls
* comments out an updateinterface call in magic mirror
* magic mirror window title, minimum sizing
* fixes minsize, adds warning for players who try to set their hair for species that have no hair
* removes spaces in xaml
* namespace changes/organization
* whoopsie (merge conflicts)
* re-enables identity from humanoid component
* damagevisuals now uses the enum given to it instead of the layerstate given on that layer tied to the enum
* removes commas from json
* changes to visuals system so the change is consistent
* chest
* reptilian
* visualizer system now handles body sprite setting/coloration, similar to how characterappearance did it
not a big fan of this
* adds a check in applybasesprites
* adding/removing parts should now make them invisible on a humanoid
* body part removal/adding now enumerates over sublayers instead
* synchro now runs in bodycomponent startup
* parts instead of slots
* humanoidcompnent check
* switches from rsi to actualrsi
* removes all the body stuff (too slow)
* cleans up resolves from humanoid visualizer system
* merging sprites now checks if the base sprites have been modified or not (through things like species changes, or custom base sprite changes)
* not forgetting that one again
* merging now returns an actual dirty value
* replaces the sequenceequal with a more accurate solution
* permanent layers, layer visibility on add/remove part in body
* should send all hidden layers over now
* isdirty in visualizer system for base layers
* isdirty checks count as well
* ok, IsDirty should now set the base layers if the merged sprites are different
* equals override in HumanoidSpritePrototypes.cs
temporary until record prototypes :heck:
* makes fields readonly, equates IDs instead
* adds forced markings through marking picker
* forced in humanoidsystem api, ignorespecies in markingpicker
* marking bui
* makes that serializable as well
* ignore species/forced toggles now work
* adds icon to modifier verb, interface and keys to humanoid bases
* needs the actual enum value to open, no?
* makes the key the actual key
* actions now propagate upwards
* ignore species when set now repopulates markingpicker
* modifiable base layers in the markings window
* oops!
* layout changes
* info box should now appear
* adds ignorespecies for marking picker, collapsible for base layer section of appearance modification window
* collapsible layout moment
* if base layers have changed, all markings are now dirty (and if a base layer is missing, the marking is still 'applied' but it's now just invisible
* small change to marking visibility
* small changes to modifier UI
* markings now match skin on zombification
* zombie stuff
* makes the line edit in marking modifier window more obvious
* disables vox on round start
* horizontal expand on the single label in base layer modifiers
* humanoid profiles in prototypes
* randomhumanoidappearance won't work if the humanoid has a profile already stored
* removes unused code
* documentation in humanoidsystem server-side
* documentation in shared/client
* whoops
* converts accessory into marking in locale files (also adds marking loc string into single marking picker)
* be gone, shared humanoid appearance system from the last upstream merge
* species ignore on randomization (defaults to no ignored species)
* more upstream merge parts that bypassed any errors before merge
* addresses review (also just adds typeserializers in some places)
* submodule moment
* upstream merge issues
2022-09-22 15:19:00 -07:00
|
|
|
|
using Content.Shared.Humanoid.Prototypes;
|
2022-05-10 13:43:30 -05:00
|
|
|
|
using Content.Shared.Inventory;
|
|
|
|
|
|
using Content.Shared.PDA;
|
|
|
|
|
|
using Content.Shared.Preferences;
|
|
|
|
|
|
using Content.Shared.Roles;
|
|
|
|
|
|
using JetBrains.Annotations;
|
2022-05-14 08:58:45 +10:00
|
|
|
|
using Robust.Shared.Configuration;
|
2022-05-10 13:43:30 -05:00
|
|
|
|
using Robust.Shared.Map;
|
|
|
|
|
|
using Robust.Shared.Prototypes;
|
|
|
|
|
|
using Robust.Shared.Utility;
|
|
|
|
|
|
|
2022-07-10 21:10:03 -04:00
|
|
|
|
|
2022-05-10 13:43:30 -05:00
|
|
|
|
namespace Content.Server.Station.Systems;
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// Manages spawning into the game, tracking available spawn points.
|
|
|
|
|
|
/// Also provides helpers for spawning in the player's mob.
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
[PublicAPI]
|
|
|
|
|
|
public sealed class StationSpawningSystem : EntitySystem
|
|
|
|
|
|
{
|
|
|
|
|
|
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
2022-05-14 08:58:45 +10:00
|
|
|
|
[Dependency] private readonly IConfigurationManager _configurationManager = default!;
|
2022-05-10 13:43:30 -05:00
|
|
|
|
[Dependency] private readonly HandsSystem _handsSystem = default!;
|
2023-01-24 13:38:19 +13:00
|
|
|
|
[Dependency] private readonly HumanoidAppearanceSystem _humanoidSystem = default!;
|
2022-05-10 13:43:30 -05:00
|
|
|
|
[Dependency] private readonly IdCardSystem _cardSystem = default!;
|
|
|
|
|
|
[Dependency] private readonly InventorySystem _inventorySystem = default!;
|
|
|
|
|
|
[Dependency] private readonly PDASystem _pdaSystem = default!;
|
2022-09-14 19:33:25 +10:00
|
|
|
|
[Dependency] private readonly SharedAccessSystem _accessSystem = default!;
|
2022-07-10 18:36:53 -07:00
|
|
|
|
[Dependency] private readonly IdentitySystem _identity = default!;
|
2022-05-10 13:43:30 -05:00
|
|
|
|
|
|
|
|
|
|
/// <inheritdoc/>
|
|
|
|
|
|
public override void Initialize()
|
|
|
|
|
|
{
|
|
|
|
|
|
SubscribeLocalEvent<StationInitializedEvent>(OnStationInitialized);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void OnStationInitialized(StationInitializedEvent ev)
|
|
|
|
|
|
{
|
|
|
|
|
|
AddComp<StationSpawningComponent>(ev.Station);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// Attempts to spawn a player character onto the given station.
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
/// <param name="station">Station to spawn onto.</param>
|
|
|
|
|
|
/// <param name="job">The job to assign, if any.</param>
|
|
|
|
|
|
/// <param name="profile">The character profile to use, if any.</param>
|
|
|
|
|
|
/// <param name="stationSpawning">Resolve pattern, the station spawning component for the station.</param>
|
|
|
|
|
|
/// <returns>The resulting player character, if any.</returns>
|
|
|
|
|
|
/// <exception cref="ArgumentException">Thrown when the given station is not a station.</exception>
|
|
|
|
|
|
/// <remarks>
|
|
|
|
|
|
/// This only spawns the character, and does none of the mind-related setup you'd need for it to be playable.
|
|
|
|
|
|
/// </remarks>
|
|
|
|
|
|
public EntityUid? SpawnPlayerCharacterOnStation(EntityUid? station, Job? job, HumanoidCharacterProfile? profile, StationSpawningComponent? stationSpawning = null)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (station != null && !Resolve(station.Value, ref stationSpawning))
|
|
|
|
|
|
throw new ArgumentException("Tried to use a non-station entity as a station!", nameof(station));
|
|
|
|
|
|
|
|
|
|
|
|
var ev = new PlayerSpawningEvent(job, profile, station);
|
|
|
|
|
|
RaiseLocalEvent(ev);
|
|
|
|
|
|
|
|
|
|
|
|
DebugTools.Assert(ev.SpawnResult is {Valid: true} or null);
|
|
|
|
|
|
|
|
|
|
|
|
return ev.SpawnResult;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//TODO: Figure out if everything in the player spawning region belongs somewhere else.
|
|
|
|
|
|
#region Player spawning helpers
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// Spawns in a player's mob according to their job and character information at the given coordinates.
|
|
|
|
|
|
/// Used by systems that need to handle spawning players.
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
/// <param name="coordinates">Coordinates to spawn the character at.</param>
|
|
|
|
|
|
/// <param name="job">Job to assign to the character, if any.</param>
|
|
|
|
|
|
/// <param name="profile">Appearance profile to use for the character.</param>
|
2022-05-27 06:01:07 +02:00
|
|
|
|
/// <param name="station">The station this player is being spawned on.</param>
|
2022-05-10 13:43:30 -05:00
|
|
|
|
/// <returns>The spawned entity</returns>
|
2022-05-27 06:01:07 +02:00
|
|
|
|
public EntityUid SpawnPlayerMob(
|
|
|
|
|
|
EntityCoordinates coordinates,
|
|
|
|
|
|
Job? job,
|
|
|
|
|
|
HumanoidCharacterProfile? profile,
|
|
|
|
|
|
EntityUid? station)
|
2022-05-10 13:43:30 -05:00
|
|
|
|
{
|
2022-07-10 21:10:03 -04:00
|
|
|
|
// If we're not spawning a humanoid, we're gonna exit early without doing all the humanoid stuff.
|
|
|
|
|
|
if (job?.JobEntity != null)
|
|
|
|
|
|
{
|
|
|
|
|
|
var jobEntity = EntityManager.SpawnEntity(job.JobEntity, coordinates);
|
|
|
|
|
|
MakeSentientCommand.MakeSentient(jobEntity, EntityManager);
|
|
|
|
|
|
DoJobSpecials(job, jobEntity);
|
2022-07-10 18:36:53 -07:00
|
|
|
|
_identity.QueueIdentityUpdate(jobEntity);
|
2022-07-10 21:10:03 -04:00
|
|
|
|
return jobEntity;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2022-05-10 13:43:30 -05:00
|
|
|
|
var entity = EntityManager.SpawnEntity(
|
2023-01-24 13:38:19 +13:00
|
|
|
|
_prototypeManager.Index<SpeciesPrototype>(profile?.Species ?? HumanoidAppearanceSystem.DefaultSpecies).Prototype,
|
2022-05-10 13:43:30 -05:00
|
|
|
|
coordinates);
|
|
|
|
|
|
|
|
|
|
|
|
if (job?.StartingGear != null)
|
|
|
|
|
|
{
|
|
|
|
|
|
var startingGear = _prototypeManager.Index<StartingGearPrototype>(job.StartingGear);
|
|
|
|
|
|
EquipStartingGear(entity, startingGear, profile);
|
|
|
|
|
|
if (profile != null)
|
2022-05-27 06:01:07 +02:00
|
|
|
|
EquipIdCard(entity, profile.Name, job.Prototype, station);
|
2022-05-10 13:43:30 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (profile != null)
|
|
|
|
|
|
{
|
Humanoid appearance refactor (#10882)
* initial commit
- species prototype modifications
- markings points as its own file
- shared humanoid component
* adds a tool to convert sprite accessories to markings (in go)
* removes a fmt call
* converts sprite accessory to markings
* adds hair and facial hair to marking categories
* multiple changes
- humanoid visualizer system
- markings modifications for visualizer
- modifications to shared humanoid component
- lays out a base for humanoid system
* hidden layers, ports some properties from appearance component, shrinks DefaultMarkings a little
* squishes the initialize event calls into one function
adds stuff to set species/skin color externally from a server message - currently laid out as if it a dirty call to a networked component, may be subject to change (server-side has not been implemented yet)
* makes the sprite pipeline more obvious
* apply all markings, hidden layer set replacement
* ensures that markings are cleared when the new set is applied
* starts refactoring markingsset (unfinished)
* more additions to the markingset api
* adds constructor logic to markingset
* adds a method to filter out markings in a set based on a given species
* fixes enumerators in markingset
* adds validator into MarkingSet, fixes ForwardMarkingEnumerator
* modifications to the humanoid visual system
* ensuredefault in markingset
* oop
* fixes up data keys, populates OnAppearanceChange in visualizer
* changes to humanoid component, markings
marking equality is now more strict, humanoidcomponent is now implemented for client as a child of sharedhumanoidcomponent
* markings are now applied the visualizer by diffing them
* base sprites are now applied to humanoids from humanoidvisualizer
* passes along base sprite settings to the marking application so that markings know to follow skin color/alpha or not (see: slimes)
* custom base layers on humanoids
* merges all data keys into one data class for humanoid visualizers
* setappearance in sharedhumanoidsystem, removes custombaselayercolors
* humanoidcomponent, system (empty) in server
* adds some basic public API functions to HumanoidSystem
* add marking, remove marking
* changes appearance MarkingsSet to a List<Marking>, adds listener for PlayerSpawnCompleteEvent in HumanoidSystem
* ensuredefaultmarkings, oninit for humanoids
* markingmanager API changes
* removes MarkingsSet
* LoadProfile, adjusts randomization in humanoid appearance to account for species
* base layer settings in humanoidsystem, eye color from profile
* rearranges files to centralize under Humanoid namespace
* more reorganization, deletes some stuff
gotta break stuff to make other things work, right?
goodbye SpriteAccessory...
* fixes a good chunk of server-side issues
still does not compile, yet
* singlemarkingpicker xaml layout
* singlemarkingpicker logic
* magic mirror window (varying pieces of it, mostly client-oriented)
* removes some imports, gives MagicMirror a BUI class (not filled in yet)
* populates magic mirror BUI functionality / window callbacks
* fixes up some errors in humanoidprofileeditor
* changes to SingleMarkingPicker
SingleMarkingPicker now accepts a List<Marking>, species, and total possible markings available in that marking category
* fixes up hair pickers on humanoid profile editor
* fixes the errors in markingpicker
* markingsystem is now gone
* fixes a bunch of build errors
* so that's why i did it like that
* namespace issues, adds robustxamlloader to singlemarkingpicker
* another robustxamlloader
* human, lizard sprites/points
* prototype fixes, deletion of old spriteaccessory
* component registration, fixes dwarf skin toning
no, 'ReptilianToned' does not exist
* removes component registration from abstract humanoid component
* visualizer data now cloneable
* serialize for visualizer key
* zero-count edge case
* missing semi-colon moment
* setspecies in humanoidsystem
* ensures that default markings, if empty, will cause ensuredefault to skip over that given category
* tryadd instead of add
* whoops
* diff and apply should properly apply markings now
* always ensure default, fixes double load for player spawning
* apply skin color now sets the skin color property in humanoidcomponent
* removes sprite from a few species prototypes
* sprite changes for specific base layers based on humanoid sex
* layer ordering fix, and a missing base layer should now disallow markings on that layer
* anymarking base layer, adds the right leg/foot for humans
* loading a profile will now clear all markings on that humanoid
* adds missing layers for humans
* separates species.yml into respective species prototype files
* ensures that if layer visibility was changed, all markings have to be reapplied
* server-side enforcement of hiding hair (and other head-related markings) when equipping things that hide hair
* slime fix, clothingsystem now dictates layer visibility server side
* sussy
* layer settings should now ensure a marking should match the skin tone
* whoops
* skincolor static class and functions in UI
* skin color validation in humanoidcharacterappearance
* markingpicker now shows only the markings for the selected category in used
* getter for slot in singlemarkingpicker now ensures slot is 0 if markings exists
* FilterSpecies no longer attempts to do removal while iterating
* expands for SingleMarkingPicker
* humanoid base dummy has blank layers now (and snout/tail/headside/headtop)
* fixes an issue with visualizer system if the marking count was different but the markings themselves were (somewhat) the same
* whoops
* adds edge case handlers for count differences in humanoid markings
* preview now loads profile instead of directly setting appearance
* moves marking set loading to update controls
* clones a marking set in markingpicker by using the deep clone constructor
* whoops (deep cloning a marking now copies the marking id)
* adds replace function for markingset
* points should now update after the markings are remove/added
* merging base layer sprites into a humanoid should now clear them before merging
* sets dirty range start to count only if the dirty range start was never set above 0
* fixes up some issues with singlemarkingpicker
* color selector sliders in single marking picker should now expand
* hair from hair pickers should now apply in profile loading (client-side)
* category in singlemarkingpicker now sets the private category variable
* slot selector should now populate
* single marking picker buttons now have text, also shows the category name over all user-clickable elements
* removes a comment
* removing hair slots now sets it to bald, defaults to zero used slots if current hair is bald on hair/facial hair
* random skin color, eye color
* populate colors now checks if the marking count is greater than zero in singlemarkingpicker
* hair/facial hair pickers now just get the first possible hair from the respective species list
* different approach to random skin color
* oh, that's why it wasn't working
* randomize everything now just updates every single control
* selecting a new marking in SingleMarkingPicker should attempt to copy over old colors, populate list now uses cache,
* markingmanager now uses OnlyWhitelisted to populate by category and species
* filterspecies now uses onlyWhitelist to filter markings based on whitelist or not
* oops
* ui fix for singlemarkingpicker, ensures that cache is not null if it is null when populatelist is called
* order of operations for the horizontal expand for add/remove
* hair pickers should now update when you add/remove the hair slot
* fixes variable naming error in character appearance
* loc string fix in singlemarkingpicker
* lizards, vox now have onlyWhitelist, vox restriction for hair/facialhairs
* having zero possible hairs should no longer cause an exception in randomization
* setting species should now update hair pickers
* ignore categories for marking picker
* and a clear as well for the category button
* places that functionality in its own function instead
* adds eye base sprite, vox now also have their own custom eye sprites
* loading a profile client-side should do FilterSpecies for markings now
* client-side load profile does filter species after adding in the hairs now
* magic mirror
* callbacks now call the callback instead of adding it on construct
* whoops
* in removemarking too
* adds missing synchronize calls
* comments out an updateinterface call in magic mirror
* magic mirror window title, minimum sizing
* fixes minsize, adds warning for players who try to set their hair for species that have no hair
* removes spaces in xaml
* namespace changes/organization
* whoopsie (merge conflicts)
* re-enables identity from humanoid component
* damagevisuals now uses the enum given to it instead of the layerstate given on that layer tied to the enum
* removes commas from json
* changes to visuals system so the change is consistent
* chest
* reptilian
* visualizer system now handles body sprite setting/coloration, similar to how characterappearance did it
not a big fan of this
* adds a check in applybasesprites
* adding/removing parts should now make them invisible on a humanoid
* body part removal/adding now enumerates over sublayers instead
* synchro now runs in bodycomponent startup
* parts instead of slots
* humanoidcompnent check
* switches from rsi to actualrsi
* removes all the body stuff (too slow)
* cleans up resolves from humanoid visualizer system
* merging sprites now checks if the base sprites have been modified or not (through things like species changes, or custom base sprite changes)
* not forgetting that one again
* merging now returns an actual dirty value
* replaces the sequenceequal with a more accurate solution
* permanent layers, layer visibility on add/remove part in body
* should send all hidden layers over now
* isdirty in visualizer system for base layers
* isdirty checks count as well
* ok, IsDirty should now set the base layers if the merged sprites are different
* equals override in HumanoidSpritePrototypes.cs
temporary until record prototypes :heck:
* makes fields readonly, equates IDs instead
* adds forced markings through marking picker
* forced in humanoidsystem api, ignorespecies in markingpicker
* marking bui
* makes that serializable as well
* ignore species/forced toggles now work
* adds icon to modifier verb, interface and keys to humanoid bases
* needs the actual enum value to open, no?
* makes the key the actual key
* actions now propagate upwards
* ignore species when set now repopulates markingpicker
* modifiable base layers in the markings window
* oops!
* layout changes
* info box should now appear
* adds ignorespecies for marking picker, collapsible for base layer section of appearance modification window
* collapsible layout moment
* if base layers have changed, all markings are now dirty (and if a base layer is missing, the marking is still 'applied' but it's now just invisible
* small change to marking visibility
* small changes to modifier UI
* markings now match skin on zombification
* zombie stuff
* makes the line edit in marking modifier window more obvious
* disables vox on round start
* horizontal expand on the single label in base layer modifiers
* humanoid profiles in prototypes
* randomhumanoidappearance won't work if the humanoid has a profile already stored
* removes unused code
* documentation in humanoidsystem server-side
* documentation in shared/client
* whoops
* converts accessory into marking in locale files (also adds marking loc string into single marking picker)
* be gone, shared humanoid appearance system from the last upstream merge
* species ignore on randomization (defaults to no ignored species)
* more upstream merge parts that bypassed any errors before merge
* addresses review (also just adds typeserializers in some places)
* submodule moment
* upstream merge issues
2022-09-22 15:19:00 -07:00
|
|
|
|
_humanoidSystem.LoadProfile(entity, profile);
|
2022-05-10 13:43:30 -05:00
|
|
|
|
EntityManager.GetComponent<MetaDataComponent>(entity).EntityName = profile.Name;
|
2022-05-14 08:58:45 +10:00
|
|
|
|
if (profile.FlavorText != "" && _configurationManager.GetCVar(CCVars.FlavorText))
|
|
|
|
|
|
{
|
|
|
|
|
|
EntityManager.AddComponent<DetailExaminableComponent>(entity).Content = profile.FlavorText;
|
|
|
|
|
|
}
|
2022-05-10 13:43:30 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
2022-07-10 21:10:03 -04:00
|
|
|
|
DoJobSpecials(job, entity);
|
2022-07-10 18:36:53 -07:00
|
|
|
|
_identity.QueueIdentityUpdate(entity);
|
2022-07-10 21:10:03 -04:00
|
|
|
|
return entity;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void DoJobSpecials(Job? job, EntityUid entity)
|
|
|
|
|
|
{
|
2022-05-10 13:43:30 -05:00
|
|
|
|
foreach (var jobSpecial in job?.Prototype.Special ?? Array.Empty<JobSpecial>())
|
|
|
|
|
|
{
|
|
|
|
|
|
jobSpecial.AfterEquip(entity);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// Equips starting gear onto the given entity.
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
/// <param name="entity">Entity to load out.</param>
|
|
|
|
|
|
/// <param name="startingGear">Starting gear to use.</param>
|
|
|
|
|
|
/// <param name="profile">Character profile to use, if any.</param>
|
|
|
|
|
|
public void EquipStartingGear(EntityUid entity, StartingGearPrototype startingGear, HumanoidCharacterProfile? profile)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (_inventorySystem.TryGetSlots(entity, out var slotDefinitions))
|
|
|
|
|
|
{
|
|
|
|
|
|
foreach (var slot in slotDefinitions)
|
|
|
|
|
|
{
|
|
|
|
|
|
var equipmentStr = startingGear.GetGear(slot.Name, profile);
|
|
|
|
|
|
if (!string.IsNullOrEmpty(equipmentStr))
|
|
|
|
|
|
{
|
|
|
|
|
|
var equipmentEntity = EntityManager.SpawnEntity(equipmentStr, EntityManager.GetComponent<TransformComponent>(entity).Coordinates);
|
|
|
|
|
|
_inventorySystem.TryEquip(entity, equipmentEntity, slot.Name, true);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!TryComp(entity, out HandsComponent? handsComponent))
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
var inhand = startingGear.Inhand;
|
|
|
|
|
|
var coords = EntityManager.GetComponent<TransformComponent>(entity).Coordinates;
|
|
|
|
|
|
foreach (var (hand, prototype) in inhand)
|
|
|
|
|
|
{
|
|
|
|
|
|
var inhandEntity = EntityManager.SpawnEntity(prototype, coords);
|
|
|
|
|
|
_handsSystem.TryPickup(entity, inhandEntity, hand, checkActionBlocker: false, handsComp: handsComponent);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// Equips an ID card and PDA onto the given entity.
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
/// <param name="entity">Entity to load out.</param>
|
|
|
|
|
|
/// <param name="characterName">Character name to use for the ID.</param>
|
|
|
|
|
|
/// <param name="jobPrototype">Job prototype to use for the PDA and ID.</param>
|
2022-05-27 06:01:07 +02:00
|
|
|
|
/// <param name="station">The station this player is being spawned on.</param>
|
|
|
|
|
|
public void EquipIdCard(EntityUid entity, string characterName, JobPrototype jobPrototype, EntityUid? station)
|
2022-05-10 13:43:30 -05:00
|
|
|
|
{
|
|
|
|
|
|
if (!_inventorySystem.TryGetSlotEntity(entity, "id", out var idUid))
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
if (!EntityManager.TryGetComponent(idUid, out PDAComponent? pdaComponent) || pdaComponent.ContainedID == null)
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
var card = pdaComponent.ContainedID;
|
2022-05-27 06:01:07 +02:00
|
|
|
|
var cardId = card.Owner;
|
|
|
|
|
|
_cardSystem.TryChangeFullName(cardId, characterName, card);
|
2022-06-28 15:55:05 +03:00
|
|
|
|
_cardSystem.TryChangeJobTitle(cardId, jobPrototype.LocalizedName, card);
|
2022-05-27 06:01:07 +02:00
|
|
|
|
|
|
|
|
|
|
var extendedAccess = false;
|
|
|
|
|
|
if (station != null)
|
|
|
|
|
|
{
|
|
|
|
|
|
var data = Comp<StationJobsComponent>(station.Value);
|
|
|
|
|
|
extendedAccess = data.ExtendedAccess;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
_accessSystem.SetAccessToJob(cardId, jobPrototype, extendedAccess);
|
2022-05-10 13:43:30 -05:00
|
|
|
|
|
|
|
|
|
|
_pdaSystem.SetOwner(pdaComponent, characterName);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#endregion Player spawning helpers
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// Ordered broadcast event fired on any spawner eligible to attempt to spawn a player.
|
|
|
|
|
|
/// This event's success is measured by if SpawnResult is not null.
|
|
|
|
|
|
/// You should not make this event's success rely on random chance.
|
|
|
|
|
|
/// This event is designed to use ordered handling. You probably want SpawnPointSystem to be the last handler.
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
[PublicAPI]
|
|
|
|
|
|
public sealed class PlayerSpawningEvent : EntityEventArgs
|
|
|
|
|
|
{
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// The entity spawned, if any. You should set this if you succeed at spawning the character, and leave it alone if it's not null.
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public EntityUid? SpawnResult;
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// The job to use, if any.
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public readonly Job? Job;
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// The profile to use, if any.
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public readonly HumanoidCharacterProfile? HumanoidCharacterProfile;
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// The target station, if any.
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public readonly EntityUid? Station;
|
|
|
|
|
|
|
|
|
|
|
|
public PlayerSpawningEvent(Job? job, HumanoidCharacterProfile? humanoidCharacterProfile, EntityUid? station)
|
|
|
|
|
|
{
|
|
|
|
|
|
Job = job;
|
|
|
|
|
|
HumanoidCharacterProfile = humanoidCharacterProfile;
|
|
|
|
|
|
Station = station;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|