-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into moth_speech
- Loading branch information
Showing
106 changed files
with
3,198 additions
and
146 deletions.
There are no files selected for viewing
53 changes: 53 additions & 0 deletions
53
Content.Client/BluespaceHarvester/BluespaceHarvesterBoundUserInterface.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
using Content.Shared.BluespaceHarvester; | ||
using JetBrains.Annotations; | ||
|
||
namespace Content.Client.BluespaceHarvester; | ||
|
||
[UsedImplicitly] | ||
public sealed class BluespaceHarvesterBoundUserInterface : BoundUserInterface | ||
{ | ||
private BluespaceHarvesterMenu? _window; | ||
|
||
public BluespaceHarvesterBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) | ||
{ | ||
} | ||
|
||
protected override void Open() | ||
{ | ||
base.Open(); | ||
|
||
_window = new BluespaceHarvesterMenu(this); | ||
_window.OnClose += Close; | ||
_window?.OpenCentered(); | ||
} | ||
|
||
protected override void Dispose(bool disposing) | ||
{ | ||
base.Dispose(disposing); | ||
if (!disposing) | ||
return; | ||
|
||
_window?.Dispose(); | ||
_window = null; | ||
} | ||
|
||
protected override void UpdateState(BoundUserInterfaceState state) | ||
{ | ||
base.UpdateState(state); | ||
|
||
if (state is not BluespaceHarvesterBoundUserInterfaceState current) | ||
return; | ||
|
||
_window?.UpdateState(current); | ||
} | ||
|
||
public void SendTargetLevel(int level) | ||
{ | ||
SendMessage(new BluespaceHarvesterTargetLevelMessage(level)); | ||
} | ||
|
||
public void SendBuy(Shared.BluespaceHarvester.BluespaceHarvesterCategory category) | ||
{ | ||
SendMessage(new BluespaceHarvesterBuyMessage(category)); | ||
} | ||
} |
6 changes: 6 additions & 0 deletions
6
Content.Client/BluespaceHarvester/BluespaceHarvesterCategory.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
<Control xmlns="https://spacestation14.io"> | ||
<GridContainer Margin = "2 0 0 0" Columns="2"> | ||
<Label Name="CategoryLabel" Text="Category" StyleClasses="StatusFieldTitle"></Label> | ||
<Button Name="CategoryButton" Text="10000" StyleClasses="OpenRight" Access="Public"/> | ||
</GridContainer> | ||
</Control> |
20 changes: 20 additions & 0 deletions
20
Content.Client/BluespaceHarvester/BluespaceHarvesterCategory.xaml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
using Robust.Client.AutoGenerated; | ||
using Robust.Client.UserInterface; | ||
using Robust.Client.UserInterface.XAML; | ||
using Content.Shared.BluespaceHarvester; | ||
|
||
namespace Content.Client.BluespaceHarvester; | ||
|
||
[GenerateTypedNameReferences] | ||
public sealed partial class BluespaceHarvesterCategory : Control | ||
{ | ||
public BluespaceHarvesterCategory(BluespaceHarvesterCategoryInfo category, bool canBuy) | ||
{ | ||
RobustXamlLoader.Load(this); | ||
|
||
CategoryLabel.Text = Loc.GetString($"bluespace-harvester-category-{Enum.GetName(typeof(Shared.BluespaceHarvester.BluespaceHarvesterCategory), category.Type)}"); | ||
|
||
CategoryButton.Text = $"{category.Cost}"; | ||
CategoryButton.Disabled = !canBuy; | ||
} | ||
} |
46 changes: 46 additions & 0 deletions
46
Content.Client/BluespaceHarvester/BluespaceHarvesterMenu.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
<controls:FancyWindow xmlns="https://spacestation14.io" | ||
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls" | ||
Title="{Loc 'bluespace-harvester-window-title'}" | ||
MinSize="480 360"> | ||
<BoxContainer Orientation="Vertical"> | ||
<Label Text="{Loc 'bluespace-harvester-window-lable-input'}"/> | ||
<controls:HLine Color="#404040" Thickness="2" Margin="0 5"/> | ||
<GridContainer Margin="2 0 0 0" Columns="2"> | ||
<Label Text="{Loc 'bluespace-harvester-window-level-input'}" StyleClasses="StatusFieldTitle"/> | ||
<LineEdit Name="InputLevelBar" PlaceHolder="0" HorizontalExpand="True" Margin ="0 4"/> | ||
<Label Text="{Loc 'bluespace-harvester-window-level-target'}" StyleClasses="StatusFieldTitle"/> | ||
<Label Name="TargetLevel" Text="0"/> | ||
<Label Text="{Loc 'bluespace-harvester-window-level-current'}" StyleClasses="StatusFieldTitle"/> | ||
<Label Name="CurrentLevel" Text="0"/> | ||
<Label Text="{Loc 'bluespace-harvester-window-level-desired'}" StyleClasses="StatusFieldTitle"/> | ||
<ProgressBar Name="DesiredBar" | ||
HorizontalExpand="True" | ||
MinValue="0" | ||
MaxValue="1" | ||
SetHeight="25"/> | ||
<Label Text="{Loc 'bluespace-harvester-window-power-usage'}" StyleClasses="StatusFieldTitle"/> | ||
<Label Name="PowerUsageLabel" Text="0w"/> | ||
<Label Text="{Loc 'bluespace-harvester-window-power-next'}" StyleClasses="StatusFieldTitle"/> | ||
<Label Name="PowerUsageNextLabel" Text="0w"/> | ||
<Label Text="{Loc 'bluespace-harvester-window-power-surplus'}" StyleClasses="StatusFieldTitle"/> | ||
<Label Name="PowerSuppliertLabel" Text="0w"/> | ||
</GridContainer> | ||
<Control/> | ||
<Label Text="{Loc 'bluespace-harvester-window-lable-output'}"/> | ||
<controls:HLine Color="#404040" Thickness="2" Margin="0 5"/> | ||
<GridContainer Margin="2 0 10 0" Columns="2"> | ||
<BoxContainer Orientation="Vertical"> | ||
<GridContainer Margin="2 0 0 0" Columns="2"> | ||
<Label Text="{Loc 'bluespace-harvester-window-points-available'}" StyleClasses="StatusFieldTitle"/> | ||
<Label Name="AvailablePointsLabel" Text="0"/> | ||
<Label Text="{Loc 'bluespace-harvester-window-points-generation'}" StyleClasses="StatusFieldTitle"/> | ||
<Label Name="GenerationPointsLabel" Text="0"/> | ||
<Label Text="{Loc 'bluespace-harvester-window-points-total'}" StyleClasses="StatusFieldTitle"/> | ||
<Label Name="TotalPontsLabel" Text="0"/> | ||
</GridContainer> | ||
</BoxContainer> | ||
<BoxContainer Name="Categories" Orientation="Vertical"> | ||
</BoxContainer> | ||
</GridContainer> | ||
</BoxContainer> | ||
</controls:FancyWindow> |
60 changes: 60 additions & 0 deletions
60
Content.Client/BluespaceHarvester/BluespaceHarvesterMenu.xaml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
using Content.Client.UserInterface.Controls; | ||
using Content.Shared.BluespaceHarvester; | ||
using Robust.Client.AutoGenerated; | ||
using Robust.Client.UserInterface.XAML; | ||
|
||
namespace Content.Client.BluespaceHarvester; | ||
|
||
[GenerateTypedNameReferences] | ||
public sealed partial class BluespaceHarvesterMenu : FancyWindow | ||
{ | ||
private readonly BluespaceHarvesterBoundUserInterface _owner; | ||
|
||
public BluespaceHarvesterMenu(BluespaceHarvesterBoundUserInterface owner) | ||
{ | ||
RobustXamlLoader.Load(this); | ||
|
||
_owner = owner; | ||
|
||
InputLevelBar.OnTextEntered += (args) => | ||
{ | ||
if (!int.TryParse(args.Text, out var level) || level < 0 || level > 20) | ||
{ | ||
InputLevelBar.Text = "0"; | ||
return; | ||
} | ||
|
||
_owner.SendTargetLevel(level); | ||
}; | ||
|
||
// EntityView.SetEntity(_owner.Owner); | ||
} | ||
|
||
public void UpdateState(BluespaceHarvesterBoundUserInterfaceState state) | ||
{ | ||
TargetLevel.Text = $"{state.TargetLevel}"; | ||
CurrentLevel.Text = $"{state.CurrentLevel}"; | ||
DesiredBar.Value = ((float)state.CurrentLevel) / ((float)state.MaxLevel); | ||
|
||
PowerUsageLabel.Text = Loc.GetString("power-monitoring-window-value", ("value", state.PowerUsage)); | ||
PowerUsageNextLabel.Text = Loc.GetString("power-monitoring-window-value", ("value", state.PowerUsageNext)); | ||
PowerSuppliertLabel.Text = Loc.GetString("power-monitoring-window-value", ("value", state.PowerSuppliert)); | ||
|
||
AvailablePointsLabel.Text = $"{state.Points}"; | ||
TotalPontsLabel.Text = $"{state.TotalPoints}"; | ||
GenerationPointsLabel.Text = $"{state.PointsGen}"; | ||
|
||
Categories.RemoveAllChildren(); | ||
foreach (var category in state.Categories) | ||
{ | ||
var child = new BluespaceHarvesterCategory(category, state.Points >= category.Cost); | ||
|
||
child.CategoryButton.OnButtonDown += (args) => | ||
{ | ||
_owner.SendBuy(category.Type); | ||
}; | ||
|
||
Categories.AddChild(child); | ||
} | ||
} | ||
} |
14 changes: 14 additions & 0 deletions
14
Content.Server/BluespaceHarvester/BluespaceHarvesterBundleComponent.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
using Content.Shared.Storage; | ||
|
||
namespace Content.Server.BluespaceHarvester; | ||
|
||
// TODO: Make it not tied to the harvester for mappers and loot in debris and dungeons. | ||
[RegisterComponent] | ||
public sealed partial class BluespaceHarvesterBundleComponent : Component | ||
{ | ||
[DataField] | ||
public List<EntitySpawnEntry> Contents = new(); | ||
|
||
[DataField] | ||
public bool Spawned; | ||
} |
44 changes: 44 additions & 0 deletions
44
Content.Server/BluespaceHarvester/BluespaceHarvesterBundleSystem.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
using Content.Shared.Destructible; | ||
using Content.Shared.Storage.Components; | ||
using Robust.Shared.Random; | ||
|
||
namespace Content.Server.BluespaceHarvester; | ||
|
||
public sealed class BluespaceHarvesterBundleSystem : EntitySystem | ||
{ | ||
[Dependency] private readonly IRobustRandom _random = default!; | ||
|
||
public override void Initialize() | ||
{ | ||
base.Initialize(); | ||
|
||
SubscribeLocalEvent<BluespaceHarvesterBundleComponent, StorageBeforeOpenEvent>(OnOpen); | ||
SubscribeLocalEvent<BluespaceHarvesterBundleComponent, DestructionEventArgs>(OnDestruction); | ||
} | ||
|
||
private void OnOpen(Entity<BluespaceHarvesterBundleComponent> bundle, ref StorageBeforeOpenEvent args) | ||
{ | ||
CreateLoot(bundle); | ||
} | ||
|
||
private void OnDestruction(Entity<BluespaceHarvesterBundleComponent> bundle, ref DestructionEventArgs args) | ||
{ | ||
CreateLoot(bundle); | ||
} | ||
|
||
private void CreateLoot(Entity<BluespaceHarvesterBundleComponent> bundle) | ||
{ | ||
if (bundle.Comp.Spawned) | ||
return; | ||
|
||
var content = _random.Pick(bundle.Comp.Contents); | ||
var position = Transform(bundle.Owner).Coordinates; | ||
|
||
for (var i = 0; i < content.Amount; i++) | ||
{ | ||
Spawn(content.PrototypeId, position); | ||
} | ||
|
||
bundle.Comp.Spawned = true; | ||
} | ||
} |
Oops, something went wrong.