62bab27e7e
CGArtifact: show yes/no dialog for guarded artifacts. Fix issue 2095
...
Also fix hover text for CGMine
2015-12-24 21:05:02 +03:00
75ca020890
CCeatureSet: add getArmyDescription for hover and InfoWindow texts
2015-12-24 21:03:51 +03:00
be50d699fb
Compile fixes for MSVS
2015-12-23 15:23:56 +01:00
48be566050
Dimension Door: fix movement points cost for expert level
2015-12-21 18:46:52 +03:00
a051a08a46
Merge remote-tracking branch 'origin/issue/2306' into develop
2015-12-18 22:21:11 +02:00
b6176649ec
CGMonolith: avoid crash when all exits are blocked by friendly heroes
2015-12-18 01:08:19 +03:00
9490a5d66d
CPathfinder: deny transit to land blockvis objs from water layer
...
When hero is in water walking layer he can only exit to accessible or visitable land tiles, but not objects that have blocking visit and leave hero standing on water.
This is different than default flying behaviour because hero in air layer can only transit into accessible land layer without any blocking or visitable objects on them.
2015-12-16 20:14:36 +03:00
bf9ac7318a
CPathfinder: change cost calculation sequence for embark / disembark
...
With old embark cost calculation pathfinder may end up thinking that hero can embark/disembark while have less movement points than base movement cost is. Now hero would be only able to embark / disembark if we have enough movement points to step on that tile. This rule is also valid for situation when hero have Admiral's Hat as in H3 even if hero don't have embark penalty he still use move points for embark and disembark.
Problem was found as it's was causing infitite loop in AI. Server of course rejected attempt to embark with less than 100 movement points while pathfinder tell AI that it's can still embark with 93 movement points.
2015-12-15 20:08:52 +03:00
2724a67a27
CPathfinder: add border gate support and use passableFor
2015-12-14 14:33:50 +03:00
9f565b81e9
CBankInfo: fix huge memory leak that appear in long run
2015-12-14 11:29:24 +03:00
59199ccdbd
Bonus system: add treeHasChanged call where bonus objects changed
2015-12-11 16:13:18 +03:00
1730a31471
HeroBonus: get rid of code that used getBonusList
2015-12-11 16:01:51 +03:00
8fb5dacba2
CBonusSystemNode: get rid of non-const getBonusList
2015-12-11 15:02:36 +03:00
ab92123da3
CPathfinder: improve support for visits and battles in teleports
...
Related movement code for client and AI is plumbed as well. Though at moment code still not finished because it's not teleport hero to the exit tile if he won battle.
2015-12-11 09:42:30 +03:00
a430769b44
CPathfinder: fix possible crash when using invisible teleport exit
...
This one is similar with FoW bug when hero was covered by FoW while one tile around wasn't.
2015-12-11 04:10:30 +03:00
c3e5231146
CPathfinder: avoid pathing through hero standing on Subterranean Gate
...
Subterranean Gates unlike Monolith allow to visit hero standing on other exit. So of course pathfinder allowed that, but it's also allowed future movement through that hero which caused infinite loop for AI.
2015-12-10 16:51:19 +03:00
2be6818e33
FoWChange::applyGs: correct copy-paste error. Fix issue 2345
2015-12-09 10:02:33 +03:00
1c0d4e3f6f
Fix filenames in file headers
2015-12-08 09:53:14 +03:00
07807fb044
Client: slience visibility error on shipyard in non-coastal town
2015-12-08 07:33:13 +03:00
03e9dd3bab
Add hero gold cost to GameConstants
2015-12-07 00:13:58 +03:00
e872b400b7
Comments save format backward compatability code as Ivan suggested
...
Also we should always handle RumorState::TYPE_NONE in getTavernRumor properly anyway.
2015-12-06 02:51:54 +03:00
05a34fb417
Use "Favorable" instead of "Favourable" everywhere for consistency
...
Original game of course used american english version so we stick to it.
2015-12-06 02:23:41 +03:00
f33bcee84c
post-merge fixes
2015-12-05 13:56:38 +03:00
947edc0693
Merge branch 'develop' into feature/VCMIMapFormat1
2015-12-05 13:04:04 +03:00
0fab319c73
Merge remote-tracking branch 'remotes/origin/develop' into issue/2306
...
s reverts commit fa8a282696
.
Conflicts:
AI/VCAI/VCAI.cpp
Conflicts:
AI/VCAI/VCAI.cpp
client/windows/CAdvmapInterface.cpp
lib/CPathfinder.cpp
lib/CPathfinder.h
2015-12-05 12:56:12 +03:00
3bf9696b13
Tweaks
2015-12-05 12:38:37 +03:00
3f79d001c1
Fix subObject identification
2015-12-05 12:38:36 +03:00
b56b7017ba
Added stubs for some Map objects serialization
2015-12-05 12:38:35 +03:00
6977fc3a14
Move test filesystem creation to global fixture
2015-12-05 12:37:37 +03:00
e7359c9a36
Serialize tempOwner
2015-12-05 12:37:35 +03:00
8a979d016f
ObjectTemplate serialization
...
(+) generated map displayed correctly in editor
2015-12-05 12:36:44 +03:00
2d777ea676
Small (temp) fix. Prevent nulls from serialization.
2015-12-05 12:36:43 +03:00
2d5a366e6c
Implemented (basic) object construction and placement
...
* contain refactoring of RMG and class handling (will be more)
2015-12-05 12:36:42 +03:00
9cc3dae5fe
Started working on objects serialization
2015-12-05 12:36:42 +03:00
a5b72ce593
Cleanup
2015-12-05 12:36:41 +03:00
8493d0cded
Initial implementation of new team settings format
2015-12-05 12:36:40 +03:00
6f203fb7e2
Save string identifiers for all game objects
2015-12-05 12:36:39 +03:00
93c214d7a0
fix CMakeLists
2015-12-05 12:36:38 +03:00
60825fbbd3
Start implementing PlayerInfo serialisation
2015-12-05 12:36:37 +03:00
2f67e015e1
Fix build
2015-12-05 12:36:36 +03:00
7c8d29b871
Start implementing player info serialization
2015-12-05 12:36:36 +03:00
f5b348a1d1
Formatting
2015-12-05 12:36:35 +03:00
3af255d1b9
Implemented terrain serialisation
...
* with test
2015-12-05 12:36:34 +03:00
6552acdff6
Check coastal tile OTF
2015-12-05 12:36:29 +03:00
8bc242d002
Cleanup
2015-12-05 12:06:52 +03:00
27bf2524a3
Advance triggered events serialization
...
(-) missing indentifier serialization (unimplemented in engine)
(-) missing tests
2015-12-05 12:06:51 +03:00
11af00bcdf
Start working on Triggered Events
2015-12-05 12:06:50 +03:00
b683c29b6e
Added modification time to zip.
...
* it is required to consider archive valid (by some tools)
2015-12-05 12:06:49 +03:00
f6e2cd16ed
Fix header.mapLevels saving
2015-12-05 12:06:48 +03:00
0cc7213a27
WiP on zip serialization
...
(-) still not works correctly
2015-12-05 12:06:47 +03:00