From 37f44b87fac719a5ce2c0f1649aa455b09fbf9ee Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Wed, 27 Mar 2019 20:47:30 +0200 Subject: [PATCH] (43425b834) Added: Video looping, replaying, pre-video text --- .../BarotraumaClient/Source/DebugConsole.cs | 189 ++++++++++++++++++ .../Source/GUI/VideoPlayer.cs | 114 +++-------- .../GameModes/Tutorials/ContextualTutorial.cs | 46 ++++- .../Source/Networking/GameClient.cs | 3 + .../Source/Characters/AI/EnemyAIController.cs | 17 +- .../Source/Characters/Animation/Ragdoll.cs | 2 + .../BarotraumaShared/Source/Map/Explosion.cs | 3 + .../Source/Physics/PhysicsBody.cs | 12 ++ 8 files changed, 285 insertions(+), 101 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/DebugConsole.cs b/Barotrauma/BarotraumaClient/Source/DebugConsole.cs index 9968e51b7..88976a848 100644 --- a/Barotrauma/BarotraumaClient/Source/DebugConsole.cs +++ b/Barotrauma/BarotraumaClient/Source/DebugConsole.cs @@ -1863,6 +1863,195 @@ namespace Barotrauma })); + commands.Add(new Command("refreshrect", "Updates the dimensions of the selected items to match the ones defined in the prefab. Applied only in the subeditor.", (string[] args) => + { + //TODO: maybe do this automatically during loading when possible? + if (Screen.Selected == GameMain.SubEditorScreen) + { + if (!MapEntity.SelectedAny) + { + ThrowError("You have to select item(s) first!"); + } + else + { + foreach (var mapEntity in MapEntity.SelectedList) + { + if (mapEntity is Item item) + { + item.Rect = new Rectangle(item.Rect.X, item.Rect.Y, + (int)(item.Prefab.sprite.size.X * item.Prefab.Scale), + (int)(item.Prefab.sprite.size.Y * item.Prefab.Scale)); + } + else if (mapEntity is Structure structure) + { + if (!structure.ResizeHorizontal) + { + structure.Rect = new Rectangle(structure.Rect.X, structure.Rect.Y, + (int)structure.Prefab.ScaledSize.X, + structure.Rect.Height); + } + if (!structure.ResizeVertical) + { + structure.Rect = new Rectangle(structure.Rect.X, structure.Rect.Y, + structure.Rect.Width, + (int)structure.Prefab.ScaledSize.Y); + } + } + } + } + } + }, isCheat: false)); +#endif + + GameMain.Config.SaveNewPlayerConfig(); + + commands.Add(new Command("loadtexts", "loadtexts [sourcefile] [destinationfile]: Loads all lines of text from a given .txt file and inserts them sequientially into the elements of an xml file. If the file paths are omitted, EnglishVanilla.txt and EnglishVanilla.xml are used.", (string[] args) => + { + string sourcePath = args.Length > 0 ? args[0] : "Content/Texts/EnglishVanilla.txt"; + string destinationPath = args.Length > 1 ? args[1] : "Content/Texts/EnglishVanilla.xml"; + + string[] lines; + try + { + lines = File.ReadAllLines(sourcePath); + } + catch (Exception e) + { + ThrowError("Reading the file \"" + sourcePath + "\" failed.", e); + return; + } + var doc = XMLExtensions.TryLoadXml(destinationPath); + int i = 0; + foreach (XElement element in doc.Root.Elements()) + { + if (i >= lines.Length) + { + ThrowError("Error while loading texts to the xml file. The xml has more elements than the number of lines in the text file."); + return; + } + element.Value = lines[i]; + i++; + } + doc.Save(destinationPath); + }, + () => + { + var files = TextManager.GetTextFiles().Select(f => f.Replace("\\", "/")); + return new string[][] + { + files.Where(f => Path.GetExtension(f)==".txt").ToArray(), + files.Where(f => Path.GetExtension(f)==".xml").ToArray() + }; + })); + + commands.Add(new Command("updatetextfile", "updatetextfile [sourcefile] [destinationfile]: Inserts all the xml elements that are only present in the source file into the destination file. Can be used to update outdated translation files more easily.", (string[] args) => + { + if (args.Length < 2) return; + string sourcePath = args[0]; + string destinationPath = args[1]; + + var sourceDoc = XMLExtensions.TryLoadXml(sourcePath); + var destinationDoc = XMLExtensions.TryLoadXml(destinationPath); + + XElement destinationElement = destinationDoc.Root.Elements().First(); + foreach (XElement element in sourceDoc.Root.Elements()) + { + if (destinationDoc.Root.Element(element.Name) == null) + { + element.Value = "!!!!!!!!!!!!!" + element.Value; + destinationElement.AddAfterSelf(element); + } + XNode nextNode = destinationElement.NextNode; + while ((!(nextNode is XElement) || nextNode == element) && nextNode != null) nextNode = nextNode.NextNode; + destinationElement = nextNode as XElement; + } + destinationDoc.Save(destinationPath); + }, + () => + { + var files = TextManager.GetTextFiles().Where(f => Path.GetExtension(f) == ".xml").Select(f => f.Replace("\\", "/")).ToArray(); + return new string[][] + { + files, + files + }; + })); + + commands.Add(new Command("dumpentitytexts", "dumpentitytexts [filepath]: gets the names and descriptions of all entity prefabs and writes them into a file along with xml tags that can be used in translation files. If the filepath is omitted, the file is written to Content/Texts/EntityTexts.txt", (string[] args) => + { + string filePath = args.Length > 0 ? args[0] : "Content/Texts/EntityTexts.txt"; + List lines = new List(); + foreach (MapEntityPrefab me in MapEntityPrefab.List) + { + lines.Add("" + me.Name + ""); + lines.Add("" + me.Description + ""); + } + File.WriteAllLines(filePath, lines); + })); +#if DEBUG + commands.Add(new Command("checkduplicates", "Checks the given language for duplicate translation keys and writes to file.", (string[] args) => + { + if (args.Length != 1) return; + TextManager.CheckForDuplicates(args[0]); + })); + + commands.Add(new Command("writetocsv", "Writes the default language (English) to a .csv file.", (string[] args) => + { + TextManager.WriteToCSV(); + NPCConversation.WriteToCSV(); + })); + + commands.Add(new Command("csvtoxml", "csvtoxml [language] -> Converts .csv localization files in Content/NPCConversations & Content/Texts to .xml for use in-game.", (string[] args) => + { + if (args.Length == 0) return; + LocalizationCSVtoXML.Convert(args[0]); + })); +#endif + + commands.Add(new Command("cleanbuild", "", (string[] args) => + { + GameMain.Config.MusicVolume = 0.5f; + GameMain.Config.SoundVolume = 0.5f; + NewMessage("Music and sound volume set to 0.5", Color.Green); + + commands.Add(new Command("camerasettings", "camerasettings [defaultzoom] [zoomsmoothness] [movesmoothness] [minzoom] [maxzoom]: debug command for testing camera settings. The values default to 1.1, 8.0, 8.0, 0.1 and 2.0.", (string[] args) => + { + float defaultZoom = Screen.Selected.Cam.DefaultZoom; + if (args.Length > 0) float.TryParse(args[0], NumberStyles.Number, CultureInfo.InvariantCulture, out defaultZoom); + + float zoomSmoothness = Screen.Selected.Cam.ZoomSmoothness; + if (args.Length > 1) float.TryParse(args[1], NumberStyles.Number, CultureInfo.InvariantCulture, out zoomSmoothness); + float moveSmoothness = Screen.Selected.Cam.MoveSmoothness; + if (args.Length > 2) float.TryParse(args[2], NumberStyles.Number, CultureInfo.InvariantCulture, out moveSmoothness); + + float minZoom = Screen.Selected.Cam.MinZoom; + if (args.Length > 3) float.TryParse(args[3], NumberStyles.Number, CultureInfo.InvariantCulture, out minZoom); + float maxZoom = Screen.Selected.Cam.MaxZoom; + if (args.Length > 4) float.TryParse(args[4], NumberStyles.Number, CultureInfo.InvariantCulture, out maxZoom); + + Screen.Selected.Cam.DefaultZoom = defaultZoom; + Screen.Selected.Cam.ZoomSmoothness = zoomSmoothness; + Screen.Selected.Cam.MoveSmoothness = moveSmoothness; + Screen.Selected.Cam.MinZoom = minZoom; + Screen.Selected.Cam.MaxZoom = maxZoom; + })); + + commands.Add(new Command("waterparams", "waterparams [distortionscalex] [distortionscaley] [distortionstrengthx] [distortionstrengthy] [bluramount]: default 0.5 0.5 0.5 0.5 1", (string[] args) => + { + float distortScaleX = 0.5f, distortScaleY = 0.5f; + float distortStrengthX = 0.5f, distortStrengthY = 0.5f; + float blurAmount = 0.0f; + if (args.Length > 0) float.TryParse(args[0], NumberStyles.Number, CultureInfo.InvariantCulture, out distortScaleX); + if (args.Length > 1) float.TryParse(args[1], NumberStyles.Number, CultureInfo.InvariantCulture, out distortScaleY); + if (args.Length > 2) float.TryParse(args[2], NumberStyles.Number, CultureInfo.InvariantCulture, out distortStrengthX); + if (args.Length > 3) float.TryParse(args[3], NumberStyles.Number, CultureInfo.InvariantCulture, out distortStrengthY); + if (args.Length > 4) float.TryParse(args[4], NumberStyles.Number, CultureInfo.InvariantCulture, out blurAmount); + WaterRenderer.DistortionScale = new Vector2(distortScaleX, distortScaleY); + WaterRenderer.DistortionStrength = new Vector2(distortStrengthX, distortStrengthY); + WaterRenderer.BlurAmount = blurAmount; + })); + + commands.Add(new Command("refreshrect", "Updates the dimensions of the selected items to match the ones defined in the prefab. Applied only in the subeditor.", (string[] args) => { //TODO: maybe do this automatically during loading when possible? diff --git a/Barotrauma/BarotraumaClient/Source/GUI/VideoPlayer.cs b/Barotrauma/BarotraumaClient/Source/GUI/VideoPlayer.cs index a50c25947..a7b414449 100644 --- a/Barotrauma/BarotraumaClient/Source/GUI/VideoPlayer.cs +++ b/Barotrauma/BarotraumaClient/Source/GUI/VideoPlayer.cs @@ -12,7 +12,8 @@ namespace Barotrauma class VideoPlayer { private Video currentVideo; - private List preloadedVideos; + private Point resolution; + private string contentPath; private GUIFrame background, videoFrame, textFrame; private GUITextBlock title, textContent, objectiveTitle, objectiveText; @@ -35,30 +36,14 @@ namespace Barotrauma private readonly int objectiveFrameHeight = 60; private readonly int textHeight = 25; - private class PreloadedContent - { - public string ContentName; - public string ContentTag; - public Video Video; - public Point Resolution; - - public PreloadedContent(string name, string tag, Video video, Point resolution) - { - ContentName = name; - ContentTag = tag; - Video = video; - Resolution = resolution; - } - } - public struct TextSettings { public string Text; public int Width; - public TextSettings(XElement element, params object[] args) + public TextSettings(XElement element) { - Text = TextManager.GetFormatted(element.GetAttributeString("tag", string.Empty), true, args); + Text = TextManager.GetFormatted(element.GetAttributeString("text", string.Empty), true); Width = element.GetAttributeInt("width", 300); } } @@ -97,45 +82,7 @@ namespace Barotrauma objectiveTitle.Text = TextManager.Get("NewObjective"); objectiveText = new GUITextBlock(new RectTransform(new Point(textFrame.Rect.Width, textHeight), textFrame.RectTransform, Anchor.TopCenter, Pivot.TopCenter), string.Empty, font: GUI.ObjectiveNameFont, textColor: new Color(4, 180, 108), textAlignment: Alignment.CenterRight); - preloadedVideos = new List(); - } - - public void PreloadContent(string contentPath, string contentTag, string contentId, VideoSettings videoSettings) - { - if (preloadedVideos.Find(s => s.ContentName == contentId) != null) return; // Already loaded - Point resolution = new Point(videoSettings.Width, videoSettings.Height); - - if (resolution.X == 0 || resolution.Y == 0) - { - resolution = defaultResolution; - } - - preloadedVideos.Add(new PreloadedContent(contentId, contentTag, CreateVideo(contentPath, resolution), resolution)); - } - - public void RemoveAllPreloaded() - { - if (preloadedVideos == null || preloadedVideos.Count == 0) return; - - for (int i = 0; i < preloadedVideos.Count; i++) - { - preloadedVideos[i] = null; - } - - preloadedVideos.Clear(); - } - - public void RemovePreloadedByTag(string tag) - { - if (preloadedVideos == null || preloadedVideos.Count == 0) return; - - for (int i = 0; i < preloadedVideos.Count; i++) - { - if (preloadedVideos[i].ContentTag != tag) continue; - preloadedVideos[i] = null; - preloadedVideos.RemoveAt(i); - i--; - } + objectiveTitle.Visible = objectiveText.Visible = false; } public void Play() @@ -160,10 +107,19 @@ namespace Barotrauma public void Update() { + if (currentVideo == null) return; + if (PlayerInput.KeyHit(Keys.Enter)) { DisposeVideo(null, null); + return; } + + if (currentVideo.IsPlaying) return; + + currentVideo.Dispose(); + currentVideo = null; + currentVideo = CreateVideo(); } public void AddToGUIUpdateList() @@ -191,19 +147,8 @@ namespace Barotrauma currentVideo = null; } - PreloadedContent preloaded = null; - Point resolution = new Point(0, 0); - - if (preloadedVideos != null && preloadedVideos.Count > 0) - { - preloaded = preloadedVideos.Find(s => s.ContentName == contentId); - - if (preloaded != null) - { - currentVideo = preloaded.Video; - resolution = preloaded.Resolution; - } - } + this.contentPath = contentPath; + resolution = new Point(0, 0); if (currentVideo == null) // No preloaded video found { @@ -214,9 +159,11 @@ namespace Barotrauma resolution = defaultResolution; } - currentVideo = CreateVideo(contentPath, resolution); + currentVideo = CreateVideo(); } + objectiveTitle.Visible = objectiveText.Visible = true; + videoFrame.RectTransform.NonScaledSize += resolution + new Point(borderSize, borderSize); videoView.RectTransform.NonScaledSize += resolution; @@ -268,19 +215,8 @@ namespace Barotrauma currentVideo = null; } - PreloadedContent preloaded = null; - Point resolution = new Point(0, 0); - - if (preloadedVideos != null && preloadedVideos.Count > 0) - { - preloaded = preloadedVideos.Find(s => s.ContentName == contentId); - - if (preloaded != null) - { - currentVideo = preloaded.Video; - resolution = preloaded.Resolution; - } - } + this.contentPath = contentPath; + resolution = new Point(0, 0); if (currentVideo == null) // No preloaded video found { @@ -291,9 +227,11 @@ namespace Barotrauma resolution = defaultResolution; } - currentVideo = CreateVideo(contentPath, resolution); + currentVideo = CreateVideo(); } + objectiveTitle.Visible = objectiveText.Visible = false; + videoFrame.RectTransform.NonScaledSize += resolution + new Point(borderSize, borderSize); videoView.RectTransform.NonScaledSize += resolution; @@ -331,7 +269,7 @@ namespace Barotrauma objectiveText.RectTransform.NonScaledSize = Point.Zero; } - private Video CreateVideo(string contentPath, Point resolution) + private Video CreateVideo() { Video video = null; @@ -361,8 +299,6 @@ namespace Barotrauma currentVideo.Dispose(); currentVideo = null; } - - RemoveAllPreloaded(); } } } diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs index 63ac9ab61..0774d6dd8 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs @@ -29,6 +29,7 @@ namespace Barotrauma.Tutorials private Character mechanic; private Character engineer; private Character injuredMember = null; + private float injuredVitalitySnapshot; private List> characterTimeOnSonar; private float requiredTimeOnSonar = 5f; @@ -53,6 +54,7 @@ namespace Barotrauma.Tutorials public XElement TextContent; public XElement VideoContent; public bool IsTriggered; + public GUIButton replayButton; public GUITextBlock LinkedTitle, LinkedText; public TutorialSegment(XElement config) @@ -265,6 +267,11 @@ namespace Barotrauma.Tutorials public override void Update(float deltaTime) { + if (videoPlayer != null) + { + videoPlayer.Update(); + } + if (!started || ContentRunning) return; deltaTime *= 0.5f; @@ -284,6 +291,12 @@ namespace Barotrauma.Tutorials } } + private void ClosePreTextAndTriggerVideoCallback() + { + string fileName = "1_CommandReactor/command_reactor_video.mp4"; + videoPlayer.LoadContentWithObjective(playableContentPath + fileName, new VideoPlayer.VideoSettings(activeSegment.VideoContent), new VideoPlayer.TextSettings(activeSegment.VideoContent), activeSegment.Id, true, activeSegment.Objective, CurrentSegmentStopCallback); + } + private void CurrentSegmentStopCallback() { if (!string.IsNullOrEmpty(activeSegment.Objective)) @@ -299,15 +312,20 @@ namespace Barotrauma.Tutorials { activeObjectives.Add(segment); - segment.LinkedTitle = new GUITextBlock(new RectTransform(new Vector2(0.8f, 0.0f + (2.5f * activeObjectives.Count - 1)), objectiveFrame.RectTransform, Anchor.TopCenter, Pivot.TopCenter), TextManager.Get("Objective"), textColor: Color.White, font: GUI.ObjectiveTitleFont, textAlignment: Alignment.CenterRight); - segment.LinkedText = new GUITextBlock(new RectTransform(new Vector2(0.8f, 1f + (2.5f * activeObjectives.Count - 1)), objectiveFrame.RectTransform, Anchor.TopCenter, Pivot.TopCenter), segment.Objective, textColor: new Color(4, 180, 108), font: GUI.ObjectiveNameFont, textAlignment: Alignment.CenterRight); + segment.replayButton = new GUIButton(new RectTransform(new Vector2(0.8f, 1.0f + (2.5f * activeObjectives.Count - 1)), objectiveFrame.RectTransform, Anchor.TopCenter, Pivot.TopCenter)); + segment.replayButton.OnClicked += (GUIButton btn, object userdata) => + { + ReplaySegmentVideo(segment); + return true; + }; + + segment.LinkedTitle = new GUITextBlock(new RectTransform(new Vector2(0.8f, 0.0f), segment.replayButton.RectTransform, Anchor.TopCenter, Pivot.TopCenter), TextManager.Get("Objective"), textColor: Color.White, font: GUI.ObjectiveTitleFont, textAlignment: Alignment.CenterRight); + segment.LinkedText = new GUITextBlock(new RectTransform(new Vector2(0.8f, 1f), segment.replayButton.RectTransform, Anchor.TopCenter, Pivot.TopCenter), segment.Objective, textColor: new Color(4, 180, 108), font: GUI.ObjectiveNameFont, textAlignment: Alignment.CenterRight); } private void RemoveCompletedObjective(TutorialSegment objective) { - objective.LinkedTitle.FadeOut(1f, true); - objective.LinkedText.FadeOut(1f, true); - + objective.replayButton.FadeOut(1f, true); CoroutineManager.StartCoroutine(WaitForObjectiveFade(objective)); } @@ -442,6 +460,7 @@ namespace Barotrauma.Tutorials Character member = crew[i]; if (member.Vitality < member.MaxVitality && !member.IsDead) { + injuredVitalitySnapshot = member.Vitality; injuredMember = member; TriggerTutorialSegment(index, new string[] { member.Info.DisplayName, (member.Info.Gender == Gender.Male) ? TextManager.Get("PronounPossessiveMale").ToLower() : TextManager.Get("PronounPossessiveFemale").ToLower() }); @@ -500,8 +519,9 @@ namespace Barotrauma.Tutorials if (IsFlooding()) return; break; case "Medical": - if (injuredMember.Vitality < injuredMember.MaxVitality && !injuredMember.IsDead) + if (injuredVitalitySnapshot >= injuredMember.Vitality && !injuredMember.IsDead) { + injuredVitalitySnapshot = injuredMember.Vitality; return; } break; @@ -673,8 +693,10 @@ namespace Barotrauma.Tutorials case ContentTypes.None: break; case ContentTypes.Video: - string fileName = "1_CommandReactor/command_reactor_video.mp4"; - videoPlayer.LoadContentWithObjective(playableContentPath + fileName, new VideoPlayer.VideoSettings(activeSegment.VideoContent), new VideoPlayer.TextSettings(activeSegment.TextContent, args), activeSegment.Id, true, objectiveText, CurrentSegmentStopCallback); + infoBox = CreateInfoFrame(TextManager.Get(activeSegment.Id), tutorialText, + activeSegment.TextContent.GetAttributeInt("width", 300), + activeSegment.TextContent.GetAttributeInt("height", 80), + activeSegment.TextContent.GetAttributeString("anchor", "Center"), true, ClosePreTextAndTriggerVideoCallback); break; case ContentTypes.TextOnly: infoBox = CreateInfoFrame(TextManager.Get(activeSegment.Id), tutorialText, @@ -692,6 +714,14 @@ namespace Barotrauma.Tutorials CoroutineManager.StartCoroutine(WaitToStop()); // Completed } + private void ReplaySegmentVideo(TutorialSegment segment) + { + if (ContentRunning) return; + ContentRunning = true; + string fileName = "1_CommandReactor/command_reactor_video.mp4"; + videoPlayer.LoadContent(playableContentPath + fileName, new VideoPlayer.VideoSettings(segment.VideoContent), new VideoPlayer.TextSettings(segment.VideoContent), segment.Id, true, () => ContentRunning = false); + } + private IEnumerable WaitToStop() { while (ContentRunning) yield return null; diff --git a/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs b/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs index 5f642d3a6..c663cbb27 100644 --- a/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs +++ b/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs @@ -1392,6 +1392,9 @@ namespace Barotrauma.Networking case ServerNetObject.CLIENT_LIST: ReadClientList(inc); break; + case ServerNetObject.CLIENT_LIST: + ReadClientList(inc); + break; case ServerNetObject.CHAT_MESSAGE: ChatMessage.ClientRead(inc); break; diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs index fb666ed9b..a27834410 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs @@ -1022,10 +1022,6 @@ namespace Barotrauma targetingTag = targetCharacter.SpeciesName.ToLowerInvariant(); } else if (targetingPriorities.ContainsKey(targetCharacter.SpeciesName.ToLowerInvariant())) - { - targetingTag = targetCharacter.SpeciesName.ToLowerInvariant(); - } - else if (targetingPriorities.ContainsKey(targetCharacter.SpeciesName.ToLowerInvariant())) { if (targetCharacter.AIController is EnemyAIController enemy) { @@ -1192,6 +1188,19 @@ namespace Barotrauma return (int)Math.Ceiling(ConvertUnits.ToDisplayUnits(colliderSize) / Structure.WallSectionSize); } + #endregion + + protected override void OnStateChanged(AIState from, AIState to) + { + latchOntoAI?.DeattachFromBody(); + Character.AnimController.ReleaseStuckLimbs(); + } + + private int GetMinimumPassableHoleCount() + { + return (int)Math.Ceiling(ConvertUnits.ToDisplayUnits(colliderSize) / Structure.WallSectionSize); + } + private bool CanPassThroughHole(Structure wall, int sectionIndex) { int requiredHoleCount = GetMinimumPassableHoleCount(); diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs b/Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs index ee0bb1d66..0bbd94574 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs @@ -1053,6 +1053,8 @@ namespace Barotrauma CheckValidity(); + CheckValidity(); + UpdateNetPlayerPosition(deltaTime); CheckDistFromCollider(); UpdateCollisionCategories(); diff --git a/Barotrauma/BarotraumaShared/Source/Map/Explosion.cs b/Barotrauma/BarotraumaShared/Source/Map/Explosion.cs index 4192c99bc..9d0422954 100644 --- a/Barotrauma/BarotraumaShared/Source/Map/Explosion.cs +++ b/Barotrauma/BarotraumaShared/Source/Map/Explosion.cs @@ -210,6 +210,9 @@ namespace Barotrauma Hull hull = Hull.FindHull(ConvertUnits.ToDisplayUnits(explosionPos), null, false); bool underWater = hull == null || explosionPos.Y < hull.Surface; + Hull hull = Hull.FindHull(ConvertUnits.ToDisplayUnits(explosionPos), null, false); + bool underWater = hull == null || explosionPos.Y < hull.Surface; + explosionPos = ConvertUnits.ToSimUnits(explosionPos); Dictionary distFactors = new Dictionary(); diff --git a/Barotrauma/BarotraumaShared/Source/Physics/PhysicsBody.cs b/Barotrauma/BarotraumaShared/Source/Physics/PhysicsBody.cs index 2d8b9cd49..e64b86c6b 100644 --- a/Barotrauma/BarotraumaShared/Source/Physics/PhysicsBody.cs +++ b/Barotrauma/BarotraumaShared/Source/Physics/PhysicsBody.cs @@ -144,6 +144,18 @@ namespace Barotrauma private set; } + public Vector2 LinearVelocity + { + get; + private set; + } + + public float AngularVelocity + { + get; + private set; + } + public readonly float Timestamp; public readonly UInt16 ID;