Skip to content

Change science to a single value #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cheese3660 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Change science to a single value #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions Assets/UI/ScienceToolsWindow.uxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
<ui:TextField picking-mode="Ignore" label="Science Points" value="..." name="add-points-field" style="width: 75%; padding-left: 0; padding-right: 0; padding-top: 0; padding-bottom: 0;" />
<ui:Button text="Add" display-tooltip-when-elided="true" name="add-points" style="height: 35px; width: 20%;" />
</ui:VisualElement>
<ui:VisualElement name="capacity" class="field">
<ui:TextField picking-mode="Ignore" label="Points Capacity" value="..." name="set-capacity-field" style="width: 75%; padding-left: 0; padding-right: 0; padding-top: 0; padding-bottom: 0;" />
<ui:Button text="Set" display-tooltip-when-elided="true" name="set-capacity" style="height: 35px; width: 20%;" />
</ui:VisualElement>
<ui:VisualElement name="allocated" class="field">
<ui:TextField picking-mode="Ignore" label="Allocated Points" value="..." name="set-allocated-field" style="width: 75%; padding-left: 0; padding-right: 0; padding-top: 0; padding-bottom: 0;" />
<ui:Button text="Set" display-tooltip-when-elided="true" name="set-allocated" style="height: 35px; width: 20%;" />
</ui:VisualElement>
<ui:VisualElement name="unlock" class="field">
<ui:DropdownField label="Tech Node" index="-1" choices="System.Collections.Generic.List`1[System.String]" name="available-nodes" style="width: 75%; margin-left: 0; margin-right: 0;" />
<ui:Button text="Unlock" display-tooltip-when-elided="true" name="unlock-node" style="height: 35px; width: 20%;" />
Expand Down
54 changes: 8 additions & 46 deletions Runtime/Controllers/ScienceToolsWindowController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ public class ScienceToolsWindowController : BaseWindowController
private Toggle? _unlockAllParts;

private TextField? _addSciencePointsField;
private TextField? _setPointsCapacityField;
private TextField? _setAllocatedPointsField;

private DropdownField? _availableNodes;

Expand All @@ -39,14 +37,6 @@ private void OnEnable()
var addPoints = RootElement.Q<Button>("add-points");
addPoints.clicked += AddSciencePoints;

_setPointsCapacityField = RootElement.Q<TextField>("set-capacity-field");
var setCapacity = RootElement.Q<Button>("set-capacity");
setCapacity.clicked += SetPointsCapacity;

_setAllocatedPointsField = RootElement.Q<TextField>("set-allocated-field");
var setAllocated = RootElement.Q<Button>("set-allocated");
setAllocated.clicked += SetAllocatedPoints;

_availableNodes = RootElement.Q<DropdownField>("available-nodes");
var unlockNode = RootElement.Q<Button>("unlock-node");
unlockNode.clicked += UpdateUnlockedTechNodes;
Expand Down Expand Up @@ -82,26 +72,7 @@ private void AddSciencePoints()
{
if (int.TryParse(_addSciencePointsField?.text, out var result))
{
var additionalSciencePoints = Game.SessionManager.GetMyAgencyAdditionalSciencePoints() + result;
Game.SessionManager.UpdateMyAgencyAdditionalSciencePoints(additionalSciencePoints);
UpdateScienceMetadata();
}
}

private void SetPointsCapacity()
{
if (int.TryParse(_setPointsCapacityField?.text, out var result))
{
Game.SessionManager.UpdateMyAgencySciencePointCapacity(result);
UpdateScienceMetadata();
}
}

private void SetAllocatedPoints()
{
if (int.TryParse(_setAllocatedPointsField?.text, out var result))
{
Game.SessionManager.SetMyPlayerAllocatedSciencePoints(result);
Game.SessionManager.AddMyAgencyAvailableSciencePoints(result);
UpdateScienceMetadata();
}
}
Expand All @@ -112,14 +83,7 @@ private void UpdateScienceMetadata()

_agencyName!.text = "Agency Name: <b>" + sessionManager.GetMyAgencyName() + "</b>";

sessionManager.TryGetDifficultyOptionState<float>("StartingScience", out var startingScience);
var capacity = (float)sessionManager.GetMyAgencySciencePointCapacity();
var allocated = (float)sessionManager.GetMyPlayerAllocatedSciencePoints();
var additional = (float)sessionManager.GetMyAgencyAdditionalSciencePoints();
var total = capacity + startingScience + additional;

var text = "Available: <b>" + (total - allocated) + "</b> - Used: <b>" + allocated +
"</b> - Total: <b>" + total + "</b>";
var text = "Available: <b>" + sessionManager.GetMyAgencyAvailableSciencePoints() + "</b>";
_scienceState!.text = text;
}

Expand All @@ -128,11 +92,11 @@ private void UpdateTechNodeDropdown()
if (_availableNodes == null) return;

List<string> list = new();
if (Game.CampaignPlayerManager.TryGetMyCampaignPlayerEntry(out var campaignPlayerEntryOut))
if (Game.AgencyManager.TryGetMyAgencyEntry(out var agencyEntry))
{
foreach (var value in Game.ScienceManager.TechNodeDataStore.AvailableData.Values)
{
if (campaignPlayerEntryOut.UnlockedTechNodes.Contains(value.ID))
if (agencyEntry.UnlockedTechNodes.Contains(value.ID))
continue;

var allRequiredUnlocked = true;
Expand Down Expand Up @@ -161,11 +125,9 @@ private void UpdateUnlockedTechNodes()
if (_availableNodes?.choices.Count <= 0) return;

var node = _availableNodes!.value;
if (!string.IsNullOrWhiteSpace(node) &&
Game.CampaignPlayerManager.TryGetMyCampaignPlayerEntry(out var player))
if (!string.IsNullOrWhiteSpace(node))
{
player.AddUnlockedTechNodeToPlayer(node.Replace("<b>", "").Replace("</b>", ""));
Game.ScienceManager.UpdateAllocatedSciencePoints();
Game.ScienceManager.UnlockTechNode(node.Replace("<b>", "").Replace("</b>", ""));
}

UpdateTechNodeDropdown();
Expand All @@ -186,9 +148,9 @@ private void UpdateLoadedTechNodesView()
private void UpdateUnlockedTechNodesView()
{
_unlockedNodes!.Clear();
if (!Game.CampaignPlayerManager.TryGetMyCampaignPlayerEntry(out var campaignPlayerEntry)) return;
if (!Game.AgencyManager.TryGetMyAgencyEntry(out var agencyEntry)) return;

foreach (var unlockedTechNode in campaignPlayerEntry.UnlockedTechNodes)
foreach (var unlockedTechNode in agencyEntry.UnlockedTechNodes)
{
var label = new Label { text = unlockedTechNode };
_unlockedNodes!.Add(label);
Expand Down