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

Unstable 1.1.14.0

Browse Source
This commit is contained in:
Markus Isberg
2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Screens/GameScreen.cs
+8 -9
View File
@@ -162,26 +162,25 @@ namespace Barotrauma
sw.Stop();
GameMain.PerformanceCounter.AddElapsedTicks("Update:Level", sw.ElapsedTicks);
if (Character.Controlled != null)
if (Character.Controlled is { } controlled)
{
if (Character.Controlled.SelectedItem != null && Character.Controlled.CanInteractWith(Character.Controlled.SelectedItem))
if (controlled.SelectedItem != null && controlled.CanInteractWith(controlled.SelectedItem))
{
Character.Controlled.SelectedItem.UpdateHUD(cam, Character.Controlled, (float)deltaTime);
controlled.SelectedItem.UpdateHUD(cam, controlled, (float)deltaTime);
}
if (Character.Controlled.Inventory != null)
if (controlled.Inventory != null)
{
foreach (Item item in Character.Controlled.Inventory.AllItems)
foreach (Item item in controlled.Inventory.AllItems)
{
if (Character.Controlled.HasEquippedItem(item))
if (controlled.HasEquippedItem(item))
{
item.UpdateHUD(cam, Character.Controlled, (float)deltaTime);
item.UpdateHUD(cam, controlled, (float)deltaTime);
}
}
}
}
sw.Restart();
sw.Restart();
Character.UpdateAll((float)deltaTime, cam);
#elif SERVER
Barotrauma/BarotraumaShared/SharedSource/Screens/NetLobbyScreen.cs
+21 -22
View File
@@ -30,28 +30,12 @@ namespace Barotrauma
GameMain.Server.ServerSettings.SelectedLevelDifficulty = difficulty;
lastUpdateID++;
}
#endif
#if CLIENT
#elif CLIENT
levelDifficultyScrollBar.BarScroll = difficulty / 100.0f;
levelDifficultyScrollBar.OnMoved(levelDifficultyScrollBar, levelDifficultyScrollBar.BarScroll);
#endif
}
public void ToggleTraitorsEnabled(int dir)
{
#if SERVER
if (GameMain.Server == null) return;
lastUpdateID++;
int index = (int)GameMain.Server.ServerSettings.TraitorsEnabled + dir;
if (index < 0) index = 2;
if (index > 2) index = 0;
SetTraitorsEnabled((YesNoMaybe)index);
#endif
}
public void SetBotCount(int botCount)
{
#if SERVER
@@ -89,13 +73,28 @@ namespace Barotrauma
#endif
}
public void SetTraitorsEnabled(YesNoMaybe enabled)
public void SetTraitorProbability(float probability)
{
#if SERVER
if (GameMain.Server != null) GameMain.Server.ServerSettings.TraitorsEnabled = enabled;
#endif
if (GameMain.NetworkMember != null)
{
GameMain.NetworkMember.ServerSettings.TraitorProbability = probability;
}
#if CLIENT
traitorProbabilityText.Text = TextManager.Get(enabled.ToString());
traitorProbabilitySlider.BarScroll = probability;
traitorProbabilitySlider.OnMoved(traitorProbabilitySlider, traitorProbabilitySlider.BarScroll);
#endif
}
public void SetTraitorDangerLevel(int dangerLevel)
{
if (GameMain.NetworkMember != null)
{
GameMain.NetworkMember.ServerSettings.TraitorDangerLevel = dangerLevel;
}
#if SERVER
if (GameMain.Server != null) { GameMain.Server.ServerSettings.TraitorDangerLevel = dangerLevel; }
#elif CLIENT
SetTraitorDangerIndicators(dangerLevel);
#endif
}
}