diff --git a/Barotrauma/BarotraumaClient/LinuxClient.csproj b/Barotrauma/BarotraumaClient/LinuxClient.csproj
index 1889a1b31..080c09481 100644
--- a/Barotrauma/BarotraumaClient/LinuxClient.csproj
+++ b/Barotrauma/BarotraumaClient/LinuxClient.csproj
@@ -56,26 +56,6 @@
true
0
-
- true
- ..\bin\x86\ReleaseLinux\
- TRACE;LINUX;CLIENT
- true
- pdbonly
- x86
- MinimumRecommendedRules.ruleset
- true
-
-
- true
- ..\bin\x86\DebugLinux\
- TRACE;DEBUG;LINUX;CLIENT
- 0
- full
- x86
- MinimumRecommendedRules.ruleset
- true
-
diff --git a/Barotrauma/BarotraumaClient/MacClient.csproj b/Barotrauma/BarotraumaClient/MacClient.csproj
index e6cd9801a..99902b0ca 100644
--- a/Barotrauma/BarotraumaClient/MacClient.csproj
+++ b/Barotrauma/BarotraumaClient/MacClient.csproj
@@ -55,26 +55,6 @@
true
0
-
- true
- ..\bin\x86\ReleaseMac\
- TRACE;OSX;CLIENT
- true
- pdbonly
- x86
- MinimumRecommendedRules.ruleset
- true
-
-
- true
- ..\bin\x86\DebugMac\
- TRACE;DEBUG;OSX;CLIENT
- 0
- full
- x86
- MinimumRecommendedRules.ruleset
- true
-
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs
index 8f9276859..bcf133b30 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs
@@ -152,6 +152,32 @@ namespace Barotrauma
}
+ if (character.MemLocalState.Count > 120) character.MemLocalState.RemoveRange(0, character.MemLocalState.Count - 120);
+ character.MemState.Clear();
+ }
+ }
+
+ partial void ImpactProjSpecific(float impact, Body body)
+ {
+ float volume = MathHelper.Clamp(impact - 3.0f, 0.5f, 1.0f);
+
+ if (body.UserData is Limb limb && character.Stun <= 0f)
+ {
+ if (impact > 3.0f) { PlayImpactSound(limb); }
+ }
+ else if (body.UserData is Limb || body == Collider.FarseerBody)
+ {
+ if (!character.IsRemotePlayer && impact > ImpactTolerance)
+ {
+ SoundPlayer.PlayDamageSound("LimbBlunt", strongestImpact, Collider);
+ }
+ }
+ if (Character.Controlled == character)
+ {
+ GameMain.GameScreen.Cam.Shake = Math.Min(Math.Max(strongestImpact, GameMain.GameScreen.Cam.Shake), 3.0f);
+ }
+ }
+
if (character.MemState.Count < 1) return;
overrideTargetMovement = Vector2.Zero;
diff --git a/Barotrauma/BarotraumaClient/Source/EventInput/EventInput.cs b/Barotrauma/BarotraumaClient/Source/EventInput/EventInput.cs
index ee3619634..557196cd5 100644
--- a/Barotrauma/BarotraumaClient/Source/EventInput/EventInput.cs
+++ b/Barotrauma/BarotraumaClient/Source/EventInput/EventInput.cs
@@ -155,9 +155,6 @@ namespace EventInput
return SetWindowLongPtr(hWnd, nIndex, dwNewLong);
}
- [DllImport("user32.dll", CharSet = CharSet.Unicode)]
- static extern IntPtr SetWindowLong(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
-
[DllImport("user32.dll", CharSet = CharSet.Unicode)]
static extern IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
#endif
@@ -176,8 +173,8 @@ namespace EventInput
#if WINDOWS
hookProcDelegate = HookProc;
- prevWndProc = TrySetWindowLong(window.Handle, GWL_WNDPROC,
- Marshal.GetFunctionPointerForDelegate(hookProcDelegate));
+ prevWndProc = SetWindowLongPtr(window.Handle, GWL_WNDPROC,
+ Marshal.GetFunctionPointerForDelegate(hookProcDelegate));
hIMC = ImmGetContext(window.Handle);
#else
diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs
index 8ec9ebd84..0289f5e3d 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs
@@ -74,17 +74,12 @@ namespace Barotrauma
public CrewManager(XElement element, bool isSinglePlayer)
: this(isSinglePlayer)
{
- if (GameMain.Client != null)
+ if (!isSinglePlayer)
{
- //let the server create random conversations in MP
+ DebugConsole.ThrowError("Cannot add messages to single player chat box in multiplayer mode!\n" + Environment.StackTrace);
return;
}
- List availableSpeakers = Character.CharacterList.FindAll(c =>
- c.AIController is HumanAIController &&
- !c.IsDead &&
- c.SpeechImpediment <= 100.0f);
- pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers));
- }
+ if (string.IsNullOrEmpty(text)) { return; }
var characterInfo = new CharacterInfo(subElement);
characterInfos.Add(characterInfo);
@@ -95,6 +90,7 @@ namespace Barotrauma
break;
}
}
+ ChatBox.AddMessage(ChatMessage.Create(senderName, text, messageType, sender));
}
partial void InitProjectSpecific()
@@ -242,24 +238,27 @@ namespace Barotrauma
public IEnumerable GetCharacters()
{
- if (characterInfos.Contains(characterInfo))
- {
- DebugConsole.ThrowError("Tried to add the same character info to CrewManager twice.\n" + Environment.StackTrace);
- return;
- }
+ if (character?.Inventory == null) return null;
- characterInfos.Add(characterInfo);
+ var radioItem = character.Inventory.Items.FirstOrDefault(it => it != null && it.GetComponent() != null);
+ if (radioItem == null) return null;
+ if (requireEquipped && !character.HasEquippedItem(radioItem)) return null;
+
+ return radioItem.GetComponent();
}
public IEnumerable GetCharacterInfos()
{
- if (character == null)
+ if (GameMain.Client != null)
{
- DebugConsole.ThrowError("Tried to remove a null character from CrewManager.\n" + Environment.StackTrace);
+ //let the server create random conversations in MP
return;
}
- characters.Remove(character);
- if (removeInfo) characterInfos.Remove(character.Info);
+ List availableSpeakers = Character.CharacterList.FindAll(c =>
+ c.AIController is HumanAIController &&
+ !c.IsDead &&
+ c.SpeechImpediment <= 100.0f);
+ pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers));
}
public void AddCharacter(Character character)
@@ -633,183 +632,9 @@ namespace Barotrauma
{
characterListBox.BarScroll = roundedPos;
}
- var characterArea = new GUIButton(new RectTransform(new Point(characterInfoWidth, frame.Rect.Height), frame.RectTransform, Anchor.CenterLeft), style: "GUITextBox")
- {
- UserData = character,
- Color = frame.Color,
- SelectedColor = frame.SelectedColor,
- HoverColor = frame.HoverColor,
- ToolTip = characterToolTip
- };
-
- var soundIcon = new GUIImage(new RectTransform(new Point((int)(characterArea.Rect.Height * 0.5f)), characterArea.RectTransform, Anchor.CenterRight) { AbsoluteOffset = new Point(5, 0) },
- "GUISoundIcon")
- {
- UserData = "soundicon",
- CanBeFocused = false,
- Visible = true
- };
- soundIcon.Color = new Color(soundIcon.Color, 0.0f);
- new GUIImage(new RectTransform(new Point((int)(characterArea.Rect.Height * 0.5f)), characterArea.RectTransform, Anchor.CenterRight) { AbsoluteOffset = new Point(5, 0) },
- "GUISoundIconDisabled")
- {
- UserData = "soundicondisabled",
- CanBeFocused = true,
- Visible = false
- };
-
- if (isSinglePlayer)
- {
- characterArea.OnClicked = CharacterClicked;
- }
- else
- {
- characterArea.CanBeFocused = false;
- characterArea.CanBeSelected = false;
- }
-
- var characterImage = new GUICustomComponent(new RectTransform(new Point(characterArea.Rect.Height), characterArea.RectTransform, Anchor.CenterLeft),
- onDraw: (sb, component) => character.Info.DrawIcon(sb, component.Rect.Center.ToVector2(), targetAreaSize: component.Rect.Size.ToVector2()))
- {
- CanBeFocused = false,
- HoverColor = Color.White,
- SelectedColor = Color.White,
- ToolTip = characterToolTip
- };
-
- var characterName = new GUITextBlock(new RectTransform(new Point(characterArea.Rect.Width - characterImage.Rect.Width - soundIcon.Rect.Width - 10, characterArea.Rect.Height),
- characterArea.RectTransform, Anchor.CenterRight) { AbsoluteOffset = new Point(soundIcon.Rect.Width + 10, 0) },
- character.Name, textColor: frame.Color, font: GUI.SmallFont, wrap: true)
- {
- Color = frame.Color,
- HoverColor = Color.Transparent,
- SelectedColor = Color.Transparent,
- CanBeFocused = false,
- ToolTip = characterToolTip,
- AutoScale = true
- };
-
- //---------------- order buttons ----------------
-
- var orderButtonFrame = new GUILayoutGroup(new RectTransform(new Point(100, frame.Rect.Height), frame.RectTransform)
- { AbsoluteOffset = new Point(characterInfoWidth + spacing, 0) },
- isHorizontal: true, childAnchor: Anchor.CenterLeft)
- {
- AbsoluteSpacing = (int)(10 * GUI.Scale),
- UserData = "orderbuttons",
- CanBeFocused = false
- };
-
- //listbox for holding the orders inappropriate for this character
- //(so we can easily toggle their visibility)
- var wrongOrderList = new GUIListBox(new RectTransform(new Point(50, orderButtonFrame.Rect.Height), orderButtonFrame.RectTransform), isHorizontal: true, style: null)
- {
- ScrollBarEnabled = false,
- ScrollBarVisible = false,
- Enabled = false,
- Spacing = spacing,
- ClampMouseRectToParent = false
- };
- wrongOrderList.Content.ClampMouseRectToParent = false;
-
- for (int i = 0; i < orders.Count; i++)
- {
- var order = orders[i];
- if (order.TargetAllCharacters) continue;
-
- RectTransform btnParent = (i >= correctOrderCount + neutralOrderCount) ?
- wrongOrderList.Content.RectTransform :
- orderButtonFrame.RectTransform;
-
- var btn = new GUIButton(new RectTransform(new Point(iconSize, iconSize), btnParent, Anchor.CenterLeft),
- style: null)
- {
- UserData = order
- };
-
- new GUIFrame(new RectTransform(new Vector2(1.5f), btn.RectTransform, Anchor.Center), "OuterGlow")
- {
- Color = Color.Lerp(order.Color, frame.Color, 0.5f) * 0.8f,
- HoverColor = Color.Lerp(order.Color, frame.Color, 0.5f) * 1.0f,
- PressedColor = Color.Lerp(order.Color, frame.Color, 0.5f) * 0.6f,
- UserData = "selected",
- CanBeFocused = false,
- Visible = false
- };
-
- var img = new GUIImage(new RectTransform(Vector2.One, btn.RectTransform), order.Prefab.SymbolSprite);
- img.Scale = iconSize / (float)img.SourceRect.Width;
- img.Color = Color.Lerp(order.Color, frame.Color, 0.5f);
- img.ToolTip = order.Name;
- img.HoverColor = Color.Lerp(img.Color, Color.White, 0.5f);
-
- btn.OnClicked += (GUIButton button, object userData) =>
- {
- if (Character.Controlled == null || Character.Controlled.SpeechImpediment >= 100.0f) return false;
-
- if (btn.GetChildByUserData("selected").Visible)
- {
- SetCharacterOrder(character, Order.PrefabList.Find(o => o.AITag == "dismissed"), null, Character.Controlled);
- }
- else
- {
- if (order.ItemComponentType != null || order.ItemIdentifiers.Length > 0 || order.Options.Length > 1)
- {
- CreateOrderTargetFrame(button, character, order);
- }
- else
- {
- SetCharacterOrder(character, order, null, Character.Controlled);
- }
- }
- return true;
- };
- btn.UserData = order;
- btn.ToolTip = order.Name;
-
- //divider between different groups of orders
- if (i == correctOrderCount - 1 || i == correctOrderCount + neutralOrderCount - 1)
- {
- //TODO: divider sprite
- new GUIFrame(new RectTransform(new Point(8, iconSize), orderButtonFrame.RectTransform), style: "GUIButton");
- }
- }
-
- var toggleWrongOrderBtn = new GUIButton(new RectTransform(new Point((int)(30 * GUI.Scale), wrongOrderList.Rect.Height), wrongOrderList.Content.RectTransform),
- "", style: "UIToggleButton")
- {
- UserData = "togglewrongorder",
- CanBeFocused = false
- };
-
- wrongOrderList.RectTransform.NonScaledSize = new Point(
- wrongOrderList.Content.Children.Sum(c => c.Rect.Width + wrongOrderList.Spacing),
- wrongOrderList.RectTransform.NonScaledSize.Y);
- wrongOrderList.RectTransform.SetAsLastChild();
-
- new GUIFrame(new RectTransform(new Point(
- wrongOrderList.Rect.Width - toggleWrongOrderBtn.Rect.Width - wrongOrderList.Spacing * 2,
- wrongOrderList.Rect.Height), wrongOrderList.Content.RectTransform),
- style: null)
- {
- CanBeFocused = false
- };
-
- //scale to fit the content
- orderButtonFrame.RectTransform.NonScaledSize = new Point(
- orderButtonFrame.Children.Sum(c => c.Rect.Width + orderButtonFrame.AbsoluteSpacing),
- orderButtonFrame.RectTransform.NonScaledSize.Y);
-
- frame.RectTransform.NonScaledSize = new Point(
- characterInfoWidth + spacing + (orderButtonFrame.Rect.Width - wrongOrderList.Rect.Width),
- frame.RectTransform.NonScaledSize.Y);
-
- characterListBox.RectTransform.NonScaledSize = new Point(
- characterListBox.Content.Children.Max(c => c.Rect.Width) + wrongOrderList.Rect.Width,
- characterListBox.RectTransform.NonScaledSize.Y);
- characterListBox.Content.RectTransform.NonScaledSize = characterListBox.RectTransform.NonScaledSize;
- characterListBox.UpdateScrollBarSize();
- return frame;
+ soundIcon.Visible = !muted && !mutedLocally;
+ soundIconDisabled.Visible = muted || mutedLocally;
+ soundIconDisabled.ToolTip = TextManager.Get(mutedLocally ? "MutedLocally" : "MutedGlobally");
}
private IEnumerable