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 |
|
Tomasz Zieliński
|
46a24043e8
|
Add back Mines.
|
2023-03-29 17:06:17 +02:00 |
|
Tomasz Zieliński
|
401f2342c0
|
Place Mines after Towns and Monoliths.
|
2023-03-29 16:54:22 +02:00 |
|
Tomasz Zieliński
|
5ed3c2d518
|
Place towns and monoliths first - preferably at the zone border.
|
2023-03-29 16:25:13 +02:00 |
|
Tomasz Zieliński
|
045942fd68
|
Fixed warning-as-error
|
2023-03-28 18:25:56 +02:00 |
|
Tomasz Zieliński
|
b184e80b72
|
Use the most suitable template for object
|
2023-03-28 17:53:08 +02:00 |
|
Tomasz Zieliński
|
49c029ea6c
|
Minor refactor
|
2023-03-28 17:13:24 +02:00 |
|
Ivan Savenko
|
8d0d5341db
|
Refactoring of hero specialty loading code:
- removed no longer used code
- follow creature upgrade chains (e.g. third upgrades)
|
2023-03-28 17:09:54 +03:00 |
|
Ivan Savenko
|
39ff7efb78
|
Fix crash on starting Launcher without H3 data
|
2023-03-27 22:33:36 +03:00 |
|
Ivan Savenko
|
b2f5042942
|
Merge pull request #1783 from vcmi/beta
Merge beta -> develop
|
2023-03-27 21:21:25 +03:00 |
|
Ivan Savenko
|
a4fe11d413
|
Merge pull request #1766 from vcmi/fix_editor_shortcut
Fix editor shortcut
|
2023-03-27 21:20:14 +03:00 |
|
Ivan Savenko
|
11088100a0
|
Merge pull request #1782 from korli/haiku
Haiku patch
|
2023-03-27 18:42:22 +03:00 |
|
Tomasz Zieliński
|
b3a457c71a
|
Skip objects with value too low to be placed in the zone.
|
2023-03-27 17:29:46 +02:00 |
|
Ivan Savenko
|
b875da108b
|
Merge pull request #1717 from SoundSSGood/backpack-limit-size
Introducing backpack size limit functionality
|
2023-03-27 17:17:49 +03:00 |
|
Ivan Savenko
|
e3b5db0ade
|
Merge pull request #1778 from rilian-la-te/fix-obstacle-removal-mechanincs
Fix landmines staying on battlefield after trigger
|
2023-03-27 17:17:14 +03:00 |
|
Konstantin
|
9a229d6e48
|
vcmi: really correct obstacle trigger
Now obstacle trigger really matches H3
|
2023-03-27 16:11:17 +03:00 |
|
Konstantin
|
8c1d6c8e13
|
CBattleInfoCallback: use obstacle only once
We should not affect creature by obstacle twice.
|
2023-03-27 15:45:41 +03:00 |
|
Konstantin
|
88a7b3141d
|
vcmi: really correct BFS
AFAIK, all is working as H3.
|
2023-03-27 15:45:41 +03:00 |
|
Jerome Duval
|
518f8d69e5
|
Haiku patch
|
2023-03-27 10:10:09 +02:00 |
|
Tomasz Zieliński
|
511a42f9b9
|
Oops missed that part.
|
2023-03-27 09:35:52 +02:00 |
|
Tomasz Zieliński
|
18a87d1ec0
|
Distribute limited objects evenly in zones with matching terrain
|
2023-03-27 09:09:58 +02:00 |
|
Tomasz Zieliński
|
a88e1dc1f6
|
Add only one template per object
|
2023-03-27 08:44:49 +02:00 |
|
Konstantin
|
5b50191af7
|
NetPacksLib: remove obstacle ACTIVATE* actions
Actually these actions was not working anyway.
|
2023-03-26 22:59:34 +03:00 |
|
Konstantin
|
26db14b7b4
|
vcmi: expert dispel now works mechanically correct
|
2023-03-26 21:25:26 +03:00 |
|
Konstantin
|
edc9812559
|
obstacle: correct logic as in OH3
Obstacle spells should not be cast if they are affected by native
terrain and enemy have at least one stack with native terrain
|
2023-03-26 21:22:38 +03:00 |
|
Konstantin
|
705afbb898
|
UnitEffect: it should not always assume smart
It is normal than non-smart spell will be cast on our units.
|
2023-03-26 21:19:49 +03:00 |
|
Konstantin
|
44a625aa6b
|
vcmi: check spell obstacles by type
|
2023-03-26 21:17:39 +03:00 |
|
Andrii Danylchenko
|
a0de223901
|
Merge pull request #1772 from vcmi/fix_invalid_native_terrain
Fix the case of invalid native town type
|
2023-03-26 13:19:01 +03:00 |
|
Ivan Savenko
|
9287d1b837
|
Merge pull request #1776 from vcmi/beta
Merge beta -> develop
|
2023-03-26 01:48:23 +02:00 |
|
Ivan Savenko
|
7477e4a8cc
|
Handle mods with "keepDisabled" propertly on client
|
2023-03-25 23:54:51 +02:00 |
|
Ivan Savenko
|
4eed0b2c9e
|
Added workaround for Dungeon towers
|
2023-03-25 23:54:51 +02:00 |
|
Ivan Savenko
|
8fbeff2a02
|
Fix movement over lowered drawbridge in Fortress
|
2023-03-25 23:54:51 +02:00 |
|
Ivan Savenko
|
5288e3761e
|
Merge pull request #1764 from IvanSavenko/selectable_spellcaster
Implemented support for multi-spell casters
|
2023-03-25 20:08:47 +02:00 |
|
Ivan Savenko
|
6f631a0aa7
|
Merge pull request #1759 from IvanSavenko/kills_in_tooltip
Show potential kill amount in attack tooltip
|
2023-03-25 20:03:27 +02:00 |
|
Tomasz Zieliński
|
00a77e3c5f
|
Probably found the root cause of terrain problems.
|
2023-03-25 18:52:18 +01:00 |
|
DjWarmonger
|
2c4cde060a
|
Merge pull request #1694 from vcmi/extra_rmg_monoliths
This could be controversial solution, but since there were no objections, I'll give it a shot.
|
2023-03-25 18:38:06 +01:00 |
|
DjWarmonger
|
114e7d196b
|
Merge pull request #1698 from vcmi/object_placement_tweaks
No objections, works fine for me as well.
|
2023-03-25 18:13:15 +01:00 |
|
Tomasz Zieliński
|
68a2bb78a5
|
Fix the case of invalid native town type :?
|
2023-03-25 18:08:46 +01:00 |
|
Tomasz Zieliński
|
9d7d4b6a5f
|
Fixed editor shortcut on Windows
|
2023-03-25 11:40:44 +01:00 |
|
Tomasz Zieliński
|
392061e97e
|
Fix loading towns which in OH3 editor have defined horde buildings level 1 - 5 (inluding random town).
|
2023-03-25 11:17:49 +01:00 |
|
Ivan Savenko
|
9a19feaf4a
|
Fix spellcasters with massive spells
|
2023-03-25 01:23:49 +02:00 |
|
Ivan Savenko
|
dc099b2a35
|
Implemented support for multi-spell casters
|
2023-03-25 00:48:14 +02:00 |
|
Ivan Savenko
|
970981cfc9
|
Show information on potential kills in attack tooltip
|
2023-03-24 17:18:47 +02:00 |
|
Ivan Savenko
|
31147ac83b
|
refactoring: TDmgRange pair -> DamageRange struct
|
2023-03-23 17:49:33 +02:00 |
|
Konstantin
|
e40b9c849d
|
vcmi: no open-code NO_APPROPRIATE_TARGET
|
2023-03-22 12:04:28 +03:00 |
|
SoundSSGood
|
19096f39f0
|
Backpack limit. Amount of fixes.
|
2023-03-21 22:11:42 +02:00 |
|
Konstantin
|
0ffc440b53
|
vcmi: fix target condition regression
|
2023-03-21 19:19:34 +03:00 |
|
Ivan Savenko
|
44dc89bdcf
|
Merge pull request #1736 from rilian-la-te/fix-target-conditions
vcmi: fix target condition regression
|
2023-03-21 17:35:20 +02:00 |
|
Konstantin
|
60b510617c
|
vcmi: fix target condition regression
|
2023-03-21 17:56:15 +03:00 |
|
Ivan Savenko
|
575fb29a22
|
Merge pull request #1534 from kambala-decapitator/pathfinder-fly
fix movement cost with Fly
|
2023-03-21 14:32:56 +02:00 |
|
SoundSSGood
|
f0f9eecf97
|
Backpack limit part5. End of battle. Other stuff
|
2023-03-21 12:14:33 +02:00 |
|
SoundSSGood
|
9f8aa25297
|
Backpack limit part4 (Using cheats, buying)
|
2023-03-21 12:14:33 +02:00 |
|
SoundSSGood
|
ca5c9910a4
|
Backpack limit part3 finishQuest
|
2023-03-21 12:14:33 +02:00 |
|
SoundSSGood
|
e23766280f
|
Backpack limit part2 (Pick up, Dig up, Object rewards)
|
2023-03-21 12:14:33 +02:00 |
|
SoundSSGood
|
96e8a1f21c
|
Backpack limit part1 (move, disassemble)
|
2023-03-21 12:14:33 +02:00 |
|
SoundSSGood
|
37edffd788
|
GameConstants upd
|
2023-03-21 12:14:33 +02:00 |
|
SoundSSGood
|
72122fb433
|
CArtifact, CArtifactInstance, CCombinedArtifactInstance reorganization
|
2023-03-21 12:14:33 +02:00 |
|
Ivan Savenko
|
6ee4fd24f7
|
Merge pull request #1731 from rilian-la-te/fix-unicorns
CStack: make unicorns ability multiplicative
|
2023-03-20 23:34:05 +02:00 |
|
Konstantin
|
8c10f48fbd
|
CStack: make unicorns ability multiplicative
|
2023-03-20 23:29:33 +03:00 |
|
Ivan Savenko
|
9289646dab
|
Merge pull request #1722 from rilian-la-te/fix-first-aid
vcmi: fix first aid regression
|
2023-03-20 21:49:53 +02:00 |
|
Andrey Filipenkov
|
147633bd9d
|
compute movement cost using PathNodeInfo layer info when possible
|
2023-03-20 11:35:20 +03:00 |
|
Andrey Filipenkov
|
a0cd69e944
|
Slight refactoring of CGHeroInstance::movementPointsAfterEmbark()
|
2023-03-20 11:35:20 +03:00 |
|
Andrey Filipenkov
|
3602645a30
|
improve iterating over EPathfindingLayer
|
2023-03-20 11:35:19 +03:00 |
|
Andrey Filipenkov
|
c0c19557af
|
fix method documentation
|
2023-03-20 11:35:19 +03:00 |
|
Andrey Filipenkov
|
8f843d0bff
|
fix typos
|
2023-03-20 11:35:19 +03:00 |
|
Andrey Filipenkov
|
68f5c1de79
|
improve variable names in CPathfinderHelper::getNeighbours()
|
2023-03-20 11:35:19 +03:00 |
|
Andrey Filipenkov
|
bfb0dc26d5
|
fix movement cost on roads
|
2023-03-20 11:35:19 +03:00 |
|
Andrey Filipenkov
|
0c7b5ac793
|
fix movement cost on Favorable Winds
|
2023-03-20 11:35:19 +03:00 |
|
Andrey Filipenkov
|
3fbdc3b198
|
improve code that checks last possible tile
|
2023-03-20 11:35:18 +03:00 |
|
Andrii Danylchenko
|
23fa7c4a9b
|
Merge pull request #1720 from vcmi/fix_small_lakes_clean
Don't place shipyard or boats at very small lakes
|
2023-03-19 19:52:22 +02:00 |
|
Andrii Danylchenko
|
aede3da74e
|
Merge pull request #1721 from vcmi/fix_rmg_infinite_loop
Fix rmg infinite loop
|
2023-03-19 19:46:28 +02:00 |
|
Konstantin
|
895572df02
|
vcmi: fix first aid regression
|
2023-03-19 19:20:08 +03:00 |
|
DjWarmonger
|
15047a4469
|
Merge pull request #1718 from vcmi/fix_shipyard_border
Fix shipyard border calculation for RMG
|
2023-03-19 16:05:24 +01:00 |
|
Tomasz Zieliński
|
9e206dbbc7
|
Forgot this one
|
2023-03-19 09:51:37 +01:00 |
|
Tomasz Zieliński
|
f52c465322
|
Allow zones to inherit properties recursively, in any order.
|
2023-03-19 09:27:05 +01:00 |
|
Andrey Filipenkov
|
21463f1c0e
|
fix movement cost with Fly
|
2023-03-19 11:26:55 +03:00 |
|
Andrey Filipenkov
|
43e89523a9
|
Merge pull request #1716 from rilian-la-te/tw-fix
TotalValue: fix typo
|
2023-03-19 11:25:48 +03:00 |
|
Tomasz Zieliński
|
dd3803b111
|
Don't place shipyard or boats at very small lakes
(cherry picked from commit 1d2913bea0)
|
2023-03-18 22:05:25 +01:00 |
|
Tomasz Zieliński
|
e1ced317a1
|
Few tweaks for boat placement to keep distance between it and other objects, especially guards.
|
2023-03-18 21:59:23 +01:00 |
|
Tomasz Zieliński
|
1dc96d6844
|
Fix shipyard border calculation for RMG
|
2023-03-18 20:12:36 +01:00 |
|
Konstantin
|
54b1b49f5a
|
totalValue: fix overflow
Fixes #1715
|
2023-03-18 22:08:21 +03:00 |
|
Tomasz Zieliński
|
23a5a32756
|
Add fallback for empty terrain types. Still it's a workaround and does not solve the root cause.
|
2023-03-18 17:00:50 +01:00 |
|
Konstantin
|
b07f4fb383
|
TotalValue: fix typo
|
2023-03-18 15:45:32 +03:00 |
|
Tomasz Zieliński
|
eabcbfc25a
|
Fix all stacks being capped at 10 units
|
2023-03-17 22:32:05 +01:00 |
|
Tomasz Zieliński
|
f57c275603
|
Merge remote-tracking branch 'origin/develop' into object_placement_tweaks
|
2023-03-17 21:47:16 +01:00 |
|
Ivan Savenko
|
f24ca6fbcf
|
Merge pull request #1699 from rilian-la-te/fix-ignissa
Rewardable: always initialize numbers
|
2023-03-17 22:15:28 +02:00 |
|
Ivan Savenko
|
95d56d3f2a
|
Merge pull request #1705 from rilian-la-te/convert-scouting
HeroBonus: add scouting to converter
|
2023-03-17 22:14:54 +02:00 |
|
Konstantin
|
6de042657c
|
fix Ignissa bug the old way
|
2023-03-17 20:09:18 +03:00 |
|
Konstantin
|
b4fe7908a4
|
HeroBonus: add scouting to converter
|
2023-03-17 18:50:57 +03:00 |
|
Konstantin
|
bbbbfe00f0
|
Modernize resourceSet
|
2023-03-17 02:26:54 +03:00 |
|
Ivan Savenko
|
8a6c51a9e6
|
Fix uninitialized pointer dereference
|
2023-03-16 20:48:37 +02:00 |
|