Commit Graph

110 Commits (1f2349ef6e82b7b1b82e1de6db2776e2043fb18d)

Author SHA1 Message Date
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.
7 years ago
David Cernat fa652964fd
Merge pull request #403 from OpenMW/master
Add OpenMW commits up to 9 Apr 2018
7 years ago
Capostrophic 4f64ba7b7f Implement sBookSkillMessage GMST 7 years ago
David Cernat bd541b1e5b Merge pull request #287 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
7 years ago
Andrei Kortunov dc0313a36f Use base skill value when calculating rank requirements 7 years ago
David Cernat e3929df38a Merge pull request #239 from OpenMW/master
Add OpenMW commits up to 14 Jul 2017
8 years ago
Andrei Kortunov 54b4d93f79 Added a special function for GUI sounds playing 8 years ago
David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
8 years ago
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
8 years ago
David Cernat edb155869b Merge pull request #201 from OpenMW/master
Add OpenMW commits up to 19 Apr 2017
8 years ago
Andrei Kortunov c3fd327bb2 Fixed drowning widget initialization 8 years ago
David Cernat a58601fb2b [Client] Delineate tes3mp-only code more clearly, part 1 8 years ago
David Cernat 3136a12051 Resolve conflicts in pull request #75
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
8 years ago
Allofich 53e94b7c3f Fix shadowing warnings 8 years ago
David Cernat 15a4602482 Add getSkillIncrease, setSkillIncrease functions to OpenMW's NpcStats 8 years ago
David Cernat 8fbc6f31f1 Add setLevelProgress function to OpenMW's NpcStats 8 years ago
MiroslavR dfc62c99b4 Show correct class image in level-up dialog (Fixes #3443) 9 years ago
scrawl 67bd6cd708 Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
10 years ago
scrawl 2ce269c0fc Werewolf stats compatibility with old save files 10 years ago
scrawl 44582fe3b3 Don't use separate werewolf skills/attributes for non-player werewolves
Still need to deal with save files.
10 years ago
Rohit Nirmal 396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 10 years ago
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
10 years ago
scrawl e81d2a9dde Merge remote-tracking branch 'upstream/openmw-35' into HEAD
Conflicts:
	apps/openmw/mwmechanics/npcstats.cpp
10 years ago
scrawl 9dbd9af31c Adjust fix for Bug #2360 to repair affected savegames 10 years ago
scrawl b542143e3a Fix faction reputation case sensitivity issue (Fixes #2360) 10 years ago
scrawl 61ec9196c8 Cap the displayed attribute multiplier in levelup to attribute points left to 100 10 years ago
scrawl b5e0e45c78 Fix iLevelUpTotal not being used in the levelUp logic 10 years ago
scrawl ae77eacd7e Skill progress refactoring 10 years ago
scrawl 6d097fbfbd Normalise spelling of "levelled" throughout the code 10 years ago
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.
10 years ago
scrawl 431f540791 ESSImport: fix NPC factions 10 years ago
scrawl 1869d37cfc Remove unused mLastDrowningHit 10 years ago
scrawl 579f5d232f Move interactive messageBox to separate function 10 years ago
scrawl efa9ff3a76 Fix incorrect implementation of iWerewolfBounty 10 years ago
scrawl c4fa671381 Don't allow raising faction rank if the next rank has no name (Fixes #1975) 10 years ago
scrawl 40587f984d Implement price-based mercantile skill progress (Fixes #1947), thanks Hrnchamd
Correct barter formula (removed erroneous clamping)
10 years ago
scrawl 4138c3e966 Reuse health of previous level rather than recalculating initial health (Fixes #1787) 11 years ago
scrawl 1dc9e151cb Count werewolf kills (Fixes #1525) 11 years ago
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.
11 years ago
scrawl bfd91c0681 Fix potential NpcStats overwriting issue 11 years ago
scrawl 6cc691115b Savegame: store most of CreatureStats 11 years ago
scrawl b0fbea9d57 Removed a wrong assertion. Max drowning time is defined by GMST. 11 years ago
scrawl ef39b0f6ab Fixes #1291: Faction rank saving issue
A value of 0 is the first rank, -1 means not a member
11 years ago
Jeffrey Haines e2fab228f9 Save state is handled correctly now. 11 years ago
Jeffrey Haines 940c88d2ec Cleaned up code, implemented crime ids
There is a problem with my game freezing. ToggleAi stops my character
11 years ago
scrawl edb5a54092 Include some more required Ogre headers explicitely. 11 years ago
Marc Zinnschlag c18c3e51ee handle IDs that don't exist anymore after loading 11 years ago
Marc Zinnschlag 9788bbcab9 partially store creature state in saved game files (only attributes and dynamics for now) 11 years ago
Marc Zinnschlag b0532e0c85 store NPC state in saved game files 11 years ago
Emanuel Guevel 8824af30b4 Allow to display message box outside of dialogue window 11 years ago