diff --git a/NewHorizons/Builder/Atmosphere/AirBuilder.cs b/NewHorizons/Builder/Atmosphere/AirBuilder.cs index 7c366ea3..da49493d 100644 --- a/NewHorizons/Builder/Atmosphere/AirBuilder.cs +++ b/NewHorizons/Builder/Atmosphere/AirBuilder.cs @@ -18,12 +18,12 @@ namespace NewHorizons.Builder.Atmosphere SC.radius = airScale; SimpleFluidVolume SFV = airGO.AddComponent(); - SFV.SetValue("_layer", 5); - SFV.SetValue("_priority", 1); - SFV.SetValue("_density", 1.2f); - SFV.SetValue("_fluidType", FluidVolume.Type.AIR); - SFV.SetValue("_allowShipAutoroll", true); - SFV.SetValue("_disableOnStart", false); + SFV._layer = 5; + SFV._priority = 1; + SFV._density = 1.2f; + SFV._fluidType = FluidVolume.Type.AIR; + SFV._allowShipAutoroll = true; + SFV._disableOnStart = false; if(hasOxygen) { @@ -33,9 +33,9 @@ namespace NewHorizons.Builder.Atmosphere if (isRaining) { VisorRainEffectVolume VREF = airGO.AddComponent(); - VREF.SetValue("_rainDirection", VisorRainEffectVolume.RainDirection.Radial); - VREF.SetValue("_layer", 0); - VREF.SetValue("_priority", 0); + VREF._rainDirection = VisorRainEffectVolume.RainDirection.Radial; + VREF._layer = 0; + VREF._priority = 0; AudioSource AS = airGO.AddComponent(); AS.mute = false; @@ -52,7 +52,7 @@ namespace NewHorizons.Builder.Atmosphere AS.reverbZoneMix = 1f; OWAudioSource OWAS = airGO.AddComponent(); - OWAS.SetValue("_audioLibraryClip", AudioType.GD_RainAmbient_LP); + OWAS._audioLibraryClip = AudioType.GD_RainAmbient_LP; OWAS.SetClipSelectionType(OWAudioSource.ClipSelectionOnPlay.RANDOM); OWAS.SetTrack(OWAudioMixer.TrackName.Environment); diff --git a/NewHorizons/Builder/Atmosphere/EffectsBuilder.cs b/NewHorizons/Builder/Atmosphere/EffectsBuilder.cs index 12ad4673..6f499572 100644 --- a/NewHorizons/Builder/Atmosphere/EffectsBuilder.cs +++ b/NewHorizons/Builder/Atmosphere/EffectsBuilder.cs @@ -15,11 +15,11 @@ namespace NewHorizons.Builder.Atmosphere effectsGO.transform.localPosition = Vector3.zero; SectorCullGroup SCG = effectsGO.AddComponent(); - SCG.SetValue("_sector", sector); - SCG.SetValue("_particleSystemSuspendMode", CullGroup.ParticleSystemSuspendMode.Stop); - SCG.SetValue("_occlusionCulling", false); - SCG.SetValue("_dynamicCullingBounds", false); - SCG.SetValue("_waitForStreaming", false); + SCG._sector = sector; + SCG._particleSystemSuspendMode = CullGroup.ParticleSystemSuspendMode.Stop; + SCG._occlusionCulling = false; + SCG._dynamicCullingBounds = false; + SCG._waitForStreaming = false; if(hasRain) { @@ -34,8 +34,8 @@ namespace NewHorizons.Builder.Atmosphere new Keyframe(atmoSize, 0f) }); - rainGO.GetComponent().SetValue("_activeInSector", sector); - rainGO.GetComponent().SetValue("_exclusionSectors", new Sector[] { }); + rainGO.GetComponent()._activeInSector = sector; + rainGO.GetComponent()._exclusionSectors = new Sector[] { }; rainGO.SetActive(true); } @@ -58,8 +58,8 @@ namespace NewHorizons.Builder.Atmosphere new Keyframe(atmoSize, 0f) }); - snowEmitter.GetComponent().SetValue("_activeInSector", sector); - snowEmitter.GetComponent().SetValue("_exclusionSectors", new Sector[] { }); + snowEmitter.GetComponent()._activeInSector = sector; + snowEmitter.GetComponent()._exclusionSectors = new Sector[] { }; snowEmitter.SetActive(true); } } diff --git a/NewHorizons/Builder/Atmosphere/FogBuilder.cs b/NewHorizons/Builder/Atmosphere/FogBuilder.cs index 0b7ed490..b4d8a8cf 100644 --- a/NewHorizons/Builder/Atmosphere/FogBuilder.cs +++ b/NewHorizons/Builder/Atmosphere/FogBuilder.cs @@ -55,7 +55,7 @@ namespace NewHorizons.Builder.Atmosphere /* SectorProxy lodFogSectorProxy = lodFogGO.AddComponent(); - lodFogSectorProxy.SetValue("_renderers", new List { lodMR }); + lodFogSectorProxy._renderers = new List { lodMR }; lodFogSectorProxy.SetSector(sector); */ diff --git a/NewHorizons/Builder/Atmosphere/SunOverrideBuilder.cs b/NewHorizons/Builder/Atmosphere/SunOverrideBuilder.cs index 1a9ba9ec..3613034d 100644 --- a/NewHorizons/Builder/Atmosphere/SunOverrideBuilder.cs +++ b/NewHorizons/Builder/Atmosphere/SunOverrideBuilder.cs @@ -14,11 +14,11 @@ namespace NewHorizons.Builder.Atmosphere overrideGO.transform.parent = body.transform; GiantsDeepSunOverrideVolume GDSOV = overrideGO.AddComponent(); - GDSOV.SetValue("_sector", sector); - GDSOV.SetValue("_cloudsOuterRadius", atmo.Size); - GDSOV.SetValue("_cloudsInnerRadius", atmo.Size * 0.9f); - GDSOV.SetValue("_waterOuterRadius", surfaceSize); - GDSOV.SetValue("_waterInnerRadius", 0f); + GDSOV._sector = sector; + GDSOV._cloudsOuterRadius = atmo.Size; + GDSOV._cloudsInnerRadius = atmo.Size * 0.9f; + GDSOV._waterOuterRadius = surfaceSize; + GDSOV._waterInnerRadius = 0f; overrideGO.transform.localPosition = Vector3.zero; overrideGO.SetActive(true); diff --git a/NewHorizons/Builder/Body/LavaBuilder.cs b/NewHorizons/Builder/Body/LavaBuilder.cs index 0af84b9d..c4e1a8a0 100644 --- a/NewHorizons/Builder/Body/LavaBuilder.cs +++ b/NewHorizons/Builder/Body/LavaBuilder.cs @@ -50,7 +50,7 @@ namespace NewHorizons.Builder.Body if (module.Tint != null) proxyLavaSphere.GetComponent().material.SetColor("_EmissionColor", module.Tint.ToColor()); var sectorProxy = moltenCoreProxy.GetComponent(); - sectorProxy.SetValue("_renderers", new List { proxyLavaSphere.GetComponent() }); + sectorProxy._renderers = new List { proxyLavaSphere.GetComponent() }; sectorProxy.SetSector(sector); var destructionVolume = GameObject.Instantiate(GameObject.Find("VolcanicMoon_Body/MoltenCore_VM/DestructionVolume"), moltenCore.transform); diff --git a/NewHorizons/Builder/Body/WaterBuilder.cs b/NewHorizons/Builder/Body/WaterBuilder.cs index 5926ed7e..0e8a94d0 100644 --- a/NewHorizons/Builder/Body/WaterBuilder.cs +++ b/NewHorizons/Builder/Body/WaterBuilder.cs @@ -50,8 +50,8 @@ namespace NewHorizons.Builder.Body TSR.LODRadius = 0; OceanEffectController OEC = waterGO.AddComponent(); - OEC.SetValue("_sector", sector); - OEC.SetValue("_ocean", TSR); + OEC._sector = sector; + OEC._ocean = TSR; //Buoyancy var buoyancyObject = new GameObject("WaterVolume"); @@ -64,18 +64,18 @@ namespace NewHorizons.Builder.Body sphereCollider.isTrigger = true; var owCollider = buoyancyObject.AddComponent(); - owCollider.SetValue("_parentBody", rb); - owCollider.SetValue("_collider", sphereCollider); + owCollider._parentBody = rb; + owCollider._collider = sphereCollider; var buoyancyTriggerVolume = buoyancyObject.AddComponent(); - buoyancyTriggerVolume.SetValue("_owCollider", owCollider); + buoyancyTriggerVolume._owCollider = owCollider; var fluidVolume = buoyancyObject.AddComponent(); - fluidVolume.SetValue("_fluidType", FluidVolume.Type.WATER); - fluidVolume.SetValue("_attachedBody", rb); - fluidVolume.SetValue("_triggerVolume", buoyancyTriggerVolume); - fluidVolume.SetValue("_radius", waterSize); - fluidVolume.SetValue("_layer", LayerMask.NameToLayer("BassicEffectVolume")); + fluidVolume._fluidType = FluidVolume.Type.WATER; + fluidVolume._attachedBody = rb; + fluidVolume._triggerVolume = buoyancyTriggerVolume; + fluidVolume._radius = waterSize; + fluidVolume._layer = LayerMask.NameToLayer("BassicEffectVolume"); var fogGO = GameObject.Instantiate(GameObject.Find("GiantsDeep_Body/Sector_GD/Sector_GDInterior/Effects_GDInterior/OceanFog"), waterGO.transform); fogGO.name = "OceanFog"; diff --git a/NewHorizons/Builder/General/BaseBuilder.cs b/NewHorizons/Builder/General/BaseBuilder.cs index 00831a87..32fbe2eb 100644 --- a/NewHorizons/Builder/General/BaseBuilder.cs +++ b/NewHorizons/Builder/General/BaseBuilder.cs @@ -28,12 +28,12 @@ namespace NewHorizons.Builder.General kinematicRigidBody.centerOfMass = Vector3.zero; OWRigidbody owRigidBody = body.AddComponent(); - owRigidBody.SetValue("_kinematicSimulation", true); - owRigidBody.SetValue("_autoGenerateCenterOfMass", true); + owRigidBody._kinematicSimulation = true; + owRigidBody._autoGenerateCenterOfMass = true; owRigidBody.SetIsTargetable(true); - owRigidBody.SetValue("_maintainOriginalCenterOfMass", true); - owRigidBody.SetValue("_rigidbody", rigidBody); - owRigidBody.SetValue("_kinematicRigidbody", kinematicRigidBody); + owRigidBody._maintainOriginalCenterOfMass = true; + owRigidBody._rigidbody = rigidBody; + owRigidBody._kinematicRigidbody = kinematicRigidBody; owRigidBody._origParent = GameObject.Find("SolarSystemRoot").transform; owRigidBody.EnableKinematicSimulation(); owRigidBody.MakeKinematic(); @@ -49,10 +49,10 @@ namespace NewHorizons.Builder.General else if (config.Base.HasCometTail) type = AstroObject.Type.Comet; else if (config.Star != null) type = AstroObject.Type.Star; else if (config.FocalPoint != null) type = AstroObject.Type.None; - astroObject.SetValue("_type", type); - astroObject.SetValue("_name", AstroObject.Name.CustomString); - astroObject.SetValue("_customName", config.Name); - astroObject.SetValue("_primaryBody", primaryBody); + astroObject._type = type; + astroObject._name = AstroObject.Name.CustomString; + astroObject._customName = config.Name; + astroObject._primaryBody = primaryBody; // Expand gravitational sphere of influence of the primary to encompass this body if needed if (primaryBody?.gameObject?.GetComponent() != null && !config.Orbit.IsStatic) @@ -66,7 +66,7 @@ namespace NewHorizons.Builder.General { var alignment = body.AddComponent(); alignment.SetTargetBody(primaryBody?.GetAttachedOWRigidbody()); - alignment.SetValue("_usePhysicsToRotate", true); + alignment._usePhysicsToRotate = true; if(config.Orbit.AlignmentAxis == null) { alignment._localAlignmentAxis = new Vector3(0, -1, 0); diff --git a/NewHorizons/Builder/General/MarkerBuilder.cs b/NewHorizons/Builder/General/MarkerBuilder.cs index 936c1320..208912b1 100644 --- a/NewHorizons/Builder/General/MarkerBuilder.cs +++ b/NewHorizons/Builder/General/MarkerBuilder.cs @@ -13,7 +13,7 @@ namespace NewHorizons.Builder.General public static void Make(GameObject body, string name, IPlanetConfig config) { MapMarker mapMarker = body.AddComponent(); - mapMarker.SetValue("_labelID", (UITextType)TranslationHandler.AddUI(config.Name)); + mapMarker._labelID = (UITextType)TranslationHandler.AddUI(config.Name); var markerType = MapMarker.MarkerType.Planet; diff --git a/NewHorizons/Builder/General/SpawnPointBuilder.cs b/NewHorizons/Builder/General/SpawnPointBuilder.cs index d74923f0..5df421bf 100644 --- a/NewHorizons/Builder/General/SpawnPointBuilder.cs +++ b/NewHorizons/Builder/General/SpawnPointBuilder.cs @@ -34,7 +34,7 @@ namespace NewHorizons.Builder.General spawnGO.transform.localPosition = module.ShipSpawnPoint; var spawnPoint = spawnGO.AddComponent(); - spawnPoint.SetValue("_isShipSpawn", true); + spawnPoint._isShipSpawn = true; var ship = GameObject.Find("Ship_Body"); ship.transform.position = spawnPoint.transform.position; diff --git a/NewHorizons/Builder/Props/RaftBuilder.cs b/NewHorizons/Builder/Props/RaftBuilder.cs index 723dceef..b9e06222 100644 --- a/NewHorizons/Builder/Props/RaftBuilder.cs +++ b/NewHorizons/Builder/Props/RaftBuilder.cs @@ -49,9 +49,9 @@ namespace NewHorizons.Builder.Props kinematicRigidBody.centerOfMass = Vector3.zero; var owRigidBody = raftObject.AddComponent(); - owRigidBody.SetValue("_kinematicSimulation", true); - owRigidBody.SetValue("_rigidbody", rigidBody); - owRigidBody.SetValue("_kinematicRigidbody", kinematicRigidBody); + owRigidBody._kinematicSimulation = true; + owRigidBody._rigidbody = rigidBody; + owRigidBody._kinematicRigidbody = kinematicRigidBody; kinematicRigidBody._rigidbody = rigidBody; kinematicRigidBody._owRigidbody = owRigidBody; diff --git a/NewHorizons/Utility/DebugReload.cs b/NewHorizons/Utility/DebugReload.cs index 8a82a7b6..60feb96b 100644 --- a/NewHorizons/Utility/DebugReload.cs +++ b/NewHorizons/Utility/DebugReload.cs @@ -42,6 +42,7 @@ namespace NewHorizons.Utility } Main.AssetBundles.Clear(); TranslationHandler.ClearTables(); + TextTranslation.Get().SetLanguage(TextTranslation.Get().GetLanguage()); Logger.Log("Begin reload of config files...", Logger.LogType.Log);