Implement source-backed Scooter vehicle in tutorial and outside
This commit is contained in:
1 parent
8df5e81070
commit
62c07a3d59
44 files changed
+3135
-174
No files matched your search
@@ -10,16 +10,18 @@ public sealed class PlayerSceneBinding : IDisposable
|
||||
private readonly LabSimulation player;
|
||||
private readonly SceneInventory inventory;
|
||||
private readonly string tag;
|
||||
public Scooter? Scooter {get;}
|
||||
public Rocketship? Rocketship { get; }
|
||||
public bool InventoryControlled=>director.InventoryEnabled&&(director.Controlled||
|
||||
Rocketship is{Mounted:true} rocket&&director.ControlledTag==rocket.Actor.Tag);
|
||||
Rocketship is{Mounted:true} rocket&&director.ControlledTag==rocket.Actor.Tag||
|
||||
Scooter is{Mounted:true} scooter&&director.ControlledTag==scooter.Actor.Tag);
|
||||
public int UnsupportedGadgetCleanups { get; private set; }
|
||||
|
||||
public PlayerSceneBinding(SceneDirector director, LabSimulation player, SceneInventory inventory, string tag,
|
||||
Rocketship? rocketship=null)
|
||||
Rocketship? rocketship=null,Scooter? scooter=null)
|
||||
{
|
||||
this.director = director; this.player = player; this.inventory = inventory; this.tag = tag;
|
||||
Rocketship=rocketship;
|
||||
Rocketship=rocketship;Scooter=scooter;
|
||||
if(rocketship!=null)rocketship.RiderHit+=player.RocketImpact;
|
||||
director.ActorPreparing += Prepare;
|
||||
director.AuthoredTransformChanged += Transform;
|
||||
@@ -34,12 +36,31 @@ public sealed class PlayerSceneBinding : IDisposable
|
||||
|
||||
public bool Step(PlayerInput input)
|
||||
{
|
||||
if(player.Noclip&&Rocketship?.Mounted==true)inventory.SelectGadget(-1);
|
||||
if(player.Noclip&&(Rocketship?.Mounted==true||Scooter?.Spawned==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();
|
||||
bool ScooterControl()=>Scooter is{Mounted:true}s&&(director.AuthoredControlledTag==s.Actor.Tag||director.DebugForceControl);
|
||||
var acceptsInput = director.Controlled || player.Noclip || VehicleControl()||ScooterControl();
|
||||
Scooter?.StepBody(FixedStepClock.Step,input);
|
||||
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);});
|
||||
bool JimmyControl()=>(director.Controlled&&Rocketship?.Mounted!=true&&Scooter?.Mounted!=true)||player.Noclip;
|
||||
player.Step(input,JimmyControl(),director.ControlledTag!=null,()=>
|
||||
{
|
||||
if(Scooter is{Spawned:true,Mounted:false}s&&!player.Noclip&&s.TryMount(player.ActorRoot,player.InteractionRadius))
|
||||
{player.EnterScooter();director.TransferControl(s.Actor);}
|
||||
if(!player.InputAfterPlayerUpdate)
|
||||
{
|
||||
if(VehicleControl())Rocketship!.StepInput(input,FixedStepClock.Step);
|
||||
if(ScooterControl())Scooter!.StepInput(input,FixedStepClock.Step);
|
||||
}
|
||||
},JimmyControl);
|
||||
Scooter?.StepFrame(input,FixedStepClock.Step);
|
||||
if(Scooter is{Mounted:true}scooter)
|
||||
{
|
||||
player.ApplyScooterTransform(scooter.Root,scooter.Rotation);
|
||||
director.TransferControl(scooter.Actor);
|
||||
if(player.InputAfterPlayerUpdate&&ScooterControl())scooter.StepInput(input,FixedStepClock.Step);
|
||||
}
|
||||
Scooter?.StepWheels();
|
||||
Rocketship?.StepFrame(input,FixedStepClock.Step);
|
||||
if(Rocketship is{Mounted:true} rocket)
|
||||
{
|
||||
@@ -69,13 +90,25 @@ 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 1 or 2 or 6 or 7 || inventory.SelectedGadget is -1 or 3)
|
||||
if (player.GadgetMode is 0 or 1 or 2 or 4 or 6 or 7 || inventory.SelectedGadget is -1 or 3)
|
||||
{ inventory.SelectGadget(-1); player.GadgetMode = -1; }
|
||||
else if (player.GadgetMode != -1) UnsupportedGadgetCleanups++;
|
||||
}
|
||||
|
||||
private void Selected(int item)
|
||||
{
|
||||
if(Scooter is{Spawned:true}scooter)
|
||||
{
|
||||
bool mounted=scooter.Mounted;
|
||||
if(director.FindActor("C3DGODDARD") is{} dog)
|
||||
{dog.Position=scooter.Root;dog.Rotation=scooter.Rotation;dog.Visible=dog.BodyEnabled=dog.MovementEnabled=true;}
|
||||
scooter.Release();
|
||||
if(mounted)
|
||||
{
|
||||
player.LeaveScooter(scooter.Root,scooter.Rotation,scooter.CameraEye);
|
||||
if(director.FindActor(tag) is{} rider){rider.Animation="RUN";director.TransferControl(rider);}
|
||||
}
|
||||
}
|
||||
if(Rocketship?.Mounted==true)
|
||||
{
|
||||
Rocketship.Release();
|
||||
@@ -85,7 +118,16 @@ public sealed class PlayerSceneBinding : IDisposable
|
||||
if (item==0 && director.FindActor(tag) is{} actor) player.SeedBubbleTilt(actor.Rotation);
|
||||
//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);
|
||||
player.GadgetMode=item==1&&Rocketship==null||item==4&&Scooter==null?-1:GadgetScreen.EquippedMode(item);
|
||||
if(item==4&&Scooter!=null)
|
||||
{
|
||||
if(director.FindActor("C3DGODDARD") is{} dog&&dog.BodyEnabled)
|
||||
{
|
||||
Scooter.Summon(dog.Position,dog.Rotation,player.CameraEye);
|
||||
dog.Visible=dog.BodyEnabled=dog.MovementEnabled=false;
|
||||
}
|
||||
else player.GadgetMode=-1;
|
||||
}
|
||||
if(item==1&&Rocketship!=null)
|
||||
{
|
||||
var rider=director.FindActor(tag)!;
|
||||
@@ -97,8 +139,9 @@ public sealed class PlayerSceneBinding : IDisposable
|
||||
|
||||
public void ResetVehicle()
|
||||
{
|
||||
if(Rocketship?.Mounted==true)inventory.SelectGadget(-1);
|
||||
if(Rocketship?.Mounted==true||Scooter?.Spawned==true)inventory.SelectGadget(-1);
|
||||
Rocketship?.Reset();
|
||||
Scooter?.Reset();
|
||||
}
|
||||
private void DefaultGadget() => inventory.SelectGadget(-1);
|
||||
|
||||
|
||||
Reference in new issue
Block a user