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.

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

Move ship view and upgrade view to python #132

Merged
merged 2 commits into from
Nov 15, 2024
Merged

Move ship view and upgrade view to python #132

merged 2 commits into from
Nov 15, 2024

Conversation

royfalk
Copy link
Contributor

@royfalk royfalk commented Nov 11, 2024

This only takes effect when the engine PR (#904) is also merged.

Code Changes:

Issues:

  • Undocumented reactor tweak - description is 'capacitor capacity'. Reword.
  • Radar is in radians. Convert to degrees for a clearer description.
  • Mass/Space required is indented for some reason.

@royfalk royfalk self-assigned this Nov 11, 2024
@evertvorster
Copy link
Contributor

Hi there!
At the moment what I am doing is to just pull whatever branch you are working on, and build that to play test it.
What is the best way of merging this and the engine PR at the same time so that I can test this properly?

@royfalk
Copy link
Contributor Author

royfalk commented Nov 11, 2024

These are two separate repos. You don't need (and can't) merge them.
One is assets. The other is engine.

Also, this doesn't fix any existing game play issues in master.
It moves the player info (relations with other factions screen) and upgrade info (part info in ship upgrades).

@evertvorster
Copy link
Contributor

Hi there!
Thanks for the pointer. I'm now building both Assets and Engine with the requested branches, and will give them a go.
Anything in particular that I should be looking for?

@royfalk
Copy link
Contributor Author

royfalk commented Nov 11, 2024

Anything in particular that I should be looking for?

player info (relations with other factions screen) and upgrade info (part info in ship upgrades).

@evertvorster
Copy link
Contributor

Hi there!
Just had a quick look. When starting a new campaign, the info looks good and normal. Ship info looks good as well.
However, when loading a saved game from a while ago, I have a negative kill count. In this save game I somehow managed to annoy the ConFed, and when loading with this branch is where I see the negative one kill counts for two of the factions.

Here is the save file for reference:
0.9.x_Advanced_Trade_Vendetta.zip

@royfalk
Copy link
Contributor Author

royfalk commented Nov 14, 2024

In this save game I somehow managed to annoy the ConFed

I just fixed it on the assets/script side. According to the records, you have one kill - a confed.

@evertvorster
Copy link
Contributor

Yup, I suppose that would do it. I think I picked up that kill as part of the last mission that you get in the beginning of the game.
In any case, I am now building this branch of Assets, and will use it to test the branches in Engine. Many thanks for the hard work you are putting into this.

Copy link
Contributor

@evertvorster evertvorster left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This now has the proper kill counts and relations as when compared with git master, and in my mind it is good to go.

@royfalk royfalk merged commit 82af8cf into master Nov 15, 2024
10 of 11 checks passed
@royfalk royfalk deleted the task_ship_info_3 branch November 15, 2024 06:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants