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

Jump to bottom

In-game Armor sprite change #66931

Merged
merged 17 commits into from
Jul 21, 2023
Merged

In-game Armor sprite change #66931

merged 17 commits into from
Jul 21, 2023

Conversation

lispcoc
Copy link
Contributor

@lispcoc lispcoc commented Jul 16, 2023 •
edited
Loading

Summary

Features "In-game Armor sprite change"

Purpose of change

Allows you to look the way you want no matter what armor you wear.

Describe the solution

"Change sprite" option in player status menu. you can select sprite from item you have.

Describe alternatives you've considered

Testing

Game starts. Sprite is able to be overriden. Restore default sprite successfully.

Additional context

image

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON [C++] Changes (can be) made in C++. Previously named `Code` Items: Armor / Clothing Armor and clothing <Enhancement / Feature> New features, or enhancements on existing labels Jul 16, 2023
github-actions[bot]
github-actions bot reviewed Jul 16, 2023
View reviewed changes
src/armor_layers.cpp Outdated Show resolved Hide resolved
src/character_attire.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jul 16, 2023
lispcoc and others added 2 commits July 16, 2023 13:23
@lispcoc @github-actions
Update src/armor_layers.cpp
aba2f02 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@lispcoc @github-actions
Update src/character_attire.cpp
f06f38a 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions and removed astyled astyled PR, label is assigned by github actions labels Jul 16, 2023
mqrause
mqrause reviewed Jul 16, 2023
View reviewed changes
src/armor_layers.cpp Outdated Show resolved Hide resolved
github-actions[bot]
github-actions bot reviewed Jul 16, 2023
View reviewed changes
src/player_display.cpp Outdated Show resolved Hide resolved
src/player_display.cpp Outdated Show resolved Hide resolved
Qrox
Qrox reviewed Jul 16, 2023
View reviewed changes
data/raw/keybindings.json Outdated Show resolved Hide resolved
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Jul 16, 2023
Qrox
Qrox reviewed Jul 16, 2023
View reviewed changes
data/raw/keybindings.json Outdated Show resolved Hide resolved
@lispcoc @Qrox
Keybinding fix
50cc800 
Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>
@alp7292
Copy link
Contributor

alp7292 commented Jul 16, 2023 •
edited
Loading

can you change the sprite only for the items you wear or also the items you have in your inventory. cuz if its only for the ones you wear you cant change shoes and helmets

@lispcoc
Copy link
Contributor Author

lispcoc commented Jul 16, 2023

can you change the sprite only for the items you wear or also the items you have in your inventory. cuz if its only for the ones you wear you cant change shoes and helmets

I think shoes and helmets already changeable, but its more useful. I will change like that.

github-actions[bot]
github-actions bot reviewed Jul 16, 2023
View reviewed changes
src/game_inventory.cpp Outdated Show resolved Hide resolved
src/game_inventory.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the astyled astyled PR, label is assigned by github actions label Jul 16, 2023
lispcoc and others added 2 commits July 17, 2023 00:20
@lispcoc @github-actions
astyle src/game_inventory.cpp
a40be25 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@lispcoc @github-actions
astyle src/game_inventory.cpp
31d7c57 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Jul 16, 2023
@github-actions github-actions bot removed astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jul 16, 2023
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Jul 16, 2023
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jul 16, 2023
@bombasticSlacks
Copy link
Contributor

You have a CLANG tidy error to resolve

@github-actions github-actions bot added Info / User Interface Game - player communication, menus, etc. Code: Build Issues regarding different builds and build environments Vehicles Vehicles, parts, mechanics & interactions SDL: Tiles / Sound Tiles visual interface and sounds. Code: Tests Measurement, self-control, statistics, balancing. Melee Melee weapons, tactics, techniques, reach attack Code: Tooling Tooling that is not part of the main game but is part of the repo. labels Jul 20, 2023
github-actions[bot]
github-actions bot reviewed Jul 20, 2023
View reviewed changes
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Auto-requesting reviews from non-collaborators: @jbytheway

@lispcoc
Copy link
Contributor Author

lispcoc commented Jul 20, 2023

You have a CLANG tidy error to resolve

It seems to be fixed, Thanks!

@bombasticSlacks bombasticSlacks merged commit d5d3d0d into CleverRaven:master Jul 21, 2023
@bombasticSlacks
Copy link
Contributor

Thanks, and thanks for the contributions 😄

@lispcoc lispcoc deleted the in_game_sprite_change branch July 25, 2023 17:18
@Brambor Brambor mentioned this pull request Jun 9, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RenechCDDA RenechCDDA RenechCDDA left review comments

@github-actions github-actions[bot] github-actions[bot] left review comments

@mqrause mqrause mqrause left review comments

@Qrox Qrox Qrox left review comments

Assignees
No one assigned
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [C++] Changes (can be) made in C++. Previously named `Code` Code: Build Issues regarding different builds and build environments Code: Tests Measurement, self-control, statistics, balancing. Code: Tooling Tooling that is not part of the main game but is part of the repo. <Enhancement / Feature> New features, or enhancements on existing Info / User Interface Game - player communication, menus, etc. Items: Armor / Clothing Armor and clothing [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Melee Melee weapons, tactics, techniques, reach attack SDL: Tiles / Sound Tiles visual interface and sounds. Vehicles Vehicles, parts, mechanics & interactions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@lispcoc @alp7292 @bombasticSlacks @Qrox @mqrause @RenechCDDA