Commit Graph

341 Commits (1cfc1f9bdb32618d46acbd72f26f138f7a7473c0)

Author SHA1 Message Date
scrawl 2db50da8dd Implement magic effect script instructions (Feature #1489) 11 years ago
scrawl d8943aef2f Encapsulate magic effect magnitude (Feature #1489) 11 years ago
scrawl 639ae7e06c Implement friendly hits on followers (Fixes #1139) 11 years ago
scrawl 2d74388a76 Don't report crime if we are in combat with the victim 11 years ago
scrawl 4773d754c6 Remove redundant isHostile flag (Fixes #1652) 11 years ago
scrawl d81e9cfefd Implement actors fighting for the actor they are following (Fixes #1141) 11 years ago
scrawl 75366b2e37 Implement CellRef's faction rank (rank requirement to use item) 11 years ago
scrawl 2b57c7fa67 Use CellRef's global variable to disable owner (Fixes #1677) 11 years ago
scrawl c0645d4978 Increase death count immediately on death (Bug #1588)
This is required for scripts using getDeadCount as reaction to onDeath that rely on the increased value.
11 years ago
scrawl d63dd88113 Apply autocalc corrections to player starting spells 11 years ago
scrawl 1c41ce9b9d Implement Hrnchamd's player and NPC autocalc spells (Some unclarities remaining, XXX) 11 years ago
scrawl 7f1d0fc2a2 Fix disposition for npcs in same faction, by Hrnchamd 11 years ago
scrawl 320ab1b2c1 Don't say voice when using startcombat for a dead actor (Fixes #1542) 11 years ago
scrawl cbec0ffaee Exception fix 11 years ago
scrawl a3ea7cb956 Ignore distance when considering aggression due to crime (seems to work better, all balmora mages guild members now come to help when one is attacked) 11 years ago
scrawl 2477456f99 Implement Murder crimes and OnMurder instruction (Fixes #1315) 11 years ago
scrawl ffb6f5d555 Use fFight<Crime> GMSTs to control attacks in response to crimes 11 years ago
scrawl 28feb260eb Implement disposition/distance based aggression (Fixes #1520) 11 years ago
scrawl f935cfc6c9 Fix crash when stealing items with the owner not around (Fixes #1512) 11 years ago
Marc Zinnschlag 01c90a3434 Merge remote-tracking branch 'mrcheko/master' 11 years ago
mrcheko a6ee4272aa fix bug when you were able to kill somebody from large distance without
being spotted
11 years ago
mrcheko 6da061fd96 fix http://bugs.openmw.org/issues/1340
Did I understand right that guards trigger combat after refusing pay
gold/go to jail via script?
11 years ago
scrawl e458cf1df2 Savegame: Store death counter (Fixes #1477) 11 years ago
scrawl 1bab74a98d Fix punishment for stealing 0 value items (Fixes #1435) 11 years ago
scrawl 56ff399f30 Say attack voiced dialogue *after* the target is set up
Required for the CreatureTargetted filter to function properly
11 years ago
scrawl e266c39c5d Implement modFactionReaction instruction (Closes #1347) 11 years ago
Marc Zinnschlag f0d0a31a19 Merge remote-tracking branch 'mrcheko/master' 11 years ago
mrcheko 8fa7fcdbee fix bug http://bugs.openmw.org/issues/1335 (1304 as well)
though fish detects if actor is swimming, but in MW it attacks even if
the player is knee-deep in water
11 years ago
scrawl 039398c8ae Basic RefData and CellRef change tracking
Wrapped item charge handling in getItemHealth function
11 years ago
scrawl b47b2b84f3 Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwdialogue/filter.cpp
	apps/openmw/mwgui/waitdialog.cpp
11 years ago
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. :)
11 years ago
scrawl 3380e1e1c5 Fix ShouldAttack filter
This makes NPCs exit dialogue properly when they should attack as a result of taunting actions.
11 years ago
scrawl b6a7aee42e Fix player not being allowed to use his own items 11 years ago
scrawl 2f13a17a39 Add some more safety checks to spellcasting 11 years ago
scrawl e591d23880 Fixes #894: Make sure the player's CharacterController is updated when the player is rebuilt. Necessary if the race is changed while we are still in a GUI (e.g. in the review dialog), and an update normally wouldn't occur. 11 years ago
scrawl 6cc691115b Savegame: store most of CreatureStats 11 years ago
scrawl 731bc9c275 Fix broken isClass check and renamed variable for clarity 11 years ago
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)
11 years ago
scrawl d2beb814e7 Remove superfluous attack phrases (already done by startCombat) 11 years ago
scrawl dd9117809d Say an attack phrase when combat starts
Move combat start to a helper method

Added some todo comments
11 years ago
Jeffrey Haines a65e8393bb Merged files 11 years ago
Jeffrey Haines 14ebd8b110 Fixed logic in commit crime 11 years ago
Marc Zinnschlag af322a9f77 Merge remote-tracking branch 'scrawl/master' 11 years ago
Marc Zinnschlag ca097e146b Merge remote-tracking branch 'jeffreyhaines/master' 11 years ago
Jeffrey Haines edbc319c42 fixed logic. || 11 years ago
Jeffrey Haines 52bb7c3f69 fixed logic. ! 11 years ago
Jeffrey Haines 7599b26d30 Fixed: creatures won't witness crimes
and potential crash.
11 years ago
Jeffrey Haines 0409e18a0e revert 11 years ago
Jeffrey Haines b9bd4bc126 broken 11 years ago
Jeffrey Haines ce106d3bec Revert "NPCs detect crime exclusively"
This reverts commit 54d9615d85ae856ad4fdd2c130ac9cb0cd847c72.

Conflicts:
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
11 years ago
scrawl e42855d522 Minor fix for spell icon 11 years ago
scrawl e8210c92c6 Fixes #1240: Don't hardcode drowning time 11 years ago
scrawl 04964595ef Fixes #1270, Fixes #1201: Update active weapon/spell icons every frame 11 years ago
Marc Zinnschlag c63d6437c0 Merge remote-tracking branch 'jeffreyhaines/master'
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
11 years ago
Thomas f3272c941f Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat.
The radius for being in combat with the player is fAlarmDistance, which looked like the only pertinent thing.
11 years ago
Jeffrey Haines 42b879a9a5 Reworked the accusation of actors 11 years ago
Jeffrey Haines c3e08916da Sneak: Added support for state checking
I need advice one what I should do in order to pass mActors over to the
player. Particularly line 139 in player.cpp
11 years ago
Marc Zinnschlag a91b386381 Merge remote-tracking branch 'jeffreyhaines/master' 11 years ago
Jeffrey Haines 3484df0743 Fixed garage value found in beta's static analysis
Source: https://forum.openmw.org/viewtopic.php?f=6&t=2059#p23844
11 years ago
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.
11 years ago
scrawl b3916e7744 Crime: mark witnesses as alarmed.
Fixes guard dialogue to properly detect if the player turned himself in.
11 years ago
Marc Zinnschlag 86e65944b8 Merge remote-tracking branch 'jeffreyhaines/master'
Conflicts:
	apps/openmw/CMakeLists.txt
11 years ago
Jeffrey Haines a274b48f2f States are saved. Crime is reacted to.
Issues where some crime is ignored. Needs a lot more work
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
Jeffrey Haines df5cbe5dec Minor changes 11 years ago
Jeffrey Haines 70919ba60a Removed witnesses and minor changes 11 years ago
Jeffrey Haines 0c957a3cde Added witnesses to the mix 11 years ago
Jeffrey Haines b1abef7a38 Cleaned up code 11 years ago
Jeffrey Haines 58b135a2be Crime is now checked every frame call 11 years ago
Jeffrey Haines 6f1211dd8d Moved mWitnesses into Player. resetCrime for paying fine. 11 years ago
Jeffrey Haines 7c0b51fb7e Ai pursue now controls guards pursuit of crimes
Should extend AiActivate in the future
11 years ago
Jeffrey Haines 50dac98a2b Feature 1154 & 73: Crime and NPC reactions 11 years ago
Jeffrey Haines 4037f3705e Feature 1154 & 73: NPCs react to crime 11 years ago
Jeffrey Haines 8ce938c6f1 Revert 6b28c06..98fd381
This rolls back to commit 6b28c06b2c.
11 years ago
Jeffrey Haines 98fd381564 Feature #1154 Not all NPCs get aggressive when one is attacked
Compiling fix
11 years ago
Jeffrey Haines 6c866deb1b Feature #1154 Not all NPCs get aggressive when one is attacked
Partially implemented
11 years ago
scrawl 793649c854 ToggleAI: Report current status on toggle 11 years ago
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
11 years ago
Marc Zinnschlag fd5486864a Merge remote-tracking branch 'gus/AIFix2'
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/actors.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
11 years ago
gus 707e579dfe Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2
Conflicts:
	apps/openmw/mwmechanics/aifollow.cpp
11 years ago
scrawl 03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
Conflicts:
	apps/openmw/mwgui/referenceinterface.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwscript/cellextensions.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/worldimp.cpp
11 years ago
scrawl 205e8aa4e9 Feature #957: Implement area magic 11 years ago
scrawl 589fbbd871 Issue #777: Create InventoryStore for creatures with weapons/shields 11 years ago
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.
11 years ago
scrawl da3295d69c Closes #1106: Move stance to CreatureStats, since creatures also have separate run/walk animations. 11 years ago
greye 15d946415e minor cleanup
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
11 years ago
scrawl 69381c49c7 Added a todo comment 11 years ago
scrawl 95651857f3 Fix code duplication 11 years ago
scrawl 0d0005c433 Fix fatigue not restoring when waiting 11 years ago
gus dd870e35db get all actors following a given actor 11 years ago
scrawl 9127839cc1 Add a searchPtr method as required for getting an owner, which may already be dead and disposed of. 11 years ago
scrawl 909494ff35 Implement Assault crimes. In other words, NPCs now fight back! 11 years ago
scrawl d4a98ffc27 Increase fight rating when being the victim of a crime 11 years ago
scrawl 727aa30347 Dead actors are unaware of everything 11 years ago
scrawl 3bf36515d5 Implement Trespassing crime 11 years ago
scrawl 223c1d5a38 Use GMSTs for crime bounty 11 years ago
scrawl 0f5dc59176 Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure. 11 years ago
scrawl 9baa1bef78 Expell player from faction when committing a crime against a faction member 11 years ago
scrawl 19d63f392f Clean up the NpcStats expelled interface. Show message box when expelled. 11 years ago
scrawl 098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 11 years ago
scrawl 7b33f6f2ac Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this. 11 years ago
scrawl b99ca92fee Add missing line of sight check 11 years ago
scrawl 2bb21f2f76 Don't copy NpcStats/CreatureStats unnecessarily. Fixes a bug: taunt actions would not correctly increase the target's fight rating. 11 years ago
scrawl c85c2cff4e Fix disposition changes from trades not applying properly 11 years ago
scrawl 0285d18fc2 Respect items belonging to a faction 11 years ago
scrawl 3c0080d2c1 Implement theft detection 11 years ago
scrawl 887db76ed2 Don't consider swimming or in-air characters as sneaking 11 years ago
scrawl 29c823b9d4 Implement awareness check function. Use this for combat AI and GetDetected instruction. 11 years ago
scrawl 62774fcc4a Merge branch 'master' into HEAD
Conflicts:
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/loadtes3.cpp
11 years ago
scrawl 44e96fcaaa Implement Charm magic effect 11 years ago
scrawl 14b70a3ce6 Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead) 11 years ago
scrawl b42240be6d Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences. 11 years ago
scrawl bfc9fcf2cd Add starting spells when building player (F_PCStart flag) 11 years ago
scrawl 2a8ab932ef Bug #951: Only recalculate derived stats when attributes change 11 years ago
Marc Zinnschlag 1c13a9037a save and load dynamic records 11 years ago
scrawl 4b4025ed0f Keep the player's CharacterController when changing cells. Fixes several glitches. 11 years ago
scrawl 320ba98097 Correct getDerivedDisposition according to wiki (check if player expelled) 11 years ago
Marc Zinnschlag 8190fdb16c Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl e8dcd74741 Recharge enchanted items in player's inventory over time 11 years ago
Marc Zinnschlag 11e254aac8 Merge remote-tracking branch 'gus/AICombat'
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
11 years ago
gus dff3cf162d ToggleAI script instruction 11 years ago
scrawl 0dc2e829dd Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX. 11 years ago
scrawl 2a11618ee7 Make sure the equipped weapon HUD icon is updated properly 11 years ago
scrawl 992a8e9c36 Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore. 11 years ago
Emanuel Guevel 2786530430 Edit InventoryStore::equip() to call the new unequipSlot function…
…to unequip previously equipped item.
11 years ago
Chris Robinson 84d259ab8e Avoid reconstructing strings for updating the dynamic stats
Attributes still do this, but they change infrequently enough that it doesn't
matter.
12 years ago
Chris Robinson 281fdbd81b Cleanup some redundancy 12 years ago
Chris Robinson 33c173a23a Update the watched Ptr when changing it 12 years ago
Chris Robinson 189541aa72 Apply drowning damage based on the update duration
1 damage every 0.33 seconds is 3 damage a second. Applying it this way avoid
having to track another stat.
12 years ago
Chris Robinson 5968165de0 Merge remote-tracking branch 'zini/master' into werewolf
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
12 years ago
Chris Robinson 46bc7bd9c8 Some cleanup since NpcStats is now also CreatureStats
This isn't a thorough cleaning, so keep an eye out for more
12 years ago
PLkolek 86020ad94d Added underwater and drowning sounds. 12 years ago
PLkolek 8f4506f5b6 Implemented drowning.
Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one),
the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.
12 years ago
scrawl 7dc30a01cd Some changes suggested by cppcheck 12 years ago
Torben Carrington c8c1ddd927 Adds functionality for checking if the animation group passed is currently playing on the actor passed. This is needed for AIWander. 12 years ago
scrawl c41f119ba6 Added new game button 12 years ago
Chris Robinson 274f3c7b77 Force character state to update after switching view modes 12 years ago
Glorf f9deb593d1 Bugfix #578 12 years ago
scrawl 2693b78536 Add initial player inventory when new game is started 12 years ago
scrawl 8bbfba3f43 Fix fatigue not being set to its maximum value when player is rebuilt 12 years ago
Marc Zinnschlag 18e046e628 cleaned up race record struct 12 years ago
Chris Robinson 04aeb3dd07 Rename Mechanics' Activators to Objects 12 years ago
Chris Robinson 10d04c928c Use the object's class to check if it's an actor 12 years ago
scrawl 95e1cdc07d Move getArmorRating to MWWorld::Class. 12 years ago
scrawl dd57eabc3e Better use an enum for magic effect IDs 12 years ago
scrawl 1666bc7740 Armor rating 12 years ago
Chris Robinson 000128d084 Merge remote-tracking branch 'zini/master' into misc-cleanup 12 years ago
Chris Robinson 48271e49ec Properly update the Ptr object in the mechanics manager when moving across cells 12 years ago
Marc Zinnschlag 88e8659a49 minor cleanup 12 years ago
scrawl 73d48a95f6 Add message box when the player tries to move when being overencumbered. 12 years ago
Chris Robinson 2f8affc955 Make sure the player's controller is properly updated when they change 12 years ago
Chris Robinson ee9b19d2ed Make sure to remove a Ptr from the activators when requested 12 years ago
Chris Robinson fdabef65a1 Use a method to update an object's cell in the mechanics manager
This prevents destroying and recreating the object's character controller (and
messing up the current animation) when moving between cells.
12 years ago
Chris Robinson 8d98f3649c Use a separate class to handle activator mechanics 12 years ago
Chris Robinson d2f5a886c7 Handle playgroup and skipanim through mwmechanics 12 years ago
Chris Robinson 3c02e1ccc9 Run physics right after updating the actors 12 years ago
eduard 2dc0064cc2 more string lowercase 12 years ago
Marc Zinnschlag 5f5addf052 fixed an enum 12 years ago
Marc Zinnschlag 75f64aa38b Merge branch 'master' into dialogue
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
	apps/openmw/mwmechanics/npcstats.cpp
	apps/openmw/mwmechanics/npcstats.hpp
12 years ago
Marc Zinnschlag 0ab4068fbd Merge remote-tracking branch 'scrawl/persuasion' into next 12 years ago
Marc Zinnschlag d15eb6cd17 Merge remote-tracking branch 'greye/player-model' into next 12 years ago
greye b1ef0026a9 race selection/inventory preview character model update 12 years ago
scrawl 553ea08eae consider temporary disposition change when trading 12 years ago
scrawl 33b4b29fbc persuasion mechanics, added reputation 12 years ago
scrawl ace9ee9c83 persuasion dialog 12 years ago
scrawl f6a9029c4b bounty & disease disposition effect 12 years ago
scrawl d53a7ade1e method names, disposition uint->int 12 years ago
scrawl b2afb1fd5c Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/spellbuyingwindow.cpp
	apps/openmw/mwgui/trainingwindow.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
12 years ago
scrawl 322faf13e4 cleanup 12 years ago
scrawl bf4e855260 fixed creatures 12 years ago
greye 2a86432887 store birthsign in MWWorld::Player 12 years ago
gugus 0a883f4492 The player can now barter with merchants 12 years ago
greye 83e758ee50 clean up interfaces 12 years ago
greye 9dc9098fa7 update MWBase::World interface since records contains own id 12 years ago
greye 5b9621bca5 store player record data in ESMStore 12 years ago
gugus bf98b95955 bugfix 12 years ago
gugus 2841d831a6 Disposition is now updated everyframe 12 years ago
gugus 9ebe9cb40c Disposition is now calculated according to the Wiki. But: bouty and deacease are not implemented (for disposition at least), and there is still no temporary/permanent dispositons changes 12 years ago
greye 86ad7a96f4 applying new interface vol.2, inconsistent 12 years ago
greye d205723a17 resolving m prefix/ESMStore movement 12 years ago
greye 2057f5619e move ESMStore to MWWorld 12 years ago
greye 3c2ce25f5f m prefix for mwworld/cellstore.hpp 12 years ago
gugus f72f898bd9 implement barterOffer. It's used for travel only.
I've started to implement disposition, but it's very basic for now.
12 years ago
Marc Zinnschlag 453f347ee8 Issue #68: added getdeadcount script function 12 years ago
Marc Zinnschlag bdca5aff87 Issue #68: simplified the dynamic stats interface 12 years ago
greye 2fa4ac177a initial resolving 12 years ago
scrawl 872fcf3e3d sleeping restoration of health, magicka, and fatigue 12 years ago
greye 7606ebafd6 resolving conflicts, minor update 12 years ago
Marc Zinnschlag e97d23e626 Issue #361: reset skill level in race selection stage 13 years ago
Marc Zinnschlag 6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag b68f9d6a28 Issue #107: MechanicsManager is accessed only through the interface class from now on 13 years ago