From 3c5fe8ed3756805d85af73f95d48419577df33cc Mon Sep 17 00:00:00 2001 From: TGRCDev Date: Tue, 10 Sep 2024 04:24:42 -0700 Subject: [PATCH] Fixed missing enum, CRLF and YML errors --- Content.Shared/Humanoid/NamingSystem.cs | 4 +- .../Humanoid/Prototypes/SpeciesPrototype.cs | 5 +- Resources/Prototypes/Datasets/Names/dwarf.yml | 565 +++++++++--------- 3 files changed, 287 insertions(+), 287 deletions(-) diff --git a/Content.Shared/Humanoid/NamingSystem.cs b/Content.Shared/Humanoid/NamingSystem.cs index b6af745abb1f..badc6f0d3c21 100644 --- a/Content.Shared/Humanoid/NamingSystem.cs +++ b/Content.Shared/Humanoid/NamingSystem.cs @@ -36,8 +36,8 @@ public string GetName(string species, Gender? gender = null) return Loc.GetString("namepreset-firstdashfirst", ("first1", GetFirstName(speciesProto, gender)), ("first2", GetFirstName(speciesProto, gender))); case SpeciesNaming.FirstMiddleLast: - return Loc.GetString("namepreset-firstmiddlelast", - ("first", GetFirstName(speciesProto, gender)), ("middle", GetMiddleName(speciesProto)), ("last", GetLastName(speciesProto))); + return Loc.GetString("namepreset-firstmiddlelast", + ("first", GetFirstName(speciesProto, gender)), ("middle", GetMiddleName(speciesProto)), ("last", GetLastName(speciesProto))); case SpeciesNaming.FirstLast: default: return Loc.GetString("namepreset-firstlast", diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs index 36507d360e8b..0cd84677830e 100644 --- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs +++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs @@ -86,8 +86,8 @@ public sealed partial class SpeciesPrototype : IPrototype [DataField] public string FemaleFirstNames { get; private set; } = "names_first_female"; - - [DataField] + + [DataField] public string MiddleNames { get; private set; } = "names_middle"; [DataField] @@ -130,5 +130,6 @@ public enum SpeciesNaming : byte First, FirstLast, FirstDashFirst, + FirstMiddleLast, TheFirstofLast, } diff --git a/Resources/Prototypes/Datasets/Names/dwarf.yml b/Resources/Prototypes/Datasets/Names/dwarf.yml index fa2e049de473..d1e2de0c937f 100644 --- a/Resources/Prototypes/Datasets/Names/dwarf.yml +++ b/Resources/Prototypes/Datasets/Names/dwarf.yml @@ -1,284 +1,283 @@ -- type: dataset - id: DwarfFirst - values: - - Kilrud - - Ingiz - - Udil - - Ushrir - - Ushat - - Erith - - Doren - - Sarvesh - - Akrul - - Stukos - - Rakust - - Konos - - Kogan - - Sazir - - Morul - - Thob - - Dobar - - Asen - - Uvash - - Kubuk - - Monom - - Athel - - Kel - - Besmar - - Kosoth - - Uzol - - Inod - - Cerol - - Likot - - Ezum - - Fikod - - Edem - - Alath - - Tosid - - Ilral - - Rovod - - Sibrek - - Cog - - Asob - - Urist - - Bim - -- type: dataset - id: DwarfMiddle - values: - - Tin - - Relic - - Book - - Lens - - Even - - Mechanical - - Mountainous - - Cuck - - Arch - - Coal - - Inken - - Iron - - Razor - - Volcano - - Furnace - - Created - - Made - - Gem - - Canyon - - Earthen - - Golden - - Copper - - Cobalt - - Silvery - - Basement - - Crafted - - Flag - - Dagger - - Rim - - Avalanche - - Boat - - Armor - - Boot - - Girdle - - Stone - - Vestibular - - Axe - - Paddle - - Seal - - Fear - - Song - - Strange - - Quiet - - Sorry - - Sorrow - - Weapon - - Grave - - Forest - - Fire - - Water - - River - - Spin - - Rough - - Decent - - Speak - - Wind - - Intent - - Knife - - Quake - - Dune - - Bread - - Bake - - Drag - - Sword - - Citrus - - Gloom - - Wing - - Priority - - Frost - - Ferry - - Man - - Real - - Dinner - - Supper - - Big - - Right - - True - - Fat - - Shielded - - Mined - - Gravel - - Sling - - Soft - - Hand - - Aluminum - - Inky - - Manufactured - - Made-of- - - Diamond - - Bronze - - Leaden - - - -- type: dataset - id: DwarfLast - values: - - bodice - - tongs - - gear - - galley - - hammer - - tomb - - town - - portal - - figure - - bodice - - mountain - - fountain - - iron - - razor - - deer - - bear - - wolf - - raven - - fish - - manor - - furnace - - anvil - - work - - treasury - - tour - - crystal - - gem - - halls - - city - - basement - - craft - - roof - - treaty - - hall - - net - - flag - - carrier - - maker - - lifter - - wright - - smith - - er - - dagger - - rack - - rope - - rim - - avalanche - - manor - - ceiling - - boot - - armor - - boat - - lancer - - cudgel - - iron - - even - - girdle - - stone - - post - - salve - - banner - - dye - - ship - - armory - - gorge - - vault - - axe - - creation - - gate - - paddle - - seal - - pallisade - - fear - - message - - sorry - - away - - weapon - - grave - - song - - reflection - - forest - - fire - - water - - river - - rise - - spin - - detail - - rough - - speaker - - wind - - sight - - knife - - quake - - wire - - dune - - bread - - baker - - dragger - - sword - - gloom - - wing - - priority - - frost - - fortress - - ferry - - man - - real - - like - - supper - - dinner - - big - - mercy - - true - - voyage - - fat - - sack - - oil - - urn - - gravel - - sling - - rampart - - anvil - - cobalt - - soft - - silver - - hand - - cannon - - aluminum - - can - - made - - diamond - - bronze - - copper - - smith - - trumpet - - mountain - - oar - - passage - - guild +- type: dataset + id: DwarfFirst + values: + - Kilrud + - Ingiz + - Udil + - Ushrir + - Ushat + - Erith + - Doren + - Sarvesh + - Akrul + - Stukos + - Rakust + - Konos + - Kogan + - Sazir + - Morul + - Thob + - Dobar + - Asen + - Uvash + - Kubuk + - Monom + - Athel + - Kel + - Besmar + - Kosoth + - Uzol + - Inod + - Cerol + - Likot + - Ezum + - Fikod + - Edem + - Alath + - Tosid + - Ilral + - Rovod + - Sibrek + - Cog + - Asob + - Urist + - Bim + +- type: dataset + id: DwarfMiddle + values: + - Tin + - Relic + - Book + - Lens + - Even + - Mechanical + - Mountainous + - Cuck + - Arch + - Coal + - Inken + - Iron + - Razor + - Volcano + - Furnace + - Created + - Made + - Gem + - Canyon + - Earthen + - Golden + - Copper + - Cobalt + - Silvery + - Basement + - Crafted + - Flag + - Dagger + - Rim + - Avalanche + - Boat + - Armor + - Boot + - Girdle + - Stone + - Vestibular + - Axe + - Paddle + - Seal + - Fear + - Song + - Strange + - Quiet + - Sorry + - Sorrow + - Weapon + - Grave + - Forest + - Fire + - Water + - River + - Spin + - Rough + - Decent + - Speak + - Wind + - Intent + - Knife + - Quake + - Dune + - Bread + - Bake + - Drag + - Sword + - Citrus + - Gloom + - Wing + - Priority + - Frost + - Ferry + - Man + - Real + - Dinner + - Supper + - Big + - Right + - 'True' + - Fat + - Shielded + - Mined + - Gravel + - Sling + - Soft + - Hand + - Aluminum + - Inky + - Manufactured + - Made-of- + - Diamond + - Bronze + - Leaden + +- type: dataset + id: DwarfLast + values: + - bodice + - tongs + - gear + - galley + - hammer + - tomb + - town + - portal + - figure + - bodice + - mountain + - fountain + - iron + - razor + - deer + - bear + - wolf + - raven + - fish + - manor + - furnace + - anvil + - work + - treasury + - tour + - crystal + - gem + - halls + - city + - basement + - craft + - roof + - treaty + - hall + - net + - flag + - carrier + - maker + - lifter + - wright + - smith + - er + - dagger + - rack + - rope + - rim + - avalanche + - manor + - ceiling + - boot + - armor + - boat + - lancer + - cudgel + - iron + - even + - girdle + - stone + - post + - salve + - banner + - dye + - ship + - armory + - gorge + - vault + - axe + - creation + - gate + - paddle + - seal + - pallisade + - fear + - message + - sorry + - away + - weapon + - grave + - song + - reflection + - forest + - fire + - water + - river + - rise + - spin + - detail + - rough + - speaker + - wind + - sight + - knife + - quake + - wire + - dune + - bread + - baker + - dragger + - sword + - gloom + - wing + - priority + - frost + - fortress + - ferry + - man + - real + - like + - supper + - dinner + - big + - mercy + - 'true' + - voyage + - fat + - sack + - oil + - urn + - gravel + - sling + - rampart + - anvil + - cobalt + - soft + - silver + - hand + - cannon + - aluminum + - can + - made + - diamond + - bronze + - copper + - smith + - trumpet + - mountain + - oar + - passage + - guild - silver \ No newline at end of file