Fix for Adreneline CBM/Injector, Mycus wrath

[Malkeus]

This adds a new..reference function? to effect.cpp/h. I needed to retrieve int_dur_factor for use in creature.cpp.
I then used the new function to force set the intensity if int_dur_factor > 0.

This resolves #14719 for real this time. After this change, there is no longer a debug message after using adrenaline cbm, injector or mycus wrath. Testing included adrenaline cbm, adrenaline injector and mycus wrath with some meth and cocaine as a chaser.

The bug was minor, but very noticeable when you needed the adrenaline rush to gtfo in a hurry. After activating or reactivating adrenaline cbm, adrenaline injector or mycus wrath(via seeing a plant monster), the intensity would be set to 0 for a single turn, giving you the stat and speed loss of adrenaline comedown and mycus respite. The next turn it would be caught by a sanity check and trigger a debug message, then function normally.

Still unresolved to my satisfaction: why does reupping with the adrenaline injector give 30 turns of duration instead of the expected 12? The cbm gives 7 as expected...vexing.

I had fun with this, and learned something. I hope this is the correct fix this time around ;)

[Malkeus]

lol...ignore the not declared in this scope bit, that was a panic'd earlier commit that i reverted. the update creature.h was also a reverted change that carried over from my local branch and I couldn't figure out how to remove. If either one will cause a problem, let me know and I'll do a clean branch.

[Malkeus]

Why?

[BevapDin]

Style issue: no space in front of the (, but a space after it. And another space before the ). See doc/CODE_STYLE.txt

Applies to the other added code as well. (Function declaration and definition are fine as they are now.)

And I agree with questions. Why are you adding and removing empty lines seemingly at random?

[Malkeus]

I will fix the style issues later today. The lines seem to be holdovers from the fiasco of my first attempt, I couldn't figure out how to make th4em go away short of starting over completely. I blame my own stupidity compounded by smartgit. I'm honestly thrilled that the only issues are style ones :)

edit: meh, i'll fix them now.

[Malkeus]

I feel like this isn't very informative, any suggestions?

[Coolthulhu]

"Returns the number of turns it takes for the intensity to fall by 1 or 0 if intensity isn't based on duration.

[Malkeus]

Thank you, that's much better.

[Malkeus]

Should I style the rest of this function similarly? I notice it doesn't follow the same style. Also I'm not clear on how
e.set_intensity( ( e.get_duration() / e.get_int_dur_factor() ) + 1 ); ---This seems more legible to me.
should look. Is this acceptable or was the original ok?

original:
e.set_intensity((e.get_duration() / e.get_int_dur_factor()) + 1);

[BevapDin]

The version e.set_intensity( ( e.get_duration() / e.get_int_dur_factor() ) + 1 ); is correct.

Should I style the rest of this function similarly?

If you change large parts of a function, you could apply astyle before changing it. But here you only add a few lines, so it's not necessarily.

[Malkeus]

Ok, thank you, I'll keep that in mind. This is ready to for merging then.
On Jan 6, 2016 4:29 PM, "BevapDin" notifications@github.com wrote:

The version e.set_intensity( ( e.get_duration() / e.get_int_dur_factor()
) + 1 ); is correct.

Should I style the rest of this function similarly?

If you change large parts of a function, you could apply astyle before
changing it. But here you only add a few lines, so it's not necessarily.

—
Reply to this email directly or view it on GitHub
#14733 (comment)
.

[Coolthulhu]

Why add it twice?
Can't existing effects be assumed to have correct intensity?

[Malkeus]

I assumed no, because of the existing check for bad intensity. I'm compiling without this check to see what happens.

[Malkeus]

It all seems to work fine, I'll delete this from my commit.

[Malkeus]

Sleek and smooth, like a swimmer zombies legs.