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

feat(content): look like for retrodays part2, 40mm ammo #4619

Merged
merged 4 commits into from May 9, 2024

Conversation

VissValdyr
Copy link
Contributor

@VissValdyr VissValdyr commented May 9, 2024

Purpose of change

part 1: #4611

This time I looked over the ammo. 40x ammo was missing a look alike, so they got one for retrodays

Describe the solution

Describe alternatives you've considered

Testing

Additional context

Checklist

@github-actions github-actions bot added the data PRs related to datas. Won't crash game (probably) label May 9, 2024
Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

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

feels bit weird, given looks_like for grenade is for much larger rockets. it may cause issues with other tilesets. could there be alternate sprites?

chaosvolt
chaosvolt previously approved these changes May 9, 2024
@VissValdyr
Copy link
Contributor Author

feels bit weird, given looks_like for grenade is for much larger rockets. it may cause issues with other tilesets. could there be alternate sprites?

I will check. It is fine enough for retrodays. Dead people have the right ones. I see to it.

@VissValdyr
Copy link
Contributor Author

@scarf005 sadly I can't find a better sprite for it. So we have to take that one for now. I mean best thing would be to have a real sprite for it. But that will do.

@chaosvolt
Copy link
Member

Hmm. Would shotshells be a better lookalike I wonder?

@VissValdyr
Copy link
Contributor Author

I checked with all other tile sets we have via hitchhiker guide. That sprite is the best one fitting.

Screenshot_20240509-120435_Opera
Screenshot_20240509-120440_Opera
Screenshot_20240509-120449_Opera
Screenshot_20240509-120500_Opera
Screenshot_20240509-120717_Opera

@VissValdyr
Copy link
Contributor Author

VissValdyr commented May 9, 2024

Hmm. Would shotshells be a better lookalike I wonder?

Could you be more precise? Which one? Shotshell itself is not an item name. Do you mean shotgun shells? Like 20ga?

@VissValdyr
Copy link
Contributor Author

20ga is also missing a sprite. Regular shotgun shots don't fit so well @chaosvolt
Screenshot_20240509-122350_Opera
Screenshot_20240509-122408_Opera

Copy link
Contributor

autofix-ci bot commented May 9, 2024

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

@scarf005 scarf005 changed the title feat(content): look like for retrodays part2 feat(content): look like for retrodays part2, 40mm ammo May 9, 2024
Copy link
Member

@chaosvolt chaosvolt left a comment

Choose a reason for hiding this comment

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

Welp, that works good enough then.

@chaosvolt chaosvolt merged commit d2785eb into cataclysmbnteam:main May 9, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
data PRs related to datas. Won't crash game (probably)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants