Cut 2 of docs/addressables-cut.md. The asset move (git mv
Resources/{Prefabs,Schematics,Sprites/Icons} -> Content/...) and the
UnityHelpers.cs deletion already landed in 1fdf8151, picked up by a
concurrent session sharing this working tree; this commit is the rest
of Cut 2 landing on top of that shared state, atomically:
- Bump CultLib to cultlib-unity-v1.0.60 / caching-unity-v1.4.0 (both
45c2f40) in Packages/manifest.json, packages-lock.json and
Directory.Build.props, together with the 8 ServerShared
[CultInspectorAssetPath] usages becoming [CultInspectorAssetGuid] -
the .NET and Unity sides move together or nothing compiles.
- Assets/Scripts/EngineAssets.cs replaces UnityHelpers: loads an
Addressables key (bare GUID or guid[subAsset]) synchronously,
loading the GameObject and taking the component for the four sites
that load a component. ActionBarSlot, EntityInstance, ShipInstance
and ZoneRenderer call it instead of Resources.Load/UnityHelpers; the
inline "Assets/Resources/" prefix strips are gone with them.
CultCacheDrawers' schematic preview goes through
AssetDatabase.GUIDToAssetPath first.
- Assets/Scripts/Editor/EngineAssetCheck.cs validates every stored
[CultInspectorAssetGuid] value: 32 lowercase hex, resolves to a file,
is addressable, and satisfies its member's consumer-type contract
(Texture2D for icons/logos/schematics, a GameObject with the right
component for prefabs) - table-driven, so an attributed member with
no row fails loudly instead of being skipped.
- GameData/Aetheria.cc: the scratch migration (Aetheria.Shared + the
pinned CultLib revision, a throwaway console app, never landed)
walked all 138 attributed field slots across 180 documents,
rewriting the 30 non-empty Resources paths to their .meta GUIDs -
108 stayed empty, 0 unresolved, matching the map's census exactly.
Verification: dotnet test tests/Aetheria.Shared.Tests 61/61 green
against CultLib 45c2f40; Unity 6000.3.24f1 batchmode compiles clean;
EngineAssetCheck.Run passes all 30 stored references; the map's
negative greps are clean; tests/mutation_tests.py's 5 mutations (wrong
type, non-addressable, random guid, an old path, and an untabled
attributed member) are all caught and named, the control case and the
post-revert recompile stay clean, and the catalog/source are restored
byte-identical afterward.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
147 lines
No EOL
5.5 KiB
C#
147 lines
No EOL
5.5 KiB
C#
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
|
|
using GameCult.Caching;
|
|
using MessagePack;
|
|
using Newtonsoft.Json;
|
|
using CultMath;
|
|
using static CultMath.math;
|
|
|
|
[Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), EntityTypeRestriction(HullType.Ship), RuntimeInspectable]
|
|
public class AetherDriveData : BehaviorData
|
|
{
|
|
[Inspectable, JsonProperty("diameters"), Key(1)]
|
|
public float3 RotorDiameter;
|
|
|
|
[Inspectable, JsonProperty("masses"), Key(2)]
|
|
public float3 RotorMass;
|
|
|
|
[Inspectable, JsonProperty("rpm"), Key(3), RuntimeInspectable]
|
|
public PerformanceStat MaximumRpm;
|
|
|
|
[Inspectable, JsonProperty("couplingLambdas"), Key(4)]
|
|
public float3 CouplingLambda;
|
|
|
|
[Inspectable, JsonProperty("lambdaMultiplier"), Key(5)]
|
|
public PerformanceStat LambdaMultiplier;
|
|
|
|
[Inspectable, JsonProperty("couplingEfficiency"), Key(6), RuntimeInspectable]
|
|
public PerformanceStat CouplingEfficiency;
|
|
|
|
[Inspectable, JsonProperty("torque"), Key(7), RuntimeInspectable]
|
|
public PerformanceStat Torque;
|
|
|
|
[Inspectable, JsonProperty("torqueProfile"), Key(8), RuntimeInspectable]
|
|
public BezierCurve TorqueProfile;
|
|
|
|
[Inspectable, JsonProperty("draw"), Key(9), RuntimeInspectable]
|
|
public PerformanceStat EnergyDraw;
|
|
|
|
[Inspectable, JsonProperty("passiveCoupling"), Key(10), RuntimeInspectable]
|
|
public PerformanceStat PassiveCoupling;
|
|
|
|
[Inspectable, JsonProperty("rpmAudio"), Key(11), RuntimeInspectable]
|
|
public uint RpmAudioParameter;
|
|
|
|
[Inspectable, JsonProperty("torqueAudio"), Key(12), RuntimeInspectable]
|
|
public uint TorqueRatioAudioParameter;
|
|
|
|
[Inspectable, CultInspectorAssetGuid, JsonProperty("particles"), Key(13)]
|
|
public string Particles;
|
|
|
|
public override Behavior CreateInstance(EquippedItem item)
|
|
{
|
|
return new AetherDrive(this, item);
|
|
}
|
|
|
|
public override Behavior CreateInstance(ConsumableItemEffect item)
|
|
{
|
|
return new AetherDrive(this, item);
|
|
}
|
|
}
|
|
|
|
public class AetherDrive : Behavior
|
|
{
|
|
private AetherDriveData _data;
|
|
private float3 _axis;
|
|
|
|
public float3 Thrust { get; private set; }
|
|
public float3 Rpm { get; private set; }
|
|
public float MaximumRpm { get; private set; }
|
|
public float2 ThrustDirection { get; private set; }
|
|
|
|
public AetherDriveData DriveData => _data;
|
|
|
|
public float3 Axis
|
|
{
|
|
get => _axis;
|
|
set => _axis = clamp(value, -1, 1);
|
|
}
|
|
|
|
public AetherDrive(AetherDriveData data, EquippedItem item) : base(data, item)
|
|
{
|
|
_data = data;
|
|
}
|
|
|
|
public AetherDrive(AetherDriveData data, ConsumableItemEffect item) : base(data, item)
|
|
{
|
|
_data = data;
|
|
}
|
|
|
|
public override bool Execute(float dt)
|
|
{
|
|
var rotorSpeed = Rpm * _data.RotorDiameter / 100;
|
|
|
|
var forward = normalize(Entity.Direction);
|
|
var right = forward.Rotate(ItemRotation.Clockwise);
|
|
|
|
var speed = float2(dot(Entity.Velocity, forward), dot(Entity.Velocity, right));
|
|
var couplingEfficiency = Evaluate(_data.CouplingEfficiency);
|
|
var efficiency = float3(saturate(1 - speed / max(rotorSpeed.xy, 1) * sign(_axis.xy)) * couplingEfficiency, 1);
|
|
|
|
Thrust = (Rpm - decay(Rpm, _data.CouplingLambda, dt)) * _data.RotorMass * efficiency;
|
|
|
|
var couplingLambda = _data.CouplingLambda * Item.Evaluate(_data.LambdaMultiplier) * max(abs(_axis), Evaluate(_data.PassiveCoupling));
|
|
var previousRpm = Rpm;
|
|
Rpm = decay(Rpm, couplingLambda, dt);
|
|
var rpmLoss = previousRpm - Rpm;
|
|
var force = rpmLoss * _data.RotorMass * efficiency;
|
|
|
|
var heat = rpmLoss * _data.RotorMass * (1 - couplingEfficiency);
|
|
AddHeat((heat.x + heat.y + heat.z)*ItemManager.GameplaySettings.AetherHeatMultiplier);
|
|
|
|
ThrustDirection = forward * (_axis.x * force.x / Entity.Mass) + right * (_axis.y * force.y / Entity.Mass);
|
|
Entity.Velocity += ThrustDirection;
|
|
|
|
Entity.Direction = mul(Entity.Direction,
|
|
CultMath.float2x2.Rotate(force.z * _axis.z * ItemManager.GameplaySettings.AetherTorqueMultiplier / Entity.Mass));
|
|
|
|
if(float.IsNaN(Entity.Velocity.x))
|
|
ItemManager.Log("FUCK FUCK FUCK FUCK");
|
|
|
|
MaximumRpm = Evaluate(_data.MaximumRpm);
|
|
var torqueProfile = float3(
|
|
_data.TorqueProfile.Evaluate(Rpm.x / MaximumRpm),
|
|
_data.TorqueProfile.Evaluate(Rpm.y / MaximumRpm),
|
|
_data.TorqueProfile.Evaluate(Rpm.z / MaximumRpm));
|
|
var potentialTorque = Evaluate(_data.Torque) * torqueProfile;
|
|
var potentialRpmDelta = potentialTorque / length(_data.RotorMass) * dt;
|
|
var actualRpmDelta = min(MaximumRpm - Rpm, potentialRpmDelta);
|
|
var torqueRatio = actualRpmDelta / potentialRpmDelta;
|
|
var draw = torqueRatio * Evaluate(_data.EnergyDraw) / 3;
|
|
|
|
Item.SetAudioParameter(SpecialAudioParameter.Intensity, max(max(abs(_axis.x), abs(_axis.y)), abs(_axis.z)));
|
|
Item.SetAudioParameter(_data.RpmAudioParameter, (Rpm.x + Rpm.y + Rpm.z) / 3 / MaximumRpm);
|
|
Item.SetAudioParameter(_data.TorqueRatioAudioParameter, max(max(torqueRatio.x, torqueRatio.y), torqueRatio.z));
|
|
|
|
if (Entity.TryConsumeEnergy((draw.x + draw.y + draw.z)*dt))
|
|
{
|
|
Rpm += actualRpmDelta;
|
|
return true;
|
|
}
|
|
|
|
|
|
return false;
|
|
}
|
|
} |