-
-
Notifications
You must be signed in to change notification settings - Fork 380
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.
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
WIP lore/worldbuilding/station lobby #5283
base: master
Are you sure you want to change the base?
Changes from 2 commits
49348dd
bf062b7
8864f02
ad4559b
21a4b97
843d1c7
37d6b32
5022d0a
02f33b6
5f04813
58166b7
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{ | ||
"" : { | ||
"description" : "", | ||
"message" : "" | ||
}, | ||
"SOL_MARS_CYDONIA" : { | ||
"description" : "", | ||
"message" : "Home of the core systems number one gravball team, the Little Green Men." | ||
}, | ||
"SOL_EARTH_LONDON" : { | ||
"description" : "", | ||
"message" : "Traditional center of civilazation. Has recovered quite well after last centurys flooding disasters, although many of the cultural landmarks will never be restored to their former glory." | ||
}, | ||
"SOL_EARTH_MOSCOW" : { | ||
"description" : "", | ||
"message" : "Moscow Spaceflight museum is a must see!" | ||
}, | ||
"SOL_EARTH_OLYMPUS" : { | ||
"description" : "", | ||
"message" : "Dont forget to enjoy the longest ski slope within a hundred lightyears!" | ||
}, | ||
"SOL_EARTH_SHANGHAI" : { | ||
"description" : "", | ||
"message" : "Industrial powerhouse of Earth. Dont forget your hazmat suit if you want to venture outside." | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1893,7 +1893,7 @@ | |
}, | ||
"STATION_DOCKS": { | ||
"description": "Information shown in the station lobby, for total number of docking pads", | ||
"message": "Our total capacity is {total_docking_pads} docking pads." | ||
"message": "Your ship is docked on pad {shipbay} out of {bays} docking pads." | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice idea! Is the "out of bays" part necessary? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I dont know but see the diff, how many bays there are in the station was all there was before, I only added the shipbay There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah, then I realized that you replace the line, not adding another about the pads. Sorry |
||
}, | ||
"STATION_LOCAL_GRAVITY": { | ||
"description": "", | ||
|
@@ -1925,7 +1925,7 @@ | |
}, | ||
"TECH_CERTIFIED_MILITARY": { | ||
"description": "Lobby screen shows the tech level of the station", | ||
"message": "This installation holds a military technology clearance." | ||
"message": "This installation holds a military technology certificate." | ||
}, | ||
"TEXTURE_COMPRESSION": { | ||
"description": "", | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -228,28 +228,24 @@ end | |
|
||
local function drawPlayerInfo() | ||
local station = Game.player:GetDockedWith() | ||
if not station or not shipDef then return end | ||
|
||
if(not (station and shipDef)) then return end | ||
|
||
local tech_certified | ||
|
||
if station.techLevel == 11 then | ||
tech_certified = l.TECH_CERTIFIED_MILITARY | ||
else | ||
tech_certified = string.interp(l.TECH_CERTIFIED, { tech_level = station.techLevel}) | ||
end | ||
|
||
local station_docks = string.interp(l.STATION_DOCKS, { total_docking_pads = string.format("%d", station.numDocks),}) | ||
local substrings = { shipbay = station:GetAssignedBayNumber(Game.player), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The bays go from 1 up so I think this should probably be: |
||
bays = string.format("%d", station.numDocks), | ||
tech_level = station.techLevel } | ||
|
||
local tech_certified = (station.techLevel >= 11) and l.TECH_CERTIFIED_MILITARY or string.interp(l.TECH_CERTIFIED, substrings) | ||
local station_docks = string.interp(l.STATION_DOCKS, substrings) | ||
local orbit_period = station.path:GetSystemBody().orbitPeriod | ||
|
||
local station_frameBody = Space.GetBody(station.path:GetSystemBody().parent.index) | ||
local local_gravity_pressure = "" | ||
if station.type == "STARPORT_SURFACE" then | ||
if station.path:GetSystemBody().parent.hasAtmosphere then | ||
local_gravity_pressure = string.format(l.STATION_LOCAL_GRAVITY_PRESSURE, (station.path:GetSystemBody().parent.gravity/9.8), station_frameBody:GetAtmosphericState(station)) | ||
local local_conditions = "" | ||
if station.isGroundStation then | ||
local myBody = station.path:GetSystemBody() | ||
if myBody.parent.hasAtmosphere then | ||
local parentBody = Space.GetBody(myBody.parent.index) | ||
local_conditions = string.format(l.STATION_LOCAL_GRAVITY_PRESSURE, (myBody.parent.gravity/9.8), parentBody:GetAtmosphericState(station)) | ||
else | ||
local_gravity_pressure = string.format(l.STATION_LOCAL_GRAVITY, (station.path:GetSystemBody().parent.gravity/9.8)) | ||
local_conditions = string.format(l.STATION_LOCAL_GRAVITY, (myBody.parent.gravity/9.8)) | ||
end | ||
end | ||
|
||
|
@@ -266,16 +262,22 @@ local function drawPlayerInfo() | |
local infoColumnWidth = conReg.x - widgetSizes.faceSize.x - widgetSizes.windowPadding.x*3 | ||
local lobbyMenuHeight = widgetSizes.buttonSizeBase.y*3 + widgetSizes.itemSpacing.y*3 + widgetSizes.windowPadding.y*2 | ||
local lobbyMenuAtBottom = (conReg.y - widgetSizes.faceSize.y > lobbyMenuHeight + widgetSizes.windowPadding.x*2) | ||
|
||
local tabLines = { { tech_certified, "" }, { station_docks, "" } } | ||
if station_orbit_info ~= "" then | ||
table.insert(tabLines, { station_orbit_info, "" }) | ||
end | ||
if local_conditions ~= "" then | ||
table.insert(tabLines, { local_conditions, "" }) | ||
end | ||
ui.child("Wrapper", Vector2(0, lobbyMenuAtBottom and -lobbyMenuHeight or 0), {}, function() | ||
ui.child("PlayerShipFuel", Vector2(infoColumnWidth, 0), {"AlwaysUseWindowPadding"}, function() | ||
local curPos = ui.getCursorPos() | ||
textTable.withHeading(station.label, orbiteer.xlarge, { | ||
{ tech_certified, "" }, | ||
{ station_docks, "" }, | ||
{ station_orbit_info, "" }, | ||
{ local_gravity_pressure, ""}, | ||
}) | ||
textTable.withHeading(station.label, orbiteer.xlarge, tabLines ) | ||
if station.lore then | ||
local lorelang = Lang.GetResource("lore") | ||
ui.separator() | ||
ui.text(lorelang[station.lore]) | ||
end | ||
|
||
if not lobbyMenuAtBottom then | ||
lobbyMenu(Vector2(curPos.x, conReg.y - lobbyMenuHeight)) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"lore" : { | ||
"value" : "SOL_EARTH_SHANGHAI" | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"lore" : { | ||
"value" : "SOL_EARTH_LONDON" | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"lore" : { | ||
"value" : "SOL_EARTH_MOSCOW" | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"techLevel" : { | ||
"value" : "10" | ||
}, | ||
"lore" : { | ||
"value" : "SOL_MARS_CYDONIA" | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"lore" : { | ||
"value" : "SOL_EARTH_OLYMPUS" | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SOL_MARS_OLYMPUS
👽
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sol_mars_cydonia you mean?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, Cydonia is another station. The text (ski slope...) shows correct on Olympus Mons station but the token name looked a bit off, that's all.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just abbreviated it because its unique enough with the sol_mars
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it would have been, but you named it SOL_EARTH_OLYMPUS. I don't know if we're talking about the same thing here and I may have misunderstood everything.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oopsies. carbon copy much? yes. I though you were talking about cydonia because of the alien emoji
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, the Little Green Men team! You need to also fix the string in SCC0000000013-OlympusMons.json. ;)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks,, seems im not a my best today.