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

New solar sprites, new solar panel upgrades, and some solar panel fixes. #29224

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

CaasGit
Copy link
Contributor

@CaasGit CaasGit commented Jun 19, 2024

About the PR

This adds and changes a few things for solar panels!

  • New sprites for all solar panels and all related states.
  • Move from xform.WorldRotation to _xformSystem.SetWorldRotation within the solar code.
  • Few random fixes that Rider suggested as warnings.
  • Solar Tracker Electronics was using what looks like to be the airlock controller electronics, so that's now updated to something a bit more realistic. It also uses the engineering circuit sprite instead of the generic
  • New Solar Panels! Adds Plasma and Uranium Glass solar panels. These can be constructed by adding the respective glass to the panel. Plasma is a slight increase of power and health, and uranium is double the power and health of glass. Thus giving engineers something to update if they want to use solar panels and possibly giving small outposts a way to make a bit more power without a large and complex power setup.

Why / Balance

I wanted to give Engineering a bit more options when it comes to solar panels. I do think there's more that can be done here, consider this part one of possibly more to come as far as solars go.

Media

Whole set:
Screenshot from 2024-06-20 23-03-34
Box lower left without additional light:
Screenshot from 2024-06-20 23-04-52
Box lower left again, full light, rotated to give an example what they look like as they are intended to rotate.
Screenshot from 2024-06-20 23-06-46

  • [ x ] I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

None

Changelog

🆑

  • add: New solar panel sprites
  • add: Plasma and Uranium solar panels

This adds and changes a few things for solar panels!

* New sprites for all solar panels and all related states.
* Move from xform.WorldRotation to _xformSystem.SetWorldRotation within
  the solar code.
* Few random fixes that Rider suggested as warnings.
* Solar Tracker Electronics was using what looks like to be the airlock
  controller electronics, so that's now updated to something a bit more
  realistic. It also uses the engineering circuit sprite instead of the
  generic
* New Solar Panels! Adds Plasma and Uranium Glass solar panels. These
  can be constructed by adding the respective glass to the panel. Plasma
  is a slight increase of power and health, and uranium is double the
  power and health of glass. Thus giving engineers something to update
  if they want to use solar panels and possibly giving small outposts
  a way to make a bit more power without a large and complex power
  setup.
@github-actions github-actions bot added the Changes: Sprites Changes: Might require knowledge of spriting or visual design. label Jun 19, 2024
Copy link
Contributor

github-actions bot commented Jun 19, 2024

RSI Diff Bot; head commit 60ea293 merging into 8a06dde
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Structures/Power/Generation/solar_panel.rsi

State Old New Status
solar_assembly Modified
solar_tracker Modified
broken Removed
normal Removed
static Removed
solar_assembly_tracker_circuit Added
solar_assembly_tracker_circuit_uncabled Added
solar_assembly_uncabled Added
solar_panel_glass Added
solar_panel_glass_broken Added
solar_panel_glass_uncabled Added
solar_panel_plasma Added
solar_panel_plasma_broken Added
solar_panel_plasma_uncabled Added
solar_panel_uranium Added
solar_panel_uranium_broken Added
solar_panel_uranium_uncabled Added
solar_tracker_broken Added
solar_tracker_broken_uncabled Added
solar_tracker_uncabled Added

Edit: diff updated after 60ea293

@Emisse
Copy link
Contributor

Emisse commented Jun 19, 2024

are you in the ss14 discord

@ps3moira
Copy link

The sprites themselves don't look that great.

@CaasGit
Copy link
Contributor Author

CaasGit commented Jun 21, 2024

Newer sprites are in, updated images above.

@snebl
Copy link
Contributor

snebl commented Jun 26, 2024

I love everything about this, the sprites looks cool and looks like it adds nuance to an otherwise boring power source.

Makes solars an actual thing you can work on, instead of just that errand you send the assistants to do.

@Golinth
Copy link
Contributor

Golinth commented Jul 8, 2024

I love this, like a lot. Upgradable solars sounds amazing. Make them into the power house they should be over the course of a round, with the help of salv or cargo.

@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Aug 6, 2024
Copy link
Contributor

github-actions bot commented Aug 6, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@lzk228
Copy link
Contributor

lzk228 commented Aug 11, 2024

are you working on it?

@github-actions github-actions bot added Changes: No C# Changes: Requires no C# knowledge to review or fix this item. and removed S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted labels Aug 11, 2024
@CaasGit
Copy link
Contributor Author

CaasGit commented Aug 11, 2024

are you working on it?

Merge conflict resolved.

@UbaserB UbaserB added the S: Undergoing Maintainer Discussion Status: Currently going through an extended discussion amongst maintainers, as per procedure. label Aug 31, 2024
@slarticodefast
Copy link
Member

slarticodefast commented Sep 4, 2024

I merged #31425 in the meantime until the maintainer discussion for this PR is finished. You might want to check if you need to re-add that construction recipe to the building menu (please merge master for this). We still need to do some testing on how much power is produced for upgraded panels on different stations, but the concept has been approved so far.

@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Sep 4, 2024
Copy link
Contributor

github-actions bot commented Sep 4, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Sep 5, 2024
@CaasGit
Copy link
Contributor Author

CaasGit commented Sep 5, 2024

Resolved the conflicts. I decided to remove the construction entries I added for the panels and tracker as well. Do let me know if there's any questions around this within the discussion, I'd be more than glad to answer anything.

@slarticodefast
Copy link
Member

Hey, sorry for the wait, we are currently quite backlogged with reviews.
I gave it an in-game test and the power supply values seem to be good on the first look. But we can adjust the exact numbers later if necessary. A few minor things I noticed need a small cleanup first though:

The solar panel sprites point in the wrong direction compared to before, could you rotate them by 180 degrees? This is important because for the power calculation a raytracer checks if there is anything blocking the area in front of the panel - if they point towards the station they don't produce power.
Screenshot (301)
Screenshot (302)

When you replace a normal solar panel with a plasma one it does not register the contruction to be complete and wants you to undo the steps:
Screenshot (303)
Not sure if this is a problem with construction graphs in general though.

Otherwise this is should be good to merge and the maintainers think it is a great addition to engineering gameplay.

@CaasGit
Copy link
Contributor Author

CaasGit commented Oct 2, 2024

Awesome! I'll be taking a look at these two issues.

@CaasGit
Copy link
Contributor Author

CaasGit commented Oct 3, 2024

Rotation should be fixed now.

I do believe that the issue is within how construction graphs are handled as a whole, I'm not seeing anything that is different between the basic glass version and the other versions, any tips on how to debug construction graphs would be handy but it reads correct to me compared to the solarpaneluranium and solarpanelplasma nodes within the graph itself.

@slarticodefast slarticodefast self-assigned this Oct 4, 2024
@slarticodefast
Copy link
Member

Tested in-game and should be good to merge.
Since the new maintainer policy is now in effect a second maintainer has to give approval and merge this, but that should be quick since this was already approved conceptually in the internal discussion.
Thank you for your contribution.

@slarticodefast slarticodefast added the S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. label Oct 4, 2024
Copy link
Member

@UbaserB UbaserB left a comment

Choose a reason for hiding this comment

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

Sorry for being late to the party, can you tweak the sprite so that the silhouette is closer to the original and the panel itself being less like. overdetailed cause the pixels are very kinda chaotic and messy. Square is better than diamond! (looks better in an array)

@CaasGit
Copy link
Contributor Author

CaasGit commented Oct 4, 2024

Sorry for being late to the party, can you tweak the sprite so that the silhouette is closer to the original and the panel itself being less like. overdetailed cause the pixels are very kinda chaotic and messy. Square is better than diamond! (looks better in an array)

Can you provide a quick mock up of what you're thinking? We've been through some iteration within the sprite channel months ago with a few reworks and were under the impression that the sprites were approved as is.

@UbaserB
Copy link
Member

UbaserB commented Oct 4, 2024

Can you provide a quick mock up of what you're thinking? We've been through some iteration within the sprite channel months ago with a few reworks and were under the impression that the sprites were approved as is.

Yeah so sorry for that, I was kind of looking at goon and /vg/ sprites for the general shape (even if the style itself is not what we're going for)
image
image

@CaasGit
Copy link
Contributor Author

CaasGit commented Oct 4, 2024

Can you provide a quick mock up of what you're thinking? We've been through some iteration within the sprite channel months ago with a few reworks and were under the impression that the sprites were approved as is.

Yeah so sorry for that, I was kind of looking at goon and /vg/ sprites for the general shape (even if the style itself is not what we're going for) image image

These look very similar to the sprites as they are in this PR, except the sprites within the PR are tilted a bit more to showcase the panel itself. The goon panel looks to almost have the same profile as well with maybe two pixels less in tilt.

To be clear your asking for us to rework the entire sprite to remove a row or two of pixels to decrease the effect of the panels being tilted?

@UbaserB
Copy link
Member

UbaserB commented Oct 4, 2024

These look very similar to the sprites as they are in this PR, except the sprites within the PR are tilted a bit more to showcase the panel itself. The goon panel looks to almost have the same profile as well with maybe two pixels less in tilt.

To be clear your asking for us to rework the entire sprite to remove a row or two of pixels to decrease the effect of the panels being tilted?

It's basically just making the blue bit on your pr less thick and less tilted yeah
and then theres the matter of making the shading simpler

@CaasGit
Copy link
Contributor Author

CaasGit commented Oct 4, 2024

I feel like we've been pulled in both directions here via the conversation that was done months ago in sprite-dungeon. We had to completely alter the dithering and shading done to all the sprites. Why wasn't this brought up months ago or even a month ago while the PR was in maintainer discussion?

@UbaserB
Copy link
Member

UbaserB commented Oct 4, 2024

I feel like we've been pulled in both directions here via the conversation that was done months ago in sprite-dungeon. We had to completely alter the dithering and shading done to all the sprites. Why wasn't this brought up months ago or even a month ago while the PR was in maintainer discussion?

It was definitely brought up in maintainer discussion but there was just so little discussion that no one refuted my claim, or reviewed it... Please understand that there are at least a hundred PRs under discussion and it's pretty easy to lose track of one or two.

@CaasGit
Copy link
Contributor Author

CaasGit commented Oct 4, 2024

I feel like we've been pulled in both directions here via the conversation that was done months ago in sprite-dungeon. We had to completely alter the dithering and shading done to all the sprites. Why wasn't this brought up months ago or even a month ago while the PR was in maintainer discussion?

It was definitely brought up in maintainer discussion but there was just so little discussion that no one refuted my claim, or reviewed it... Please understand that there are at least a hundred PRs under discussion and it's pretty easy to lose track of one or two.

Sure, but in this case at the last moment, is it worth killing the entire PR for this change that can be done by another contributor in the future? The license is permissive on the sprites as intended so others can make the change they see fit to match the vision you propose.

I very much support getting something that's 95% there and an improvement over something into main and then coming back around to it to fix as it's own item instead of dragging this PR out for months which has already burned us out as we've had limited to no communication after we've been through a round or two of re-spriting.

@CaasGit
Copy link
Contributor Author

CaasGit commented Oct 4, 2024

Resolved the conflicts. I decided to remove the construction entries I added for the panels and tracker as well. Do let me know if there's any questions around this within the discussion, I'd be more than glad to answer anything.

I even a month ago raised the point that we were open to hearing feedback or questions, Being a part of the maintainer discussion for the PR someone has opened even as an observer could help solve these issues.

@UbaserB
Copy link
Member

UbaserB commented Oct 4, 2024

Sure, but in this case at the last moment, is it worth killing the entire PR for this change that can be done by another contributor in the future? The license is permissive on the sprites as intended so others can make the change they see fit to match the vision you propose.

It's your decision in the end but as soon as you address the changes I'll merge it.

@SlamBamActionman SlamBamActionman added S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. T: New Feature Type: New feature or content, or extending existing content D3: Low Difficulty: Some codebase knowledge required. A: Engineering Area: Engineering department, including Atmospherics. T: Visual Change Type: Deals with changes to art, sprites or other visuals in the game. size/L Denotes a PR that changes 1000-4999 lines. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Nov 14, 2024
@SlamBamActionman SlamBamActionman added S: Awaiting Changes Status: Changes are required before another review can happen and removed S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. labels Dec 16, 2024
@Warpzoned
Copy link

@CaasGit How's this going? Have you made any progress on the re-spriting?

@Pumkin69
Copy link

i'd be willing to help with sprite work i can understand how frustrating it is

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A: Engineering Area: Engineering department, including Atmospherics. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. D3: Low Difficulty: Some codebase knowledge required. P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. S: Awaiting Changes Status: Changes are required before another review can happen S: Undergoing Maintainer Discussion Status: Currently going through an extended discussion amongst maintainers, as per procedure. size/L Denotes a PR that changes 1000-4999 lines. T: New Feature Type: New feature or content, or extending existing content T: Visual Change Type: Deals with changes to art, sprites or other visuals in the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.