From 45e3bed07c1e650dbba025a92d24b5620343d5dc Mon Sep 17 00:00:00 2001 From: Regalis Date: Sun, 24 Apr 2016 20:33:33 +0300 Subject: [PATCH] Some more fabricable chemicals, made cargo missions more common, items in characters' inventories aren't affected by fire --- .../Content/Items/Fabricators/fabricators.xml | 10 ++++- .../Content/Items/Fabricators/materials.xml | 5 +++ Subsurface/Content/Items/Medical/medical.xml | 42 ++++++++++++++++++- Subsurface/Content/Jobs.xml | 2 +- Subsurface/Content/Missions.xml | 10 ++--- Subsurface/Source/Characters/AICharacter.cs | 6 +-- Subsurface/Source/Items/Inventory.cs | 2 +- Subsurface/Source/Map/FireSource.cs | 2 +- Subsurface/Source/Networking/NetworkMember.cs | 12 +++++- 9 files changed, 75 insertions(+), 16 deletions(-) diff --git a/Subsurface/Content/Items/Fabricators/fabricators.xml b/Subsurface/Content/Items/Fabricators/fabricators.xml index 01bf900e1..271179d1c 100644 --- a/Subsurface/Content/Items/Fabricators/fabricators.xml +++ b/Subsurface/Content/Items/Fabricators/fabricators.xml @@ -118,7 +118,15 @@ - + + + + + + + + + diff --git a/Subsurface/Content/Items/Fabricators/materials.xml b/Subsurface/Content/Items/Fabricators/materials.xml index 44e167ed8..32c8e39a6 100644 --- a/Subsurface/Content/Items/Fabricators/materials.xml +++ b/Subsurface/Content/Items/Fabricators/materials.xml @@ -29,6 +29,11 @@ canbepicked="true" price="100"> + + + + + diff --git a/Subsurface/Content/Items/Medical/medical.xml b/Subsurface/Content/Items/Medical/medical.xml index e9986d730..ae81ef990 100644 --- a/Subsurface/Content/Items/Medical/medical.xml +++ b/Subsurface/Content/Items/Medical/medical.xml @@ -194,7 +194,7 @@ - + @@ -351,13 +351,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + pickdistance="150" + description="A highly potent neurotoxin."> diff --git a/Subsurface/Content/Jobs.xml b/Subsurface/Content/Jobs.xml index 1029f4b1a..4e9bd5773 100644 --- a/Subsurface/Content/Jobs.xml +++ b/Subsurface/Content/Jobs.xml @@ -79,7 +79,7 @@ - + diff --git a/Subsurface/Content/Missions.xml b/Subsurface/Content/Missions.xml index a1ce2101b..6ab71adfc 100644 --- a/Subsurface/Content/Missions.xml +++ b/Subsurface/Content/Missions.xml @@ -70,7 +70,7 @@ @@ -88,7 +88,7 @@ @@ -109,7 +109,7 @@ @@ -128,7 +128,7 @@ @@ -144,7 +144,7 @@ diff --git a/Subsurface/Source/Characters/AICharacter.cs b/Subsurface/Source/Characters/AICharacter.cs index c26ee7684..71341552d 100644 --- a/Subsurface/Source/Characters/AICharacter.cs +++ b/Subsurface/Source/Characters/AICharacter.cs @@ -98,7 +98,7 @@ namespace Barotrauma message.Write(AnimController.RefLimb.SimPosition.X); message.Write(AnimController.RefLimb.SimPosition.Y); - message.Write(AnimController.RefLimb.Rotation); + //message.Write(AnimController.RefLimb.Rotation); message.WriteRangedSingle(MathHelper.Clamp(AnimController.StunTimer, 0.0f, 60.0f), 0.0f, 60.0f, 8); message.Write((byte)((health / maxHealth) * 255.0f)); @@ -148,7 +148,7 @@ namespace Barotrauma limbPos.X = message.ReadFloat(); limbPos.Y = message.ReadFloat(); - rotation = message.ReadFloat(); + //rotation = message.ReadFloat(); } catch (Exception e) { @@ -161,7 +161,7 @@ namespace Barotrauma if (AnimController.RefLimb.body != null) { AnimController.RefLimb.body.TargetPosition = limbPos; - AnimController.RefLimb.body.TargetRotation = rotation; + //AnimController.RefLimb.body.TargetRotation = rotation; } float newStunTimer = 0.0f, newHealth = 0.0f, newBleeding = 0.0f; diff --git a/Subsurface/Source/Items/Inventory.cs b/Subsurface/Source/Items/Inventory.cs index 746bf0100..5413c3ff9 100644 --- a/Subsurface/Source/Items/Inventory.cs +++ b/Subsurface/Source/Items/Inventory.cs @@ -313,7 +313,7 @@ namespace Barotrauma selectedSlot = containerRect.Contains(PlayerInput.MousePosition) && !Locked ? slotIndex : -1; - GUI.DrawRectangle(spriteBatch, containerRect, Color.Black * 0.8f, true); + GUI.DrawRectangle(spriteBatch, new Rectangle(containerRect.X, containerRect.Y, containerRect.Width, containerRect.Height - 50), Color.Black * 0.8f, true); GUI.DrawRectangle(spriteBatch, containerRect, Color.White); Item[] containedItems = null; diff --git a/Subsurface/Source/Map/FireSource.cs b/Subsurface/Source/Map/FireSource.cs index 7545fa229..7dcdc44cf 100644 --- a/Subsurface/Source/Map/FireSource.cs +++ b/Subsurface/Source/Map/FireSource.cs @@ -250,7 +250,7 @@ namespace Barotrauma foreach (Item item in Item.ItemList) { if (item.CurrentHull != hull || item.FireProof || item.Condition <= 0.0f) continue; - //if (item.ParentInventory != null) return; + if (item.ParentInventory != null && item.ParentInventory.Owner is Character) return; float range = (float)Math.Sqrt(size.X) * 10.0f; if (item.Position.X < position.X - range || item.Position.X > position.X + size.X + range) continue; diff --git a/Subsurface/Source/Networking/NetworkMember.cs b/Subsurface/Source/Networking/NetworkMember.cs index 52e196935..1ab56e0f2 100644 --- a/Subsurface/Source/Networking/NetworkMember.cs +++ b/Subsurface/Source/Networking/NetworkMember.cs @@ -340,8 +340,16 @@ namespace Barotrauma.Networking if (EndVoteCount > 0) { - GUI.DrawString(spriteBatch, new Vector2(GameMain.GraphicsWidth - 140.0f, 40), - "Votes (y/n): " + EndVoteCount + "/" + (EndVoteMax - EndVoteCount), Color.White, null, 0, GUI.SmallFont); + if (GameMain.NetworkMember.myCharacter == null) + { + GUI.DrawString(spriteBatch, new Vector2(GameMain.GraphicsWidth - 180.0f, 20), + "Votes to end the round (y/n): " + EndVoteCount + "/" + (EndVoteMax - EndVoteCount), Color.White, null, 0, GUI.SmallFont); + } + else + { + GUI.DrawString(spriteBatch, new Vector2(GameMain.GraphicsWidth - 140.0f, 40), + "Votes (y/n): " + EndVoteCount + "/" + (EndVoteMax - EndVoteCount), Color.White, null, 0, GUI.SmallFont); + } } }