mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-29 22:06:45 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2931 from Capostrophic/intimidate

Browse source 
Increase disposition on marginal Intimidate wins (#5485)
This commit is contained in:
Bret Curtis 2020-06-26 13:47:35 +02:00 committed by GitHub
commit c4453322e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -31,6 +31,7 @@
Bug #5452: Autowalk is being included in savegames Bug #5452: Autowalk is being included in savegames
Bug #5479: NPCs who should be walking around town are standing around without walking Bug #5479: NPCs who should be walking around town are standing around without walking
Bug #5484: Zero value items shouldn't be able to be bought or sold for 1 gold Bug #5484: Zero value items shouldn't be able to be bought or sold for 1 gold
Bug #5485: Intimidate doesn't increase disposition on marginal wins
Bug #5490: Hits to carried left slot aren't redistributed if there's no shield equipped Bug #5490: Hits to carried left slot aren't redistributed if there's no shield equipped
Bug #5499: Faction advance is available when requirements not met Bug #5499: Faction advance is available when requirements not met
Feature #390: 3rd person look "over the shoulder" Feature #390: 3rd person look "over the shoulder"

7
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View file

@ -786,8 +786,11 @@ namespace MWMechanics
{ {
if (std::abs(c) < iPerMinChange) if (std::abs(c) < iPerMinChange)
{ {
x = 0; // Deviating from Morrowind here: it doesn't increase disposition on marginal wins,
y = -iPerMinChange; // which seems to be a bug (MCP fixes it too).
// Original logic: x = 0, y = -iPerMinChange
x = -iPerMinChange;
y = x; // This goes unused.
} }
else else
{ {