diff --git a/Subsurface/Content/Items/Jobgear/doctorgear.xml b/Subsurface/Content/Items/Jobgear/doctorgear.xml index 10913db3f..12ce2e492 100644 --- a/Subsurface/Content/Items/Jobgear/doctorgear.xml +++ b/Subsurface/Content/Items/Jobgear/doctorgear.xml @@ -36,6 +36,10 @@ + + + + + + + + diff --git a/Subsurface/Properties/AssemblyInfo.cs b/Subsurface/Properties/AssemblyInfo.cs index e35e1e321..01a41e158 100644 --- a/Subsurface/Properties/AssemblyInfo.cs +++ b/Subsurface/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.4.0.0")] -[assembly: AssemblyFileVersion("0.4.0.0")] +[assembly: AssemblyVersion("0.4.0.2")] +[assembly: AssemblyFileVersion("0.4.0.2")] diff --git a/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs b/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs index 2bf8b162b..0f191fd75 100644 --- a/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs +++ b/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs @@ -192,8 +192,6 @@ namespace Barotrauma return; } - if (TargetDir != dir) Flip(); - if (Anim != Animation.UsingConstruction) ResetPullJoints(); if (SimplePhysicsEnabled) @@ -226,6 +224,7 @@ namespace Barotrauma break; } + if (TargetDir != dir) Flip(); foreach (Limb limb in Limbs) { diff --git a/Subsurface/Source/Characters/Character.cs b/Subsurface/Source/Characters/Character.cs index 793f3fa94..b6d15bf26 100644 --- a/Subsurface/Source/Characters/Character.cs +++ b/Subsurface/Source/Characters/Character.cs @@ -1668,7 +1668,7 @@ namespace Barotrauma if (allOk) { bleeding = 0.0f; - Stun = 0.0f; + AnimController.StunTimer = 0.0f; return; } diff --git a/Subsurface/Source/Events/Missions/Mission.cs b/Subsurface/Source/Events/Missions/Mission.cs index 64b1ec523..de10a9780 100644 --- a/Subsurface/Source/Events/Missions/Mission.cs +++ b/Subsurface/Source/Events/Missions/Mission.cs @@ -92,7 +92,7 @@ namespace Barotrauma } } - public static Mission LoadRandom(Location[] locations, Random rand) + public static Mission LoadRandom(Location[] locations, MTRandom rand) { var files = GameMain.SelectedPackage.GetFilesOfType(ContentType.Missions); string configFile = files[rand.Next(files.Count)]; diff --git a/Subsurface/Source/GameSession/CrewManager.cs b/Subsurface/Source/GameSession/CrewManager.cs index 68e3c0a48..2c613449c 100644 --- a/Subsurface/Source/GameSession/CrewManager.cs +++ b/Subsurface/Source/GameSession/CrewManager.cs @@ -206,8 +206,6 @@ namespace Barotrauma public void CreateCrewFrame(List crew, GUIFrame crewFrame) { - int width = 600, height = 400; - //crewFrame = new GUIFrame(new Rectangle(GameMain.GraphicsWidth / 2 - width / 2, GameMain.GraphicsHeight / 2 - height / 2, width, height), GUI.Style); //crewFrame.Padding = new Vector4(10.0f, 10.0f, 10.0f, 10.0f); @@ -242,7 +240,7 @@ namespace Barotrauma protected virtual bool SelectCrewCharacter(GUIComponent component, object obj) { Character character = obj as Character; - if (character == null || character.IsDead || character.IsUnconscious) return false; + if (character == null) return false; var crewFrame = component.Parent; while (crewFrame.Parent!=null) diff --git a/Subsurface/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs b/Subsurface/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs index 24cd84a89..122e046b0 100644 --- a/Subsurface/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs +++ b/Subsurface/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs @@ -18,7 +18,7 @@ namespace Barotrauma.Tutorials public override IEnumerable UpdateState() { - Submarine.Loaded.SetPosition(new Vector2(Submarine.Loaded.Position.X, 38500.0f)); + //Submarine.Loaded.SetPosition(new Vector2(Submarine.Loaded.Position.X, 38500.0f)); //spawn some fish next to the player GameMain.GameScreen.BackgroundCreatureManager.SpawnSprites(2, @@ -276,7 +276,7 @@ namespace Barotrauma.Tutorials infoBox = CreateInfoFrame("Steer the submarine downwards, heading further into the cavern."); - while (Submarine.Loaded.WorldPosition.Y > 29000.0f) + while (Submarine.Loaded.WorldPosition.Y > 40000.0f) { yield return CoroutineStatus.Running; } diff --git a/Subsurface/Source/Networking/NetworkMember.cs b/Subsurface/Source/Networking/NetworkMember.cs index 1ab56e0f2..dc78c8a48 100644 --- a/Subsurface/Source/Networking/NetworkMember.cs +++ b/Subsurface/Source/Networking/NetworkMember.cs @@ -342,7 +342,7 @@ namespace Barotrauma.Networking { if (GameMain.NetworkMember.myCharacter == null) { - GUI.DrawString(spriteBatch, new Vector2(GameMain.GraphicsWidth - 180.0f, 20), + GUI.DrawString(spriteBatch, new Vector2(GameMain.GraphicsWidth - 180.0f, 40), "Votes to end the round (y/n): " + EndVoteCount + "/" + (EndVoteMax - EndVoteCount), Color.White, null, 0, GUI.SmallFont); } else diff --git a/Subsurface/changelog.txt b/Subsurface/changelog.txt index c4ec02a42..8780b7a35 100644 --- a/Subsurface/changelog.txt +++ b/Subsurface/changelog.txt @@ -1,3 +1,15 @@ +--------------------------------------------------------------------------------------------------------- +v0.4.0.2 +--------------------------------------------------------------------------------------------------------- + +- fire doesn't affect items in characters' inventories (e.g. holding a thermal artifact won't blow up +oxygen tanks in your inventory) +- handheld sonars only consume power when they're on +- cargo missions are more common +- fix for endworms (and possibly other large monsters) teleporting partially inside the sub +- some more chemicals/drugs +- doctor's clothes have some extra slots for chemicals + --------------------------------------------------------------------------------------------------------- v0.4.0.1 --------------------------------------------------------------------------------------------------------- diff --git a/Subsurface/config.xml b/Subsurface/config.xml index fa7192526..12baf166c 100644 --- a/Subsurface/config.xml +++ b/Subsurface/config.xml @@ -1,5 +1,5 @@  - +