readded the blacksmith as an activenpc
improve category selection border
removed torch, visually tweaked shopping gamestate, changed prices of materials
Merge branch 'master' into blacksmith_active_npc

Conflicts:
	src/level.lua
switch jump back to attack
add trombonist enemies to valley
change damamge and hp of trombonists
Merge pull request #1058 from didory123/trombonist

Add trombonist enemies to valley
Merge pull request #1030 from NimbusBP1729/blacksmith_active_npc

readded the blacksmith as an activenpc
removed attack skating changed troy's jump back to its original
Merge pull request #1059 from NimbusBP1729/animation_tweaks

removed attack skating changed troy's jump back to its original
removes weird 0 in dialog printing
Merge pull request #1061 from NimbusBP1729/fix_dialog_fonts

removes weird 0 in dialog printing
delayed blacksmith speech
lowered sfx volumes
blocks blacksmith
Merge pull request #1073 from NimbusBP1729/blacksmith_cleanup

delayed blacksmith speech
fixed missing floor space
Merge pull request #1077 from CalebJohn/floor-fix

Black caverns missing floor space
Merge branch 'master' into weapons_stats

Conflicts:
	src/character_map.lua