Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
scrawl
ac88326909
Exit out of choice when no responses are found ( Fixes #2525 )
2015-05-11 16:38:16 +02:00
scrawl
37a6d7da76
WindowManager refactoring
2015-03-11 20:04:25 +01:00
scrawl
e30f240ba2
Add travel service support for creatures ( Fixes #2432 )
2015-03-09 03:15:11 +01:00
dteviot
e197f5318b
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 13:07:29 +13:00
Jordan Ayers
419046e121
Dialogue: Use std::set for known topics in the manager.
...
There were three different data structures being used for topic lists
in this code. (map< string, true >, list< string >, and vector< string >)
Switch the local topic lists to set< string >. This supports everything
the list and map were doing, reduces the variety of data structures, and
makes count (a more efficient search) available.
The vector has not changed, since it's tied to the ESM modules, and must
meet other requirements.
2015-01-29 18:28:13 -06:00
scrawl
c883a73d30
Several warning fixes
2015-01-23 15:34:47 +01:00
scrawl
5104a5a023
Add missing setFactionReaction instruction, use absolute storage instead of difference
...
Seems to be closer to how MW is storing it (it has the complete FACT record in the savegame, actually).
This (somewhat) breaks OMW savegame compatibility in that old changes are discarded, but I don't think the faction reactions are quest relevant anywhere.
2015-01-20 00:53:31 +01:00
scrawl
c3f3f8b3d0
Use only Cell records for saving progress bar ( Fixes #2259 )
2015-01-11 18:01:06 +01:00
Marc Zinnschlag
1f74d8cca5
Merge remote-tracking branch 'scrawl/scripttest'
2014-12-13 12:49:33 +01:00
scrawl
ba65c6cc7f
Add --script-all-dialogue switch to compile all dialogue scripts ( Fixes #1659 )
2014-12-13 02:51:18 +01:00
scrawl
2ebf328dec
Always print the failing dialogue script
...
These aren't usually very long, so printing them shouldn't spam the console by too much.
2014-12-13 00:39:24 +01:00
MiroslavR
5a7dbb19f7
Code clarity
2014-10-20 01:10:08 +02:00
MiroslavR
ed6bdc0bde
Use all topics to search for keywords in dialogues ( Fixes #2013 )
...
Move KeywordSearch to MWDialogue
Move hypertext parsing functions to a new file
2014-10-18 20:07:40 +02:00
scrawl
7252cb63a6
Fix cppcheck issues
2014-09-26 17:48:14 +02:00
scrawl
e508450c1c
Add persuasion GMST to ensureNeededRecords ( Fixes #1817 )
2014-08-17 03:58:03 +02:00
scrawl
f9a39138cc
Add missing endline
2014-07-17 16:16:14 +02:00
scrawl
8b404ee255
Fix not being able to exit dialogue using Escape when a Goodbye link appears
2014-07-13 06:42:24 +02:00
scrawl
0aba1088a1
Attempt to open companion window if no greetings are found (Bug #1507 )
2014-06-16 02:52:25 +02:00
scrawl
1adb81abd0
Sort using ciLess, not ciEqual
2014-06-15 14:18:16 +02:00
scrawl
88f8f25ffa
Don't allow scripted dialogue with dead actors ( Fixes #1493 )
2014-06-15 14:18:16 +02:00
scrawl
2dd54dbcfc
Implement ClearInfoActor script instruction ( Fixes #1422 )
2014-06-10 18:49:41 +02:00
scrawl
a90245147b
Don't reset history when ForceGreeting is used and a dialogue window was already open for the same actor ( Fixes #1423 )
2014-06-10 18:46:16 +02:00
scrawl
1ed3f092c1
Implement text replacement for journal topic responses ( Fixes #1429 )
2014-06-10 15:42:50 +02:00
scrawl
865486604f
Make trade disposition changes temporary again, as in vanilla
2014-05-31 13:57:07 +02:00
scrawl
0b45a9e6b2
Fix case folding for faction reaction from ESX records
2014-05-27 19:02:48 +02:00
scrawl
e266c39c5d
Implement modFactionReaction instruction ( Closes #1347 )
2014-05-27 14:54:29 +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
1677fcf324
Dialogue merging
2014-05-18 15:25:16 +02:00
scrawl
e1458453f3
Fix "unknown info ID" exceptions when a dialogue response is from the Info Refusal group
...
Could be observed in TG_OverduePayments quest when talking to Trasteve about Dwemer Artifacts.
Info Refusal responses are not specific to any particular topic, so they should not be added to the journal. Trying to do so anyway will cause "unknown id" exceptions because MWDialogue::Entry expects the infoId to be from the Dialogue for the supplied topic.
2014-05-18 06:52:15 +02:00
scrawl
872d9be1b4
Fix potential issue with dialogue globals
...
Make sure they are updated throughout the conversation
2014-05-09 19:19:21 +02:00
scrawl
27a05027f4
Fixes #1172 : Added basic loading/saving progress bar
...
The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.
2014-04-28 11:29:57 +02:00
scrawl
f921f2e7db
Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last.
...
This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.
2014-04-26 12:04:37 +02:00
scrawl
5eeed03f5b
Only exchange bribe gold if the bribe was accepted
2014-03-30 00:12:31 +01:00
Marc Zinnschlag
9f721fd144
store list of known topics in saved game files
2014-02-16 12:54:27 +01:00
scrawl
f89b3cac02
Feature #764 : Store the actor that gave the dialog response
2014-02-01 18:42:01 +01:00
scrawl
f89c400305
Don't complain about greetings with no sound
2014-01-22 00:02:43 +01:00
scrawl
589fbbd871
Issue #777 : Create InventoryStore for creatures with weapons/shields
2014-01-19 11:43:23 +01:00
scrawl
9bf7bf529c
Implement crime-related dialogue globals as they are described in MSFD
2014-01-09 00:40:25 +01:00
scrawl
098f9712f1
Add getPlayerPtr() utility method. Reduces dependencies a lot.
2014-01-08 18:39:44 +01:00
scrawl
c85c2cff4e
Fix disposition changes from trades not applying properly
2014-01-08 01:46:42 +01:00
scrawl
12691040d1
Fix incorrect disposition testing and get rid of of a related hack that is no longer needed.
2014-01-04 02:49:10 +01:00
scrawl
a0d38dfb63
Fix highlighted topics being selectable when in a choice
2013-12-19 00:26:08 +01:00
scrawl
7dc30a01cd
Some changes suggested by cppcheck
2013-07-31 18:46:32 +02:00
Chris Robinson
d8ec813939
Say something from the "hit" dialog topic when losing health
2013-07-24 10:02:50 -07:00
scrawl
c41f119ba6
Added new game button
2013-05-15 17:54:18 +02:00
scrawl
78e6dab9d2
Dialogue history rewrite WIP
2013-05-04 14:15:47 +02:00
scrawl
a8e3acd6c4
Fix consecutive dialogue choices
2013-04-19 17:57:22 +02:00
scrawl
b0199c703c
Companion UI
2013-03-31 13:13:46 +02:00
scrawl
20774f8f81
Added merchant repair feature
2013-03-22 14:13:10 +01:00
scrawl
6c1ff8caca
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwworld/weather.cpp
components/fileorderlist/model/datafilesmodel.cpp
2013-03-20 02:29:03 +01:00
scrawl
cebcbe11f8
Implemented service refusal
2013-03-16 20:32:21 +01:00
scrawl
7ab236337b
Dialogue responses should be random only for persuasion results
2013-03-14 21:33:00 +01:00
Marc Zinnschlag
0f4f91605a
some cleanup
2013-03-02 11:19:48 +01:00
lazydev
ccb7ed93b3
fix for https://bugs.openmw.org/issues/593
2013-03-02 03:54:25 +04:00
Emanuel Guevel
736e471613
Print a fallback text when no topic response is found
2013-01-20 17:44:09 +01:00
Emanuel Guevel
43e85ea0c6
Disallow redirection to info refusal for greetings
2013-01-20 17:44:09 +01:00
Nathan Jeffords
528c3da6da
record heard topics in journal
2013-01-19 16:20:22 -08:00
Marc Zinnschlag
82b790770d
Merge remote-tracking branch 'potatoesmaster/dialogue-creatures'
2013-01-17 10:21:01 +01:00
Emanuel Guevel
4feaa66897
Do not open the dialogue window if no greeting is found
2013-01-17 01:58:44 +01:00
Emanuel Guevel
f1f9173f24
Prevent closing dialogue window when an answer is expected
2013-01-15 00:53:32 +01:00
lazydev
7cd1e87fe8
Merge branch 'master' of git://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
2013-01-01 22:18:21 +04:00
greye
7e0713f6c4
fix string case update
2012-12-31 11:22:40 +04:00
lazydev
cd5d95ed22
1. Dialogs in Russian version now works.
...
2. Destination names it travel window are now translated
2012-12-31 04:15:47 +04:00
eduard
69d9d22579
comparestring
2012-12-30 19:56:38 +01:00
eduard
fb25f407fb
dialoguemanager conflict
2012-12-30 13:37:19 +01:00
eduard
c85400b809
Merge https://github.com/zinnschlag/openmw into comparestring
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwworld/worldimp.cpp
components/esm_store/reclists.hpp
components/misc/stringops.hpp
2012-12-30 13:09:37 +01:00
eduard
8545667bbd
string compare and tolower
2012-12-28 17:54:56 +01:00
Tom Mason
f2c6907244
Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work
2012-12-20 23:16:34 +00:00
Marc Zinnschlag
caaffd1ec2
handle persuasion records properly
2012-12-08 14:24:15 +01:00
Marc Zinnschlag
386eec51c1
some skill usage fixes
2012-12-07 11:36:38 +01:00
eduard
e50b9aca86
tradding skill use, spechcraft use
2012-12-06 20:58:33 +01:00
eduard
2d62649dc9
tradding skill use, spechcraft use
2012-12-06 18:30:19 +01:00
eduard
b2a0e4b1fd
tradding skill use, spechcraft use
2012-12-06 18:19:35 +01:00
scrawl
1d7e92b6b3
dialogue fixes
2012-11-23 19:05:40 +01:00
Marc Zinnschlag
89c7936534
fixed dialogue script error reporting
2012-11-16 12:47:09 +01:00
Marc Zinnschlag
2a1727d4c5
improved error reporting for dialogue scripts (enabled via --script-verbose)
2012-11-13 15:35:46 +01:00
Marc Zinnschlag
cbb0fd5792
Merge branch 'dialogue'
2012-11-13 10:04:08 +01:00
scrawl
8e847fdc6e
fix speechcraft skill increasing when persuade didn't succeed
2012-11-11 19:18:41 +01:00
Marc Zinnschlag
75f64aa38b
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.hpp
apps/openmw/mwmechanics/npcstats.cpp
apps/openmw/mwmechanics/npcstats.hpp
2012-11-10 15:44:44 +01:00
Marc Zinnschlag
6dc2214502
Issue #219 : more DialogueManager refactoring
2012-11-10 14:52:44 +01:00
Marc Zinnschlag
79706bf60f
Issue #219 : dialogue manager cleanup
2012-11-10 14:31:58 +01:00
Marc Zinnschlag
d24e3eec9f
Issue #219 : added filters for various player stats
2012-11-10 14:02:52 +01:00
Marc Zinnschlag
f8fcca64b6
Issue #219 : Proper implementation of talked to PC filter
2012-11-10 13:31:10 +01:00
Marc Zinnschlag
7e8d4bb3c9
Issue #219 : added various creature and NPC stats; implemented respective filters
2012-11-10 13:21:38 +01:00
Marc Zinnschlag
e97f3003ab
Issue #219 : added expelled status tracking; implemented expelled filter
2012-11-10 12:28:40 +01:00
Marc Zinnschlag
d6961c0246
Issue #219 : made all unimplemented filters return false
2012-11-10 11:42:03 +01:00
Marc Zinnschlag
ceaf1677ce
Issue #219 : rewrote AI settings and implemented AI settings filters
2012-11-10 11:38:37 +01:00
Marc Zinnschlag
eb4e72aaa7
Issue #219 : implemented disease filters
2012-11-10 11:08:36 +01:00
Marc Zinnschlag
c425b3f4a3
Issue #219 : fixed function decoding and moved choice function from DialogueManager to Filter
2012-11-10 09:48:20 +01:00
Marc Zinnschlag
a752536cea
Issue #219 : added function decoding and moved same faction function from DialogueManager to Filter
2012-11-10 09:35:50 +01:00
scrawl
94aeb15220
bartering disposition change
2012-11-10 00:38:45 +01:00
scrawl
33b4b29fbc
persuasion mechanics, added reputation
2012-11-10 00:29:36 +01:00
Marc Zinnschlag
4994a253da
Merge branch 'bountydisease' into dialogue
2012-11-09 18:17:14 +01:00
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
2012-11-08 23:16:40 +01:00
scrawl
bf4e855260
fixed creatures
2012-11-08 22:31:08 +01:00
Marc Zinnschlag
e6021a3fe3
Issue #219 : moved checks for local and global variables from DialogueManager to Filter
2012-11-08 22:11:50 +01:00
Marc Zinnschlag
e68bb3481e
Issue #219 : moved over the second batch of functions (boolean and one integer I forgot last time)
2012-11-08 21:48:17 +01:00
Marc Zinnschlag
91afef140b
Issue #219 : moved first batch of integer type functions from DialogueManager to Filter
2012-11-08 21:16:49 +01:00
Marc Zinnschlag
4614d2bc8e
Issue #219 : added basic select struct analysis and type checking
2012-11-08 16:49:38 +01:00
