vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build 0.18.11.0

Browse Source
This commit is contained in:
Markus Isberg
2022-06-16 01:03:48 +09:00
parent 856f894203
commit 8e6c601162
14 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/Tutorials/CaptainTutorial.cs
+1 -1
View File
@@ -104,7 +104,7 @@ namespace Barotrauma.Tutorials
foreach (Item item in captain.Inventory.AllItemsMod)
{
if (item.HasTag("identitycard") || item.HasTag("headset")) { continue; }
if (item.HasTag("identitycard") || item.HasTag("mobileradio")) { continue; }
item.Unequip(captain);
captain.Inventory.RemoveItem(item);
}
Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/Tutorials/DoctorTutorial.cs
+1 -1
View File
@@ -107,7 +107,7 @@ namespace Barotrauma.Tutorials
foreach (Item item in doctor.Inventory.AllItemsMod)
{
if (item.HasTag("clothing") || item.HasTag("identitycard") || item.HasTag("headset")) { continue; }
if (item.HasTag("clothing") || item.HasTag("identitycard") || item.HasTag("mobileradio")) { continue; }
item.Unequip(doctor);
doctor.Inventory.RemoveItem(item);
}
Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/Tutorials/EngineerTutorial.cs
+1 -1
View File
@@ -133,7 +133,7 @@ namespace Barotrauma.Tutorials
foreach (Item item in engineer.Inventory.AllItemsMod)
{
if (item.HasTag("clothing") || item.HasTag("identitycard") || item.HasTag("headset")) { continue; }
if (item.HasTag("clothing") || item.HasTag("identitycard") || item.HasTag("mobileradio")) { continue; }
item.Unequip(engineer);
engineer.Inventory.RemoveItem(item);
}
Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/Tutorials/MechanicTutorial.cs
+1 -1
View File
@@ -162,7 +162,7 @@ namespace Barotrauma.Tutorials
foreach (Item item in mechanic.Inventory.AllItemsMod)
{
if (item.HasTag("clothing") || item.HasTag("identitycard") || item.HasTag("headset")) { continue; }
if (item.HasTag("clothing") || item.HasTag("identitycard") || item.HasTag("mobileradio")) { continue; }
item.Unequip(mechanic);
mechanic.Inventory.RemoveItem(item);
}
Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/Tutorials/OfficerTutorial.cs
+1 -1
View File
@@ -143,7 +143,7 @@ namespace Barotrauma.Tutorials
foreach (Item item in officer.Inventory.AllItemsMod)
{
if (item.HasTag("clothing") || item.HasTag("identitycard") || item.HasTag("headset")) { continue; }
if (item.HasTag("clothing") || item.HasTag("identitycard") || item.HasTag("mobileradio")) { continue; }
item.Unequip(officer);
officer.Inventory.RemoveItem(item);
}
Barotrauma/BarotraumaClient/ClientSource/Items/Components/Signal/ConnectionPanel.cs
+3 -2
View File
@@ -147,9 +147,10 @@ namespace Barotrauma.Items.Components
//because some of the wires connected to the panel may not exist yet
long msgStartPos = msg.BitPosition;
msg.ReadUInt16(); //user ID
foreach (Connection connection in Connections)
foreach (Connection _ in Connections)
{
for (int i = 0; i < connection.MaxWires; i++)
uint wireCount = msg.ReadVariableUInt32();
for (int i = 0; i < wireCount; i++)
{
msg.ReadUInt16();
}
Barotrauma/BarotraumaClient/ClientSource/Settings/SettingsMenu.cs
+12 -6
View File
@@ -462,6 +462,8 @@ namespace Barotrauma
Slider(voiceChat, (0, 500), 26, (v) => $"{Round(v)} ms", unsavedConfig.Audio.VoiceChatCutoffPrevention, (v) => unsavedConfig.Audio.VoiceChatCutoffPrevention = Round(v), TextManager.Get("CutoffPreventionTooltip"));
}
private bool inputBoxSelectedThisFrame = false;
private void CreateControlsTab()
{
GUIFrame content = CreateNewContentFrame(Tab.Controls);
@@ -510,16 +512,13 @@ namespace Barotrauma
bool willBeSelected = !btn.Selected;
if (willBeSelected)
{
inputBoxSelectedThisFrame = true;
currentSetter = (v) =>
{
valueSetter(v);
btn.Text = valueNameGetter();
};
}
else
{
currentSetter = null;
}
btn.Selected = willBeSelected;
return true;
@@ -538,6 +537,12 @@ namespace Barotrauma
{
if (currentSetter is null) { return; }
if (PlayerInput.PrimaryMouseButtonClicked() && inputBoxSelectedThisFrame)
{
inputBoxSelectedThisFrame = false;
return;
}
void clearSetter()
{
currentSetter = null;
@@ -551,7 +556,7 @@ namespace Barotrauma
}
var pressedKeys = PlayerInput.GetKeyboardState.GetPressedKeys();
if ((pressedKeys?.Any() ?? false))
if (pressedKeys?.Any() ?? false)
{
if (pressedKeys.Contains(Keys.Escape))
{
@@ -562,7 +567,8 @@ namespace Barotrauma
callSetter(pressedKeys.First());
}
}
else if (PlayerInput.PrimaryMouseButtonClicked() && !(GUI.MouseOn is GUIButton))
else if (PlayerInput.PrimaryMouseButtonClicked() &&
(GUI.MouseOn == null || !(GUI.MouseOn is GUIButton) || GUI.MouseOn.IsChildOf(keyMapList.Content)))
{
callSetter(MouseButton.PrimaryMouse);
}