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

Adds combat info, examine flag shorthands. Fixes suicide with guns, fix armor comparisons not working #12480

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

Conversation

Tsar-Salat
Copy link
Contributor

@Tsar-Salat Tsar-Salat commented Mar 21, 2025

About The Pull Request

This adds combat labels, which show the particular strength of an item when wielded. Item flags have been consolidated into shorthands.

closes #12086

Additionally, I fixed suicide with guns not working, due to a bug in #9845 , and fixed armor comparisions due to a regression in #11742

Ports:

Why It's Good For The Game

These are useful to go along with armor tags, and make it much more accessible for new players to check stats on weapons.

Testing Photographs and Procedure

Screenshots&Videos

Screenshot 2025-03-21 174914

Screenshot 2025-03-21 182218

image

dreamseeker_2D7gmmTWRP.mp4

Changelog

🆑 rkz, Ryll/Shaps, SpaceDragon00, TJatPBnJ, EOBGames, GPeckman, LemonInTheDark, SmArtKar, Hatterhat
add: Combat Information tag for weapons. Shows how many hits or bullets a weapon will take to crit
fix: fixes armor comparisions
fix: fixes suicides with guns
add: adds shorthands for item flags
add: adds variable on guns to modify bullet power. No weapon has anything except the normal value of 1, this just makes sure if people modify the integrity of guns or the like in the future, they go through this code which is accounted for in the combat tags display
add: pressure/cold/heat-proof clothing now has appropriate display in armor tag examine block
/:cl:

@Tsar-Salat Tsar-Salat requested a review from Rukofamicom March 21, 2025 22:53
@github-actions github-actions bot added the TGUI-Changes Contains changes to TGUI. Make sure its up to date with TGUI 4.0 label Mar 21, 2025
@Tsar-Salat Tsar-Salat changed the title Adds combat info. Fixes suicide with guns, fix armor comparisons not working Adds combat info, examine flag shorthands. Fixes suicide with guns, fix armor comparisons not working Mar 22, 2025
Copy link

github-actions bot commented Apr 4, 2025

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Feature Fix Merge Conflict TGUI-Changes Contains changes to TGUI. Make sure its up to date with TGUI 4.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Armor Stat comparison doesn't work
1 participant