7886e8986e
Merge pull request #197 from vcmi/issue/2304_2418
...
Issues/2304/2418/2293
2016-03-01 15:20:59 +03:00
3873e5047e
Attempt to fix 2293
2016-03-01 13:24:46 +03:00
277211e569
Fix summoning block by clones.
2016-03-01 04:16:51 +03:00
5df8d1cbd0
Update low level battle stacks accessor for ghost selection support.
2016-02-28 05:10:20 +03:00
47b619a543
Centralize GHOST state handling
2016-02-28 01:35:23 +03:00
d2a5e64542
Remove clone of killed or removed creature. Treat summoned creature as clone when killed.
2016-02-27 18:39:37 +03:00
53b5587c2e
Advance map header serialization
2016-02-21 21:21:22 +03:00
150fcc9422
Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1
2016-02-15 13:39:00 +03:00
4d9058e412
Whitespace cleanup. (No code changes.)
2016-02-15 13:34:37 +03:00
7106c5d1af
Fix loading of spell identifier
2016-02-13 19:41:28 +03:00
6e205a58b4
Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1
...
Conflicts:
lib/VCMI_lib.cbp
lib/filesystem/CZipLoader.cpp
lib/filesystem/CZipLoader.h
lib/mapObjects/CGTownInstance.cpp
2016-02-04 10:27:51 +03:00
bdd87be10d
Try to fix http://bugs.vcmi.eu/view.php?id=2362
2016-02-02 11:46:33 +03:00
3926920103
Rename radious -> radius
...
There is no such English word, "radious"
Some files get new lines in the end - BSD sed bug + best practices
2016-01-31 18:01:58 +03:00
37d0dad70a
Merge branch 'develop' into feature/VCMIMapFormat1
...
Conflicts:
lib/CArtHandler.cpp
2016-01-01 20:28:52 +03:00
9fd1cff090
Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared
...
Long time ago it's was used without prefix to make future switch from boost to std version easier.
I discusses this with Ivan and decide to drop these using from Global.h now.
This change wouldn't break anything because there was already code with prefix for each of three cases.
2015-12-29 05:43:33 +03:00
48be566050
Dimension Door: fix movement points cost for expert level
2015-12-21 18:46:52 +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
6f203fb7e2
Save string identifiers for all game objects
2015-12-05 12:36:39 +03:00
faa7cbff18
Fixed gcc/clang warnings
2015-12-04 01:17:43 +02:00
7b5a7f43ad
Removed includes of CGameState from headers
2015-12-02 21:39:53 +02:00
c3ce4b25df
Removed all #include's of CMap.h from headers.
...
To all - please, avoid #include's in headers as much as possible
This kills incremental build compile times
2015-12-02 21:05:10 +02:00
eeb100d6a4
More comments about dispell special cases.
2015-10-13 07:11:49 +03:00
02c15085be
Remove (aready disabled in prev. commit) active stack change in sacrifice mechanics
...
* stack removing is evil, but changing active stack by spells is more evil ...
2015-10-06 03:59:05 +03:00
f99bf099ca
Made player interface tolerant to active stack removal.
2015-10-06 03:46:35 +03:00
4e60b4cf53
Fixed 0002280
2015-10-06 01:26:50 +03:00
6cf220b882
Partial fix for 2272, there are more active stack sacrifice problems.
2015-10-05 20:33:05 +03:00
b07d272c2a
Added new BattleSpellCastParameters support to SACRIFICE spell.
2015-10-01 02:36:00 +03:00
939a9180e2
Added new BattleSpellCastParameters support to TELEPORT spell.
2015-09-30 22:38:50 +03:00
57e5b768e8
Allow multiple destinations in BattleSpellCastParameters
2015-09-30 00:31:50 +03:00
70d9be8447
Use ISpellCaster in battle callback
2015-09-29 17:26:52 +03:00
75c2566410
"const" tweak
2015-09-29 17:26:51 +03:00
36e154d9b9
Use ISpellCaster in getAffectedStacks
2015-09-29 17:26:50 +03:00
947f6089d5
Use ISpellCaster in isImmuneByStack
2015-09-29 17:26:49 +03:00
a4d4851d80
Fix typo: casted->cast
2015-09-29 17:26:48 +03:00
d9cbe487c7
remove useless function CSpell::getTargetInfo
2015-09-29 17:26:47 +03:00
5f41ec912f
fix sphereOfPermanence
2015-09-29 17:26:45 +03:00
3d7435c520
Introduced absolute specific spell immunity.
2015-09-29 17:26:44 +03:00
253b850ac3
Partial fix for 1791
2015-09-29 17:26:43 +03:00
a44c606277
Use callback methods
2015-09-29 17:26:42 +03:00
660203b436
Tweak BattleSpellCastParameters
2015-09-29 17:26:41 +03:00
2b434111bf
More hero|creature casting unification
2015-09-29 17:26:40 +03:00
e454649886
Use BattleSpellCastParameters for spell parameters override
2015-09-29 17:26:39 +03:00
10318a3da3
Intoduce PASSIVE_CASTING mode for opening battle spells
...
* now at least one "caster" object is present
2015-09-29 17:26:39 +03:00
e552e37cf7
Factored out CDefaultSpellMechanics::battleCast
...
(-) still huge
2015-09-29 17:26:36 +03:00
baba3a46e1
Centralize creature spell bonuses handling
...
* unified heal and damage calculation
* apply SPELL_DAMAGE_REDUCTION, MORE_DAMAGE_FROM_SPELL for Fairy dragon
2015-09-29 17:26:35 +03:00
67bd698019
Added some debug logging
2015-09-29 17:26:34 +03:00
873979a300
The only usage of secHero cast parameter is mana channeling - better to get it OTF
2015-09-29 17:26:33 +03:00
46f99db8d7
Hide some spell mechnaics details
2015-09-29 17:26:32 +03:00
9ed9075afc
Introduce calculateHealedHP again, now in better place.
2015-09-29 17:26:29 +03:00
0929e009db
Remove suspicios code in display damage calculation
2015-09-29 17:26:28 +03:00
