[Feature] Minor races tweaks (#49)

* feat: remove arachne, reintroduce dwarfs * feat: rebance most races height/width * fix: validate player character before joining * feat: transfer arachne components to arachnid * remove: disable roundstart oni * feat: перевод названий рас * feat: make dwarfs have a bit more stamina * docs: marked changes as white dream
WWhiteDreamProject · Sep 12, 2024 · eae3633 · eae3633
1 parent 958b24f
commit eae3633
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 37 deletions.
diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs
@@ -163,7 +163,11 @@ async void AddPlayerToDb(Guid id)
 
         public HumanoidCharacterProfile GetPlayerProfile(ICommonSession p)
         {
-            return (HumanoidCharacterProfile) _prefsManager.GetPreferences(p.UserId).SelectedCharacter;
+            // White Dream Start
+            var profile = (HumanoidCharacterProfile) _prefsManager.GetPreferences(p.UserId).SelectedCharacter;
+            profile.EnsureValid(p, IoCManager.Instance!);
+            return profile;
+            // White Dream End
         }
 
         public void PlayerJoinGame(ICommonSession session, bool silent = false)

diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
@@ -125,37 +125,37 @@ public sealed partial class SpeciesPrototype : IPrototype
     ///     The minimum height for this species
     /// </summary>
     [DataField]
-    public float MinHeight = 0.75f;
+    public float MinHeight = 0.9f; // White Dream Edit
 
     /// <summary>
     ///     The default height for this species
     /// </summary>
     [DataField]
-    public float DefaultHeight = 1f;
+    public float DefaultHeight = 1f; // White Dream Edit
 
     /// <summary>
     ///     The maximum height for this species
     /// </summary>
     [DataField]
-    public float MaxHeight = 1.25f;
+    public float MaxHeight = 1.1f; // White Dream Edit
 
     /// <summary>
     ///     The minimum width for this species
     /// </summary>
     [DataField]
-    public float MinWidth = 0.7f;
+    public float MinWidth = 0.9f; // White Dream Edit
 
     /// <summary>
     ///     The default width for this species
     /// </summary>
     [DataField]
-    public float DefaultWidth = 1f;
+    public float DefaultWidth = 1f; // White Dream Edit
 
     /// <summary>
     ///     The maximum width for this species
     /// </summary>
     [DataField]
-    public float MaxWidth = 1.3f;
+    public float MaxWidth = 1.1f; // White Dream Edit
 
     /// <summary>
     ///     The average height in centimeters for this species, used to calculate player facing height values in UI elements

diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -532,13 +532,9 @@ public void EnsureValid(ICommonSession session, IDependencyCollection collection
                 flavortext = FormattedMessage.RemoveMarkup(FlavorText);
             }
 
-            var height = Height;
-            if (speciesPrototype != null)
-                height = Math.Clamp(Height, speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
+            var height = Math.Clamp(Height, speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
 
-            var width = Width;
-            if (speciesPrototype != null)
-                width = Math.Clamp(Width, speciesPrototype.MinWidth, speciesPrototype.MaxWidth);
+            var width = Math.Clamp(Width, speciesPrototype.MinWidth, speciesPrototype.MaxWidth);
 
             var appearance = HumanoidCharacterAppearance.EnsureValid(Appearance, Species, Sex);
 

diff --git a/Resources/Locale/ru-RU/species/species.ftl b/Resources/Locale/ru-RU/species/species.ftl
@@ -6,7 +6,12 @@ species-name-reptilian = Ящер
 species-name-slime = Слаймолюд
 species-name-diona = Диона
 species-name-arachnid = Арахнид
-species-name-skrell = Скрелл
+species-name-arachne = Арахне
 species-name-moth = Моль
 species-name-skeleton = Скелет
+species-name-vox = Вокс
+species-name-ipc = КПБ
+
+# Nyanocode
 species-name-felinid = Фелинид
+species-name-oni = Они
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -123,6 +123,10 @@
         sprite: "Effects/creampie.rsi"
         state: "creampie_arachnid"
         visible: false
+  # White Dream Start - transfer features from Arachne
+  - type: Spider
+  - type: IgnoreSpiderWeb
+  # White Dream End
 
 - type: entity
   parent: BaseSpeciesDummy

diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -60,6 +60,8 @@
     - SolCommon
   - type: LightweightDrunk
     boozeStrengthMultiplier: 0.5
+  - type: Stamina # White Dream: Make dwarfs a bit more durable.
+    critThreshold: 115
 
 - type: entity
   parent: BaseSpeciesDummy

diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Oni
   name: species-name-oni
-  roundStart: true
+  roundStart: false # White Dream - Disable roundstart oni
   prototype: MobOni
   dollPrototype: MobOniDummy
   markingLimits: MobOniMarkingLimits

diff --git a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml
@@ -7,12 +7,12 @@
   markingLimits: MobFelinidMarkingLimits
   dollPrototype: MobFelinidDummy
   skinColoration: HumanToned
-  minHeight: 0.65
-  defaultHeight: 0.8
-  maxHeight: 1.1
-  minWidth: 0.6
+  minHeight: 0.8 # White Dream: Changed sizes of all species to be less extreme.
+  defaultHeight: 0.85
+  maxHeight: 1
+  minWidth: 0.8
   defaultWidth: 0.8
-  maxWidth: 1.15
+  maxWidth: 1 # White Dream: End of changes
 
 - type: markingPoints
   id: MobFelinidMarkingLimits

diff --git a/Resources/Prototypes/Species/arachne.yml b/Resources/Prototypes/Species/arachne.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Arachne
   name: species-name-arachne
-  roundStart: true
+  roundStart: false # White Dream - disable arachne for missing textures.
   prototype: MobArachne
   sprites: MobArachneSprites
   markingLimits: MobArachneMarkingLimits

diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml
@@ -1,15 +1,15 @@
 - type: species
   id: Dwarf
   name: species-name-dwarf
-  roundStart: false # DeltaV - Disable dwarf
+  roundStart: true
   prototype: MobDwarf
   sprites: MobHumanSprites
   markingLimits: MobHumanMarkingLimits
   dollPrototype: MobDwarfDummy
   skinColoration: HumanToned
-  minHeight: 0.6
+  minHeight: 0.7 # White Dream: Changed sizes of all species to be less extreme.
   defaultHeight: 0.8
-  maxHeight: 0.8
-  minWidth: 0.55
+  maxHeight: 0.9
+  minWidth: 0.7
   defaultWidth: 0.8
-  maxWidth: 0.85
+  maxWidth: 0.9 # White Dream: End of changes
diff --git a/Resources/Prototypes/Species/harpy.yml b/Resources/Prototypes/Species/harpy.yml
@@ -7,12 +7,12 @@
   markingLimits: MobHarpyMarkingLimits
   dollPrototype: MobHarpyDummy
   skinColoration: HumanToned
-  minHeight: 0.6
-  defaultHeight: 0.8
-  maxHeight: 1.1
-  minWidth: 0.55
+  minHeight: 0.8 # White Dream: Changed sizes of all species to be less extreme.
+  defaultHeight: 0.85
+  maxHeight: 1
+  minWidth: 0.8
   defaultWidth: 0.8
-  maxWidth: 1.15
+  maxWidth: 1 # White Dream: End of changes
 
 - type: speciesBaseSprites
   id: MobHarpySprites

diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml
@@ -11,12 +11,12 @@
   maleFirstNames: names_reptilian_male
   femaleFirstNames: names_reptilian_female
   naming: FirstDashFirst
-  minHeight: 0.7
-  defaultHeight: 0.95
-  maxHeight: 1.25
-  minWidth: 0.65
-  defaultWidth: 0.95
-  maxWidth: 1.3
+  minHeight: 0.9 # White Dream: Changed sizes of all species to be less extreme.
+  defaultHeight: 1.1
+  maxHeight: 1.2
+  minWidth: 0.9
+  defaultWidth: 1.1
+  maxWidth: 1.2 # White Dream: End of changes.
 
 - type: speciesBaseSprites
   id: MobReptilianSprites