Ai fix2 #1274
Open
Ai fix2 #1274
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
That does not merge cleanly. |
|
:( |
|
What is the state on this one? |
Removed some unused state in and changed Ogre::String to std::string in WeatherManager.
|
I have troubles with my ISP, and I can't push anything on github, nor retrieve latest master. You can either wait for my internet to come back to normal (around the beginning april according to my ISP) or merge it yourself (should not be too hard). |
Implemented traded gold reset delay. Note: Traders gold pool is still in inventory.
Trade Time initialized to 0 Gold pot set correctly for npc’s and creatures
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.
Implemented a getBaseGold() to get the vendor gold base NPC gold base now can come from mNpdt12 and mNpdt52
Removed unused code getBaseGold throws proper error
Gold is now put into inventory receivers when bribing.
…ed some comments as well. There may be opportunities for some optimization but left that out for now.
…n fact caused due to some of the pathgrid points being unreachable. Instead of returning an empty path in such a scenario, incorrect path + requested destination were being returned. There was also a defect where past cost was being used for selecting open points. There is still an unresolved issue where mGraph and mSCComp are being rebuilt unnecessarily. The check mCell != cell in buildPath() is being triggered frequently. Not sure why.
This reverts commit 3e8f7b3.
This reverts commit 33aecc5.
…Fix2 Conflicts: apps/openmw/mwmechanics/aifollow.cpp
nikolaykasyanov
pushed a commit
to nikolaykasyanov/openmw
that referenced
this pull request
Jun 3, 2017
Fix wrong incrementation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://bugs.openmw.org/issues/1140