dteviot
038851420d
Removed unneeded temp variables.
...
Corrected case of function names.
2015-08-09 14:18:55 +12:00
dteviot
50ddcd1953
more attack logic moved into AiCombatStorage.
2015-08-09 14:10:08 +12:00
dteviot
0735e3e06e
move start attack logic to AiCombatStorage.
...
Basically, copied from mrchenko's 1d4be08f6e4c2dbd89cc0c3408a8231ee4497277
2015-08-09 14:08:42 +12:00
dteviot
1676bf917e
CombatMove logic moved into AiCombatStorage.
...
Basically, copied from mrcheko's 1d4be08f6e4c2dbd89cc0c3408a8231ee4497277
2015-08-09 14:06:52 +12:00
dteviot
58f732ebc9
Update path following checks each frame in AiCombat.
2015-08-04 18:20:05 +12:00
dteviot
ad9bab0b68
Removed redundant if.
2015-08-04 18:17:08 +12:00
dteviot
4256e151b1
Fixed error in deciding type of attack
2015-08-04 18:15:58 +12:00
Marc Zinnschlag
26ea3aa1ad
Merge remote-tracking branch 'dteviot/refactoringAiWander'
2015-07-30 10:26:40 +02:00
dteviot
04aee1fe20
extracted function reactionTimeActions().
2015-07-26 17:32:29 +12:00
dteviot
b3d5b47fea
extracted function UpdateActorsMovement().
2015-07-26 17:23:45 +12:00
dteviot
aba7225817
Removed some duplicated operations.
2015-07-26 11:15:21 +12:00
scrawl
b3f5ac5dbb
Include cleanup
2015-07-25 02:11:49 +02:00
scrawl
e6b28d84f0
Outdated comment fix
2015-07-25 00:28:47 +02:00
dteviot
1ed6e95c07
Got rid of some radians to degrees to radians conversions.
2015-07-19 18:01:25 +12:00
mrcheko
c773ed9f9a
move checkWayIsClear to pathfinding; move shortcut logic to separate func (AiPackage::shortcutPath); rework AiPackage::pathTo
2015-07-04 18:00:16 +03:00
scrawl
6bcea21e14
Use fCombatDelayCreature, fCombatDelayNpc for random delays between aicombat attacks (Bug #1876 )
2015-07-04 05:19:05 +02:00
scrawl
a7bd050928
Accurate attack timings in AiCombat
2015-07-03 05:58:12 +02:00
scrawl
82740c1645
Remove completely broken code
2015-07-03 02:29:42 +02:00
scrawl
d07b176b36
Take into account hit recovery, knockdown and other animations for AiCombat attack timing
2015-07-03 02:18:35 +02:00
scrawl
520a832a9a
Remove an already resolved todo comment
2015-07-02 22:24:23 +02:00
scrawl
a1432b0255
Move attackingOrSpell flag to the CharacterController
2015-07-02 19:14:28 +02:00
scrawl
59db9664ba
Pass the CharacterController to AiPackage::execute
2015-06-26 17:47:04 +02:00
scrawl
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
2015-06-14 16:32:13 +02:00
dteviot
cb8ca2f03a
Moved logic for building a Sync'ed path from AiCombat to PathFinding.
...
Is now used by AiFollow, which should fix "running in circles" bug caused when recalc a path and closest way point is the one NPC has just passed.
2015-06-11 18:31:35 +12:00
scrawl
a0b0ae9bd1
Remove an unused variable
2015-06-04 21:51:24 +02:00
scrawl
4bb3cbf0fb
Remove last remains of Ogre
2015-06-03 23:04:35 +02:00
scrawl
7bacb9418d
Various math code ported to osg
2015-06-03 19:41:19 +02:00
scrawl
58ebf57154
Apply a comment that got lost in the endless depths of my git stash
2015-06-02 17:13:30 +02:00
scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
2015-05-23 20:33:44 +02:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
scrawl
ccab8cc9a1
Register Player in the PhysicsSystem
2015-05-12 17:40:42 +02:00
scrawl
8c810e3620
Move rng to components
2015-04-22 17:58:55 +02:00
scrawl
4e69e7cc0f
OpenMW compiles and runs w/o render window
2015-04-01 17:02:15 +02:00
dteviot
eb1090a1b6
Waypoint check only considers X & Y distance ( Fixes #2423 )
...
When pathfinder checks if actor has reached a waypoint, ignore actor's altitude.
2015-03-23 20:09:46 +13:00
dteviot
3f28634d1f
consolidate random number logic
...
Note, I suspect Rng::rollClosedProbability() is not needed. The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
2015-03-15 14:07:47 +13: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
81925645a3
Unreachable enemies combat AI fix ( Fixes #2271 )
2015-02-14 16:51:54 +01:00
scrawl
f35c9b7a69
Clang warning fixes (thanks hemite)
2015-01-27 23:12:20 +01:00
dteviot
458b82c308
Centralized "fish can't attack non-swimmer" logic.
2015-01-11 14:25:46 +13:00
dteviot
7fe2f86d06
Slaughter fish attacks when player only knee deep in water ( Fixes #2076 )
2015-01-09 21:40:53 +13:00
scrawl
a17252eab3
Remove unused checkWaypoint function
...
It was an almost exact copy of the checkPathCompleted function anyway.
2015-01-07 02:34:28 +01:00
scrawl
a58bc9f2f7
Remove sneaking effect on combat AI ( Fixes #2237 )
2014-12-28 14:45:20 +01:00
Paulo Viadanna
bfa048e687
Fix #1734 : AI will stop combat if target disappear
2014-12-02 17:38:25 -02:00
terrorfisch
4eb1668467
references now initialized when they are needed
2014-10-10 23:32:15 +02:00
terrorfisch
730abf6841
Moved all variables in temporary storage for AiCombat and some more for AiWander.
...
+Buxfix for previous AiWander changes
2014-10-10 00:16:17 +02:00
terrorfisch
4c36c67fb8
Updated AiCombat:
...
-moved everything except target to temporary storage
-removed the Pathfinder since present in baseclass
-cleaned some trigonometric mess
2014-10-08 23:00:36 +02:00
terrorfisch
0871d45790
Draft how to move temporary package state to CharacterController.
...
Example for a few values shown in AiWander.
2014-10-08 10:58:52 +02:00
scrawl
07cd647e75
Fix broken AI for creatures with OnTarget spells (Bug #1927 )
2014-09-18 03:19:13 +02:00
scrawl
233e221de2
Terminate AI packages when target is disabled or deleted ( Fixes #1910 )
2014-09-14 10:49:33 +02:00
scrawl
0f43592237
Another invalid iterator fix
2014-08-28 16:47:54 +02:00
scrawl
f8f4d2dfdb
Another invalid iterator fix
2014-08-28 02:14:30 +02:00
scrawl
1a98f8ca93
Invalid iterator fix
2014-08-28 02:09:00 +02:00
scrawl
0fe9612afb
Implement basic spellcasting AI ( Fixes #961 )
...
Select a weapon to attack with in AiCombat and equip it (Fixes #1609 , Fixes #1772 )
2014-08-28 00:55:37 +02:00
scrawl
4773d754c6
Remove redundant isHostile flag ( Fixes #1652 )
2014-07-28 16:41:12 +02:00
scrawl
d81e9cfefd
Implement actors fighting for the actor they are following ( Fixes #1141 )
2014-07-27 20:33:45 +02:00
Lukasz Gromanowski
171c61022d
Added initialization of weapRange in AiCombat::execute().
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-07-21 21:17:12 +02:00
scrawl
523c2715e3
AiCombat: Handle Start to Min and Min to Max durations of 0 (found in Riekling animation)
2014-06-28 01:31:34 +02:00
scrawl
4f9ebd148c
Fix broken AI movement on Z axis
2014-06-17 15:25:54 +02:00
Marc Zinnschlag
01c90a3434
Merge remote-tracking branch 'mrcheko/master'
2014-06-15 14:12:38 +02:00
scrawl
832f1a4857
Fix merge mistake
2014-06-14 02:31:01 +02:00
mrcheko
c4e5872620
fix bug http://bugs.openmw.org/issues/1470
2014-06-13 23:22:00 +04:00
scrawl
fe5bbfce3c
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
2014-06-13 19:31:33 +02:00
scrawl
a54ac579a5
Savegame: Store AiSequence
2014-06-13 02:26:52 +02:00
mrcheko
df7213185f
warning fixes
2014-06-12 23:42:33 +04:00
mrcheko
d6d9df6cec
split getStartTime
2014-06-11 00:20:46 +04:00
mrcheko
979128b2c5
Combat music; some minor combat fixes
2014-06-10 14:20:29 +04:00
mrcheko
08e8dab067
merge openmw master
2014-06-09 22:37:49 +04:00
mrcheko
67abc60264
aiming to moving target in ranged combat ai
...
1) Taking into account target move vector and speed. However aiming is not
ideal, since attack strength can't be controlled directly. I did achieve
almost 100% accuracy updating it everyframe but then thought it would be
unfair, cause AI should mimic human targetting.
2) Also added in this commit func to measure real attack durations for
weapon.
2014-06-08 20:59:26 +04:00
Marc Zinnschlag
4aab4bae65
minor cleanup and silenced a warning
2014-05-26 10:14:24 +02:00
Marc Zinnschlag
f0d0a31a19
Merge remote-tracking branch 'mrcheko/master'
2014-05-26 10:08:40 +02:00
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
2014-05-25 21:03:37 +04:00
scrawl
039398c8ae
Basic RefData and CellRef change tracking
...
Wrapped item charge handling in getItemHealth function
2014-05-25 14:30:07 +02:00
mrcheko
c62187bd55
fix bug at http://bugs.openmw.org/issues/1155
...
Though it still can happen sometimes but not in such stupid manner.
2014-05-25 13:31:46 +04:00
mrcheko
aa5647b45e
merge master, resolve conflicts
2014-05-17 19:20:57 +04:00
mrcheko
5be37f04ef
Feature 1314: make npc fight creatures
2014-05-16 00:03:48 +04:00
scrawl
0bc33fa86a
Revert "AiCombat: Removed obsolete door back-off code (now handled in AiAvoidDoor)"
...
Apparently not working for AiCombat due to its higher getPriority(). What should we do here?
This reverts commit a6e1d7ffd6
2014-05-15 10:14:47 +02:00
scrawl
a6e1d7ffd6
AiCombat: Removed obsolete door back-off code (now handled in AiAvoidDoor)
2014-05-15 09:54:10 +02:00
scrawl
2e9985c1a3
Change all AI packages (except AiActivate) to use ActorIds
...
More robust in case the target changes cell or there are multiple targets with the same RefId
2014-05-15 09:54:10 +02:00
Marc Zinnschlag
2009cf9ad7
Merge remote-tracking branch 'scrawl/master' into openmw-30
2014-05-10 10:48:40 +02:00
scrawl
1444cd9051
Fix AiCombat exception when actor has a lockpick/probe equipped.
...
Don't make NPCs autoEquip lockpicks/probes, since they can't use them.
2014-05-10 00:37:36 +02:00
cc9cii
cf23721f1b
Windows debug build crash fix.
2014-05-09 20:43:24 +10:00
mrcheko
e8f7d12c01
uninit bool and invalid iterator bugs fixes
2014-04-30 23:57:19 +04:00
mrcheko
35c1724d39
unblock vertical aiming for combatants
2014-04-28 16:34:49 +04:00
mrcheko
22cdb166f2
warning fix, vars renaming
2014-04-27 22:38:04 +04:00
mrcheko
82121e0401
some checks reworked
2014-04-27 16:59:21 +04:00
mrcheko
6a3dddfb9a
merge master
2014-04-27 13:49:31 +04:00
mrcheko
dbe1307de0
code refining + minor fixes
2014-04-26 22:21:20 +04:00
mrcheko
f3626adc86
remake of z-moving in combat for flying/swimming enemies
2014-04-26 00:20:55 +04:00
mrcheko
fbd0ffe86f
enable z-moving for flying/water combatants
2014-04-22 22:59:39 +04:00
mrcheko
f811abb752
pathgrid shortcutting extended
2014-04-20 20:35:07 +04:00
cc9cii
3dfd08cf2d
Cleanup and little tweaking.
2014-04-20 08:31:02 +10:00
cc9cii
479a94b35d
Backing off closed doors working, needs cleanup and tweaking.
2014-04-20 08:14:54 +10:00
Marc Zinnschlag
f9d2fde783
Merge branch 'openmw-29'
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
2014-03-04 09:34:38 +01:00
cc9cii
85c467f00f
Minor cleanup for aicombat pathfinding workaround.
2014-02-25 08:30:52 +01:00
Marc Zinnschlag
367919200f
moved CellRefList into a separate file
2014-02-23 20:11:05 +01:00
cc9cii
1bd2664cb0
aicombat pathfinding workaround
2014-02-23 11:47:25 +01:00
Marc Zinnschlag
7693f712bc
started making CellStore into a proper class; encapsulated mCell member
2014-02-21 11:35:46 +01:00
scrawl
d25b3ad9cb
Fix AiCombat for creatures with weapons
2014-02-19 11:23:03 +01:00
scrawl
5ee105c812
Fix typo
2014-02-05 05:18:10 +01:00
scrawl
067c2bc2ec
Disable combat movements for creatures without weapons
2014-01-31 04:43:35 +01:00
scrawl
39d86a9468
Improvements to smooth NPC steering
2014-01-31 04:43:29 +01:00
mrcheko
3a5da7e6e8
merged with master
2014-01-29 00:03:00 +02:00
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
2014-01-28 12:33:31 +01:00
mrcheko
fe0268062d
merge with master
2014-01-27 22:38:01 +02:00
mrcheko
45b3aa3d93
corrected things connected to determining attack type
2014-01-26 23:32:57 +02:00
scrawl
b1066de81d
Revert "Merge remote-tracking branch 'mrcheko/master'"
...
This reverts commit 4e360136b1047bbe43b2
2014-01-26 00:31:44 +01:00
scrawl
a1fbd1fcc8
Revert "Merge remote-tracking branch 'mrcheko/master'"
...
This reverts commit df7c139e2ffec26342cd
2014-01-26 00:14:49 +01:00
gus
707e579dfe
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2
...
Conflicts:
apps/openmw/mwmechanics/aifollow.cpp
2014-01-24 19:16:50 +01:00
gus
5ca5946760
WIP
2014-01-24 19:13:23 +01:00
mrcheko
87e83a92f8
refactoring of setting an attack type
2014-01-23 23:14:20 +02:00
scrawl
ea21d8fec3
Fix CreatureTargetted function
2014-01-22 13:30:45 +01:00
scrawl
c8a9e9f7fa
Stop AiCombat when the target is dead
2014-01-20 13:54:10 +01:00
scrawl
df7c139e2f
Merge remote-tracking branch 'mrcheko/master'
2014-01-19 21:23:04 +01:00
mrcheko
339399f8b1
bug fix/logic fix/future suggestion
2014-01-19 22:09:51 +02: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
4e360136b1
Merge remote-tracking branch 'mrcheko/master'
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/character.cpp
apps/openmw/mwmechanics/character.hpp
2014-01-19 14:01:39 +01:00
scrawl
13646a651b
Issue #777 : Handle creatures with weapons in CharacterController. Move attack strength to CreatureStats.
2014-01-19 13:32:58 +01:00
mrcheko
df4df5b094
fixed weapRange for creatures/startcombat script(?)
2014-01-17 23:30:28 +02:00
mrcheko
435bbdd530
one more mismatch fixed
2014-01-17 20:55:21 +02:00
mrcheko
46a4790cb1
final warnings removal
2014-01-17 20:33:49 +02:00
mrcheko
7df8273d71
fix for everybody
2014-01-17 20:01:15 +02:00
mrcheko
5357f569e6
fix for scrawl
2014-01-17 19:36:22 +02:00
mrcheko
f2ad1c18f2
fix merging problem/some logic fixes
2014-01-16 22:24:05 +02:00
mrcheko
d5f794d4fb
update to combat ai behaviour
2014-01-15 22:56:55 +02: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
Marc Zinnschlag
3e58eb34e4
Merge remote-tracking branch 'sergeyshambir/startcombat'
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2014-01-13 10:17:10 +01:00
gus
5d4e148063
some clean up
2014-01-12 22:47:22 +01:00
gus
5d038423ec
attempt to solve Bug #1009 by not building graph every frame
2014-01-12 18:42:31 +01:00
gus
2d66b2c4fa
AiFollow. Npc get stuck often (no stuck dtection yet)
2014-01-11 12:06:36 +01:00
gus
f41f08c352
Wrong logic... should improve performances
2014-01-11 12:04:32 +01:00
scrawl
621e52f09d
Play "attack" voiced dialogue entries randomly based on iVoiceAttackOdds.
2014-01-10 22:48:42 +01:00
scrawl
098f9712f1
Add getPlayerPtr() utility method. Reduces dependencies a lot.
2014-01-08 18:39:44 +01:00
scrawl
90b55c8d4b
Use Ogre's asin/acos functions which will protect against NaNs
2014-01-07 17:09:08 +01:00
Sergey Shambir
5c7e39a92f
Implemented script commands StartCombat, StopCombat, GetTarget.
...
Also renamed one field of AIWander class because it's not longer
unknown.
2014-01-07 04:43:06 +04:00
scrawl
b22dd40b41
Implement Paralyze magic effect
2014-01-03 17:06:05 +01:00
gus
4559e932ae
AI packages have priority and combat is triggered in actor.cpp using the Hostile setting in CreaturesState
2013-11-18 12:33:09 +01:00
gus
683b8d77dd
build fix (thanks travis)
2013-10-31 11:02:26 +01:00
gus
02ded18fc5
Linux backslash fix
2013-10-31 09:43:12 +01:00
gus
2a927f65d3
perfomances optimisations (pathfinding is computed less often, max 4 times per sec)
2013-10-30 20:52:23 +01:00
gus
650a112e2e
better timer
2013-10-30 20:42:50 +01:00
gus
0e86209224
linux fix :p
2013-10-28 18:33:10 +01:00
gus
b7a9243173
fighting should stop when the target is dead
2013-10-28 18:22:36 +01:00
gus
12d8b4e0f8
bugfix
2013-10-28 18:13:07 +01:00
gus
2d84f7d33d
NPC run
2013-10-28 18:10:00 +01:00
gus
968968502e
NPC always face you when fighting
2013-10-27 14:03:58 +01:00
gus
1ac3d99c78
pathfinding now works in AICombat.
2013-10-07 10:20:02 +02:00
gus
83a375b55d
AI now continue to hit you.
...
TODO: change the way time is handled
2013-09-28 21:17:06 +02:00
gus
2537384c50
bug fix
2013-09-28 12:25:37 +02:00
gus
9353f4d14f
WIP AI combat
2013-09-25 18:01:36 +02:00
