-
Notifications
You must be signed in to change notification settings - Fork 122
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
Mercs now start with weapons in their inventory #110
Conversation
changed 'mosquito' and the bomber ones
Hooray Jenkins reported success with all tests good! |
Ah yes- I should probably add that this resolves issue #109, and also that I really should have payed attention when reading #101, where @Cervator clearly stated that
(emphasis mine). Anyway, the next time a experienced member of the project mentions something, I'll try to pay attention XD. At least I only wasted four hours... T_T. |
Hehe sorry about the hassle! But thank you so much for figuring this one out :-) |
Do you want to have me work on making mercenaries equip items dropped on them, or do you just want to quickly remove the placeholder and pull? |
Please leave the placeholder in place, it'll be good to have it handy. I'll merge this soon'ish today, catching up after having mostly missed a day or two :-) Equipping items dropped on the mercenaries can be done as a separate issue any time later. Maybe we should add a few more options too, I never actually noticed there were only two of them enabled. |
Tested on both PC and Android, looking good! Thanks again :-) |
Oh, a Git protip as well: Whenever upstream (MovingBlocks) changes favor updating in these two ways:
Both of those approaches keep the history graph cleaner as it avoids merges in favor of just moving commits around cleanly :-) So right now with this merged assuming you have nothing outstanding locally you should be able to simply pull latest from upstream ( |
Thanks for the tip. I'm currently even with MovingBlocks, but next time I get behind I'll try this, I guess. |
The planets.json config file has the mercenary item listings, and neither one was starting with weapons in their inventory. I added weapons, and everything else worked ok. I also added a placeholder block for code for mercenaries equipping items dropped on them. I don't think we should have them do that, though- not having to worry about equipping mercenaries is easier for the player.