1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 10:49:57 +00:00
Commit graph

698 commits

Author SHA1 Message Date
scrawl
28fe81df90 Make Lights with OffDefault flag not emit light nor particles when placed in a cell (Fixes #1796) 2014-08-11 20:39:56 +02:00
scrawl
accab47724 Don't knock down from fall damage in onHit (CharacterController is doing that already) 2014-08-08 15:46:32 +02:00
scrawl
639ae7e06c Implement friendly hits on followers (Fixes #1139) 2014-08-03 16:24:16 +02:00
scrawl
216ebac2e9 Implement weapon condition damage for ranged weapons (Fixes #1746) 2014-08-03 16:24:11 +02:00
scrawl
b58b8c6f8f Adjust player position to ground when using a door marker, even if the player is levitating (Fixes #1737) 2014-07-31 04:28:02 +02:00
scrawl
0f1451babd Add epsilon to armor class calculation 2014-07-30 20:26:47 +02:00
scrawl
45af34d189 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-07-29 19:35:44 +02:00
scrawl
4773d754c6 Remove redundant isHostile flag (Fixes #1652) 2014-07-28 16:41:12 +02:00
scrawl
d69ed78ccd Don't add combat AI to player 2014-07-28 15:40:52 +02:00
Marc Zinnschlag
7991dfb907 Merge remote-tracking branch 'scrawl/master' 2014-07-28 09:03:17 +02:00
Marc Zinnschlag
c9cd7fb6b7 Merge branch 'scripts' 2014-07-28 09:02:24 +02:00
scrawl
d81e9cfefd Implement actors fighting for the actor they are following (Fixes #1141) 2014-07-27 20:33:45 +02:00
scrawl
75366b2e37 Implement CellRef's faction rank (rank requirement to use item) 2014-07-24 02:17:38 +02:00
scrawl
ca45a63cf7 Close doors instantly when using Lock instruction 2014-07-22 17:55:54 +02:00
scrawl
2b57c7fa67 Use CellRef's global variable to disable owner (Fixes #1677) 2014-07-22 17:06:40 +02:00
scrawl
d43c21a9fc Make NPCs react to being attacked by other actors (Fixes #1588) 2014-07-21 20:36:26 +02:00
scrawl
127add7623 Don't allow dialogue with werewolf NPCs 2014-07-21 18:19:45 +02:00
scrawl
5629803a08 Implement correct armor mitigation mechanics 2014-07-20 23:45:31 +02:00
scrawl
804f1a5e59 Adjust combat mechanics
- Projectiles can not trigger critical hits
 - Critical hits are only possible if the target is not in combat (Fixes #1669)
 - Hand-to-hand deals damage to health during entire duration of knockdown animation (including standing up)
2014-07-20 23:17:55 +02:00
scrawl
1636fd66db Don't add creature base damage to weapon damage (UESP was wrong) 2014-07-20 22:26:26 +02:00
scrawl
28a0899d2b Implement difficulty scaling (Fixes #1505) 2014-07-20 16:38:20 +02:00
scrawl
5bbf07976f Consider Shield spell effect for creature armor rating 2014-07-20 14:41:39 +02:00
scrawl
691ba02115 Reduce wepaon condition even if attack misses 2014-07-20 14:12:27 +02:00
Marc Zinnschlag
4fb897f2f8 added missing getId functions to classes derived from MWWorld::Class 2014-07-18 09:56:58 +02:00
scrawl
123157b216 Implement elemental shield damage to attacker (Feature #1121) 2014-07-16 10:58:28 +02:00
scrawl
fd3f109362 Fix underflow for NPCs with level 0 2014-07-12 18:53:16 +02:00
scrawl
a1639371d3 Fix rounding for skill/attribute autocalc 2014-07-12 18:53:16 +02:00
scrawl
83819b2894 Traverse spells in record order from content files. bronrod_the_roarer is perfect now. Other NPCs have some differences. 2014-07-12 18:53:15 +02:00
scrawl
1c41ce9b9d Implement Hrnchamd's player and NPC autocalc spells (Some unclarities remaining, XXX) 2014-07-12 18:53:15 +02:00
scrawl
048d07b299 Show owner of doors in tooltip 2014-07-11 11:57:21 +02:00
scrawl
4aab4e1c26 Ignore item condition when determining value, except in trade (Fixes #1557) 2014-06-26 14:59:33 +02:00
scrawl
869fa08a32 Fix disarming a trap when key is used (Fixes #1556) 2014-06-26 14:30:19 +02:00
scrawl
3d9bdad8ba Correct run speed for creatures (by Hrnchamd - Fixes #1136) 2014-06-25 00:51:02 +02:00
scrawl
cc3c6ae7b8 Fix very slow movement on some creatures, e.g. rats (Bug #1136)
Neither fAthleticsRunBonus, fBaseRunMultiplier or the creature's athletics skill (i.e. Combat stat) have any effect on the run speed (tested by setting those to absurd values). The new formula is just a guess and doesn't seem to be completely accurate.
2014-06-19 02:36:10 +02:00
scrawl
6760f4c897 Make cached GMSTs in MWClass::Npc/Creature safer 2014-06-19 02:09:46 +02:00
scrawl
4234c70232 Savegame: Disable CustomData load optimization for npcs and creatures for now to preserve compatibility (still enabled for containers) 2014-06-19 02:00:40 +02:00
scrawl
2193977eec Savegame: Don't fill CustomData from ESM records if the savegame overwrites it anyway
This gets rid of some junk in ContainerStores (since clear() only sets count to 0 and doesn't really delete references), and significantly speeds up loading savegames (by about 80% in my test)
2014-06-18 22:59:18 +02:00
scrawl
1dc9e151cb Count werewolf kills (Fixes #1525) 2014-06-18 16:56:36 +02:00
scrawl
2477456f99 Implement Murder crimes and OnMurder instruction (Fixes #1315) 2014-06-17 04:05:27 +02:00
scrawl
8ac019611d Fix Potion use action removing the potion even when the action is not executed (Fixes #1521) 2014-06-17 04:05:20 +02:00
scrawl
28feb260eb Implement disposition/distance based aggression (Fixes #1520) 2014-06-16 20:05:53 +02:00
scrawl
3b7119ba0d Make Bipedal creatures always able to walk and swim (Fixes #1509)
This is necessary since the vanilla CS greys out the walk/swim checkboxes when Bipedal is checked.
2014-06-16 02:52:24 +02:00
scrawl
31a4e10c6f Fix incorrect trigger of change flag for static doors 2014-06-15 14:18:16 +02:00
scrawl
395f98e476 Fix triggering changed flag for all references when cell is visited
The InsertFunctor for cells was calling localRotateObject() for all references which set the mChanged flag in RefData to true.

Also clean up RefData interface slightly.
2014-06-15 14:18:16 +02:00
scrawl
91ed5183c8 Show base item value in tooltip, not real value (Fixes #1469) 2014-06-13 02:26:52 +02:00
scrawl
881ae33b74 Don't allow Creatures with no movement abilities to move (Fixes #1457) 2014-06-10 02:15:09 +02:00
scrawl
823ccb1b3d Don't batch statics that have "references persist" set (temporary fix for Arkngthand door - Fixes #1386) 2014-06-08 11:22:37 +02:00
scrawl
0063b63ae4 Don't use armor mitigation for fall damage 2014-06-05 22:23:57 +02:00
scrawl
00775035af Add missing hasItemHealth for lockpicks/probes (Fixes #1385) 2014-06-04 01:03:12 +02:00
scrawl
a6788cfb0e Support lights that do not have a model (Fixes #1361) 2014-05-29 16:44:50 +02:00
scrawl
039398c8ae Basic RefData and CellRef change tracking
Wrapped item charge handling in getItemHealth function
2014-05-25 14:30:07 +02:00
scrawl
a05c8fd3ce Make applyEnchantment return the record ID instead of modifying Ptr 2014-05-24 14:58:48 +02:00
Emanuel Guevel
1e4a854433 Remove static method MWWorld::Class::get(&Ptr)
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
2014-05-22 20:50:00 +02:00
scrawl
a872c9f83a Feature #1323: handle restocking levelled items 2014-05-18 12:53:21 +02:00
scrawl
b4ed828e21 Feature #1323: Implement restocking items (does not handle levelled lists yet) 2014-05-17 14:30:31 +02:00
scrawl
ae66d28c87 Feature #32: Implement respawn for containers, creatures and NPCs 2014-05-17 09:09:00 +02:00
scrawl
868e38a07c Fix Assault crimes being reported when striking in self-defense
Last missing fix for Bug #1134.
2014-05-16 08:32:00 +02:00
scrawl
a76e391ad0 Savegame: store door movement state (Closes #747) 2014-05-15 09:54:10 +02:00
scrawl
471bbd0021 Savegame: store levelled creature state and move to actorIds
(Closes #1332)
2014-05-15 09:54:04 +02:00
scrawl
9052cc4a57 Savegame: store ActiveSpells 2014-05-14 23:54:15 +02:00
scrawl
67e942e733 Bug #869: Some fixes to the previous fix 2014-05-14 07:13:12 +02:00
scrawl
6cc691115b Savegame: store most of CreatureStats 2014-05-12 21:37:36 +02:00
scrawl
312dc84fa4 Fix a bug where the player's inventory could be opened as a container
If an NPC uses AiActivate on the player (i.e. to activate dialogue) precisely in the frame where the player just died, the player's inventory would be opened as a container instead.
2014-05-08 20:40:45 +02:00
scrawl
1c8c26072d Crime and self defense fixes
- NPCs should still shout messages such as "thief" even if they did not report the crime
 - Fixed self defense for NPCs (they no longer attack the player when they were attacked by a non-player actor)
 - Fixed self defense for creatures (Fixes #1203)
2014-05-06 19:15:43 +02:00
scrawl
1b074e5524 Call setAttacked even if the attack missed. Unsuccessful hits should also evoke a response. 2014-05-02 22:38:39 +02:00
mrcheko
82121e0401 some checks reworked 2014-04-27 16:59:21 +04:00
Thomas
f6deca7c80 Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors 2014-04-23 13:02:51 -04:00
Thomas
61341d4206 Removed mLocked, kept it as "Negative lock level means unlocked" 2014-04-23 10:00:18 -04:00
Thomas
cac8e52154 Seperated locked and lock level, to allow for relocking doors to previous lock level.
The data is stored in the esm as -lockLevel if unlocked; lockLevel if locked. While not tested, it should not present any problems.
2014-04-23 05:12:07 -04:00
Jeffrey Haines
6733a1541e Fixes to Crime System
Victimless crimes were removed because victims may not exist in the
case of stealing items.

Is class now uses case insensitive comparison.

Fixed issue with confiscation of stolen items.
2014-04-19 19:03:31 -04:00
Jeffrey Haines
50dac98a2b Feature 1154 & 73: Crime and NPC reactions 2014-04-01 20:24:25 -04:00
Jeffrey Haines
4037f3705e Feature 1154 & 73: NPCs react to crime 2014-04-01 14:15:55 -04:00
Jeffrey Haines
9efef31bb8 Feature #953 Trader Gold - Unused code/warning resolved
Removed unused code
getBaseGold throws proper error
2014-03-28 17:27:23 -04:00
Jeffrey Haines
401d21b4ee getBaseGold implemented in MWWorld::Class for NPC and Creature
Implemented a getBaseGold() to get the vendor gold base
NPC gold base now can come from mNpdt12 and mNpdt52
2014-03-28 14:21:38 -04:00
Jeffrey Haines
895748f18d Gold Pool implemented for Vendors
It appears that my solution breaks persuasion gold for some reason. I
may be wrong. I can’t see where this could be happening as the files
I’ve changes should not affect persuasion at all.
2014-03-28 12:01:56 -04:00
Jeffrey Haines
6896142db1 Trader Gold Reset Delay
Trade Time initialized to 0
Gold pot set correctly for npc’s and creatures
2014-03-27 07:30:24 -04:00
Jeffrey Haines
2a8bf46607 Trader Gold Reset Delay
Implemented traded gold reset delay.

Note:
Traders gold pool is still in inventory.
2014-03-27 01:23:56 -04:00
scrawl
c8c0e5de38 Fixed code issues found with unity build. Missing include guards, duplicated functions, ... 2014-03-16 23:49:06 +01:00
Marc Zinnschlag
8b36de6c67 Merge remote-tracking branch 'cc9cii/Slaughterfish-fix' 2014-03-16 12:57:38 +01:00
cc9cii
43757efdc4 Feature #1030 - partial fix to stop creatures unable to walk/fly to come out of water. Does not necessarily handle situations where they are already out of water, however. 2014-03-16 08:09:14 +11:00
scrawl
d08394bf78 Fixes #1205: apparently creature and hand-to-hand (health) attacks should also level up armor skill (tested in vanilla) 2014-03-15 21:00:25 +01:00
scrawl
072dc6d438 Feature #50: Implement marksman mechanics. 2014-03-08 06:03:45 +01:00
scrawl
12de0afb03 Feature #50: Spawn projectiles
Fix a bug in copyObjectToCell.
Make actor rotations more consistent.
2014-03-08 01:31:27 +01:00
Marc Zinnschlag
83ded18af0 encapsulated reference collections 2014-02-23 21:21:27 +01:00
Marc Zinnschlag
367919200f moved CellRefList into a separate file 2014-02-23 20:11:05 +01:00
Marc Zinnschlag
ea16f79d77 Merge remote-tracking branch 'gus/AIFix2' 2014-02-17 10:54:07 +01:00
gus
e5b19cf3c6 clean up 2014-02-17 10:37:11 +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
gus
a315d5cc2b aiactivate works. Bug when you try to use it on a reference that doesn't exist. Need to clran up door.cpp 2014-02-14 12:55:14 +01:00
scrawl
e1e7a492e2 Fix movement speed formula for flying creatures 2014-02-05 05:18:10 +01:00
Marc Zinnschlag
1b5301eec0 Merge branch 'savedgame'
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp
2014-02-01 18:16:32 +01:00
Marc Zinnschlag
5b04c10e1d added creature/NPC state to saved games (only container/inventory for now) 2014-02-01 17:36:23 +01:00
Marc Zinnschlag
dd674566a2 store content of containers in saved game files 2014-01-31 13:25:32 +01:00
Marc Zinnschlag
900532a6ca store additional state of lights in saved game files 2014-01-30 12:37:33 +01:00
scrawl
2b15b8b484 Fix gold bugs (Fixes #1145, Fixes #1146) 2014-01-29 15:37:27 +01:00
scrawl
305e78c981 Fix creature attack bug 2014-01-29 15:37:27 +01:00
scrawl
190512156d Use some more GMSTs for enchanting 2014-01-29 15:37:26 +01:00
scrawl
ea7e0abdc2 Move WhenStrikes skill success to a more appropriate place 2014-01-29 15:37:26 +01:00
scrawl
b8db151da7 Add missing skill increases for armor hits 2014-01-29 15:37:26 +01:00
mrcheko
5ee1dc6be8 attacktypes error fix 2014-01-28 21:07:26 +02:00
scrawl
194413c955 Feature #1119: Implement Resistance/Weakness to normal weapons magic effect. Handle fWereWolfSilverWeaponDamageMult. 2014-01-22 12:26:53 +01:00
scrawl
16f5f5862d Feature #956: Implement blocking melee attacks 2014-01-21 23:25:24 +01:00
scrawl
82a07af72c Fix typo (should be Strength, not Luck). Use GMSTs for strength damage. 2014-01-21 12:30:23 +01:00
scrawl
1617a4f7d9 Use fCombatDistance 2014-01-21 12:30:23 +01:00
scrawl
a4404054bb Feature #1130: Add race power spells for NPCs as well, not just the player 2014-01-21 12:30:23 +01:00
scrawl
5de8c7fe29 Feature #1130: Add auto-calculated NPC spells 2014-01-21 12:30:23 +01:00
scrawl
851a7d5014 Feature #957: Handle area effects for "on touch" range 2014-01-21 12:30:15 +01:00
scrawl
0adc0f56ed Issue #777: Consider weapons in Creature::hit 2014-01-19 16:13:16 +01:00
scrawl
9723263730 Bug #1126: Tweak creature attack distance a bit (still no idea where this should come from) 2014-01-19 14:47:58 +01:00
scrawl
198bb0de60 Issue #777: Add CreatureAnimation variant for creatures with weapons/shields 2014-01-19 13:05:26 +01:00
scrawl
589fbbd871 Issue #777: Create InventoryStore for creatures with weapons/shields 2014-01-19 11:43:23 +01:00
scrawl
947b6c9645 kOgrePi unused 2014-01-18 22:16:31 +01:00
scrawl
9653355cf1 Feature #701: Spawn levelled creatures in cells 2014-01-18 07:26:27 +01:00
scrawl
149d77dedf Feature #960: Add knockdown and hit recovery for creatures 2014-01-17 17:41:16 +01:00
scrawl
9b32b1403b Feature #960: Implement Creature::hit 2014-01-17 17:19:08 +01:00
scrawl
5fc38e7ac4 Don't use blood effects for fatigue damage 2014-01-17 15:20:28 +01:00
scrawl
805843d7ff Closes #1086: Implement blood effects 2014-01-17 11:27:13 +01:00
scrawl
ddc432c7ef Fix stealing bug 2014-01-17 10:55:46 +01:00
scrawl
f070d9966d Implement movement speed formula for creatures. Still moving a bit too slow. 2014-01-17 10:55:46 +01:00
scrawl
ea8f60eddf Implement movement speed formula for creatures. Still moving a bit too slow. 2014-01-15 16:30:16 +01:00
scrawl
d544551f61 Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization)
Information provided by Hrnchamd.
2014-01-15 15:50:45 +01:00
scrawl
da3295d69c Closes #1106: Move stance to CreatureStats, since creatures also have separate run/walk animations. 2014-01-15 14:53:29 +01:00
scrawl
03b2e99802 Remove unused Combat stance 2014-01-15 14:53:29 +01:00
scrawl
d0500e8124 Some unneeded includes cleanup 2014-01-15 14:53:28 +01:00
scrawl
0c4b6ea89f Minor fix 2014-01-15 14:53:28 +01:00
scrawl
cd06b2177d Automatically knock down when fatigue goes below zero 2014-01-13 10:18:03 +01:00
scrawl
3a1b6dd354 Handle fCombatKODamageMult and fCombatCriticalStrikeMult. Fix SelectWrapper Function_Detected. 2014-01-13 10:18:02 +01:00
scrawl
83872f6bf5 Knockdown / hit recovery improvements. Use formula and GMSTs from research wiki for knockdown determination. Hand-to-hand automatically knocks out when fatigue empty. 2014-01-13 10:18:02 +01:00
scrawl
fb778f8ecd Use fEncumbranceStrMult 2014-01-12 04:09:51 +01:00
scrawl
10ddea45e9 Move crime from onHit to hit, since failed hits are apparently also a crime 2014-01-11 23:12:21 +01:00
scrawl
44b2380874 Closes #947: Decrease fatigue when running, swimming and attacking 2014-01-11 22:28:50 +01:00
scrawl
3db299f1b2 Fix fall damage crash 2014-01-11 21:30:26 +01:00
scrawl
9ddee8fd8c Autocalculate NPC reputation as according to research wiki 2014-01-11 04:03:13 +01:00
scrawl
909494ff35 Implement Assault crimes. In other words, NPCs now fight back! 2014-01-11 03:08:16 +01:00
scrawl
d9d6f37619 Use iVoiceHitOdds 2014-01-10 22:44:40 +01:00
Marc Zinnschlag
85707b5e3e Merge remote-tracking branch 'scrawl/master' 2014-01-09 09:35:54 +01:00
scrawl
baf55df7a1 Gold fixes (when did this break?) 2014-01-09 01:34:10 +01:00
scrawl
0f5dc59176 Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure. 2014-01-08 23:37:46 +01:00
Marc Zinnschlag
a7be755db0 Merge remote-tracking branch 'mrcheko/master' 2014-01-08 20:13:31 +01:00
scrawl
098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 2014-01-08 18:39:44 +01:00
mrcheko
46519062d3 hit recoils/knockdowns feature 2014-01-08 16:05:14 +02:00
scrawl
0285d18fc2 Respect items belonging to a faction 2014-01-07 20:24:01 +01:00
scrawl
ea3ee4407f oops, didn't mean to commit this 2014-01-07 02:48:44 +01:00
scrawl
dde2cd5d5a Fix some code that still used setCount directly instead of using the ContainerStore interface. Also fix a related annoyance with the interface. 2014-01-05 20:53:45 +01:00
scrawl
ce013315ba Nothing to see here, move along.
Fine... it's flying cliff racers. But did you really want to know?
2014-01-05 16:09:06 +01:00
scrawl
14b70a3ce6 Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead) 2014-01-05 01:34:35 +01:00
mrcheko
7002412760 resolve conflict in character.cpp 2014-01-04 17:55:09 +02:00
scrawl
be2ebc5cac Closes #1081: Implement disease contraction 2014-01-03 23:33:14 +01:00
scrawl
b22dd40b41 Implement Paralyze magic effect 2014-01-03 17:06:05 +01:00