Tomasz Zieliński
|
308b42549b
|
Merge remote-tracking branch 'origin/beta' into object_distribution
|
2023-03-31 15:44:14 +02:00 |
|
Konstantin
|
6d17b9342d
|
ResourceSet: resolve .at troubles
|
2023-03-31 14:12:38 +03:00 |
|
Konstantin
|
c1fd7309ad
|
ResourceSet: composition
|
2023-03-31 14:00:49 +03:00 |
|
Ivan Savenko
|
e485c5811e
|
Merge pull request #1799 from IvanSavenko/beta_fixes
Several more fixes for beta branch
|
2023-03-31 12:11:25 +03:00 |
|
Ivan Savenko
|
ea1d177c9b
|
Fixed false error messages on game startup
|
2023-03-31 01:28:56 +03:00 |
|
Ivan Savenko
|
6e28b6ed90
|
Do not crash on invalid callback name
|
2023-03-31 01:28:33 +03:00 |
|
Konstantin
|
d8a237ba46
|
vcmi: add getTrigger method to obstacles
Fixes advanced remove obstacle spell
|
2023-03-31 01:01:26 +03:00 |
|
Konstantin
|
82a6d94fd0
|
moats: indentation
|
2023-03-31 01:01:26 +03:00 |
|
Konstantin
|
d5e2933bee
|
CGameHandler: slightly rework obstacle caster
|
2023-03-31 01:01:26 +03:00 |
|
Konstantin
|
25956e3f37
|
vcmi: bump serializer version
|
2023-03-31 01:01:25 +03:00 |
|
Konstantin
|
ecae600563
|
effects: Moat now includes battlefield bonus
This is an implementation which works exactly like in H3
|
2023-03-31 01:01:25 +03:00 |
|
Konstantin
|
53a6fb2836
|
CGameHandler: do not open-code toInfo
There is an obstacle function which is doing exactly this.
|
2023-03-31 01:01:25 +03:00 |
|
Konstantin
|
f704a17e1a
|
vcmi: add a last hex setting
I consider this behaviour as H3 bug, but this is H3.
So, added a setting to disable this behaviour.
|
2023-03-31 01:01:25 +03:00 |
|
Konstantin
|
35e8ce2ead
|
vcmi: update russian translation
|
2023-03-31 01:01:25 +03:00 |
|
Konstantin
|
d83e58f948
|
vcmi: use new animation functions in client
|
2023-03-31 01:01:25 +03:00 |
|
Konstantin
|
179cee3e88
|
vcmi: add obstacle animation helper functions
|
2023-03-31 01:01:25 +03:00 |
|
Konstantin
|
eff41f66ed
|
vcmi: now obstacles can have disappearing anim
It is a reverse version of appearingAnimation.
|
2023-03-31 01:01:25 +03:00 |
|
Konstantin
|
7543fdf787
|
vcmi: add reverse effect animation type
To be used later with obstacle removal
|
2023-03-31 01:01:25 +03:00 |
|
Konstantin
|
c4d5a7a2d6
|
vcmi:towns now can choose if moat render is needed
Using invalid points. Also removed unused variable.
|
2023-03-31 01:01:25 +03:00 |
|
Konstantin
|
a8478a012b
|
vcmi: check long bridge by moat
If moat is on GATE_BRIDGE hex, then it is a long bridge.
No need to check town type.
|
2023-03-31 01:01:25 +03:00 |
|
Konstantin
|
3bbff0588d
|
CSpell: !isMagical() -> no sorcery and no generic spell dmg reduction
Other bonus are still applied.
|
2023-03-31 01:01:25 +03:00 |
|
Konstantin
|
a639bd2606
|
spells: rework isMagical()
Now it is a flag of a spell, and not a target condition.
This fixes resistance to bind effect
|
2023-03-31 01:01:25 +03:00 |
|
Konstantin
|
aab5b47038
|
vcmi: setup moats using MoatAbility
Setup moats using moat ability, need playtest for now.
-3 to defence not added for now.
|
2023-03-31 01:01:25 +03:00 |
|
Konstantin
|
6c5f5dba75
|
BattleAI: check negative obstacles instead of moat.
This will work for fire walls too (and if someone will summon elementals
after placing land mines). But will not work for Tower's landmines.
|
2023-03-31 01:01:25 +03:00 |
|
Konstantin
|
1100bc7a5b
|
obstacle: remove trigger animation and sound
It was not working anyway. Now it is handled by trigger ability.
Trigger ability hit animation + trigger ability cast sound.
|
2023-03-31 01:01:25 +03:00 |
|
Konstantin
|
50dab1f049
|
vcmi: convert fireWall and landMine
convert fireWall and landMine to new
trigger system. Now landmines correctly removed
after exploding
|
2023-03-31 01:01:25 +03:00 |
|
Ivan Savenko
|
4f703df4ac
|
Removed old bonuses data
|
2023-03-31 00:16:27 +03:00 |
|
Ivan Savenko
|
508d68f77c
|
Rewardables will use per-object name, if available
|
2023-03-30 22:29:58 +03:00 |
|
Dydzio
|
93c9632814
|
Minor readability fix
|
2023-03-30 21:19:05 +02:00 |
|
Ivan Savenko
|
e652b3eef0
|
Removed old code - VCMI now supports json-based animations everywhere
|
2023-03-30 19:59:19 +03:00 |
|
Dydzio
|
e70dd599bb
|
Update / tweak translations
|
2023-03-30 18:58:31 +02:00 |
|
Ivan Savenko
|
46ccd65080
|
Removed largely unused signal handling, fixes build with musl c library
|
2023-03-30 14:56:13 +03:00 |
|
Konstantin
|
cd1730b1fb
|
vcmi: remove obstacle caster logic
It is possible now to cast something via obstacle
Immune creatures should not trigger an obstacle trigger now
and should not reveal it.
|
2023-03-30 14:41:40 +03:00 |
|
Konstantin
|
db428faeeb
|
vcmi: allow obstacles to store another spells
It will be used as trigger spell, if set
If not set, it will be ignored
|
2023-03-30 14:41:40 +03:00 |
|
Konstantin
|
57c35f39ca
|
WIP: Moat placer
|
2023-03-30 14:41:40 +03:00 |
|
Konstantin
|
d90d00eeac
|
vcmi: rework ProxyCaster
Now ProxyCaster can be used without hero and can even cast something
with default values.
|
2023-03-30 14:41:40 +03:00 |
|
Konstantin
|
847437bbfa
|
BattleInfo: update bonus tree when unit is moved
This is a semi-dirty hack to force uncaching a bonuses with
UnitOnHexLimiter
|
2023-03-30 12:51:59 +03:00 |
|
Konstantin
|
4c08e6a0f9
|
vcmi: add UnitOnHex limiter
Bonus will be accepted, if unit stands in listed hexes
|
2023-03-30 12:51:59 +03:00 |
|
Konstantin
|
ffe24627e7
|
HeroBonus: change limiters to enum class
Also remove unused functions.
|
2023-03-30 12:42:24 +03:00 |
|
Konstantin
|
777818b388
|
HeroBonus: use 64 bit for tree counter (to be more robust)
|
2023-03-30 12:41:17 +03:00 |
|
Konstantin
|
0e69aac96f
|
HeroBonus: removed unused functions
|
2023-03-30 12:41:17 +03:00 |
|
Konstantin
|
89fd742c1a
|
NetPacks: add BATTLE type to GiveBonus
Will work as battlefield effect of current battle.
|
2023-03-30 12:41:17 +03:00 |
|
Konstantin
|
5716925b47
|
NetPacks: change GiveBonus enum to enum class.
|
2023-03-30 12:41:17 +03:00 |
|
Ivan Savenko
|
1084da00df
|
Fix initial value of sound/music labels in settings
|
2023-03-30 12:23:47 +03:00 |
|
Ivan Savenko
|
484f0a175a
|
Blocked movement of war machines in tactics phase
|
2023-03-30 12:20:13 +03:00 |
|
Ivan Savenko
|
9e75568574
|
Fixed Roland's specialty to use Swordsmen instead of Griffins
|
2023-03-30 12:19:31 +03:00 |
|
Ivan Savenko
|
974be97e6d
|
Merge pull request #1792 from IvanSavenko/happy_dydzio
Fixes for beta - graphical artifacts
|
2023-03-30 00:11:19 +03:00 |
|
Ivan Savenko
|
bfd8d3e1f7
|
Merge pull request #1790 from IvanSavenko/creature_specialty_loading_refactoring
Refactoring of hero specialty loading code
|
2023-03-30 00:11:08 +03:00 |
|
Ivan Savenko
|
8a3e1b0230
|
Merge pull request #1789 from IvanSavenko/beta_fixes
Fixes for 1.2 release
|
2023-03-30 00:09:51 +03:00 |
|
Ivan Savenko
|
abecda52b6
|
Merge pull request #1793 from heroesiiifan/patch-1
Update german translation
|
2023-03-30 00:09:40 +03:00 |
|