80220fda5b
Merge remote-tracking branch 'upstream/develop' into vcmi-campaign
...
# Conflicts:
# lib/mapping/CMap.h
2023-04-17 04:54:57 +04:00
91b4782a2f
Refactor more fields from campaign header
2023-04-17 04:47:54 +04:00
70f4cc5e0f
Refactor campaign regions
2023-04-17 04:26:35 +04:00
54eb550eb9
vcmi: remove unused functions now
2023-04-17 00:43:13 +03:00
7a5775a9f9
vcmi: use std::optional
2023-04-17 00:43:13 +03:00
0d35606a44
vcmi: use std::variant
2023-04-17 00:43:13 +03:00
8dcb041917
vcmi: use std::any
2023-04-17 00:43:13 +03:00
25783066e8
vcmi: use std::any_cast
2023-04-17 00:43:13 +03:00
e3ed728193
Merge pull request #1932 from rilian-la-te/proper-teleport
...
VCMI: teleport redesign
2023-04-16 22:52:01 +03:00
0c87d0a26c
Add a comment
2023-04-16 21:49:43 +04:00
954a2abb71
Verifying mods before starting map
2023-04-16 15:38:13 +04:00
67e1b48d47
Remove unused interface
2023-04-16 14:00:01 +04:00
65e4ce9ffe
Update to c++17
2023-04-15 17:20:38 +03:00
5589e973a8
Fixed parsing of hota 'arena' map format hacks
2023-04-15 17:20:38 +03:00
22558551bf
Fix parsing of invalid data from h3m
2023-04-15 17:20:38 +03:00
2c2c2c8fe0
Slight tweaking of logging of h3m edge cases
2023-04-15 17:20:38 +03:00
f84665b5ec
Fixed loading of maps with objects owned by non-existing players
2023-04-15 17:20:38 +03:00
f997241da1
Throw exception on loading not supported hota duel/arena maps
2023-04-15 17:20:38 +03:00
87647cd02a
Do not propose banned skills in witch huts
2023-04-15 17:20:38 +03:00
d6a3c0e666
Cleaned up handling of hota map format versioning
2023-04-15 17:20:38 +03:00
5b658462a1
Renamed army formation enum value
2023-04-15 17:20:38 +03:00
b1e7774bbd
Fixed parsing of hota format '0'
2023-04-15 17:20:38 +03:00
1b6ece1367
Formatting and renames of H3M readers, no functionality changes
2023-04-15 17:20:38 +03:00
de855085f0
Added information on banks, seer hut and monster properties
2023-04-15 17:20:38 +03:00
ea8aeef8c0
Implemeted parsing of HotA Seer Huts
2023-04-15 17:20:38 +03:00
88096de7e4
Fixed parsing of HotA H3M format, including Seer Huts
2023-04-15 17:20:38 +03:00
46239215af
Implemented parsing of HotA map objects (except for Seer Hut)
2023-04-15 17:20:38 +03:00
3790661fa6
Refactored loadObject() monstrocity into set of smaller methods.
2023-04-15 17:20:38 +03:00
c0e9eb6eb1
HotA maps up to objects block can be parsed
2023-04-15 17:20:38 +03:00
838d45b32c
Implemented parsing of HotA h3m header
2023-04-15 17:20:38 +03:00
f93335d678
Cleanup and formatting of H3M loader code
2023-04-15 17:20:38 +03:00
3738171b21
Refactoring of H3M loader to make HotA format support easier
...
- extracted low-level reader from MapFormatH3M class
- added separate structure to define version-specific values
- cleared up some H3M format edge cases
- replaced witch hut skill vector with set
- converted several fields to enum type
2023-04-15 17:20:38 +03:00
9a838598a6
arts refactoring part1
2023-04-15 00:10:39 +03:00
b354f99cc3
Merge pull request #1936 from IvanSavenko/cpp_17_upgrade
...
Upgrade c++ standard to c++17
2023-04-14 19:21:17 +03:00
128764b1c9
Merge pull request #1968 from rilian-la-te/fix-caster-tactics
...
Fix caster tactics
2023-04-14 18:59:03 +03:00
44b83b2e11
Merge master -> develop
2023-04-14 16:51:35 +03:00
5dd1d5bf3f
Merge pull request #1973 from IvanSavenko/beta_fixes
...
Fixes for 1.2 release
2023-04-14 11:41:22 +03:00
e97c2bd838
Merge pull request #1970 from IvanSavenko/add_rmg_templates
...
Moved RMG templates from vcmi-extras to vcmi mod
2023-04-14 11:40:27 +03:00
9d31830c74
Fix check for Demon Summon targets
2023-04-13 21:17:35 +03:00
1fab2e2e34
Do not allow rising of corpses below alive stack
2023-04-13 19:08:08 +03:00
35ac4d88ac
Fix Seer Hut right-click text
2023-04-13 19:06:44 +03:00
9d901efb0c
Change default difficulty to "Normal"
2023-04-13 19:06:17 +03:00
2dc48496ef
Fix generation of roads and rivers near map edge
2023-04-13 16:26:03 +03:00
f11fa8f0c8
Teleport: can trigger obstacles now
2023-04-13 11:24:19 +03:00
384ee99834
vcmi: configurable teleport v2
...
1. Redesign wall and teleport penalty using shortest path
This will avoid OH3 exploits with teleport inside walls
2. Teleport is now configurable
2023-04-13 11:24:19 +03:00
bc1aad3b26
vcmi: remove deprecated CStack::getCreature()
...
Function battle::Unit::unitType() does the same.
2023-04-13 11:24:19 +03:00
03eb997137
CBattleInfoEssentials: add battleIsGatePassable()
...
This is a helper to check if gate is passable now or not.
2023-04-13 11:24:19 +03:00
5419de3468
Fix getCasterUnitId
2023-04-13 02:18:12 +04:00
cb83a9371d
vcmi: 1.2 compatibility to FACTION_LIMITER
2023-04-12 23:14:38 +03:00
74d028d951
Use product instead of distance sum for Subterranean Gate placement.
2023-04-12 09:31:09 +02:00
