Skip to content

Feat/ship market show details #6191

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

Draft
mwerle wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Feat/ship market show details #6191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5494a24
fix(ShipMarket): correct parameters for matching slot types
mwerle Jul 7, 2025
0414714
feat(ui): add slots to the ShipMarket
mwerle Jul 7, 2025
f09a95f
feat(ui-ship-market): add cargo capacity to ship list
mwerle Sep 15, 2025
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
36 changes: 36 additions & 0 deletions data/lang/ui-core/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,10 @@
"description": "graphics option in game settings menu ",
"message": "Compress Textures"
},
"COMPUTER_MOUNTS": {
"description": "How many slots or mounts exist on the ship for fitting COMPUTER equipment (e.g. autopilot, trade computer, etc)",
"message": "Computer mounts"
},
"CONFIRM_PURCHASE": {
"description": "",
"message": "Confirm purchase"
Expand Down Expand Up @@ -1327,6 +1331,10 @@
"description": "",
"message": "Hull integrity"
},
"HULL_MOUNTS": {
"description": "How many slots or mounts exist on the ship for fitting Hull mounted equipment (eg. Atmospheric Shielding)",
"message": "Hull mounts"
},
"HULL_REPAIRED_BY_NAME_NOW_AT_N_PERCENT": {
"description": "",
"message": "Hull repaired by {name}, now at {repairPercent}%"
Expand Down Expand Up @@ -1695,10 +1703,18 @@
"description": "For displaying commodity information",
"message": "Minor Import"
},
"MISSILE_BAYS": {
"description": "How many slots or mounts exist on the ship for Missile Bays.",
"message": "Missile bays"
},
"MISSILE_MOUNTS": {
"description": "",
"message": "Missile mounts"
},
"MISSILE_PYLONS": {
"description": "How many slots or mounts exist on the ship for Missile Pylons.",
"message": "Missile pylons"
},
"MISSIONS": {
"description": "",
"message": "Missions"
Expand Down Expand Up @@ -2335,6 +2351,10 @@
"description": "Title for sell-price column in commodity market",
"message": "Sell"
},
"SENSOR_MOUNTS": {
"description": "How many slots or mounts exist on the ship for fitting SENSOR equipment (e.g. radar, etc)",
"message": "Sensor mounts"
},
"SENSORS": {
"description": "Crew skill",
"message": "Sensors"
Expand Down Expand Up @@ -2371,6 +2391,10 @@
"description": "For the speed limiter button",
"message": "Set to zero"
},
"SHIELD_MOUNTS": {
"description": "How many slots or mounts exist on the ship for fitting Shields",
"message": "Shield mounts"
},
"SHIP": {
"description": "",
"message": "Ship"
Expand Down Expand Up @@ -2531,6 +2555,10 @@
"description": "",
"message": "Status"
},
"STRUCTURE_MOUNTS": {
"description": "How many slots or mounts exist on the ship for fitting Structural equipment (e.g. Hull Reinforcement)",
"message": "Structure mounts"
},
"SUMMARY": {
"description": "Tab item in the start game menu",
"message": "Summary"
Expand Down Expand Up @@ -2731,6 +2759,10 @@
"description": "",
"message": "Used"
},
"UTILITY_MOUNTS": {
"description": "How many slots or mounts exist on the ship for fitting UTILITY equipment (e.g. scanners) ",
"message": "Utility mounts"
},
"VERY_HIGH": {
"description": "Game settings option: graphic resolution",
"message": "Very high"
Expand Down Expand Up @@ -2783,6 +2815,10 @@
"description": "Salary of crew shown in crew roster",
"message": "Wage"
},
"WEAPON_MOUNTS": {
"description": "How many slots or mounts exist on the ship for fitting Weapons.",
"message": "Weapon mounts"
},
"WEIGHT_EMPTY": {
"description": "",
"message": "Weight empty"
Expand Down
28 changes: 22 additions & 6 deletions data/pigui/modules/station-view/04-shipMarket.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ local function getNumSlotsCompatibleWithType(def, type)
local count = 0

for _, slot in pairs(config.slots) do
if EquipSet.SlotTypeMatches(type, slot.type) then
if EquipSet.SlotTypeMatches(slot.type, type) then
count = count + (slot.count or 1)
end
end
Expand Down Expand Up @@ -492,14 +492,24 @@ local tradeMenu = function()
shipFormatAndCompare:draw_deltav_cell( l.DELTA_V_FULL, "fullMass", "massAtCapacity")
shipFormatAndCompare:draw_unformated_cell( l.MAXIMUM_CREW, "maxCrew" )
shipFormatAndCompare:draw_deltav_cell( l.DELTA_V_MAX, "fullMass", "hullMass")
shipFormatAndCompare:draw_equip_slot_cell( l.MISSILE_MOUNTS, "missile" )
shipFormatAndCompare:draw_equip_slot_cell( l.PASSENGER_CABIN_CAPACITY, "cabin" )
shipFormatAndCompare:draw_yes_no_equip_slot_cell( l.ATMOSPHERIC_SHIELDING, "hull.atmo_shield" )
shipFormatAndCompare:draw_atmos_pressure_limit_cell( l.ATMO_PRESS_LIMIT )

shipFormatAndCompare:draw_equip_slot_cell( l.SHIELD_MOUNTS, "shield" )
shipFormatAndCompare:draw_equip_slot_cell( l.HULL_MOUNTS, "hull" )
shipFormatAndCompare:draw_equip_slot_cell( l.WEAPON_MOUNTS, "weapon" )
shipFormatAndCompare:draw_equip_slot_cell( l.STRUCTURE_MOUNTS, "structure" )
shipFormatAndCompare:draw_equip_slot_cell( l.MISSILE_MOUNTS, "missile" )
shipFormatAndCompare:draw_equip_slot_cell( l.COMPUTER_MOUNTS, "computer" )
shipFormatAndCompare:draw_equip_slot_cell( l.MISSILE_PYLONS, "pylon" )
shipFormatAndCompare:draw_equip_slot_cell( l.SENSOR_MOUNTS, "sensor" )
shipFormatAndCompare:draw_equip_slot_cell( l.MISSILE_BAYS, "missile_bay" )

shipFormatAndCompare:draw_equip_slot_cell( l.SCOOP_MOUNTS, "scoop" )
shipFormatAndCompare:draw_equip_slot_cell( l.PASSENGER_CABIN_CAPACITY, "cabin" )
shipFormatAndCompare:draw_equip_slot_cell( l.UTILITY_MOUNTS, "utility" )

ui.endTable()

end)
end)

Expand All @@ -509,14 +519,15 @@ local tradeMenu = function()
end

shipMarket = Table.New("shipMarketWidget", false, {
columnCount = 4,
columnCount = 5,
initTable = function(self)
local iconColumnWidth = widgetSizes.iconSize.x + widgetSizes.itemSpacing.x
local columnWidth = (self.style.size.x - iconColumnWidth) / (self.columnCount-1)
ui.setColumnWidth(0, widgetSizes.iconSize.x + widgetSizes.itemSpacing.x)
ui.setColumnWidth(1, columnWidth)
ui.setColumnWidth(2, columnWidth)
ui.setColumnWidth(3, columnWidth)
ui.setColumnWidth(4, columnWidth)
end,
renderHeaderRow = function(_)
ui.withFont(orbiteer.heading, function()
Expand All @@ -528,6 +539,8 @@ shipMarket = Table.New("shipMarketWidget", false, {
ui.nextColumn()
ui.text(l.CAPACITY)
ui.nextColumn()
ui.text(l.CARGO)
ui.nextColumn()
end)
end,
renderItem = function(_, item)
Expand Down Expand Up @@ -555,7 +568,10 @@ shipMarket = Table.New("shipMarketWidget", false, {
ui.text(Format.Money(advertDataCache[item].price, false))
ui.nextColumn()
ui.dummy(widgetSizes.rowVerticalSpacing)
ui.text(item.def.equipCapacity.." t")
ui.text(item.def.equipCapacity .." t")
ui.nextColumn()
ui.dummy(widgetSizes.rowVerticalSpacing)
ui.text(item.def.cargo .." t")
ui.nextColumn()
end)
end,
Expand Down