From 0692f961e5457e23d975d2b6c086572934abdba5 Mon Sep 17 00:00:00 2001 From: Jade Macho Date: Sun, 18 Aug 2024 14:27:36 +0200 Subject: [PATCH] Update for updated DT housing skybox --- VoidBox/Assets/BuiltinEnvs.json | 189 +++++++++++++++++++++++++++----- VoidBox/Plugin.cs | 12 +- VoidBox/VoidBox.csproj | 2 +- 3 files changed, 169 insertions(+), 34 deletions(-) diff --git a/VoidBox/Assets/BuiltinEnvs.json b/VoidBox/Assets/BuiltinEnvs.json index 47df64f..a667341 100644 --- a/VoidBox/Assets/BuiltinEnvs.json +++ b/VoidBox/Assets/BuiltinEnvs.json @@ -1,8 +1,139 @@ [ + { + "$type": "VoidBox.SavedEnv, VoidBox", + "Id": "24ba660e-7212-45cf-a386-d7449ff9568e", + "Name": "Housing Void (7.0+)", + "Env": { + "$type": "System.Nullable`1[[Ktisis.Structs.Env.EnvState, VoidBox]], System.Private.CoreLib", + "SkyId": 0, + "Lighting": { + "$type": "Ktisis.Structs.Env.Weather.EnvLighting, VoidBox", + "SunLightColor": { + "$type": "System.Numerics.Vector3, System.Private.CoreLib", + "X": 1.4000001, + "Y": 1.3296363, + "Z": 1.2609105 + }, + "MoonLightColor": { + "$type": "System.Numerics.Vector3, System.Private.CoreLib", + "X": 0.01, + "Y": 0.01, + "Z": 0.01 + }, + "Ambient": { + "$type": "System.Numerics.Vector3, System.Private.CoreLib", + "X": 0.48, + "Y": 0.43482354, + "Z": 0.384 + }, + "_unk1": 0.5, + "AmbientSaturation": 1.5, + "Temperature": 0.6, + "_unk2": 0.5, + "_unk3": 0.0, + "_unk4": 0.0 + }, + "Stars": { + "$type": "Ktisis.Structs.Env.Weather.EnvStars, VoidBox", + "ConstellationIntensity": 0.0, + "Constellations": 0.0, + "Stars": 0.0, + "GalaxyIntensity": 0.0, + "StarIntensity": 0.0, + "MoonColor": { + "$type": "System.Numerics.Vector4, System.Private.CoreLib", + "X": 0.0, + "Y": 0.0, + "Z": 0.0, + "W": 0.0 + }, + "MoonBrightness": 0.0 + }, + "Fog": { + "$type": "Ktisis.Structs.Env.Weather.EnvFog, VoidBox", + "Color": { + "$type": "System.Numerics.Vector4, System.Private.CoreLib", + "X": 0.0, + "Y": 0.0, + "Z": 0.0, + "W": 0.0 + }, + "Distance": 0.0, + "Thickness": 0.0, + "_unk1": 1000.0, + "_unk2": 1.0, + "Opacity": 0.0, + "SkyVisibility": 1.0 + }, + "Clouds": { + "$type": "Ktisis.Structs.Env.Weather.EnvClouds, VoidBox", + "CloudColor": { + "$type": "System.Numerics.Vector3, System.Private.CoreLib", + "X": 1.0, + "Y": 1.0, + "Z": 1.0 + }, + "Color2": { + "$type": "System.Numerics.Vector3, System.Private.CoreLib", + "X": 1.0, + "Y": 1.0, + "Z": 1.0 + }, + "Gradient": 0.5, + "SideHeight": 0.0, + "CloudTexture": 0, + "CloudSideTexture": 0 + }, + "Rain": { + "$type": "Ktisis.Structs.Env.Weather.EnvRain, VoidBox", + "Raindrops": 0.0, + "Intensity": 0.0, + "Weight": 0.0, + "Scatter": 0.0, + "_unk1": 0.0, + "Size": 1.0, + "Color": { + "$type": "System.Numerics.Vector4, System.Private.CoreLib", + "X": 0.0, + "Y": 0.0, + "Z": 0.0, + "W": 0.0 + }, + "_unk2": 0.0, + "_unk3": 0.0, + "_unk4": 0 + }, + "Dust": { + "$type": "Ktisis.Structs.Env.Weather.EnvDust, VoidBox", + "_unk1": 0.0, + "Intensity": 0.0, + "Weight": 0.0, + "Spread": 0.0, + "Speed": 0.0, + "Size": 1.0, + "Color": { + "$type": "System.Numerics.Vector4, System.Private.CoreLib", + "X": 0.0, + "Y": 0.0, + "Z": 0.0, + "W": 0.0 + }, + "Glow": 0.0, + "Spin": 0.0, + "TextureId": 0 + }, + "Wind": { + "$type": "Ktisis.Structs.Env.Weather.EnvWind, VoidBox", + "Direction": 0.0, + "Angle": 0.0, + "Speed": 0.0 + } + } + }, { "$type": "VoidBox.SavedEnv, VoidBox", "Id": "388f6ab7-c3ff-4587-ae13-df9daead6471", - "Name": "Housing Void", + "Name": "Housing Void (6.x)", "Env": { "$type": "System.Nullable`1[[Ktisis.Structs.Env.EnvState, VoidBox]], System.Private.CoreLib", "SkyId": 0, @@ -1189,28 +1320,28 @@ "$type": "Ktisis.Structs.Env.Weather.EnvLighting, VoidBox", "SunLightColor": { "$type": "System.Numerics.Vector3, System.Private.CoreLib", - "X": 0.86194694, - "Y": 0.69091094, - "Z": 0.68265486 + "X": 1.4000001, + "Y": 1.3296363, + "Z": 1.2609105 }, "MoonLightColor": { "$type": "System.Numerics.Vector3, System.Private.CoreLib", - "X": 0.2848343, - "Y": 0.36279023, - "Z": 0.7 + "X": 0.01, + "Y": 0.01, + "Z": 0.01 }, "Ambient": { "$type": "System.Numerics.Vector3, System.Private.CoreLib", - "X": 0.5, - "Y": 0.45294118, - "Z": 0.4 + "X": 0.48, + "Y": 0.43482354, + "Z": 0.384 }, "_unk1": 0.5, - "AmbientSaturation": 1.0, - "Temperature": 1.0, - "_unk2": 3.774338, - "_unk3": 75.0, - "_unk4": 0.75 + "AmbientSaturation": 1.5, + "Temperature": 0.6, + "_unk2": 0.5, + "_unk3": 0.0, + "_unk4": 0.0 }, "Stars": { "$type": "Ktisis.Structs.Env.Weather.EnvStars, VoidBox", @@ -1320,28 +1451,28 @@ "$type": "Ktisis.Structs.Env.Weather.EnvLighting, VoidBox", "SunLightColor": { "$type": "System.Numerics.Vector3, System.Private.CoreLib", - "X": 0.86194694, - "Y": 0.69091094, - "Z": 0.68265486 + "X": 1.4000001, + "Y": 1.3296363, + "Z": 1.2609105 }, "MoonLightColor": { "$type": "System.Numerics.Vector3, System.Private.CoreLib", - "X": 0.2848343, - "Y": 0.36279023, - "Z": 0.7 + "X": 0.01, + "Y": 0.01, + "Z": 0.01 }, "Ambient": { "$type": "System.Numerics.Vector3, System.Private.CoreLib", - "X": 0.5, - "Y": 0.45294118, - "Z": 0.4 + "X": 0.48, + "Y": 0.43482354, + "Z": 0.384 }, "_unk1": 0.5, - "AmbientSaturation": 1.0, - "Temperature": 1.0, - "_unk2": 3.774338, - "_unk3": 75.0, - "_unk4": 0.75 + "AmbientSaturation": 1.5, + "Temperature": 0.6, + "_unk2": 0.5, + "_unk3": 0.0, + "_unk4": 0.0 }, "Stars": { "$type": "Ktisis.Structs.Env.Weather.EnvStars, VoidBox", diff --git a/VoidBox/Plugin.cs b/VoidBox/Plugin.cs index 625cf45..b9fcb9f 100644 --- a/VoidBox/Plugin.cs +++ b/VoidBox/Plugin.cs @@ -172,13 +172,17 @@ public sealed unsafe class Plugin : IDalamudPlugin { replace |= dest->SkyId == 0 && - dest->Fog.Color == new Vector4(0, 0, 0, 1.0f) && - dest->Fog.Distance == 50.0f && - dest->Fog.Thickness == 5.0f && + dest->Clouds.Gradient == 0.5f && + dest->Lighting._unk1 == 0.5f && + dest->Lighting.Temperature == 0.6f && + dest->Lighting._unk2 == 0.5f && + dest->Fog.Color == new Vector4(0, 0, 0, 0) && + dest->Fog.Distance == 0.0f && + dest->Fog.Thickness == 0.0f && dest->Fog._unk1 == 1000.0f && dest->Fog._unk2 == 1.0f && dest->Fog.Opacity == 0.0f && - dest->Fog.SkyVisibility == 0.0f; + dest->Fog.SkyVisibility == 1.0f; } if (replace) diff --git a/VoidBox/VoidBox.csproj b/VoidBox/VoidBox.csproj index a4a5802..df129c2 100644 --- a/VoidBox/VoidBox.csproj +++ b/VoidBox/VoidBox.csproj @@ -3,7 +3,7 @@ 0x0ade - 0.1.0.7 + 0.1.0.8