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

Adds pet FOOD flag for monsters and taming #23779

Merged
merged 4 commits into from May 21, 2018

Conversation

Projects
None yet
6 participants
@DracoGriffin
Copy link
Member

commented May 20, 2018

Creatures with CATFOOD / DOGFOOD flag can be tamed when fed with cat / dog food, respectively.

Simple PR to allow for upcoming expanded dog breeds and more.

Adds DOGFOOD flag for monsters
Creatures with DOGFOOD flag can be tamed when fed with dog food.
@cainiaowu

This comment has been minimized.

Copy link
Contributor

commented May 20, 2018

Need document added for modder

@DracoGriffin

This comment has been minimized.

Copy link
Member Author

commented May 20, 2018

Need document added for modder

I don't understand what you're asking.

@John-Candlebury

This comment has been minimized.

Copy link
Contributor

commented May 20, 2018

I don't understand what you're asking.

I think they mean you should add a brief explanation of what the flag does in /doc/JSON_FLAGS.md

Added flag explanation
Per feedback, explains that DOGFOOD flag allows that creature to be tamed when given dog food.
@DracoGriffin

This comment has been minimized.

Copy link
Member Author

commented May 20, 2018

I think they mean you should add a brief explanation of what the flag does in /doc/JSON_FLAGS.md

Yeah, not sure why when there's plenty of stuff not documented... milkable isn't even there.

Either way, this has been corrected.

@smolbird

This comment has been minimized.

Copy link
Contributor

commented May 20, 2018

Yeah, not sure why when there's plenty of stuff not documented... milkable isn't even there.

Gee, I wonder how that became problem in the first place...

@ZhilkinSerg

This comment has been minimized.

Copy link
Contributor

commented May 20, 2018

There are three pet food types. Can you expand this further for all three types?

@kevingranade

This comment has been minimized.

Copy link
Member

commented May 20, 2018

@smolbird chill it with the snide comments, if you dont have anything productive to say, you dont have anything to say.

@DracoGriffin

This comment has been minimized.

Copy link
Member Author

commented May 20, 2018

There are three pet food types. Can you expand this further for all three types?

You mean dog food, cat food, and cattle fodder? The only one missing is cat food. I suppose I can replace that as well. Please specify so I can address this sooner. Thank you.

Gee, I wonder how that became problem in the first place...
chill it with the snide comments, if you dont have anything productive to say, you dont have anything to say.

This is my fault. I wasn't being reasonable, because I thought I had explained what it did in mtype.h, but I realize I should be documenting in the DOC files as well, to hopefully assist others like myself, trying to help create with little to no knowledge of coding changes.

Add flag to mon_dog
Add DOGFOOD flag to mon_dog to retain tamability.
@DracoGriffin

This comment has been minimized.

Copy link
Member Author

commented May 21, 2018

Added new flag to mon_dog to retain ability to tame them. Rather than making a new PR to fix that if this one is merged. A "Duh!" moment for me.

@ZhilkinSerg

This comment has been minimized.

Copy link
Contributor

commented May 21, 2018

You mean dog food, cat food, and cattle fodder? The only one missing is cat food. I suppose I can replace that as well. Please specify so I can address this sooner. Thank you.

Yes, cat food. You can do it in another PR if you want to.

Add CATFOOD flag
Per ZhilkinSerg -- all previous tamable animals now reference appropriate food flag to be tamed

@DracoGriffin DracoGriffin changed the title Adds DOGFOOD flag for monsters and taming Adds pet FOOD flag for monsters and taming May 21, 2018

@DracoGriffin

This comment has been minimized.

Copy link
Member Author

commented May 21, 2018

Yes, cat food. You can do it in another PR if you want to.

Might as well address it now, it's not like it's two wholly separate things -- pretty related. Either way, this has been fixed.

@ZhilkinSerg ZhilkinSerg merged commit bcf2e27 into CleverRaven:master May 21, 2018

3 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.09%) to 23.57%
Details
gorgon-ghprb Build finished.
Details

@DracoGriffin DracoGriffin deleted the DracoGriffin:dogfood_flag branch May 21, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.