GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests 4 Projects Releases Packages Wiki Activity Actions

TradeMenu sells and repairs through StationServices; credits seed from the stage or the save

Browse source 
The hardcoded credits initializer and its stale scene serialization go. Buy charges the hull price it checked. Sell is a
mode of the trade list over the selected bay; Repair is a foldout option for the docked ship.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Meta Vens 2026-10-06 19:30:34 +02:00
commit c204397cb0
3 changed files with 52 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Assets/Scenes/ARPG.unity
View file

@ -16674,7 +16674,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
Settings: {fileID: 11400000, guid: cd2344e2001a37544aab0960c164d4ff, type: 2}
Credits: 100000000
TargetSpottedBlinkFrequency: 20
TargetSpottedBlinkOffset: -0.25
DeathPostTransitionTime: 1

7
Assets/Scripts/Gameplay/ActionGameManager.cs
View file

@ -111,7 +111,8 @@ public class ActionGameManager : MonoBehaviour
public GameSettings Settings;
//public string StarterShipTemplate = "Longinus";
public int Credits = 15000000;
// The run's credits: seeded from the scenario stage on a new game and from SavedGame on Continue, written by SaveRun.
[NonSerialized] public int Credits;
public float TargetSpottedBlinkFrequency = 20;
public float TargetSpottedBlinkOffset = -.25f;
@ -252,7 +253,7 @@ public class ActionGameManager : MonoBehaviour
if (CurrentGalaxy != null)
{
var (game, zones) = RunSave.Capture(CultCache, CurrentGalaxy, Zone, DockedEntity ?? CurrentEntity,
_actionBarSlots.Select(s => s.Save()).ToArray());
_actionBarSlots.Select(s => s.Save()).ToArray(), Credits);
RunSave.Commit(CultCache, game, zones, ItemManager.Lots);
}
}
@ -774,6 +775,7 @@ public class ActionGameManager : MonoBehaviour
else
{
var saved = CultCache.GetGlobal<SavedGame>();
Credits = saved.Credits;
foreach(var group in CurrentGalaxy.DiscoveredZones
.GroupBy(dz=>dz.Distance[CurrentGalaxy.Entrance]))
SectorMap.QueueZoneReveal(group);
@ -829,6 +831,7 @@ public class ActionGameManager : MonoBehaviour
MainMenu.Refuse($"{scenario.Name} could not start", string.Join("\n", failures));
return;
}
Credits = staged.Credits;
SectorMap.QueueZoneReveal(CurrentGalaxy.Entrance.AdjacentZones.Prepend(CurrentGalaxy.Entrance));
BindToEntity(staged.Player);
}

50
Assets/Scripts/UI/Menu/TradeMenu.cs
View file

@ -25,6 +25,8 @@ public class TradeMenu : MonoBehaviour
public TextMeshProUGUI CreditsLabel;
private EquippedCargoBay _targetCargo;
// False lists the station's wares to buy; true lists the selected bay's goods to sell.
private bool _selling;
private (ItemFilter filter, HardpointType type) _hardpointFilter;
private (ItemFilter filter, SimpleCommodityCategory type) _commodityFilter;
private (ItemFilter filter, CompoundCommodityCategory type) _compoundCommodityFilter;
@ -36,6 +38,7 @@ public class TradeMenu : MonoBehaviour
{
if (GameManager.DockedEntity == null) return;
_targetCargo = GameManager.DockingBay;
_selling = false;
TargetCargoLabel.text = "Docking Bay";
Properties.GameManager = GameManager;
UpdateCreditsLabel();
@ -220,7 +223,7 @@ public class TradeMenu : MonoBehaviour
x => () => $"{x.data.Shape.Width}x{x.data.Shape.Height}",
data => data.Shape.Width*data.Shape.Height));
var items = Inventory.Cargo.Keys
var items = (_selling ? _targetCargo : Inventory).Cargo.Keys
.Select<ItemInstance, (ItemInstance item, ItemData data)>(ii=>(ii, GameManager.ItemManager.GetData(ii)));
if (MinimumSizeFilter.gameObject.activeSelf)
@ -315,6 +318,7 @@ public class TradeMenu : MonoBehaviour
OnClick = () => Properties.Inspect(i.item),
OnDoubleClick = () =>
{
if (_selling) return;
switch (i.item)
{
case CraftedItemInstance c:
@ -329,7 +333,13 @@ public class TradeMenu : MonoBehaviour
},
OnRightClick = () =>
{
if (i.item is SimpleCommodity s)
if (_selling)
{
ContextMenu.Clear();
ContextMenu.AddOption($"Sell ({StationServices.SellPrice(GameManager.ItemManager, i.item):N0})", () => Sell(i.item));
ContextMenu.Show();
}
else if (i.item is SimpleCommodity s)
{
ContextMenu.Clear();
ContextMenu.AddOption("Buy Quantity",
@ -363,6 +373,33 @@ public class TradeMenu : MonoBehaviour
}
}
private void Sell(ItemInstance item)
{
if (StationServices.TrySell(_targetCargo, GameManager.DockedEntity, item, ref GameManager.Credits))
{
UpdateCreditsLabel();
Populate();
return;
}
Dialog.Clear();
Dialog.Title.text = "Unable to sell: Station Cargo Full!";
Dialog.Show();
Dialog.MoveToCursor();
}
private void Repair()
{
if (StationServices.TryRepair(GameManager.CurrentEntity, ref GameManager.Credits))
{
UpdateCreditsLabel();
return;
}
Dialog.Clear();
Dialog.Title.text = "Unable to repair: Insufficient Credits!";
Dialog.Show();
Dialog.MoveToCursor();
}
private void Buy(CraftedItemInstance item)
{
var data = GameManager.ItemManager.GetData(item);
@ -375,7 +412,7 @@ public class TradeMenu : MonoBehaviour
GameManager.CommissionShip(item as EquippableItem);
GameManager.Credits -= data.Price;
GameManager.Credits -= price;
UpdateCreditsLabel();
}
else if (Inventory.TryTransferItem(_targetCargo, item))
@ -468,6 +505,13 @@ public class TradeMenu : MonoBehaviour
}
}
}
ContextMenu.AddOption(_selling ? "Buy Goods" : "Sell Goods", () =>
{
_selling = !_selling;
Populate();
});
var repairCost = StationServices.RepairCost(GameManager.ItemManager, GameManager.CurrentEntity);
if (repairCost > 0) ContextMenu.AddOption($"Repair ({repairCost:N0})", Repair);
ContextMenu.Show();
});
}