Microwave UX enhancements (#24547)
* Facelift Microwave UI Includes new background light in UI, Uses predictive input, UI now properly disables buttons when microwave is active * Microwave now shows Elapsed time * Fixed bad formatting * Added new term for "BottomMargin" * Change yellow color * Update StyleNano.cs just spacing fixed * Cook time countdown now detached from server Instead of the server constantly sending out messages for the cook countdown, it is now predicted client side using TimeSpan * Update MicrowaveMenu.xaml forgot to re-add item space
This commit is contained in:
@@ -369,7 +369,8 @@ namespace Content.Server.Kitchen.EntitySystems
|
||||
GetNetEntityArray(component.Storage.ContainedEntities.ToArray()),
|
||||
HasComp<ActiveMicrowaveComponent>(uid),
|
||||
component.CurrentCookTimeButtonIndex,
|
||||
component.CurrentCookTimerTime
|
||||
component.CurrentCookTimerTime,
|
||||
component.CurrentCookTimeEnd
|
||||
));
|
||||
}
|
||||
|
||||
@@ -492,6 +493,7 @@ namespace Content.Server.Kitchen.EntitySystems
|
||||
activeComp.CookTimeRemaining = component.CurrentCookTimerTime * component.CookTimeMultiplier;
|
||||
activeComp.TotalTime = component.CurrentCookTimerTime; //this doesn't scale so that we can have the "actual" time
|
||||
activeComp.PortionedRecipe = portionedRecipe;
|
||||
component.CurrentCookTimeEnd = _gameTiming.CurTime + TimeSpan.FromSeconds(component.CurrentCookTimerTime);
|
||||
if (malfunctioning)
|
||||
activeComp.MalfunctionTime = _gameTiming.CurTime + TimeSpan.FromSeconds(component.MalfunctionInterval);
|
||||
UpdateUserInterfaceState(uid, component);
|
||||
@@ -557,7 +559,7 @@ namespace Content.Server.Kitchen.EntitySystems
|
||||
|
||||
active.CookTimeRemaining -= frameTime;
|
||||
|
||||
RollMalfunction((uid, active,microwave));
|
||||
RollMalfunction((uid, active, microwave));
|
||||
|
||||
//check if there's still cook time left
|
||||
if (active.CookTimeRemaining > 0)
|
||||
@@ -580,6 +582,7 @@ namespace Content.Server.Kitchen.EntitySystems
|
||||
}
|
||||
|
||||
_container.EmptyContainer(microwave.Storage);
|
||||
microwave.CurrentCookTimeEnd = TimeSpan.Zero;
|
||||
UpdateUserInterfaceState(uid, microwave);
|
||||
_audio.PlayPvs(microwave.FoodDoneSound, uid);
|
||||
StopCooking((uid, microwave));
|
||||
@@ -617,6 +620,7 @@ namespace Content.Server.Kitchen.EntitySystems
|
||||
|
||||
ent.Comp.CurrentCookTimeButtonIndex = args.ButtonIndex;
|
||||
ent.Comp.CurrentCookTimerTime = args.NewCookTime;
|
||||
ent.Comp.CurrentCookTimeEnd = TimeSpan.Zero;
|
||||
_audio.PlayPvs(ent.Comp.ClickSound, ent, AudioParams.Default.WithVolume(-2));
|
||||
UpdateUserInterfaceState(ent, ent.Comp);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user