1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-27 00:41:08 +02:00
Commit Graph

9319 Commits

Author SHA1 Message Date
46f99db8d7 Hide some spell mechnaics details 2015-09-29 17:26:32 +03:00
2c3a607497 Tweak StacksHealedOrResurrected
* flags should be bool
2015-09-29 17:26:31 +03:00
a1e06aa217 Unify LIFE_DRAIN and Tent healing with magic healing 2015-09-29 17:26:30 +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
16f0714474 More usage of OOP in HealingSpellMechanics::applyBattleEffects 2015-09-29 17:26:28 +03:00
0fecb40039 Extract HealingSpellMechanics
* healing effects are too specific to be allowed for any spell
* mixing heal with direct damage does not make sence
* mixing heal with timed effect can be easy allowed if needed
2015-09-29 17:26:27 +03:00
c050fde3f9 Get rid of DefaultSpellMechanics::calculateHealedHP 2015-09-29 17:26:26 +03:00
a35b8a46d3 Comment out wrong code 2015-09-29 17:26:25 +03:00
f66c29ea3b fix comments 2015-09-29 17:26:24 +03:00
05e52993fd Simplified healed HP calculation 2015-09-29 17:26:23 +03:00
eb1753851e Fix comment 2015-09-29 17:25:04 +03:00
f81b46088a Fixed #2218 2015-09-29 11:01:59 +02:00
108d4c39b5 Fix build 2015-09-24 11:55:23 +03:00
6b45f323ea Fixed logic regression from previous commit. 2015-09-23 21:38:16 +02:00
971f6d1c1f Removed WoG dependency for random artifacts. WoG version in repository updated. 2015-09-23 21:14:41 +02:00
e2165a33a0 - Updated MSVS project
- Artifacts added via mods now work correctly without WoG
2015-09-23 19:34:12 +02:00
def56051fc Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2015-09-23 19:03:48 +02:00
76cd002f07 Remove unused variable found by valgrind 2015-09-23 11:09:15 +03:00
ffb8e6a696 Garrison: fix more issues introduced in pull #115
After 8cad23956c there was several issues remaining:
* Last creature would remain even for town garrisons.
* Impossibility to move last stack even within same garrison.
* Impossibility of partially merge of last stack into other hero stack.
All fixed. However last stack merge to other hero will now make split window appear instead of auto merge.
2015-09-23 08:12:43 +03:00
2851832f0c Fixed logs. 2015-09-20 14:02:52 +02:00
57637dd71a Added some checks & logs for empty def names, but it only delays the crash. 2015-09-20 13:02:13 +02:00
e14faea181 Merge branch 'develop' of https://github.com/vcmi/vcmi into mutexRelax 2015-09-20 09:46:52 +02:00
8cad23956c Fix 2258 2015-09-19 17:16:09 +03:00
9e0fd70208 Move isCastableBy logic back to CGHeroInstance - it is Hero-specific
* When and if canCastThisSpell will also be implmented for creatures common part may be moved to CSpell class.
2015-09-16 04:39:44 +03:00
dc8b05fbd8 Give banned spells only by SPELL bonus 2015-09-16 04:16:46 +03:00
f2605e059c Fix 2042 2015-09-16 02:20:57 +03:00
b0c039bd7f fix 2241 2015-09-15 10:54:55 +03:00
d181d764bb fix 2215 2015-09-15 10:02:27 +03:00
395070b584 Fix 1974 2015-09-15 08:51:05 +03:00
017b4c308c Enable crashhandler for mingw. It works for mingw 4.0. 2015-09-15 07:27:18 +03:00
080244f30e MAXED_SPELL bonus should only affect spell effects
* fixes 2146
2015-09-15 06:00:24 +03:00
b4d73409b7 Fix random server crash after CLONE or SACRIFICE use 2015-09-15 04:58:32 +03:00
27f2dfc576 Quick fix for SACRIFICE immunity check 2015-09-15 04:31:43 +03:00
bd70f672c3 fix 1814 2015-09-15 03:08:45 +03:00
466ddb37b3 fix 1556 2015-09-14 18:38:41 +03:00
e5b4b2341d Fix fortess heros specialities, issue 2131 2015-09-14 17:36:33 +03:00
3ed3f1fa13 Use json configuration for special spell effect duration 2015-09-14 13:22:23 +03:00
3c053e5dd5 Quick fix for 2245 & 2238 2015-09-14 12:35:58 +03:00
d4ae63e7ef Expert FIRE_SHIELD should not be massive 2015-09-14 12:08:48 +03:00
0e8598bafe Merge branch 'issue/2243' into develop 2015-09-14 11:56:38 +03:00
329c1d6b94 Calculate magic mirror effect at same time as magic resistance. 2015-09-14 11:52:56 +03:00
caf8ae62cc Allow custom effect animation on any stack during spell cast. 2015-09-14 06:21:49 +03:00
0f0e67dbe3 Do not include resisted stacks in affected 2015-09-14 05:45:05 +03:00
6374eaef7a Merge branch 'SpellsRefactoring6' into develop 2015-09-14 03:28:17 +03:00
843a2a39bd Use general dispell algorithm for CURE 2015-09-13 01:06:07 +03:00
32337102ac Fix a typo 2015-09-13 00:54:39 +03:00
9d0a1f0eef Added logging for CDummyAnimation creation (like other types) 2015-09-13 00:01:36 +03:00
3029b1a432 Fix initialization of CSpell::AnimationItem 2015-09-12 23:52:04 +03:00
cbd8900c0b Added CBattleConsole tracing 2015-09-12 23:03:45 +03:00