Merge branch 'Dunn_Works'
Merge branch 'Dunn_Works'
Fiddled with values and fixed typo

attacks are a little more reasonable now... enemies are weak as butts!
Keys can now unlock doors
Items cannot be picked up infinitely
Key can now ACTUALLY unlock doors
Fixed the time on print message

IM SO IMPATIENT
Enemy only attacks if has health
Merge branch 'master' of https://github.com/Mattrask/CSCI1101-group_project
Enemies don't deal damage if they die

Shits getting cray
Gave player and enemy defense in damage calculation

Will now need to have it desplay value taken in takedamage methods
Delete Game.java~
Enemy only attacks if has health
Enemies don't deal damage if they die

Shits getting cray
Gave player and enemy defense in damage calculation

Will now need to have it desplay value taken in takedamage methods
Delete Game.java~
User can view their health and stats now
Merge remote-tracking branch 'origin/lockhart'
Health in battle as well
Merge remote-tracking branch 'origin/lockhart'