+1 −1

rail.json

data/json/items/gunmod/rail.json

+7 −7

sights.json

data/json/items/gunmod/sights.json

+1 −1

underbarrel.json

data/json/items/gunmod/underbarrel.json

+4 −0

class_definitions.lua

lua/class_definitions.lua

+1 −8

ballistics.cpp

src/ballistics.cpp

+13 −0

ballistics.h

src/ballistics.h

+11 −0

calendar.h

src/calendar.h

+104 −33

character.cpp

src/character.cpp

+20 −0

character.h

src/character.h

+3 −0

dispersion.h

src/dispersion.h

+0 −2

game_constants.h

src/game_constants.h

+19 −7

item.cpp

src/item.cpp

+3 −3

item_factory.cpp

src/item_factory.cpp

+5 −2

itype.h

src/itype.h

+14 −6

newcharacter.cpp

src/newcharacter.cpp

+2 −3

npcmove.cpp

src/npcmove.cpp

+1 −1

player.cpp

src/player.cpp

+3 −4

player.h

src/player.h

+24 −12

player_display.cpp

src/player_display.cpp

+215 −146

ranged.cpp

src/ranged.cpp

+2 −0

ranged.h

src/ranged.h

+43 −0

map_helpers.cpp

tests/map_helpers.cpp

+12 −0

map_helpers.h

tests/map_helpers.h

+1 −34

monster_test.cpp

tests/monster_test.cpp

+326 −0

ranged_balance.cpp

tests/ranged_balance.cpp

+13 −0

test_statistics.h

tests/test_statistics.h

+1 −1

gunmod.json

tools/format/examples/gunmod.json

+1 −1

format.conf

tools/format/format.conf