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

Add Sprite changes to Logic Gates to show the input/output state #33277

Merged
merged 8 commits into from
Dec 6, 2024

Conversation

0tito
Copy link
Contributor

@0tito 0tito commented Nov 12, 2024

About the PR

Gates now show the state of their inputs and outputs on the sprite

Why / Balance

Its easier to use them if you can see the states

Media

2024-11-12.10-41-36.mp4

Requirements

Changelog

@github-actions github-actions bot added the Changes: Sprites Changes: Might require knowledge of spriting or visual design. label Nov 12, 2024
Copy link
Contributor

github-actions bot commented Nov 12, 2024

RSI Diff Bot; head commit 04873c0 merging into 8776c71
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Devices/gates.rsi

State Old New Status
logic_a Added
logic_b Added
logic_o Added

Edit: diff updated after 04873c0

@deltanedas
Copy link
Contributor

use separate layers for a/b/output and none of the evil stuff is needed

@0tito
Copy link
Contributor Author

0tito commented Nov 14, 2024

Is this better? im not exactly the best coder :godo:

@SlamBamActionman SlamBamActionman added the S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. label Nov 14, 2024
@SaphireLattice SaphireLattice added P3: Standard Priority: Default priority for repository items. T: New Feature Type: New feature or content, or extending existing content D3: Low Difficulty: Some codebase knowledge required. S: Needs Review Status: Requires additional reviews before being fully accepted A: Art Area: Art with no implications for other areas. T: Visual Change Type: Deals with changes to art, sprites or other visuals in the game. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Nov 15, 2024
Copy link
Contributor

@Aeshus Aeshus left a comment

Choose a reason for hiding this comment

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

Thanks for the PR!

There's some small code style issues, and a bug where the code accidentally sets InputA instead of InputB.

Other than that, I like the change and the rest of the visualizer/layering stuff looks good (I don't have personal experience with any of it).

Also, I'm not a maintainer, so this is just a peer review. I may have made some mistakes in my review, or have missed things, so take this review with a grain of salt.

@github-actions github-actions bot added the size/M Denotes a PR that changes 100-999 lines. label Nov 20, 2024
Copy link
Contributor

@Aeshus Aeshus left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks for applying the changes/feedback.

I think the only thing now is that you could add yourself to the meta.json's copyright to say that you created the sprites for the light-up states.

Also, make sure to click "resolve" for comments/requested changes once you address it. Otherwise, maintainers may have the false impression that it is still a work-in-progress or ongoing issue.

Copy link
Member

@slarticodefast slarticodefast left a comment

Choose a reason for hiding this comment

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

Cool idea. Needs a little more cleanup before it can be merged.
Thanks to Aeshus and delta for doing the previous reviews.

@slarticodefast slarticodefast self-assigned this Nov 27, 2024
@slarticodefast slarticodefast added S: Awaiting Changes Status: Changes are required before another review can happen and removed S: Needs Review Status: Requires additional reviews before being fully accepted labels Nov 27, 2024
…and make input sprites toggle between on and off
@slarticodefast
Copy link
Member

Quick question: What changes did you make to logic.png? I don't see any difference yet somehow it still doubled in size.

@0tito
Copy link
Contributor Author

0tito commented Dec 3, 2024

I used it as base when i was making the other sprites, and i think i changed its sprite when i was learning how to change sprites but then instead of reverting it i painted it back to a similar color :godo: i used krita, maybe when i saved i changed something on it?

@slarticodefast
Copy link
Member

If it is not changed leave it as it was to preserve the git history and attributions.
And I gave the PR a quick in-game test and the sprites for gates other than the or gate seem to be wrong now when spawning them.
grafik

@0tito
Copy link
Contributor Author

0tito commented Dec 3, 2024

This happens in normal wizden too, iirc oasis has some gates like that, but if you craft them and switch through them normally they work. I can try to change it tho, also how do i "revert" the change to logic.png, would just replacing the sprite with upstream logic.png fix it? or do i have to do something else

@slarticodefast
Copy link
Member

Just copying the original sprite back is probably the easiest way. There should be a git command, too, but no idea which one.
Thanks for fixing the other gates! I'll give it another test later.

Copy link
Member

@slarticodefast slarticodefast left a comment

Choose a reason for hiding this comment

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

I tested this and it works as intended for non-pulsed signals. With signal buttons there seems to be some weird behaviour for gates, but that is not the fault of this PR and is happening on master as well. I opened an issue for that #33716.
Thank you for your first contribution!

@slarticodefast slarticodefast added S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. and removed S: Awaiting Changes Status: Changes are required before another review can happen labels Dec 4, 2024
@0tito
Copy link
Contributor Author

0tito commented Dec 4, 2024

🫡

@VasilisThePikachu VasilisThePikachu merged commit de19418 into space-wizards:master Dec 6, 2024
14 checks passed
Doctor-Cpu pushed a commit to Doctor-Cpu/space-station-14 that referenced this pull request Jan 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A: Art Area: Art with no implications for other areas. Changes: Sprites Changes: Might require knowledge of spriting or visual design. D3: Low Difficulty: Some codebase knowledge required. P3: Standard Priority: Default priority for repository items. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. size/M Denotes a PR that changes 100-999 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.

7 participants