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

More lab background tiles will match floor #27962

Merged
merged 4 commits into from
Jan 30, 2019
Merged

More lab background tiles will match floor #27962

merged 4 commits into from
Jan 30, 2019

Conversation

sneeze-attack
Copy link
Contributor

Summary

SUMMARY: Bugfixes "More lab background tiles will match floor"

Purpose of change

Alleviates issue with lab terrain not matching surrounding floor tiles as described in #27139

Describe the solution

  1. Created new terrain tiles for lab which includes these IDs:
t_reinforced_door_glass_lab_c
t_reinforced_door_glass_lab_o
t_door_lab_c
t_door_lab_o
t_door_lab_frame
t_door_lab_b
t_mdoor_lab_frame
t_door_metal_lab_c
t_door_metal_lab_o
t_door_glass_lab_c
t_door_glass_lab_o
t_door_glass_frosted_lab_c
t_door_glass_frosted_lab_o
t_gates_mech_control_lab
t_gates_control_metal_lab
t_gates_concrete_control_lab
t_gates_concrete_brick_lab
  1. Adjusted new terrains to have t_thconc_floor where possible (such as deconstructing or bashing)

  2. Added new terrains to all tilesets. Used same graphic ID t_thconc_floor used or used t_concrete when t_thconc_floor did not have a separate graphic available.

  3. Added t_thconc_floor and t_strconc_floor to any tilesets that did not already have them defined.

Describe alternatives you've considered

I am not aware of any alternatives to this issue

Additional context

Some tilesets such as Chesthole have the wooden door background filled in which prevents you from setting a background other than t_floor. To fix this, the png files must be edited.

Some of the mapgen in the labs appear to use t_door_metal_c. This appears to be hardcoded and not configurable via JSON files.

A lot of tilesets still have missing or incorrect backgrounds for items. Much of this likely needs to be fixed for the individual tileset.

@AMurkin
Copy link
Contributor

AMurkin commented Jan 29, 2019

I think you may squash some commits or even all of them to one.

@sneeze-attack
Copy link
Contributor Author

sneeze-attack commented Jan 29, 2019

I think you may squash some commits or even all of them to one.

Thanks for catching that, squashed down to 4.

@ZhilkinSerg ZhilkinSerg added <Enhancement / Feature> New features, or enhancements on existing Map / Mapgen Overmap, Mapgen, Map extras, Map display Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON labels Jan 30, 2019
@ZhilkinSerg ZhilkinSerg self-assigned this Jan 30, 2019
@ZhilkinSerg ZhilkinSerg merged commit f53995c into CleverRaven:master Jan 30, 2019
@ZhilkinSerg ZhilkinSerg removed their assignment Jan 30, 2019
@sneeze-attack
Copy link
Contributor Author

sneeze-attack commented Jan 31, 2019

Living quatters and armory in labs still have "street" concreete (the type you would see at electrical substation, for example) for the floor. And it mixed with lights tiles which is basicly lab concrete floor with the spotlight on it. Look in to it, if you can.
Otherwise - awesome additions to make labs look unique. Thank you.

I'll give it another go after my work on the mall is finished. If you can provide screenshots, that is the most helpful as some tilesets have the issue, some do not depending on the tilesets' configuration.

I do know what you mean about the armory and living quarters though. So you prefer that the t_strconc_floor (that the armory uses) all be replaced with t_thconc_floor to make the entire lab have the same floor? I can do that, I just figured that was more of an intentional design rather than sloppy design or mistake.

Another idea is that I could probably keep the floor the same but make the lights have the correct background.

@sneeze-attack sneeze-attack deleted the floorfix_lab branch January 31, 2019 11:30
@sneeze-attack
Copy link
Contributor Author

sneeze-attack commented Jan 31, 2019

@SomeDeadGuy these screenshots help a lot. I'll take a second pass at the labs and reference your original issue again with the next PR. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Enhancement / Feature> New features, or enhancements on existing Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants