David Cernat
4b30a44816
[Client] Compare crimeTime and deathTime when NPCs forgive player crimes
...
Previously, all crime witnesses stopped being hostile to a respawning player for as long as the player's diedSinceArrestAttempt was true. That meant that, in an area with no guards to arrest the player, crime witnesses did not enage in combat with the player at all ever again until diedSinceArrestAttempt became false.
This commit makes it so the time of the last crime is recorded for each witness, and that is then compared with the time of the LocalPlayer's last death for a one-time crime forgiveness during that player's current life.
This is essentially a gameplay adjustment for "singleplayer with respawns," and will have to be reworked to make sense for every player in multiplayer, though that requires reworking the crime system as a whole and is thus on hold.
2018-07-06 14:17:54 +03:00
David Cernat
fa652964fd
Merge pull request #403 from OpenMW/master
...
Add OpenMW commits up to 9 Apr 2018
2018-04-10 06:43:24 +03:00
Capostrophic
4f64ba7b7f
Implement sBookSkillMessage GMST
2018-04-02 21:12:38 +03:00
David Cernat
bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
2017-09-12 07:38:49 +03:00
Andrei Kortunov
dc0313a36f
Use base skill value when calculating rank requirements
2017-09-07 21:06:10 +04:00
David Cernat
e3929df38a
Merge pull request #239 from OpenMW/master
...
Add OpenMW commits up to 14 Jul 2017
2017-07-15 09:13:04 +03:00
Andrei Kortunov
54b4d93f79
Added a special function for GUI sounds playing
2017-07-10 15:48:00 +04:00
David Cernat
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
2017-06-18 18:16:10 +03:00
Bret Curtis
c781d1f8ed
purge unnecessary imports
...
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
2017-06-09 19:08:53 +02:00
David Cernat
edb155869b
Merge pull request #201 from OpenMW/master
...
Add OpenMW commits up to 19 Apr 2017
2017-04-19 22:12:33 +03:00
Andrei Kortunov
c3fd327bb2
Fixed drowning widget initialization
2017-04-19 08:48:16 +04:00
David Cernat
a58601fb2b
[Client] Delineate tes3mp-only code more clearly, part 1
2017-02-26 16:59:53 +02:00
David Cernat
3136a12051
Resolve conflicts in pull request #75
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
2016-10-14 18:34:17 +03:00
Allofich
53e94b7c3f
Fix shadowing warnings
2016-10-06 23:33:52 +09:00
David Cernat
15a4602482
Add getSkillIncrease, setSkillIncrease functions to OpenMW's NpcStats
2016-09-30 07:15:03 +03:00
David Cernat
8fbc6f31f1
Add setLevelProgress function to OpenMW's NpcStats
2016-09-30 06:26:43 +03:00
MiroslavR
dfc62c99b4
Show correct class image in level-up dialog ( Fixes #3443 )
2016-06-26 03:22:58 +02:00
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-08-18 23:06:12 +02:00
scrawl
2ce269c0fc
Werewolf stats compatibility with old save files
2015-06-21 18:45:49 +02:00
scrawl
44582fe3b3
Don't use separate werewolf skills/attributes for non-player werewolves
...
Still need to deal with save files.
2015-06-21 17:28:18 +02:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
dteviot
ca8c8c6aa4
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 17:42:07 +13:00
scrawl
e81d2a9dde
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
...
Conflicts:
apps/openmw/mwmechanics/npcstats.cpp
2015-02-08 21:28:29 +01:00
scrawl
9dbd9af31c
Adjust fix for Bug #2360 to repair affected savegames
2015-02-08 21:26:58 +01:00
scrawl
b542143e3a
Fix faction reputation case sensitivity issue ( Fixes #2360 )
2015-02-08 21:04:01 +01:00
scrawl
61ec9196c8
Cap the displayed attribute multiplier in levelup to attribute points left to 100
2015-02-06 01:27:17 +01:00
scrawl
b5e0e45c78
Fix iLevelUpTotal not being used in the levelUp logic
2015-02-06 01:27:17 +01:00
scrawl
ae77eacd7e
Skill progress refactoring
2015-02-06 01:27:16 +01:00
scrawl
6d097fbfbd
Normalise spelling of "levelled" throughout the code
2015-02-05 04:18:42 +01:00
scrawl
2346c3528d
Remove NpcStats::mProfit and store it in the script instead
...
Also use the Profit label when the "minimumProfit" script variable exists, rather than hardcoding to NPCs.
2015-01-31 22:40:40 +01:00
scrawl
431f540791
ESSImport: fix NPC factions
2015-01-27 23:12:21 +01:00
scrawl
1869d37cfc
Remove unused mLastDrowningHit
2015-01-17 00:10:45 +01:00
scrawl
579f5d232f
Move interactive messageBox to separate function
2015-01-10 23:23:48 +01:00
scrawl
efa9ff3a76
Fix incorrect implementation of iWerewolfBounty
2014-12-24 15:45:12 +01:00
scrawl
c4fa671381
Don't allow raising faction rank if the next rank has no name ( Fixes #1975 )
2014-10-05 16:47:55 +02:00
scrawl
40587f984d
Implement price-based mercantile skill progress ( Fixes #1947 ), thanks Hrnchamd
...
Correct barter formula (removed erroneous clamping)
2014-09-25 13:02:42 +02:00
scrawl
4138c3e966
Reuse health of previous level rather than recalculating initial health ( Fixes #1787 )
2014-08-10 17:09:14 +02:00
scrawl
1dc9e151cb
Count werewolf kills ( Fixes #1525 )
2014-06-18 16:56:36 +02:00
scrawl
d5b97005ab
Make ESM::Faction skills optional ( Fixes #1508 )
...
Also increased size of mSkills array to 7. Some factions with 7 skills can be found in the vanilla CS. The previously "mUnknown" int appears to be the 7th element of the skills array.
2014-06-16 02:52:16 +02:00
scrawl
bfd91c0681
Fix potential NpcStats overwriting issue
2014-05-26 12:31:08 +02:00
scrawl
6cc691115b
Savegame: store most of CreatureStats
2014-05-12 21:37:36 +02:00
scrawl
b0fbea9d57
Removed a wrong assertion. Max drowning time is defined by GMST.
2014-05-11 21:03:27 +02:00
scrawl
ef39b0f6ab
Fixes #1291 : Faction rank saving issue
...
A value of 0 is the first rank, -1 means not a member
2014-04-26 11:41:44 +02:00
Jeffrey Haines
e2fab228f9
Save state is handled correctly now.
2014-04-14 18:11:04 -04:00
Jeffrey Haines
940c88d2ec
Cleaned up code, implemented crime ids
...
There is a problem with my game freezing. ToggleAi stops my character
2014-04-05 10:26:14 -04:00
scrawl
edb5a54092
Include some more required Ogre headers explicitely.
2014-03-05 21:46:37 +01:00
Marc Zinnschlag
c18c3e51ee
handle IDs that don't exist anymore after loading
2014-02-16 16:23:05 +01:00
Marc Zinnschlag
9788bbcab9
partially store creature state in saved game files (only attributes and dynamics for now)
2014-02-16 15:56:36 +01:00
Marc Zinnschlag
b0532e0c85
store NPC state in saved game files
2014-02-16 15:51:45 +01:00
Emanuel Guevel
8824af30b4
Allow to display message box outside of dialogue window
2014-02-11 18:26:57 +01:00
