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

Unstable 0.17.6.0

Browse Source
This commit is contained in:
Markus Isberg
2022-04-04 16:46:08 +09:00
parent 44ded0225a
commit 95764d1fa8
78 changed files with 1265 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Fabricator.cs
+14 -13
View File
@@ -4,9 +4,7 @@ using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Reflection.Metadata;
namespace Barotrauma.Items.Components
{
@@ -53,15 +51,12 @@ namespace Barotrauma.Items.Components
[Serialize("vendingmachine.outofstock", IsPropertySaveable.Yes)]
public string FabricationLimitReachedText { get; set; }
partial void InitProjSpecific()
{
//CreateGUI();
}
protected override void OnResolutionChanged()
{
base.OnResolutionChanged();
OnItemLoadedProjSpecific();
if (GuiFrame != null)
{
OnItemLoadedProjSpecific();
}
}
protected override void CreateGUI()
@@ -162,7 +157,7 @@ namespace Barotrauma.Items.Components
// === ACTIVATE BUTTON === //
var buttonFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.3f, 0.8f), inputArea.RectTransform), childAnchor: Anchor.CenterRight);
activateButton = new GUIButton(new RectTransform(new Vector2(1f, 0.6f), buttonFrame.RectTransform),
TextManager.Get(CreateButtonText), style: "DeviceButton")
TextManager.Get(CreateButtonText), style: "DeviceButtonFixedSize")
{
OnClicked = StartButtonClicked,
UserData = selectedItem,
@@ -173,7 +168,7 @@ namespace Barotrauma.Items.Components
{
bottomFrame.RectTransform.RelativeSize = new Vector2(1.0f, 0.1f);
activateButton = new GUIButton(new RectTransform(new Vector2(0.3f, 1.0f), bottomFrame.RectTransform, Anchor.CenterRight),
TextManager.Get(CreateButtonText), style: "DeviceButton")
TextManager.Get(CreateButtonText), style: "DeviceButtonFixedSize")
{
OnClicked = StartButtonClicked,
UserData = selectedItem,
@@ -566,7 +561,7 @@ namespace Barotrauma.Items.Components
LocalizedString itemName = GetRecipeNameAndAmount(selectedItem);
LocalizedString name = itemName;
float quality = GetFabricatedItemQuality(selectedItem, user);
float quality = selectedItem.Quality ?? GetFabricatedItemQuality(selectedItem, user);
if (quality > 0)
{
name = TextManager.GetWithVariable("itemname.quality" + (int)quality, "[itemname]", itemName + '\n')
@@ -636,7 +631,7 @@ namespace Barotrauma.Items.Components
float requiredTime = overrideRequiredTime ??
(user == null ? selectedItem.RequiredTime : GetRequiredTime(selectedItem, user));
if (requiredTime > 0.0f)
if ((int)requiredTime > 0)
{
new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedReqFrame.RectTransform),
TextManager.Get("FabricatorRequiredTime") , textColor: ToolBox.GradientLerp(degreeOfSuccess, GUIStyle.Red, Color.Yellow, GUIStyle.Green), font: GUIStyle.SubHeadingFont)
@@ -778,6 +773,12 @@ namespace Barotrauma.Items.Components
UInt16 userID = msg.ReadUInt16();
Character user = Entity.FindEntityByID(userID) as Character;
ushort reachedLimitCount = msg.ReadUInt16();
for (int i = 0; i < reachedLimitCount; i++)
{
fabricationLimits[msg.ReadUInt32()] = 0;
}
State = newState;
if (newState == FabricatorState.Stopped || recipeHash == 0)
{
Barotrauma/BarotraumaClient/ClientSource/Items/Components/StatusHUD.cs
+1 -1
View File
@@ -320,7 +320,7 @@ namespace Barotrauma.Items.Components
}
}
GUI.DrawString(spriteBatch, hudPos, texts[0], textColors[0] * alpha, Color.Black * 0.7f * alpha, 2, GUIStyle.SubHeadingFont);
GUI.DrawString(spriteBatch, hudPos, texts[0].Value, textColors[0] * alpha, Color.Black * 0.7f * alpha, 2, GUIStyle.SubHeadingFont, ForceUpperCase.No);
hudPos.X += 5.0f;
hudPos.Y += 24.0f * GameSettings.CurrentConfig.Graphics.TextScale;
Barotrauma/BarotraumaClient/ClientSource/Items/Item.cs
+28 -17
View File
@@ -77,7 +77,7 @@ namespace Barotrauma
get { return base.Rect; }
set
{
cachedVisibleSize = null;
cachedVisibleExtents = null;
base.Rect = value;
}
}
@@ -213,11 +213,11 @@ namespace Barotrauma
UpdateSpriteStates(0.0f);
}
private Vector2? cachedVisibleSize;
private Rectangle? cachedVisibleExtents;
public void ResetCachedVisibleSize()
{
cachedVisibleSize = null;
cachedVisibleExtents = null;
}
public override bool IsVisible(Rectangle worldView)
@@ -234,28 +234,39 @@ namespace Barotrauma
return false;
}
Vector2 size;
if (cachedVisibleSize.HasValue)
Rectangle extents;
if (cachedVisibleExtents.HasValue)
{
size = cachedVisibleSize.Value;
extents = cachedVisibleExtents.Value;
}
else
{
float padding = 100.0f;
size = new Vector2(rect.Width + padding, rect.Height + padding);
int padding = 100;
Vector2 min = new Vector2(-rect.Width / 2 - padding, -rect.Height / 2 - padding);
Vector2 max = -min;
foreach (IDrawableComponent drawable in drawableComponents)
{
size.X = Math.Max(drawable.DrawSize.X, size.X);
size.Y = Math.Max(drawable.DrawSize.Y, size.Y);
min.X = Math.Min(min.X, -drawable.DrawSize.X / 2);
min.Y = Math.Min(min.Y, -drawable.DrawSize.Y / 2);
max.X = Math.Max(max.X, drawable.DrawSize.X / 2);
max.Y = Math.Max(max.Y, drawable.DrawSize.Y / 2);
}
size *= 0.5f;
cachedVisibleSize = size;
foreach (DecorativeSprite decorativeSprite in Prefab.DecorativeSprites)
{
float scale = decorativeSprite.GetScale(spriteAnimState[decorativeSprite].RandomScaleFactor) * Scale;
min.X = Math.Min(-decorativeSprite.Sprite.size.X * decorativeSprite.Sprite.RelativeOrigin.X * scale, min.X);
min.Y = Math.Min(-decorativeSprite.Sprite.size.Y * (1.0f - decorativeSprite.Sprite.RelativeOrigin.Y) * scale, min.Y);
max.X = Math.Max(decorativeSprite.Sprite.size.X * (1.0f - decorativeSprite.Sprite.RelativeOrigin.X) * scale, max.X);
max.Y = Math.Max(decorativeSprite.Sprite.size.Y * decorativeSprite.Sprite.RelativeOrigin.Y * scale, max.Y);
}
cachedVisibleExtents = extents = new Rectangle(min.ToPoint(), max.ToPoint());
}
//cache world position so we don't need to calculate it 4 times
Vector2 worldPosition = WorldPosition;
if (worldPosition.X - size.X > worldView.Right || worldPosition.X + size.X < worldView.X) return false;
if (worldPosition.Y + size.Y < worldView.Y - worldView.Height || worldPosition.Y - size.Y > worldView.Y) return false;
if (worldPosition.X + extents.X > worldView.Right || worldPosition.X + extents.Width < worldView.X) { return false; }
if (worldPosition.Y + extents.Height < worldView.Y - worldView.Height || worldPosition.Y + extents.Y > worldView.Y) { return false; }
return true;
}
@@ -934,8 +945,8 @@ namespace Barotrauma
{
OnSelected = (component, userData) =>
{
string text = userData as string ?? "";
AddTag(text);
if (!(userData is Identifier)) { return true; }
AddTag((Identifier)userData);
textBox.Text = Tags;
msgBox.Close();
return true;