0cbc2e458c
CBonusSystemNode: remove description
...
It was almost unused, but this change is save-breaking
2023-05-05 18:57:11 +03:00
d0e6205688
CBonusSystemNode: make some properties private
2023-05-05 18:57:11 +03:00
eb50ae3aa7
- Pre-distribute max number of Prisons
...
- Minor refactor for artifact and hero pool management
2023-05-05 10:30:36 +02:00
d137f7157c
Merge remote-tracking branch 'origin/develop' into parellel_rmg
...
# Conflicts:
# lib/rmg/CZonePlacer.h
# lib/rmg/TreasurePlacer.h
2023-05-05 09:00:44 +02:00
35ec720555
Forget objects that were already replaced iwth an artifact.
2023-05-05 07:16:38 +02:00
67331c5520
Fix after merge
2023-05-05 00:14:44 +04:00
7f180b6e81
Split enum EMonsterStrength into EMonsterStrength and EZoneMonsterStrength.
...
Removed obsolete ZONE_ and GLOBAL_ from enum item names.
Simplified serialization of zone monster strength in preparation for adding zone monster strength: none.
2023-05-04 21:43:31 +02:00
ce80c83ca2
Merge remote-tracking branch 'upstream/develop' into town-buildings
...
# Conflicts:
# lib/CTownHandler.cpp
# lib/rewardable/Interface.cpp
2023-05-04 22:23:44 +04:00
05e72e2e7f
Don't remove zone guards in a zone with monsters: none, remove extra parentheses and add comments
2023-05-04 18:40:04 +02:00
9984351302
Fix object clearing
2023-05-04 15:03:18 +04:00
42d6cb4f8a
Merge branch 'develop' into rmg-no-monster-zone
2023-05-03 19:29:07 +02:00
05eccbc2bb
vcmi: split bonus to enumerator and HeroBonus.h
2023-05-03 18:01:06 +03:00
8ebaa3fd6b
Adding zoneMonserStrength: none
2023-05-03 12:07:00 +02:00
92dcfd1f68
Fix garrisons hero
2023-05-02 15:09:02 +04:00
7996123dfa
Rename constant
2023-05-02 14:45:53 +04:00
fbc05c70ac
vcmi: camelCase methods of new classes
...
Also use EGameSettings for clamping morale and luck
2023-05-02 12:09:13 +03:00
a6de9097be
vcmi: rename HeroBonus.h to Bonus.h
2023-05-02 11:20:58 +03:00
c4cf2a100b
Fix behavior for hero bought in town tavern
2023-05-02 04:44:09 +04:00
18efde3b02
Fix incorrect merge
2023-05-02 01:58:19 +04:00
3df5a8e415
vcmi: split selectors from HeroBonus.h
2023-05-02 00:54:53 +03:00
29c76fb9bf
HeroBonus: split BonusList
2023-05-02 00:54:53 +03:00
48bcfe74f7
HeroBonus: move TBonusSubtype from GameConstants.h
2023-05-02 00:54:53 +03:00
ce37380e99
HeroBonus: remove unused template
2023-05-02 00:54:53 +03:00
4866c2fe5c
vcmi: split IBonusBearer
2023-05-02 00:54:53 +03:00
b6eb2dc060
vcmi: rename IFactionMember and ICreature
2023-05-02 00:54:53 +03:00
1d34c73c2d
vcmi: split CBonusSystemNode, BonusParams and prop
...
More splitting of HeroBonus.h
2023-05-02 00:54:53 +03:00
713e3004df
vcmi: rename updater and limiter files
2023-05-02 00:53:51 +03:00
4894280c6b
HeroBonus: remove unused function
2023-05-02 00:53:51 +03:00
34c1d4f3e9
vcmi: move CBonusProxy and friends to new file
...
To decouple HeroBonus.h more
2023-05-02 00:53:51 +03:00
a2d4c72016
vcmi: morale and luck now also IFactionMember
...
Not all bonus bearers have morale and luck, only faction members
2023-05-02 00:53:51 +03:00
e37f798a68
vcmi: split bonus updaters
2023-05-02 00:53:50 +03:00
416faf521e
vcmi: move limiters outside of HeroBonus.cpp
...
This will help for recompilation.
2023-05-02 00:53:50 +03:00
6fa1b2b19f
vcmi: move bonuses to its own folder
2023-05-02 00:53:50 +03:00
03b8ce2d4c
HeroBonus: remove unused functions
2023-05-02 00:53:50 +03:00
4b2a09dae7
FactionMember: move code around
2023-05-02 00:53:50 +03:00
1f54a1474c
vcmi: remove SHval (replace by simple val)
2023-05-02 00:53:50 +03:00
af25ad0866
vcmi: split creatures and faction members
2023-05-02 00:53:50 +03:00
f4f0fd5945
vcmi: magicResistance is IFactionMember property
...
It is no reason to keep it inside IBonusBearer
2023-05-02 00:53:50 +03:00
4f7035d3ff
vcmi: add IFactionMember abstract class
2023-05-02 00:53:50 +03:00
0250e6fb92
Merge branch 'develop-upstream' into town-buildings
...
# Conflicts:
# client/CPlayerInterface.cpp
# client/windows/CTradeWindow.cpp
# config/objects/generic.json
# lib/mapObjects/CGMarket.cpp
# lib/mapObjects/CGMarket.h
# lib/mapObjects/CGTownInstance.cpp
# lib/mapObjects/CommonConstructors.cpp
# lib/mapObjects/CommonConstructors.h
2023-05-02 01:48:13 +04:00
c9b59735cf
Merge pull request #2101 from Nordsoft91/rewardable-expand
...
Part 2: refactoring for rewardable object
2023-05-02 01:19:57 +04:00
916b41d9a7
Merge pull request #2078 from IvanSavenko/shortcuts
...
Basic shortcuts system
2023-05-01 21:45:52 +03:00
97a1758e8e
Merge remote-tracking branch 'upstream/develop' into rewardable-expand
2023-05-01 21:51:10 +04:00
eb577a03b5
Deprecating enum constants
2023-05-01 21:49:37 +04:00
87ff31531f
Rename parameter and remove extra check
2023-05-01 21:49:37 +04:00
07b2052679
Bit refactoring
2023-05-01 21:49:37 +04:00
68fa7aaf35
Remove limitations for amount of skills
2023-05-01 21:49:37 +04:00
a4fd6c1c92
Move trading window title to config
2023-05-01 21:49:37 +04:00
b29fc1a5f4
Fix movement bonus subtype
2023-05-01 21:49:37 +04:00
3d20538c1e
Implement markets
2023-05-01 21:49:37 +04:00
