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

Put mines back. #117

Merged
merged 1 commit into from
Sep 29, 2021
Merged

Put mines back. #117

merged 1 commit into from
Sep 29, 2021

Conversation

kindaro
Copy link
Collaborator

@kindaro kindaro commented Sep 25, 2021

Resolve #99.

  • Checked out from 3ba21b6 — the last
    commit where this weapon existed.

  • Uses work in progress from Standardised explosives #113 for explosive projectiles. Since that work is behind main by a few commits, I simply copied the files I needed. This patch will become half its current size once Standardised explosives #113 is merged.

@kindaro
Copy link
Collaborator Author

kindaro commented Sep 25, 2021

I chose to qualitatively deviate from the original behaviour in one instance: in this draft mines are thrown with velocity 0. I think this is more cool because it communicates that they are attached to the floor and differentiates them from grenades. Please comment on this!

@kindaro
Copy link
Collaborator Author

kindaro commented Sep 25, 2021

Let us wait for #113 to get merged. I set this to draft to avoid accidental merge but it is ready for review!

@not-fl3 not-fl3 marked this pull request as ready for review September 26, 2021 14:48
@grufkork
Copy link
Collaborator

Added the new explosive system so it doesn’t compile now, but that should be easily fixed!

@kindaro
Copy link
Collaborator Author

kindaro commented Sep 28, 2021

Yep, I shall re-base this.

@kindaro kindaro force-pushed the feature/mines branch 2 times, most recently from 2ccd0af to 81cabce Compare September 29, 2021 06:15
Resolve fishfolk#99.

* Checked out from 3ba21b6 — the last
  commit where this weapon existed.

* Uses work in progress from fishfolk#113 for explosive projectiles.
@kindaro
Copy link
Collaborator Author

kindaro commented Sep 29, 2021

Ready to be merged!

@erlend-sh erlend-sh merged commit ff14a11 into fishfolk:main Sep 29, 2021
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.

Put mines back.
3 participants