My goal for the week was to integrate the gameplay-npc branch into our server and client. I also wanted to fix a bug on the server that resulted in inconsistent client speeds.
A few of us met up on Thursday and we were able to merge the gameplay-npc branch into the multiplayer branch. I was then able to move over the new gameplay logic (NPCs, security guard ability, grabbing artifact) to the server. I was also able to fix the bug with the client speeds.
I thought getting the new game logic integrated into the client and server would be a lot more difficult than it actually was, so I got more done than I expected to.
The goal for this coming week is to get the UI code integrated with our server and client. If gameplay has any new logic that they've finished in the last week, I'd also like to get that moved over to the server asap.
After spending three hours losing my mind over what I thought was an incredibly tricky and well-hidden bug, only to find out it was due to me incrementing with the wrong variable, I learned (for the upteenth time) that I am an idiot and should never assume that any portion of my code works.
Not feeling very live, laugh, love right now.