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

Abstractify basic walls #77797

Merged
merged 3 commits into from
Nov 16, 2024
Merged

Conversation

ShnitzelX2
Copy link
Contributor

Summary

Infrastructure "abstractify basic walls"

Purpose of change

Colored wall bloat is egregious, as is redefining the same flags over and over

Describe the solution

Set up a simple wall hierarchy by material

Also, defined values for fields in map_common_bash_info and related structs' constructors. copy-from uses the default constructor, and unset fields default to values inconsistent with the default optional values from load() functions, so copying from an abstract terrain didn't work.

I didn't do half-walls here because they have differences that seemed questionable

Describe alternatives you've considered

Testing

  • Can burn t_wall but not t_concrete_wall
  • Can destroy t_wall with a pickaxe but not t_concrete_wall
  • Can mine t_wall and t_concrete_wall with a pickaxe
  • t_wall_glass is still transparent
  • Can remove paint from t_wall_blue with a paint chipper
  • Deconstructed a table
  • Deconstructed t_wall
  • Blew up the side of a TCLF without errors

Additional context

Let me know if I misplaced anything. I'd like to do this with windows, but they need extra work for copy-from

-not adding them means they default to values inconsistent with optional values from load() functions
@github-actions github-actions bot added Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style [JSON] Changes (can be) made in JSON [C++] Changes (can be) made in C++. Previously named `Code` Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Nov 13, 2024
move_cost now optional
@github-actions github-actions bot added Translation I18n [Python] Code made in Python BasicBuildPassed This PR builds correctly, label assigned by github actions and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels Nov 14, 2024
@Maleclypse Maleclypse merged commit 1de726b into CleverRaven:master Nov 16, 2024
22 of 28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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: Infrastructure / Style / Static Analysis Code internal infrastructure and style Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions [Python] Code made in Python Translation I18n
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants