From 28bbb35d69c1fab41dc4f692679fb772868e7661 Mon Sep 17 00:00:00 2001 From: Remuchi Date: Mon, 9 Sep 2024 13:51:50 +0700 Subject: [PATCH 1/8] feat: remove arachne, reintroduce dwarfs --- Resources/Prototypes/Species/arachne.yml | 2 +- Resources/Prototypes/Species/dwarf.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Species/arachne.yml b/Resources/Prototypes/Species/arachne.yml index ed494c37cc..336904acb0 100644 --- 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 index d32f1e6476..5ca6ed42f1 100644 --- a/Resources/Prototypes/Species/dwarf.yml +++ b/Resources/Prototypes/Species/dwarf.yml @@ -1,7 +1,7 @@ - type: species id: Dwarf name: species-name-dwarf - roundStart: false # DeltaV - Disable dwarf + roundStart: true prototype: MobDwarf sprites: MobHumanSprites markingLimits: MobHumanMarkingLimits From 50112af5931c527a81ed52242b25907c9c5ec0f3 Mon Sep 17 00:00:00 2001 From: Remuchi Date: Mon, 9 Sep 2024 14:37:45 +0700 Subject: [PATCH 2/8] feat: rebance most races height/width --- .../Humanoid/Prototypes/SpeciesPrototype.cs | 8 ++++---- Resources/Prototypes/Nyanotrasen/Species/felinid.yml | 8 ++++---- Resources/Prototypes/Species/dwarf.yml | 8 ++++---- Resources/Prototypes/Species/harpy.yml | 8 ++++---- Resources/Prototypes/Species/reptilian.yml | 12 ++++++------ 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs index 8500d530e5..76eef0eeb6 100644 --- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs +++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs @@ -125,7 +125,7 @@ public sealed partial class SpeciesPrototype : IPrototype /// The minimum height for this species /// [DataField] - public float MinHeight = 0.75f; + public float MinHeight = 0.9f; /// /// The default height for this species @@ -137,13 +137,13 @@ public sealed partial class SpeciesPrototype : IPrototype /// The maximum height for this species /// [DataField] - public float MaxHeight = 1.25f; + public float MaxHeight = 1.1f; /// /// The minimum width for this species /// [DataField] - public float MinWidth = 0.7f; + public float MinWidth = 0.9f; /// /// The default width for this species @@ -155,7 +155,7 @@ public sealed partial class SpeciesPrototype : IPrototype /// The maximum width for this species /// [DataField] - public float MaxWidth = 1.3f; + public float MaxWidth = 1.1f; /// /// The average height in centimeters for this species, used to calculate player facing height values in UI elements diff --git a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml index 5eb26edd51..b707d54757 100644 --- 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 + minHeight: 0.8 defaultHeight: 0.8 - maxHeight: 1.1 - minWidth: 0.6 + maxHeight: 1 + minWidth: 0.8 defaultWidth: 0.8 - maxWidth: 1.15 + maxWidth: 1 - type: markingPoints id: MobFelinidMarkingLimits diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml index 5ca6ed42f1..6f32d32c72 100644 --- a/Resources/Prototypes/Species/dwarf.yml +++ b/Resources/Prototypes/Species/dwarf.yml @@ -7,9 +7,9 @@ markingLimits: MobHumanMarkingLimits dollPrototype: MobDwarfDummy skinColoration: HumanToned - minHeight: 0.6 + minHeight: 0.7 defaultHeight: 0.8 - maxHeight: 0.8 - minWidth: 0.55 + maxHeight: 0.9 + minWidth: 0.7 defaultWidth: 0.8 - maxWidth: 0.85 + maxWidth: 0.9 diff --git a/Resources/Prototypes/Species/harpy.yml b/Resources/Prototypes/Species/harpy.yml index 43d28daab0..cd07091649 100644 --- 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 + minHeight: 0.8 defaultHeight: 0.8 - maxHeight: 1.1 - minWidth: 0.55 + maxHeight: 1 + minWidth: 0.8 defaultWidth: 0.8 - maxWidth: 1.15 + maxWidth: 1 - type: speciesBaseSprites id: MobHarpySprites diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml index dc5a56534b..ad1f791216 100644 --- 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 + defaultHeight: 1.1 + maxHeight: 1.2 + minWidth: 0.9 + defaultWidth: 1.1 + maxWidth: 1.2 - type: speciesBaseSprites id: MobReptilianSprites From fd7bd491320f2efc22e67529790a60cbc5444049 Mon Sep 17 00:00:00 2001 From: Remuchi Date: Mon, 9 Sep 2024 15:15:06 +0700 Subject: [PATCH 3/8] fix: validate player character before joining --- Content.Server/GameTicking/GameTicker.Player.cs | 4 +++- Content.Shared/Preferences/HumanoidCharacterProfile.cs | 8 ++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs index be52137d4f..4f4bfcb558 100644 --- a/Content.Server/GameTicking/GameTicker.Player.cs +++ b/Content.Server/GameTicking/GameTicker.Player.cs @@ -163,7 +163,9 @@ async void AddPlayerToDb(Guid id) public HumanoidCharacterProfile GetPlayerProfile(ICommonSession p) { - return (HumanoidCharacterProfile) _prefsManager.GetPreferences(p.UserId).SelectedCharacter; + var profile = (HumanoidCharacterProfile) _prefsManager.GetPreferences(p.UserId).SelectedCharacter; + profile.EnsureValid(p, IoCManager.Instance!); + return profile; } public void PlayerJoinGame(ICommonSession session, bool silent = false) diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index 3899fa65da..fb0df05499 100644 --- 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); From 2cebbfcf846318e9f37e2aa9389e5753fa9e7cfd Mon Sep 17 00:00:00 2001 From: Remuchi Date: Mon, 9 Sep 2024 15:15:28 +0700 Subject: [PATCH 4/8] feat: transfer arachne components to arachnid --- Resources/Prototypes/Entities/Mobs/Species/arachnid.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index c135ac2b82..90bc2a711a 100644 --- 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 From 03a40ee75b44119c2709dc33d0bb77c478444494 Mon Sep 17 00:00:00 2001 From: Remuchi Date: Tue, 10 Sep 2024 21:16:36 +0700 Subject: [PATCH 5/8] remove: disable roundstart oni --- Resources/Prototypes/Nyanotrasen/Species/Oni.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml index ba5e5661f9..2b3f0e367e 100644 --- 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 From a858d9049301511491966bdcb8a9152de0b2d0c4 Mon Sep 17 00:00:00 2001 From: Remuchi Date: Tue, 10 Sep 2024 21:16:52 +0700 Subject: [PATCH 6/8] =?UTF-8?q?feat:=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2?= =?UTF-8?q?=D0=BE=D0=B4=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B9?= =?UTF-8?q?=20=D1=80=D0=B0=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/species/species.ftl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/species/species.ftl b/Resources/Locale/ru-RU/species/species.ftl index 3bd0908a7d..c54f7ba3c2 100644 --- 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 = Они From e6c61f25429ddb48d55ff4856facfb636a850367 Mon Sep 17 00:00:00 2001 From: Remuchi Date: Tue, 10 Sep 2024 21:21:32 +0700 Subject: [PATCH 7/8] feat: make dwarfs have a bit more stamina --- Resources/Prototypes/Entities/Mobs/Species/dwarf.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml index 055c6522dd..2d14f90d32 100644 --- 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 + critThreshold: 115 - type: entity parent: BaseSpeciesDummy From c87f0fa90d5d4dccf91410cd178432957ec5c843 Mon Sep 17 00:00:00 2001 From: Remuchi Date: Thu, 12 Sep 2024 11:37:04 +0700 Subject: [PATCH 8/8] docs: marked changes as white dream --- Content.Server/GameTicking/GameTicker.Player.cs | 2 ++ .../Humanoid/Prototypes/SpeciesPrototype.cs | 12 ++++++------ Resources/Prototypes/Entities/Mobs/Species/dwarf.yml | 2 +- Resources/Prototypes/Nyanotrasen/Species/felinid.yml | 6 +++--- Resources/Prototypes/Species/dwarf.yml | 4 ++-- Resources/Prototypes/Species/harpy.yml | 6 +++--- Resources/Prototypes/Species/reptilian.yml | 4 ++-- 7 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs index 4f4bfcb558..6af9df70f0 100644 --- a/Content.Server/GameTicking/GameTicker.Player.cs +++ b/Content.Server/GameTicking/GameTicker.Player.cs @@ -163,9 +163,11 @@ async void AddPlayerToDb(Guid id) public HumanoidCharacterProfile GetPlayerProfile(ICommonSession p) { + // 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 index 76eef0eeb6..4101363475 100644 --- 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 /// [DataField] - public float MinHeight = 0.9f; + public float MinHeight = 0.9f; // White Dream Edit /// /// The default height for this species /// [DataField] - public float DefaultHeight = 1f; + public float DefaultHeight = 1f; // White Dream Edit /// /// The maximum height for this species /// [DataField] - public float MaxHeight = 1.1f; + public float MaxHeight = 1.1f; // White Dream Edit /// /// The minimum width for this species /// [DataField] - public float MinWidth = 0.9f; + public float MinWidth = 0.9f; // White Dream Edit /// /// The default width for this species /// [DataField] - public float DefaultWidth = 1f; + public float DefaultWidth = 1f; // White Dream Edit /// /// The maximum width for this species /// [DataField] - public float MaxWidth = 1.1f; + public float MaxWidth = 1.1f; // White Dream Edit /// /// The average height in centimeters for this species, used to calculate player facing height values in UI elements diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml index 2d14f90d32..1de9f89ce8 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml @@ -60,7 +60,7 @@ - SolCommon - type: LightweightDrunk boozeStrengthMultiplier: 0.5 - - type: Stamina + - type: Stamina # White Dream: Make dwarfs a bit more durable. critThreshold: 115 - type: entity diff --git a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml index b707d54757..f92c6fb3c8 100644 --- 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.8 - defaultHeight: 0.8 + 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 + maxWidth: 1 # White Dream: End of changes - type: markingPoints id: MobFelinidMarkingLimits diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml index 6f32d32c72..01c08790b4 100644 --- a/Resources/Prototypes/Species/dwarf.yml +++ b/Resources/Prototypes/Species/dwarf.yml @@ -7,9 +7,9 @@ markingLimits: MobHumanMarkingLimits dollPrototype: MobDwarfDummy skinColoration: HumanToned - minHeight: 0.7 + minHeight: 0.7 # White Dream: Changed sizes of all species to be less extreme. defaultHeight: 0.8 maxHeight: 0.9 minWidth: 0.7 defaultWidth: 0.8 - maxWidth: 0.9 + maxWidth: 0.9 # White Dream: End of changes diff --git a/Resources/Prototypes/Species/harpy.yml b/Resources/Prototypes/Species/harpy.yml index cd07091649..ee7ad49c41 100644 --- a/Resources/Prototypes/Species/harpy.yml +++ b/Resources/Prototypes/Species/harpy.yml @@ -7,12 +7,12 @@ markingLimits: MobHarpyMarkingLimits dollPrototype: MobHarpyDummy skinColoration: HumanToned - minHeight: 0.8 - defaultHeight: 0.8 + 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 + 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 index ad1f791216..3d91e597a1 100644 --- 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.9 + 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 + maxWidth: 1.2 # White Dream: End of changes. - type: speciesBaseSprites id: MobReptilianSprites