Skip to content

Commit 571bd9a

Browse files
authored
Merge pull request #1180 from ss14Starlight/starlight-dev
Fix Characters Sizes
2 parents cb8f521 + 659a361 commit 571bd9a

10 files changed

Lines changed: 36 additions & 36 deletions

File tree

Content.Client/Humanoid/HumanoidAppearanceSystem.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ private void UpdateSprite(Entity<HumanoidAppearanceComponent, SpriteComponent> e
5757
//starlight start
5858
if (humanoidAppearance.EyeGlowing)
5959
sprite.LayerSetShader(HumanoidVisualLayers.Eyes, "unshaded");
60-
else
60+
else
6161
if(_sprite.LayerMapTryGet((entity.Owner, sprite), HumanoidVisualLayers.Eyes, out var layerIndex, true))
6262
sprite.LayerSetShader(layerIndex, (ShaderInstance?)null);
6363

64-
sprite.Scale = new Vector2(humanoidAppearance.Width, humanoidAppearance.Height);
64+
sprite.Scale = new Vector2(humanoidAppearance.Width * humanoidAppearance.Height, humanoidAppearance.Height);
6565
//starlight end
6666
}
6767

@@ -249,7 +249,7 @@ public void AddCustomBaseLayers(EntityUid uid, Dictionary<HumanoidVisualLayers,
249249
{
250250
return;
251251
}
252-
252+
253253
humanoid.CustomBaseLayers = layers;
254254
UpdateSprite((uid, humanoid, Comp<SpriteComponent>(uid)));
255255
}

Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ public HumanoidProfileEditor(
484484
Markings.OnMarkingRankChange += OnMarkingChange;
485485

486486
#endregion Markings
487-
487+
488488
// Starlight
489489
#region Cybernetics
490490
TabContainer.SetTabTitle(5, Loc.GetString("humanoid-profile-editor-cybernetics-tab"));
@@ -1333,8 +1333,8 @@ private void SetGender(Gender newGender)
13331333
private void UpdateSizeText() {
13341334
if(Profile is null) return;
13351335
if (_prototypeManager.TryIndex<SpeciesPrototype>(Profile.Species, out var speciesPrototype)) {
1336-
var height = speciesPrototype.StandardSize * Profile.Appearance.Height;
1337-
var weight = speciesPrototype.StandardWeight + speciesPrototype.StandardDensity * ((Profile.Appearance.Width * Profile.Appearance.Height) - 1);
1336+
var height = speciesPrototype.StandardSize * (Profile.Appearance.Height - 1f) * 2f + speciesPrototype.StandardSize;
1337+
var weight = speciesPrototype.StandardWeight + speciesPrototype.StandardDensity * (Profile.Appearance.Width * Profile.Appearance.Height * Profile.Appearance.Height - 1);
13381338
HeightDescribeLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", Math.Round(height)));
13391339
WidthDescribeLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("weight", Math.Round(weight, 1)));
13401340
}
@@ -1496,7 +1496,7 @@ private void UpdateSizeControls()
14961496
HeightSlider.MinValue = speciesPrototype.MinHeight;
14971497
HeightSlider.MaxValue = speciesPrototype.MaxHeight;
14981498
HeightSlider.Value = Profile.Appearance.Height;
1499-
1499+
15001500
UpdateSizeText();
15011501
}
15021502
}

Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,13 @@ public sealed partial class SpeciesPrototype : IPrototype
143143
/// Characters must not crumple under earth-like gravity.
144144
/// </summary>
145145
[DataField]
146-
public float MinWidth = 0.8f;
146+
public float MinWidth = 0.9f;
147147

148148
/// <summary>
149149
/// Characters must not exhibit a measurable gravitational pull on nearby objects.
150150
/// </summary>
151151
[DataField]
152-
public float MaxWidth = 1.2f;
152+
public float MaxWidth = 1.1f;
153153

154154
/// <summary>
155155
/// The normal width for this species.
@@ -161,13 +161,13 @@ public sealed partial class SpeciesPrototype : IPrototype
161161
/// Sentient microbial lifeforms are not currently hireable under contract.
162162
/// </summary>
163163
[DataField]
164-
public float MinHeight = 0.8f;
164+
public float MinHeight = 0.9f;
165165

166166
/// <summary>
167167
/// You cannot fit in our cloning pods.
168168
/// </summary>
169169
[DataField]
170-
public float MaxHeight = 1.2f;
170+
public float MaxHeight = 1.15f;
171171

172172
/// <summary>
173173
/// The normal height for this species.

Resources/Changelog/ChangelogStarlight.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10021,5 +10021,20 @@ Entries:
1002110021
id: 1380
1002210022
time: '2025-08-01T04:54:21.000000+00:00'
1002310023
url: https://github.com/ss14Starlight/space-station-14/pull/1171
10024+
- author: Arkanic
10025+
changes:
10026+
- message: 1984 the character min/max sizes to something more reasonable
10027+
type: Tweak
10028+
id: 1381
10029+
time: '2025-08-01T16:02:15.000000+00:00'
10030+
url: https://github.com/ss14Starlight/space-station-14/pull/1174
10031+
- author: Arkanic
10032+
changes:
10033+
- message: Width slider now acts more like an "aspect ratio" slider to stop goofy
10034+
min width max height characters
10035+
type: Tweak
10036+
id: 1382
10037+
time: '2025-08-01T16:02:15.000000+00:00'
10038+
url: https://github.com/ss14Starlight/space-station-14/pull/1174
1002410039
Order: -1
1002510040

Resources/Prototypes/Species/dwarf.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
markingLimits: MobHumanMarkingLimits
88
dollPrototype: MobDwarfDummy
99
skinColoration: HumanToned
10-
customName: true # Starlight
11-
minWidth: 0.9 # Starlight
12-
defaultWidth: 1 # Starlight
13-
maxWidth: 1.2 # Starlight
14-
minHeight: 0.6 # Starlight
15-
defaultHeight: 0.8 # Starlight
16-
maxHeight: 0.8 # Starlight
10+
customName: true # Starlight start
11+
minWidth: 1.25
12+
defaultWidth: 1.25
13+
maxWidth: 1.5
14+
minHeight: 0.8
15+
defaultHeight: 0.8
16+
maxHeight: 0.85 # Starlight end

Resources/Prototypes/Species/resomi.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@
1717
oldAge: 257
1818
maxAge: 430
1919
customName: true # Starlight
20-
minWidth: 0.9
21-
defaultWidth: 1
22-
maxWidth: 1.2
23-
minHeight: 0.8
24-
defaultHeight: 1
25-
maxHeight: 1.1
2620
standardSize: 150
2721
standardWeight: 40
2822
standardDensity: 17

Resources/Prototypes/_StarLight/Species/avali.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
youngAge: 103
1717
oldAge: 257
1818
maxAge: 430
19-
minWidth: 0.8
20-
defaultWidth: 0.91
21-
maxWidth: 1
2219
minHeight: 0.8
2320
defaultHeight: 0.91
2421
maxHeight: 1

Resources/Prototypes/_StarLight/Species/cyclorite.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@
1212
femaleFirstNames: names_cyclorite
1313
naming: First
1414
customName: true
15-
minWidth: 0.9
16-
defaultWidth: 1
17-
maxWidth: 1.25
1815
minHeight: 0.9
1916
defaultHeight: 1
20-
maxHeight: 1.25
17+
maxHeight: 1.2
2118
standardSize: 170
2219
standardWeight: 100
2320
standardDensity: 110

Resources/Prototypes/_StarLight/Species/felionoid.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
femaleFirstNames: names_felionoid
1313
naming: First
1414
customName: true
15-
minWidth: 0.7
16-
defaultWidth: 0.8
17-
maxWidth: 0.9
18-
minHeight: 0.7
15+
minHeight: 0.8
1916
defaultHeight: 0.8
2017
maxHeight: 0.9
2118
standardSize: 170

Resources/Prototypes/_StarLight/Species/vulpkanin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
customName: true
1414
minHeight: 0.9
1515
defaultHeight: 1
16-
maxHeight: 1.25
16+
maxHeight: 1.2
1717
standardSize: 170
1818
standardWeight: 75
1919
standardDensity: 110

0 commit comments

Comments
 (0)