Implement evidence-backed VR02 Rocketship flight and ownership
This commit is contained in:
1 parent
312efccb77
commit
e77add5fdf
50 files changed
+4326
-66
No files matched your search
@@ -10,11 +10,17 @@ public sealed class PlayerSceneBinding : IDisposable
|
||||
private readonly LabSimulation player;
|
||||
private readonly SceneInventory inventory;
|
||||
private readonly string tag;
|
||||
public Rocketship? Rocketship { get; }
|
||||
public bool InventoryControlled=>director.InventoryEnabled&&(director.Controlled||
|
||||
Rocketship is{Mounted:true} rocket&&director.ControlledTag==rocket.Actor.Tag);
|
||||
public int UnsupportedGadgetCleanups { get; private set; }
|
||||
|
||||
public PlayerSceneBinding(SceneDirector director, LabSimulation player, SceneInventory inventory, string tag)
|
||||
public PlayerSceneBinding(SceneDirector director, LabSimulation player, SceneInventory inventory, string tag,
|
||||
Rocketship? rocketship=null)
|
||||
{
|
||||
this.director = director; this.player = player; this.inventory = inventory; this.tag = tag;
|
||||
Rocketship=rocketship;
|
||||
if(rocketship!=null)rocketship.RiderHit+=player.RocketImpact;
|
||||
director.ActorPreparing += Prepare;
|
||||
director.AuthoredTransformChanged += Transform;
|
||||
director.GadgetReleaseRequested += Release;
|
||||
@@ -27,11 +33,23 @@ public sealed class PlayerSceneBinding : IDisposable
|
||||
|
||||
public bool Step(PlayerInput input)
|
||||
{
|
||||
var acceptsInput = director.Controlled || player.Noclip;
|
||||
player.Step(input, acceptsInput, director.ControlledTag != null);
|
||||
if(player.Noclip&&Rocketship?.Mounted==true)inventory.SelectGadget(-1);
|
||||
bool VehicleControl()=>Rocketship is{Mounted:true} r&&(director.AuthoredControlledTag==r.Actor.Tag||director.DebugForceControl);
|
||||
var acceptsInput = director.Controlled || player.Noclip || VehicleControl();
|
||||
Rocketship?.StepBody(FixedStepClock.Step);
|
||||
player.Step(input,(director.Controlled&&Rocketship?.Mounted!=true)||player.Noclip,director.ControlledTag!=null,
|
||||
()=>{if(!player.InputAfterPlayerUpdate&&VehicleControl())Rocketship!.StepInput(input,FixedStepClock.Step);});
|
||||
Rocketship?.StepFrame(input,FixedStepClock.Step);
|
||||
if(Rocketship is{Mounted:true} rocket)
|
||||
{
|
||||
//43DF70 copies passenger transforms and reasserts ship ownership.
|
||||
player.ApplyAuthoredTransform(rocket.Root,rocket.Rotation.Y);
|
||||
director.TransferControl(rocket.Actor);
|
||||
if(player.InputAfterPlayerUpdate&&VehicleControl())rocket.StepInput(input,FixedStepClock.Step);
|
||||
}
|
||||
if (player.GadgetMode==0 && player.Grounded && director.FindActor(tag) is{} actor) actor.Animation="STOP";
|
||||
var rotation=director.FindActor(tag)?.Rotation ?? Vector3.Zero;
|
||||
director.SyncActor(tag,player.ActorRoot,player.TracksBubbleOrientation
|
||||
director.SyncActor(tag,player.ActorRoot,Rocketship is{Mounted:true} vehicle?vehicle.Rotation:player.TracksBubbleOrientation
|
||||
? new(player.Pitch,player.Yaw,player.Roll) : rotation with{Y=player.Yaw});
|
||||
return acceptsInput;
|
||||
}
|
||||
@@ -50,15 +68,36 @@ public sealed class PlayerSceneBinding : IDisposable
|
||||
if (!string.Equals(actor.Tag, tag, StringComparison.OrdinalIgnoreCase)) return;
|
||||
//427FF0 switches raw mode, not display selection. A rejected Invisible
|
||||
//equip can leave display2 with raw mode-1; cleanup does not equip it.
|
||||
if (player.GadgetMode is 0 or 2 or 6 || inventory.SelectedGadget is -1 or 3)
|
||||
if (player.GadgetMode is 0 or 1 or 2 or 6 || inventory.SelectedGadget is -1 or 3)
|
||||
{ inventory.SelectGadget(-1); player.GadgetMode = -1; }
|
||||
else if (player.GadgetMode != -1) UnsupportedGadgetCleanups++;
|
||||
}
|
||||
|
||||
private void Selected(int item)
|
||||
{
|
||||
if(Rocketship?.Mounted==true)
|
||||
{
|
||||
Rocketship.Release();
|
||||
player.LeaveRocketship(Rocketship.CameraEye);
|
||||
if(director.FindActor(tag) is{} rider){rider.Animation="FALL";director.TransferControl(rider);}
|
||||
}
|
||||
if (item==0 && director.FindActor(tag) is{} actor) player.SeedBubbleTilt(actor.Rotation);
|
||||
player.GadgetMode=GadgetScreen.EquippedMode(item);
|
||||
//The display tile remains available for Practice outside the bounded
|
||||
//live scene; unsupported selection must not invent a Jimmy flight mode.
|
||||
player.GadgetMode=item==1&&Rocketship==null?-1:GadgetScreen.EquippedMode(item);
|
||||
if(item==1&&Rocketship!=null)
|
||||
{
|
||||
var rider=director.FindActor(tag)!;
|
||||
Rocketship.Mount(player.ActorRoot,rider.Rotation with{Y=player.Yaw},player.CameraEye);
|
||||
rider.Animation="DRIVE";
|
||||
director.TransferControl(Rocketship.Actor);
|
||||
}
|
||||
}
|
||||
|
||||
public void ResetVehicle()
|
||||
{
|
||||
if(Rocketship?.Mounted==true)inventory.SelectGadget(-1);
|
||||
Rocketship?.Reset();
|
||||
}
|
||||
private void DefaultGadget() => inventory.SelectGadget(-1);
|
||||
|
||||
@@ -93,5 +132,6 @@ public sealed class PlayerSceneBinding : IDisposable
|
||||
player.Invisible.EquippedChanged -= InvisibleEquipped;
|
||||
player.Baseball.EquippedChanged -= BaseballEquipped;
|
||||
player.DefaultGadgetRequested -= DefaultGadget;
|
||||
if(Rocketship!=null)Rocketship.RiderHit-=player.RocketImpact;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user