Merge conflict solved: Added changes to NPCs and updated Case Generation

Now the NPCs have the right condition and the case generator initializes.
This isn't using the Case class yet.