CleverRaven / Cataclysm-DDA / 36367
33%

DEFAULT BRANCH: master
Ran
Jobs 1
Files 552
Run time 42s
Badge
Embed ▾
README BADGES
x

If you need to use a raster PNG badge, change the '.svg' to '.png' in the link

Markdown

Textile

RDoc

HTML

Rst
36367

push

travis-ci

ZhilkinSerg 
JSONize flag-based modifiers on comestible enjoyability (#35813)

* JSONize flag taste modifiers
There was only a single flag that affected the "fun" value of
comestibles (BAD_TASTE) but I want to add more for a water sanitation
rework, so rather than hardcoding more, I JSONized the process.

Adds a new member variable to json_flag objects, "taste_mod," which
additively modifies the enjoyability of comestibles.
This is done via a new function, "item::get_comestible_fun". The MUSHY
flag check was moved there from Character::fun_for as well.
"item::get_comestible_fun" is of course called in "Character::fun_for",
so this commit shouldn't have any functional changes.

* Make "islot_comestible::fun" private
Anyone trying to query a comestible's "fun" should be using the new
"item::get_comestible_fun" method. This commit is to enforce that.

Of course, that had to be reconciled with the current usage of "fun".
I added "item" and "Item_factory" as friends of "islot_comestible" so
that "item::get_comestible_fun" and the function that sets "fun" still
have access to it.
All other queries of "fun" were instead changed to the new method.
This has the side-effect of applying BAD_TASTE and MUSHY effects in
places where they didn't before, including but not limited to:
- Interaction with taste blocker bionic.
- NPCs making decisions about faction food stocks.
- NPCs making decisions about whether they personally want food.
- Scavenging monsters deciding whether to eat food off the ground.

* Apply suggestions from code review

Co-Authored-By: BevapDin <tho_ki@gmx.de>

* Subjugate rogue tab (i.e. astyle)

* Fix merge mistake

24 of 24 new or added lines in 8 files covered. (100.0%)

39272 of 142312 relevant lines covered (27.6%)

512955.84 hits per line

New Missed Lines in Diff

Lines Coverage ∆ File
1
52.71
 -0.2% src/consumption.cpp
1
1.35
 0.0% src/faction_camp.cpp
1
3.45
 0.0% src/iuse.cpp
1
3.94
 0.15% src/monattack.cpp
2
27.51
 -1.52% src/npcmove.cpp
3
49.01
 0.09% src/item.cpp
3
34.73
 -0.37% src/npc.cpp

Uncovered Existing Lines

Lines Coverage ∆ File
1
52.71
 -0.2% src/consumption.cpp
1
11.5
 -0.02% src/game.cpp
1
49.01
 0.09% src/item.cpp
1
41.84
 0.0% src/npctalk.cpp
1
80.75
 0.0% src/overmap.cpp
2
47.54
 -3.28% src/active_item_cache.cpp
2
57.83
 -2.88% src/mapgendata.cpp
2
22.82
 0.1% src/melee.cpp
2
33.33
 0.0% src/skill.h
3
19.08
 -0.04% src/iuse_actor.cpp
3
48.96
 -0.3% src/mutation.cpp
4
44.36
 0.32% src/map.cpp
6
47.32
 -0.09% src/character.cpp
6
11.03
 -1.1% src/clzones.cpp
8
34.73
 -0.37% src/npc.cpp
18
13.28
 -1.72% src/suffer.cpp
29
72.89
 0.5% src/skill.cpp
31
10.98
 -1.18% src/newcharacter.cpp
35
27.51
 -1.52% src/npcmove.cpp
42
24.46
 -1.01% src/mapgen.cpp
76
12.4
 -3.84% src/mapgen_functions.cpp
90
10.53
 -3.44% src/map_extras.cpp
196
8.53
 0.0% src/panels.cpp
Jobs
ID Job ID Ran Files Coverage
10 36367.10 (COMPILER=g++-6 CODE_COVERAGE=true) 552
27.6
 Travis Job 36367.10
Source Files on build 36367