More damage fixes

Fix two damage bugs - one that generates too much damage when switching planes, and one that doesn't generate enough damage when switching layers.