mirrors/Simitone
1
0
Fork 0
mirror of https://github.com/riperiperi/Simitone.git synced 2025-01-22 09:11:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update FreeSO, simless build, CAS outfit discovery.

Browse source
This commit is contained in:
riperiperi 2020-05-14 22:56:35 +01:00
parent eda7f0e3d6
commit 5786205b99
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Client/Simitone/Simitone.Client/UI/Screens/TS1CASScreen.cs
View file

@ -144,7 +144,7 @@ namespace Simitone.Client.UI.Screens
var pos1 = Mode2D[prev];
var pos2 = Mode2D[next];
if (World != null) World.State.PreciseZoom = 1 + Math.Min(0, value*0.5f);
if (World != null) World.State.PreciseZoom = 1 + Math.Min(0, value * 0.5f);
value = (float)DirectionUtils.PosMod(value, 1.0);
var campos = Vector3.Lerp(pos1, pos2, value);
campos += (float)Math.Sin(value * Math.PI) * SinTransitions[prev];
@ -173,12 +173,17 @@ namespace Simitone.Client.UI.Screens
}
}
private string MissingFallback(string x, IEnumerable<string> texnames)
{
return "x";
}
private void PopulateSimType(string simtype)
{
CurrentCode = simtype;
var heads = Content.Get().BCFGlobal.CollectionsByName["c"].ClothesByAvatarType[simtype];
if (simtype[1] == 'c') simtype += "chd";
var bodies = Content.Get().BCFGlobal.CollectionsByName["b"].ClothesByAvatarType[simtype];
var bodies = Content.Get().BCFGlobal.CollectionsByName["b"].GeneralAvatarType(simtype);
var tex = (TS1AvatarTextureProvider)Content.Get().AvatarTextures;
var texnames = tex.GetAllNames();
@ -186,8 +191,11 @@ namespace Simitone.Client.UI.Screens
ActiveBodies = bodies;
ActiveHeadTex = heads.Select(x => RemoveExt(texnames.FirstOrDefault(y => y.StartsWith(ExtractID(x, CurrentSkin))))).ToList();
ActiveBodyTex = bodies.Select(x => RemoveExt(texnames.FirstOrDefault(y => y.StartsWith(ExtractID(x, CurrentSkin))))).ToList();
ActiveHandgroupTex = bodies.Select(x => (RemoveExt(texnames.FirstOrDefault(y => y == "huao"+FindHG(x))) ?? "huao"+ CurrentSkin).Substring(4)).ToList();
ActiveBodyTex = bodies.Select(x => RemoveExt(
texnames.FirstOrDefault(y => y.StartsWith(ExtractID(x, CurrentSkin)))
?? texnames.FirstOrDefault(y => y.StartsWith(ExtractID(x, ""))) ?? MissingFallback(x, texnames)
)).ToList();
ActiveHandgroupTex = ActiveBodyTex.Select(x => (RemoveExt(texnames.FirstOrDefault(y => RemoveExt(y) == "huao"+FindHG(x))) ?? "huao"+ CurrentSkin).Substring(4)).ToList();
for (int i=0; i<ActiveHeads.Count; i++)
{

8
Client/Simitone/Simitone.Client/UI/Screens/TS1GameScreen.cs
View file

@ -709,18 +709,16 @@ namespace Simitone.Client.UI.Screens
});
}
var isSimless = (ActiveFamily == null && !isSurrounding);
vm.SpeedMultiplier = -1;
vm.Tick();
vm.SpeedMultiplier = 1;
if (ActiveFamily == null && !isSurrounding)
if (isSimless)
{
vm.SetGlobalValue(32, 1);
vm.SpeedMultiplier = -1;
} else
{
vm.SetGlobalValue(32, 0);
}
vm.SetGlobalValue(32, (short)(isSimless ? 1 : 0));
}

2
FreeSO

@ -1 +1 @@
Subproject commit a57ba7b55a77345eaaf8c512692e79a0fb080404
Subproject commit 77066aa2865301ea72e0ca238f0a42ba04d59625