Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tajara #1647

Merged
merged 41 commits into from
Jan 26, 2025
Merged

Tajara #1647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
a0c3617
working proof of concept
SX-7 Jan 23, 2025
cbf3f31
Full on replacement
SX-7 Jan 23, 2025
e39ef5c
Fixed some cyberlimbs not being avaible to tajaran
SX-7 Jan 23, 2025
266fdeb
Let humans be nekonomini
SX-7 Jan 23, 2025
71cb6c9
Added names, and some prototype reorganization
SX-7 Jan 23, 2025
fd73fb0
Better names
SX-7 Jan 23, 2025
f309545
New organisation
SX-7 Jan 24, 2025
4b072c1
merge ours
SX-7 Jan 24, 2025
274ede6
Removed overwritten locales from nyano
SX-7 Jan 24, 2025
736c0fc
Merge branch 'master' into tajaran-felinid-replacement
SX-7 Jan 24, 2025
16c5185
Merge branch 'master' into tajaran-felinid-replacement
sleepyyapril Jan 25, 2025
b51f904
Added NV, guidebook stub
SX-7 Jan 25, 2025
5be9495
Basic color limiters in place
SX-7 Jan 25, 2025
a024642
siikmaas
SX-7 Jan 25, 2025
ba6fcd6
le fix
SX-7 Jan 25, 2025
334e1c2
pre locstring language work done
SX-7 Jan 25, 2025
03d6ded
improvements to sign language
SX-7 Jan 25, 2025
5eb3559
swapped sign lingo to nalrasan, added lingo locstrings
SX-7 Jan 25, 2025
45016ad
Moved some locstrings around
SX-7 Jan 25, 2025
247dd01
Bleh, can't do much else with it, I'm not remaking/breaking the entir…
SX-7 Jan 25, 2025
ee58723
Merge branch 'master' into tajaran-felinid-replacement
SX-7 Jan 25, 2025
94dd132
Update Resources/Prototypes/CharacterItemGroups/Generic/languageGroup…
VMSolidus Jan 25, 2025
39e1b7a
Merge branch 'master' into tajaran-felinid-replacement
sleepyyapril Jan 25, 2025
f5f9485
I'm going to need a long, warm shower.
SX-7 Jan 25, 2025
9ab2973
Merge branch 'tajaran-felinid-replacement' of https://github.com/SX-7…
SX-7 Jan 25, 2025
80d5c6e
fixed the sign language wraps
SX-7 Jan 25, 2025
af5de1b
seperate fonts for every lingo. added chat names locstrings
SX-7 Jan 25, 2025
5737b0a
actually added chat names
SX-7 Jan 25, 2025
61f89ab
Guidebook thingy
SX-7 Jan 25, 2025
5ce9c48
Merge branch 'master' into tajaran-felinid-replacement
SX-7 Jan 25, 2025
02df0dd
translators
SX-7 Jan 25, 2025
adcb0e4
I actually didn't test this one lol
SX-7 Jan 25, 2025
c2b2401
Seems like all, reenabled felis, but also some fixes. Also made tajar…
SX-7 Jan 25, 2025
fc803f9
Forgor about this :skull:
SX-7 Jan 25, 2025
c255155
Merge branch 'master' into tajaran-felinid-replacement
SX-7 Jan 25, 2025
804423d
Merge branch 'master' into tajaran-felinid-replacement
SX-7 Jan 25, 2025
eca66cd
Better gibs!
SX-7 Jan 26, 2025
ca0b575
Merge branch 'tajaran-felinid-replacement' of https://github.com/SX-7…
SX-7 Jan 26, 2025
fed1767
Forgive me father, for I have sinned
SX-7 Jan 26, 2025
bd8f5fb
fixed cold damage not aligning
SX-7 Jan 26, 2025
9b64319
it's like 2 am lol
SX-7 Jan 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1178,6 +1178,20 @@ private void OnSkinColorOnValueChanged()
Profile = Profile.WithCharacterAppearance(Profile.Appearance.WithSkinColor(color));
break;
}
case HumanoidSkinColor.AnimalFur: // Einstein Engines - Tajaran
{
if (!RgbSkinColorContainer.Visible)
{
Skin.Visible = false;
RgbSkinColorContainer.Visible = true;
}

var color = SkinColor.ClosestAnimalFurColor(_rgbSkinColorSelector.Color);

Markings.CurrentSkinColor = color;
Profile = Profile.WithCharacterAppearance(Profile.Appearance.WithSkinColor(color));
break;
}
}

SetDirty();
Expand Down Expand Up @@ -1444,6 +1458,18 @@ private void UpdateSkinColor()

break;
}
case HumanoidSkinColor.AnimalFur: // Einstein Engines - Tajaran
{
if (!RgbSkinColorContainer.Visible)
{
Skin.Visible = false;
RgbSkinColorContainer.Visible = true;
}

_rgbSkinColorSelector.Color = SkinColor.ClosestAnimalFurColor(Profile.Appearance.SkinColor);

break;
}
}
}

Expand Down
6 changes: 5 additions & 1 deletion Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using Content.Shared.Humanoid.Markings;
using Content.Shared.Humanoid.Prototypes;
using Robust.Shared.Prototypes;
Expand Down Expand Up @@ -106,6 +106,7 @@ public static HumanoidCharacterAppearance DefaultWithSpecies(string species)
HumanoidSkinColor.Hues => speciesPrototype.DefaultSkinTone,
HumanoidSkinColor.TintedHues => Humanoid.SkinColor.TintedHues(speciesPrototype.DefaultSkinTone),
HumanoidSkinColor.VoxFeathers => Humanoid.SkinColor.ClosestVoxColor(speciesPrototype.DefaultSkinTone),
HumanoidSkinColor.AnimalFur => Humanoid.SkinColor.ClosestAnimalFurColor(speciesPrototype.DefaultSkinTone), // Einstein Engines - Tajaran
HumanoidSkinColor.TintedHuesSkin => Humanoid.SkinColor.TintedHuesSkin(speciesPrototype.DefaultSkinTone, speciesPrototype.DefaultSkinTone),
_ => Humanoid.SkinColor.ValidHumanSkinTone,
};
Expand Down Expand Up @@ -176,6 +177,9 @@ public static HumanoidCharacterAppearance Random(string species, Sex sex)
case HumanoidSkinColor.VoxFeathers:
newSkinColor = Humanoid.SkinColor.ProportionalVoxColor(newSkinColor);
break;
case HumanoidSkinColor.AnimalFur: // Einstein Engines - Tajaran
newSkinColor = Humanoid.SkinColor.ProportionalAnimalFurColor(newSkinColor);
break;
}

return new HumanoidCharacterAppearance(newHairStyle, newHairColor, newFacialHairStyle, newHairColor, newEyeColor, newSkinColor, new ());
Expand Down
65 changes: 65 additions & 0 deletions Content.Shared/Humanoid/SkinColor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ public static class SkinColor
public const float MinFeathersValue = 36f / 100;
public const float MaxFeathersValue = 55f / 100;

// Einstein Engines - Tajaran
public const float MinAnimalFurHue = 20f / 360;
public const float MaxAnimalFurHue = 60f / 360;
public const float MinAnimalFurSaturation = 0f / 100;
public const float MaxAnimalFurSaturation = 100f / 100;
public const float MinAnimalFurValue = 0f / 100;
public const float MaxAnimalFurValue = 100f / 100;

public static Color ValidHumanSkinTone => Color.FromHsv(new Vector4(0.07f, 0.2f, 1f, 1f));

/// <summary>
Expand Down Expand Up @@ -223,6 +231,60 @@ public static bool VerifyVoxFeathers(Color color)
return true;
}

/// <summary>
/// Converts a Color proportionally to the allowed animal fur color range.
/// Will NOT preserve the specific input color even if it is within the allowed animal fur color range.
/// </summary>
/// <param name="color">Color to convert</param>
/// <returns>Vox feather coloration</returns>
public static Color ProportionalAnimalFurColor(Color color)
{
var newColor = Color.ToHsv(color);

newColor.X = newColor.X * (MaxAnimalFurHue - MinAnimalFurHue) + MinAnimalFurHue;
newColor.Y = newColor.Y * (MaxAnimalFurSaturation - MinAnimalFurSaturation) + MinAnimalFurSaturation;
newColor.Z = newColor.Z * (MaxAnimalFurValue - MinAnimalFurValue) + MinAnimalFurValue;

return Color.FromHsv(newColor);
}

// /// <summary>
// /// Ensures the input Color is within the allowed animal fur color range.
// /// </summary>
// /// <param name="color">Color to convert</param>
// /// <returns>The same Color if it was within the allowed range, or the closest matching Color otherwise</returns>
public static Color ClosestAnimalFurColor(Color color)
{
var hsv = Color.ToHsv(color);

hsv.X = Math.Clamp(hsv.X, MinAnimalFurHue, MaxAnimalFurHue);
hsv.Y = Math.Clamp(hsv.Y, MinAnimalFurSaturation, MaxAnimalFurSaturation);
hsv.Z = Math.Clamp(hsv.Z, MinAnimalFurValue, MaxAnimalFurValue);

return Color.FromHsv(hsv);
}

/// <summary>
/// Verify if this color is a valid animal fur coloration, or not.
/// </summary>
/// <param name="color">The color to verify</param>
/// <returns>True if valid, false otherwise</returns>
public static bool VerifyAnimalFur(Color color)
{
var colorHsv = Color.ToHsv(color);

if (colorHsv.X < MinAnimalFurHue || colorHsv.X > MaxAnimalFurHue)
return false;

if (colorHsv.Y < MinAnimalFurSaturation || colorHsv.Y > MaxAnimalFurSaturation)
return false;

if (colorHsv.Z < MinAnimalFurValue || colorHsv.Z > MaxAnimalFurValue)
return false;

return true;
}

/// <summary>
/// This takes in a color, and returns a color guaranteed to be above MinHuesLightness
/// </summary>
Expand Down Expand Up @@ -254,6 +316,7 @@ public static bool VerifySkinColor(HumanoidSkinColor type, Color color)
HumanoidSkinColor.TintedHuesSkin => true, // DeltaV - Tone blending
HumanoidSkinColor.Hues => VerifyHues(color),
HumanoidSkinColor.VoxFeathers => VerifyVoxFeathers(color),
HumanoidSkinColor.AnimalFur => VerifyAnimalFur(color), // Einsetin Engines - Tajaran
_ => false,
};
}
Expand All @@ -267,6 +330,7 @@ public static Color ValidSkinTone(HumanoidSkinColor type, Color color)
HumanoidSkinColor.TintedHuesSkin => ValidTintedHuesSkinTone(color), // DeltaV - Tone blending
HumanoidSkinColor.Hues => MakeHueValid(color),
HumanoidSkinColor.VoxFeathers => ClosestVoxColor(color),
HumanoidSkinColor.AnimalFur => ClosestAnimalFurColor(color), // Einsetin Engines - Tajaran
_ => color
};
}
Expand All @@ -279,4 +343,5 @@ public enum HumanoidSkinColor : byte
VoxFeathers, // Vox feathers are limited to a specific color range
TintedHues, //This gives a color tint to a humanoid's skin (10% saturation with full hue range).
TintedHuesSkin, // DeltaV - Default TintedHues assumes the texture will have the proper skin color, but moths dont
AnimalFur, // Einstein Engines - limits coloration to more or less what earthen animals might have
}
Binary file not shown.
93 changes: 93 additions & 0 deletions Resources/Fonts/Grenze_Gotisch/OFL.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
Copyright 2020 The Grenze Gotisch Project Authors (https://github.com/Omnibus-Type/Grenze-Gotisch)

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
https://openfontlicense.org


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
93 changes: 93 additions & 0 deletions Resources/Fonts/Rubik_Dirt/OFL.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
Copyright 2020 The Rubik Filtered Project Authors (https://https://github.com/NaN-xyz/Rubik-Filtered)

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
https://openfontlicense.org


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
Binary file added Resources/Fonts/Rubik_Dirt/RubikDirt.ttf
Binary file not shown.
Loading
Loading