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

Allows dropping of projectiles #1580

Merged
merged 8 commits into from
Jul 5, 2013

Conversation

CalebJohn
Copy link
Member

This gives projectiles and scrolls support to be dropped.

There is a bug where you can pick up more of a projectile then you dropped, I couldn't find this but I'm hoping @bucketh3ad might have a better idea.

@edisonout
Copy link
Member

This works for scrolls, throwing knives and icicles. but there are 2 different problems for others. You can drop throwing axes but they are just thrown off the screen so you can't pick them up again & I get a blue screen error saying something about nodes/ammo when I try to drop an arrow.

@ghost ghost assigned bucketh3ad Jun 20, 2013
@bucketh3ad
Copy link
Member

@edisonout Good find. Sentry tracker for the arrow error is here: https://app.getsentry.com/hawkthorne/journey-to-the-center-of-hawkthorne/group/6139503/

@CalebJohn Thanks for getting started on this. If you want any help testing and fixing all the various items to make sure everything's working, I'm your guy.

@CalebJohn
Copy link
Member Author

@edisonout the arrow error is unrelated to this pull but has been addressed here #1579 , as for the throwing axes, I'll look into it right away, thanks.

@bucketh3ad ya I think it may be related to #1570 but it looks like when you pick up projectiles you're picking up the max not the amount you droppped

@CalebJohn
Copy link
Member Author

Throwing axes are now fixed, I'm thinking that we need to add more properties to the projectiles to give them a proper bounding box once dropped.

@Protuhj
Copy link
Contributor

Protuhj commented Jun 20, 2013

I see you added a directory field to some of the weapons, but you don't use that field outside of the Scroll.lua, did you mean to use that elsewhere?

@CalebJohn
Copy link
Member Author

Its already built in to projectile.lua so it is also being used there it's just not showing up in the diff

@Protuhj
Copy link
Contributor

Protuhj commented Jun 20, 2013

That makes sense. My bad.

On Thu, Jun 20, 2013 at 5:01 PM, Caleb John notifications@git.luolix.topwrote:

Its already built in to projectile.lua so it is also being used there it's
just not showing up in the diff


Reply to this email directly or view it on GitHubhttps://github.com//pull/1580#issuecomment-19783042
.

@bucketh3ad
Copy link
Member

Good, except you can pick up projectiles you've thrown on the run if you hit the button quick enough. It's not a major problem with throwing knives, but it crashes with lightning since the projectile isn't the same as the inventory object.

We need to differentiate between thrown and dropped projectiles somehow.

@CalebJohn
Copy link
Member Author

@bucketh3ad could you check if this actually fixes it? I was able to duplicate once but could never get it again.

@bucketh3ad
Copy link
Member

Looks like that did the trick. Should be ready to merge.

@didory123
Copy link
Member

For throwing axes, you can throw them and you can pick them back up. Regular projectiles work fine though.

EDIT: Arrows don't work, it crashes saying "nodes/ammo not found"

Conflicts:
	src/inventory.lua

fixes arrow drop crash and throwing axe
Conflicts:
	src/inventory.lua

update to master
@CalebJohn
Copy link
Member Author

So Updated this to master and fixed dropping arrows and picking up throwing axes.

@didory123
Copy link
Member

The throwing axes are still really bugged, you can pick them up after you throw them. Arrows now work fine though.

@CalebJohn
Copy link
Member Author

Sorry @didory123 I blame the bad fix on being really tired when I made my original claim this should return the axe to its old behavior.

@didory123
Copy link
Member

@CalebJohn This pull will be good after you fix the conflicts, just merge whenever you're ready

Conflicts:
	src/inventory.lua

update to master
@CalebJohn
Copy link
Member Author

done and done

CalebJohn added a commit that referenced this pull request Jul 5, 2013
@CalebJohn CalebJohn merged commit 93568a7 into hawkthorne:master Jul 5, 2013
@CalebJohn CalebJohn deleted the drop-projectiles branch June 12, 2015 04:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants