Laserlicht
081ba4839c
added town info
2024-09-18 22:39:53 +02:00
Laserlicht
735af83294
castSpellThisTurn to bool var
2024-09-18 21:24:27 +02:00
K
bda1adbdfd
miniscule bonus system cleanup
...
update comments, remove one never used method, make another method private
2024-09-18 16:41:41 +02:00
Xilmi
27aed74397
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-18 14:52:24 +02:00
Laserlicht
6aa29ac8ee
show creature level
2024-09-17 22:34:09 +02:00
Dydzio
7979f62f82
Add status bar movement points info for own hero on adventure map or hero list
2024-09-17 21:38:28 +02:00
Ivan Savenko
d0ac6458b9
Merge pull request #4609 from IvanSavenko/building_fixes
...
Building fixes
2024-09-17 17:50:49 +03:00
Ivan Savenko
8b2821456a
Show generic dialog if building was already visited
2024-09-16 19:51:10 +00:00
Ivan Savenko
e09fbe5ea4
Implement detection of typos in json using Levenshtein Distance
2024-09-15 20:14:08 +00:00
Ivan Savenko
c2dc88bf06
Fix refusing a reward, for example from Tree of Knowledge
2024-09-15 10:32:29 +00:00
Xilmi
ca4a46466b
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-15 11:32:46 +02:00
Laserlicht
0aaafc4c8a
cast without skip
2024-09-14 15:10:24 +02:00
Ivan Savenko
90733cfe0e
Do not place obstacles during sieges
2024-09-14 11:02:23 +00:00
Ivan Savenko
95df330843
Remove unused files
2024-09-14 10:47:43 +00:00
Xilmi
737a8d4966
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-14 12:45:25 +02:00
Tomasz Zieliński
2fe54504ab
Merge remote-tracking branch 'origin/develop' into custom_objects_per_zone
...
# Conflicts:
# lib/rmg/CRmgTemplate.cpp
2024-09-14 10:19:22 +02:00
Tomasz Zieliński
4d4538a48d
Use CompoundMapObjectID in ObjectInfo
2024-09-14 09:23:28 +02:00
Tomasz Zieliński
9591ce1ab4
Move CompoundMapObjectID to separate file
2024-09-14 08:55:28 +02:00
Tomasz Zieliński
e89649ec1c
Move ObjectConfig to separate file
2024-09-14 08:41:00 +02:00
Ivan Savenko
4772311160
Fix positioning of defender war machines
2024-09-12 20:27:32 +00:00
Ivan Savenko
6c0b9415c0
Fix positioning of defender units in non-bank battles
2024-09-12 20:11:26 +00:00
Tomasz Zieliński
4b263b6d41
Add specific objects and configure their frequency / value
2024-09-12 21:04:27 +02:00
Xilmi
a1a03d4b74
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-12 14:54:39 +02:00
Ivan Savenko
45c8553ecb
Remove old code
2024-09-12 12:11:18 +00:00
Ivan Savenko
d20d9bd96b
Fix generation of placeholders for banks
2024-09-12 12:11:18 +00:00
Ivan Savenko
ca13fe04df
Use alphabetic ordering for game settings
2024-09-12 12:11:18 +00:00
Ivan Savenko
2ee4e42348
Implement placeholders for creature banks messages
2024-09-12 12:11:18 +00:00
Ivan Savenko
39a2c29c97
Removed creatureBank flag from battle, battles now receive BattleLayout
...
struct that defines how units are placed in combat
2024-09-12 12:11:18 +00:00
Ivan Savenko
31dff8f8da
Add coastVisitable property to rewardables, update schemas
2024-09-12 12:11:18 +00:00
Ivan Savenko
503b87561e
Converted all h3 banks to rewardable, remove most of hardcoded checks
2024-09-12 12:11:18 +00:00
Ivan Savenko
cb5df096c1
Added per-team tracking of scouted state of an object
2024-09-12 12:11:17 +00:00
Ivan Savenko
785036836c
Rewardable objects may now define guards. Converted Crypt to rewardable.
2024-09-12 12:10:40 +00:00
Ivan Savenko
a9c4683da6
Merge pull request #4566 from Laserlicht/outro_support
...
Campaign outro
2024-09-12 14:20:56 +03:00
Ivan Savenko
9a08e2eb0f
Merge pull request #4573 from kdmcser/stack_level_updater_for_commander
...
make TimesStackLevelUpdater support commander
2024-09-12 14:16:16 +03:00
Xilmi
065125e770
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-10 14:57:27 +02:00
Laserlicht
258d298775
Merge branch 'develop' into outro_support
2024-09-09 23:09:44 +02:00
Ivan Savenko
ce4548718c
Merge pull request #4544 from IvanSavenko/map_settings
...
Per-map game settings
2024-09-10 00:03:10 +03:00
Ivan Savenko
a58e209cbd
Merge pull request #4490 from godric3/fix-campaign-hero-placeholder
...
Fix campaign hero placeholder
2024-09-09 23:39:20 +03:00
kdmcser
b84d653a99
make TimesStackLevelUpdater support commander
2024-09-09 19:23:23 +08:00
Xilmi
d4ee899565
Merge remote-tracking branch 'upstream/develop' into develop
2024-09-06 17:04:34 +02:00
Laserlicht
6d9385b8bd
outro for RoE
2024-09-05 21:31:17 +02:00
Xilmi
581a142a20
HeroStrengthForCampaign
...
Make sure to take our magic-specialist to the next campaign-mission even if he's totally out of mana.
2024-09-05 17:38:27 +02:00
Ivan Savenko
ff8d36c350
It is now possible to define game settings in rmg template
2024-09-05 15:16:28 +00:00
Ivan Savenko
8225eb454e
Added GameSettings to gamestate, potentially allowing to define game
...
settings per map (or in random map template)
2024-09-05 15:16:27 +00:00
Xilmi
7c42e43fe5
Update CCreatureSet.cpp
...
Use getMarketValue instead of getCost.
2024-09-05 17:16:06 +02:00
Xilmi
20cfe712c9
Update ResourceSet.h
...
Rename income to availableFunds
2024-09-05 16:34:42 +02:00
Xilmi
044dc272c2
Update lib/CCreatureSet.h
...
Use a better name and add a comment to explain what it does.
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-09-05 16:31:44 +02:00
Xilmi
79531c8596
Update ResourceSet.h
...
Use a more descriptive method name and add comment of what it does.
2024-09-05 16:30:15 +02:00
Xilmi
51b9d16291
Merge branch 'develop' of https://github.com/xilmi/vcmi into develop
2024-09-05 16:22:30 +02:00
Xilmi
23cd54c998
Preparations for merge
...
No longer using FuzzyEngine just to create a log-message. It's now only used when isUseFuzzy is set.
Also:
Removed < operator and instead use already existing "canAfford"-Method.
2024-09-05 16:22:25 +02:00