+2 −8

class_definitions.lua

lua/class_definitions.lua

+2 −5

activity_handlers.cpp

src/activity_handlers.cpp

+22 −18

artifact.cpp

src/artifact.cpp

+1 −1

character.cpp

src/character.cpp

+21 −0

damage.cpp

src/damage.cpp

+6 −0

damage.h

src/damage.h

+1 −1

game.cpp

src/game.cpp

+6 −0

game_constants.h

src/game_constants.h

+1 −1

iexamine.cpp

src/iexamine.cpp

+76 −79

item.cpp

src/item.cpp

+22 −20

item.h

src/item.h

+12 −6

item_factory.cpp

src/item_factory.cpp

+4 −2

itype.h

src/itype.h

+1 −1

martialarts.cpp

src/martialarts.cpp

+62 −179

melee.cpp

src/melee.cpp

+1 −1

mondefense.cpp

src/mondefense.cpp

+1 −1

npc.cpp

src/npc.cpp

+1 −1

npcmove.cpp

src/npcmove.cpp

+10 −4

player.cpp

src/player.cpp

+7 −6

ranged.cpp

src/ranged.cpp

+1 −1

sounds.cpp

src/sounds.cpp

+1 −1

tutorial.cpp

src/tutorial.cpp