Skip to content
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

Add paintshop to stations #5342

Merged
merged 18 commits into from
May 20, 2022
Merged

Add paintshop to stations #5342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
32e73aa
Preliminary paintshop experimentation
WKFO Feb 12, 2022
5b6ad64
Fix paintshop not applying changes, add lang strings
WKFO Feb 13, 2022
bdbdc6d
Use user-defined colors for paintshop
WKFO Feb 15, 2022
4f48681
Use colorEdit in paintshop
WKFO Feb 16, 2022
04aa34b
Fix color format conversion
WKFO Feb 16, 2022
4d13e8e
Make paintshops available with conditions
WKFO Feb 16, 2022
adb312c
Change paint pricing and prettify the UI
WKFO Feb 17, 2022
1d891ee
Change location of modelspinner
WKFO Feb 17, 2022
96bbe86
Paintshop welcome message edit
WKFO Feb 22, 2022
6487ed0
Add paintshop icon
WKFO Feb 24, 2022
6ba921e
Put paintshop icon in correct line
WKFO Feb 24, 2022
c66442e
Show ship painting price at all times
WKFO Feb 25, 2022
8b1df20
Carry paintshop over to repair tab
WKFO May 7, 2022
8a3e6d0
Change paintjob purchase button text
WKFO May 7, 2022
f120e3f
Reorganize repair & paintshop tab
WKFO May 8, 2022
7adbfc7
Rewrite colorEdit to model reformatter
WKFO May 13, 2022
a6f3186
Fix color turning black
WKFO May 13, 2022
0d0d9eb
Add ship repair tab sounds
WKFO May 13, 2022
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
72 changes: 70 additions & 2 deletions data/lang/ui-core/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
"description": "",
"message": "An error has occurred"
},
"PURCHASE_PAINTJOB": {
"description": "Paintshop button",
"message": "Purchase Paintjob"
},
"ARRIVAL_DATE": {
"description": "Time of arrival, used in flight log",
"message": "Arrival date"
Expand Down Expand Up @@ -147,6 +151,14 @@
"description": "Key binding option",
"message": "Change Binding"
},
"CHANGE_COLOR": {
"description": "Paintshop button",
"message": "Change Color"
},
"CHANGE_PATTERN": {
"description": "Paintshop button",
"message": "Change Pattern"
},
"CHIEF_MECHANIC": {
"description": "",
"message": "Chief Mechanic"
Expand Down Expand Up @@ -179,6 +191,10 @@
"description": "",
"message": "Close"
},
"COLOR": {
"description": "",
"message": "Color"
},
"COMBAT": {
"description": "Headline for kills and combat rating",
"message": "Combat"
Expand Down Expand Up @@ -1415,6 +1431,10 @@
"description": "",
"message": "Negotiate"
},
"NEW_PAINTJOB_APPLIED": {
"description": "Paintshop popup",
"message": "The new paintjob has been applied to your ship."
},
"NEXT_FACE_FEATURE": {
"description": "Face feature switch button for FaceGenerator in the PersonalInfo view",
"message": "Next"
Expand Down Expand Up @@ -1555,6 +1575,38 @@
"description": "Player owing money to crew members",
"message": "Owed"
},
"PAINTSHOP": {
"description": "Station tab title",
"message": "Paintshop"
},
"PAINTSHOP_NOT_AVAILABLE": {
"description": "",
"message": "Paintshop is not available in this spaceport."
},
"PAINTSHOP_WELCOME_0": {
"description": "Welcome message to the paintshop.",
"message": "Welcome! We will paint your ship pretty!"
},
"PAINTSHOP_WELCOME_1": {
"description": "Welcome message to the paintshop.",
"message": "Hi there! Looking for a change in aesthetics?"
},
"PAINTSHOP_WELCOME_2": {
"description": "Welcome message to the paintshop.",
"message": "We can't make your ship fly fast, but we can make it fly in style!"
},
"PAINTSHOP_WELCOME_3": {
"description": "Welcome message to the paintshop.",
"message": "Welcome, traveller. Please take your time and let out your creativity."
},
"PAINTSHOP_WELCOME_4": {
"description": "Welcome message to the paintshop.",
"message": "Looking the best in the galaxy has never been easier!"
},
"PATTERN": {
"description": "Ship painting pattern.",
"message": "Pattern"
},
"PAY": {
"description": "Pay for a transaction of services, e.g. for paying fines, (or repairs)",
"message": "Pay"
Expand Down Expand Up @@ -1595,6 +1647,10 @@
"description": "",
"message": "Planet textures"
},
"PLEASE_DESIGN_NEW_PAINTJOB": {
"description": "",
"message": "Please design your new paintjob:"
},
"PLEASE_REPORT_THIS_ERROR": {
"description": "Informational text mentioning the error and asking the player to report it.",
"message": "Oops, something went wrong here! Please report the steps to reproduce this error, the output log, and your save file to the Pioneer issue tracker on Github.\nYou can find your output log at: {path}/output.txt"
Expand Down Expand Up @@ -1719,6 +1775,10 @@
"description": "",
"message": "Reset Orientation and Zoom"
},
"RESET_PREVIEW": {
"description": "Paintshop button",
"message": "Reset Preview"
},
"RETURN_TO_GAME": {
"description": "",
"message": "Return to game"
Expand Down Expand Up @@ -1844,8 +1904,8 @@
"message": "Ship Market"
},
"SHIP_REPAIRS": {
"description": "",
"message": "Ship Repairs"
"description": "Station tab name",
"message": "Ship Repairs & Paintshop"
},
"SHIP_TYPE": {
"description": "",
Expand Down Expand Up @@ -2099,6 +2159,14 @@
"description": "Tooltip for video mode/resultion setting",
"message": "Higher resolutions display more information at a smaller size and can decrease performance."
},
"VISIT_PAINTSHOP": {
"description": "Ship Repair tab button.",
"message": "Visit Paintshop"
},
"VISIT_REPAIR_SERVICES": {
"description": "Ship Repair tab button.",
"message": "Visit Repair Services"
},
"VSYNC": {
"description": "For the checkbox in settings window",
"message": "VSync"
Expand Down
Loading