Tomasz Zieliński
a952a9e279
Remove unused code
2023-05-06 12:22:01 +02:00
Warzyw647
d74fdad432
Renamed enum EMonsterStrength to EGlobalMonsterStrength. Enum EZoneMonsterStrength unchanged.
2023-05-06 12:18:53 +02:00
Tomasz Zieliński
d22ec0ee0c
Move Modificator to separate file.
2023-05-06 10:49:18 +02:00
Konstantin P
8600e3035a
IBonusBearer: split cached methods
2023-05-05 21:30:45 +03:00
Konstantin P
f2827834c0
vcmi: bump serialization version
2023-05-05 21:30:45 +03:00
Konstantin P
45ca449f2c
vcmi: more optionals in bonuses
2023-05-05 21:30:45 +03:00
Konstantin P
9e1cdc410f
vcmi: replace school bonuses to unified ones
...
Except immunity now
2023-05-05 21:30:45 +03:00
Konstantin P
8764765dcf
Bonus: complex duration as bitset
...
Fixes #2125
2023-05-05 21:30:45 +03:00
Konstantin P
e9a90a8cbf
Serializer: serialize small bitsets (32 bits)
2023-05-05 21:30:45 +03:00
Konstantin P
6ff83e6f16
tests: test nonMagical effects
2023-05-05 18:57:40 +03:00
Konstantin P
75948a5dd7
tests: add ResistanceCondition test
2023-05-05 18:57:40 +03:00
Konstantin
3d46ee3182
TargetCondition: units with 100% MR is immune
...
Spells should not consider units with 100% MR as valid targets.
2023-05-05 18:57:40 +03:00
Konstantin P
c216292f1e
CHeroHandler: remove confusing map
...
This map should not be used, it does not have values anymore
2023-05-05 18:57:40 +03:00
Konstantin
b0d2787e86
vcmi: remove DIRECT_DAMAGE_IMMUNITY bonus
...
Replace by SPELL_DAMAGE_REDUCTION bonus with 100 value
2023-05-05 18:57:40 +03:00
Konstantin P
5841c716fd
vcmi: 100% damage reduction is damage immunity
2023-05-05 18:57:11 +03:00
Konstantin P
0cbc2e458c
CBonusSystemNode: remove description
...
It was almost unused, but this change is save-breaking
2023-05-05 18:57:11 +03:00
Konstantin P
d0e6205688
CBonusSystemNode: make some properties private
2023-05-05 18:57:11 +03:00
Nordsoft91
3a731b62b8
Merge pull request #2119 from macomarivas/spanish_translation
...
Spanish translation updated
2023-05-05 19:23:48 +04:00
Asirome
f28ed43a86
Merge branch 'vcmi:develop' into spanish_translation
2023-05-05 13:53:03 +02:00
Asirome
ea0c219c53
Update spanish.ts
2023-05-05 13:52:12 +02:00
Asirome
1fa252add7
Update spanish.json
2023-05-05 13:49:42 +02:00
Ivan Savenko
095064d288
Merge pull request #2118 from IvanSavenko/mod_repo_url
...
Use separate json for vcmi-1.3
2023-05-05 12:06:44 +03:00
Tomasz Zieliński
eb50ae3aa7
- Pre-distribute max number of Prisons
...
- Minor refactor for artifact and hero pool management
2023-05-05 10:30:36 +02:00
Tomasz Zieliński
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
Tomasz Zieliński
35ec720555
Forget objects that were already replaced iwth an artifact.
2023-05-05 07:16:38 +02:00
nordsoft
67331c5520
Fix after merge
2023-05-05 00:14:44 +04:00
Warzyw647
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
nordsoft
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
Asirome
04e59c7f2e
Update spanish.ts
2023-05-04 20:05:09 +02:00
Asirome
84127e6104
Update spanish.json
2023-05-04 20:03:28 +02:00
Warzyw647
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
Ivan Savenko
4c93b8f3f2
Use separate json for vcmi-1.3
2023-05-04 19:38:36 +03:00
Ivan Savenko
9373239c03
Merge pull request #2108 from rilian-la-te/bonuses-refactor-p2
...
Split HeroBonus.h to pieces, part2
2023-05-04 19:14:39 +03:00
nordsoft
9984351302
Fix object clearing
2023-05-04 15:03:18 +04:00
Warzyw647
42d6cb4f8a
Merge branch 'develop' into rmg-no-monster-zone
2023-05-03 19:29:07 +02:00
Konstantin
05eccbc2bb
vcmi: split bonus to enumerator and HeroBonus.h
2023-05-03 18:01:06 +03:00
Warzyw647
8ebaa3fd6b
Adding zoneMonserStrength: none
2023-05-03 12:07:00 +02:00
Nordsoft91
9f5ee885b4
Merge pull request #2105 from rilian-la-te/bonuses-refactor
...
Split HeroBonus.h to pieces: part1
2023-05-02 15:39:49 +04:00
nordsoft
92dcfd1f68
Fix garrisons hero
2023-05-02 15:09:02 +04:00
nordsoft
7996123dfa
Rename constant
2023-05-02 14:45:53 +04:00
nordsoft
96420bfc05
Fix configurable reward for non-query scenrio
2023-05-02 14:45:42 +04:00
Konstantin
fbc05c70ac
vcmi: camelCase methods of new classes
...
Also use EGameSettings for clamping morale and luck
2023-05-02 12:09:13 +03:00
Konstantin
a6de9097be
vcmi: rename HeroBonus.h to Bonus.h
2023-05-02 11:20:58 +03:00
nordsoft
c4cf2a100b
Fix behavior for hero bought in town tavern
2023-05-02 04:44:09 +04:00
nordsoft
18efde3b02
Fix incorrect merge
2023-05-02 01:58:19 +04:00
Konstantin
3df5a8e415
vcmi: split selectors from HeroBonus.h
2023-05-02 00:54:53 +03:00
Konstantin
29c76fb9bf
HeroBonus: split BonusList
2023-05-02 00:54:53 +03:00
Konstantin
48bcfe74f7
HeroBonus: move TBonusSubtype from GameConstants.h
2023-05-02 00:54:53 +03:00
Konstantin
ce37380e99
HeroBonus: remove unused template
2023-05-02 00:54:53 +03:00
Konstantin
4866c2fe5c
vcmi: split IBonusBearer
2023-05-02 00:54:53 +03:00
