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

GenericButton improvements #640

Merged
merged 5 commits into from Oct 11, 2019

Conversation

eps0003
Copy link
Member

@eps0003 eps0003 commented Jun 18, 2019

Status

READY

Description

New stuff:

  • Buttons only display when you are not attached to or inside the inventory of a blob except the one you're interacting with
  • Prevented displaying shop buttons while attached to the shop
    • This currently only prevents you from opening the shop while sleeping in a quarters (which you couldn't even buy from while sleeping)
  • Made seat arrows not display while inside a blob's inventory (crates)
  • Visible buttons are cleared when you attach to a blob or a blob attaches to you
    • Prevents opening a shop menu while attached to a blob (see issue below)

Issues:

  • High ping still allows you to open a shop menu while attached to a blob if you're fast
    • This is completely useless though since you can't buy from the shop while riding a siege/boat

Resolves #577
Resolves #600 (comment)

Steps to Test or Reproduce

Tested most CTF shops
Tested sieges, boats and crates
Didn't test TDM ruins, TTH related stuff (factory, scrolls), and wiring components (lever, button, coin slot, etc.) but it uses identical code to everything else so it should be fine

@eps0003 eps0003 requested a review from 1bardesign June 18, 2019 05:51
1bardesign
1bardesign previously approved these changes Jun 19, 2019
Copy link
Member

@1bardesign 1bardesign left a comment

Choose a reason for hiding this comment

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

Looks fine, there might be some issues with nested includes with this approach but it seems to only be used in top level files as far as I can tell. Definitely will need careful testing on net though to make sure there's no funny business.

Copy link
Member

@furai furai left a comment

Choose a reason for hiding this comment

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

@eps0003 can you resolve these merge conflicts?

@eps0003
Copy link
Member Author

eps0003 commented Oct 11, 2019

I swear I left a comment right after my commit. @furai can you check this PR out now that I've resolved the merge conflicts.

@eps0003 eps0003 requested a review from furai October 11, 2019 06:57
@furai furai merged commit 3f67f57 into transhumandesign:master Oct 11, 2019
@eps0003 eps0003 deleted the button-improvements branch February 8, 2020 23:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ballista/Catapult and tunnel interaction Building interaction while inside crate
3 participants