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

Interact Menu: runOnHover can now be a different CODE than the statement #1415

Merged
merged 1 commit into from
Jun 2, 2015
Merged

Conversation

GitHawk
Copy link
Contributor

@GitHawk GitHawk commented May 28, 2015

Expanded render, compileMenu, compileMenuSelfAction so runOnHover can be CODE
e.g. runOnHover = QUOTE([] call DFUNC(myRunOnHoverCheck););
This allows more dynamic menus.

  • added SurgicalKit action to other body parts
  • fixed vanilla damage in bandageLocal
  • added ACE messge to CPRLocal informing about sucess
  • added surgicalKit and surgicalKitLocal functions
  • fixed some german translations
  • added surgicalKit functions to preInit

Expanded render, compileMenu, compileMenuSelfAction so runOnHover can be
CODE
@jaynus jaynus changed the title runOnHover can now be CODE runOnHover can now be CODE & SurgicalKits May 28, 2015
@jaynus
Copy link
Contributor

jaynus commented May 28, 2015

Edited title to include Surgical kits as there was code included for those as well. New hover code looks good, it caches appropriately so we aren't taking PFH compile overhead.

@esteldunedain @Glowbal

@jaynus jaynus added the kind/enhancement Release Notes: **IMPROVED:** label May 28, 2015
@jaynus jaynus added this to the 3.1.0 milestone May 28, 2015
@GitHawk
Copy link
Contributor Author

GitHawk commented May 28, 2015

Yes, that was the other suitable option. And I didn't like it either.

@nicolasbadano
Copy link
Contributor

The runOnHover part seems fine. I first assumed it was neccesary for the surgical kit stuff, but it's not the case; it should have been a sepparate PR, but meh.

@GitHawk
Copy link
Contributor Author

GitHawk commented May 28, 2015

I forgot to push the surgicalKit stuff to a different branch - sry

@thojkooi
Copy link
Contributor

Surgical kit will not go in. We have a different implementation for that which is (nearly) completed. #1392

Please remove it from this PR and @esteldunedain can asses if we will take the runOnHover.

@nicolasbadano
Copy link
Contributor

The run on hover stuff is basically a single commit. I can just cherry-pick it from this branch into master; no need for a separate PR.

@GitHawk
Copy link
Contributor Author

GitHawk commented May 28, 2015

@Glowbal My implementation follows the other stuff (e.g. bandage) and is complete.

@GitHawk
Copy link
Contributor Author

GitHawk commented May 31, 2015

@esteldunedain Have you cherry-picked my additions yet?
@Glowbal Please consider at least using my changes in bandageLocal as it will reset vanilla damage.

@GitHawk
Copy link
Contributor Author

GitHawk commented Jun 2, 2015

@esteldunedain I removed the medical stuff. Please merge, so I can continue develloping/debugging ACE.

@nicolasbadano
Copy link
Contributor

@esteldunedain I removed the medical stuff. Please merge, so I can continue develloping/debugging ACE.

Thanks

nicolasbadano added a commit that referenced this pull request Jun 2, 2015
runOnHover can now be CODE & SurgicalKits
@nicolasbadano nicolasbadano merged commit 8f15856 into acemod:master Jun 2, 2015
@nicolasbadano nicolasbadano changed the title runOnHover can now be CODE & SurgicalKits runOnHover can now be CODE Jun 2, 2015
@nicolasbadano nicolasbadano changed the title runOnHover can now be CODE Interact Menu: runOnHover can now be a different CODE than the statement Jun 2, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants